Fix test suite compatibility with Node v24 (CJS/ESM, locutus v3, twing v6)

lib/filters/clean_class/twing.js

@@ -2,7 +2,7 @@ import { newTwingFilter } from '../../helpers/twing.js';
 import config from '../../config.js';
 import { name, options, acceptedArguments, cleanClass } from './definition.js';
 
-export async function callable(string) {
+export async function callable(_ctx, string) {
   return cleanClass(config, string);
 }
 

lib/filters/clean_id/twing.js

@@ -1,7 +1,7 @@
 import { newTwingFilter } from '../../helpers/twing.js';
 import { name, options, acceptedArguments, cleanID } from './definition.js';
 
-export async function callable(...args) {
+export async function callable(_ctx, ...args) {
   return cleanID(...args);
 }
 

lib/filters/format_date/definition.js

@@ -8,7 +8,7 @@
  * ```
  */
 
-import date from 'locutus/php/datetime/date.js';
+import { date } from 'locutus/php/datetime/date';
 
 export const name = 'format_date';
 

lib/filters/format_date/twing.js

@@ -2,7 +2,14 @@ import { newTwingFilter } from '../../helpers/twing.js';
 import config from '../../config.js';
 import { name, options, acceptedArguments, formatDate } from './definition.js';
 
-export async function callable(timestamp, type, format, timezone, langcode) {
+export async function callable(
+  _ctx,
+  timestamp,
+  type,
+  format,
+  timezone,
+  langcode,
+) {
   return formatDate(config, timestamp, type, format, timezone, langcode);
 }
 

lib/filters/placeholder/twing.js

@@ -7,9 +7,9 @@ import {
   wrapPlaceholder,
 } from './definition.js';
 
-export async function callable(template, value) {
-  const escapedValue = await escape(template, value, 'html', null, true);
-  return wrapPlaceholder(escapedValue);
+export async function callable(_ctx, value) {
+  const escapedValue = await escape(_ctx, value, 'html');
+  return wrapPlaceholder(String(escapedValue));
 }
 
 export default newTwingFilter(name, callable, options, acceptedArguments);

lib/filters/render/twing.js

@@ -1,7 +1,7 @@
 import { newTwingFilter } from '../../helpers/twing.js';
 import { name, options, acceptedArguments, renderVar } from './definition.js';
 
-export async function callable(...args) {
+export async function callable(_ctx, ...args) {
   return renderVar(...args);
 }
 

lib/filters/safe_join/twing.js

@@ -3,15 +3,15 @@ import { isTraversable } from 'twing/dist/cjs/lib/helpers/is-traversable.js';
 import { newTwingFilter } from '../../helpers/twing.js';
 import { name, options, acceptedArguments } from './definition.js';
 
-export async function callable(value, glue) {
+export async function callable(executionContext, value, glue) {
   // Twing's join() doesn't join Object values like it should. Issue #44
   // @see https://gitlab.com/nightlycommit/twing/-/issues/544
   // @see https://github.com/JohnAlbin/drupal-twig-extensions/issues/45
   const newValue =
     typeof value === 'object' && !isTraversable(value)
       ? Object.values(value)
       : value;
-  return join(newValue, glue);
+  return join(executionContext, newValue, glue, null);
 }
 
 export default newTwingFilter(name, callable, options, acceptedArguments);

lib/filters/without/twing.js

@@ -1,16 +1,7 @@
 import { newTwingFilter } from '../../helpers/twing.js';
 import { name, options, without } from './definition.js';
 
-export async function callable(element, argsMap) {
-  // Twing will give an is_variadic filter its arguments as a Map.
-  const args = Array.from(argsMap.values()).map((value) => {
-    if (value instanceof Map) {
-      // Twing v5 converts Twig [] into JS Maps; convert to an Array.
-      return Array.from(value.values());
-    } else {
-      return value;
-    }
-  });
+export async function callable(_ctx, element, ...args) {
   return without(element, ...args);
 }
 

lib/functions/active_theme/definition.js

@@ -10,7 +10,7 @@
 
 export const name = 'active_theme';
 
-export const options = {};
+export const options = { is_variadic: true };
 
 export const acceptedArguments = [];
 

lib/functions/active_theme/twing.js

@@ -2,7 +2,8 @@ import { newTwingFunction } from '../../helpers/twing.js';
 import config from '../../config.js';
 import { name, options, acceptedArguments, activeTheme } from './definition.js';
 
-export async function callable() {
+// eslint-disable-next-line no-unused-vars
+export async function callable(_ctx) {
   return activeTheme(config);
 }
 

lib/functions/active_theme_path/definition.js

@@ -10,7 +10,7 @@
 
 export const name = 'active_theme_path';
 
-export const options = {};
+export const options = { is_variadic: true };
 
 export const acceptedArguments = [];
 

lib/functions/active_theme_path/twing.js

@@ -7,7 +7,8 @@ import {
   activeThemePath,
 } from './definition.js';
 
-export async function callable() {
+// eslint-disable-next-line no-unused-vars
+export async function callable(_ctx) {
   return activeThemePath(config);
 }
 

lib/functions/create_attribute/twing.js

@@ -6,7 +6,7 @@ import {
   createAttribute,
 } from './definition.js';
 
-export async function callable(...args) {
+export async function callable(_ctx, ...args) {
   return createAttribute(...args);
 }
 

lib/functions/file_url/twing.js

@@ -2,7 +2,7 @@ import { newTwingFunction } from '../../helpers/twing.js';
 import config from '../../config.js';
 import { name, options, acceptedArguments, fileUrl } from './definition.js';
 
-export async function callable(uri) {
+export async function callable(_ctx, uri) {
   return fileUrl(config, uri);
 }
 

lib/functions/link/twing.js

@@ -1,7 +1,7 @@
 import { newTwingFunction } from '../../helpers/twing.js';
 import { name, options, acceptedArguments, link } from './definition.js';
 
-export async function callable(...args) {
+export async function callable(_ctx, ...args) {
   return link(...args);
 }
 

lib/functions/render_var/twing.js

@@ -1,8 +1,8 @@
 import { newTwingFunction } from '../../helpers/twing.js';
-import { name, options, renderVar } from './definition.js';
+import { name, options, acceptedArguments, renderVar } from './definition.js';
 
-export async function callable(...args) {
+export async function callable(_ctx, ...args) {
   return renderVar(...args);
 }
 
-export default newTwingFunction(name, callable, options);
+export default newTwingFunction(name, callable, options, acceptedArguments);

lib/helpers/twing/newEmptyStringFunction.js

@@ -7,7 +7,8 @@ const newEmptyStringFunction = (
 ) =>
   newTwingFunction(
     functionName,
-    async function () {
+    // eslint-disable-next-line no-unused-vars
+    async function (_ctx) {
       return '';
     },
     options,

lib/helpers/twing/newPassThroughFilter.js

@@ -7,7 +7,7 @@ const newPassThroughFilter = (
 ) =>
   newTwingFilter(
     filterName,
-    async function (value) {
+    async function (_ctx, value) {
       return value;
     },
     options,

lib/helpers/twing/newPassThroughFunction.js

@@ -7,7 +7,7 @@ const newPassThroughFunction = (
 ) =>
   newTwingFunction(
     functionName,
-    async function (value) {
+    async function (_ctx, value) {
       return value;
     },
     options,

lib/helpers/twing/newTwingFilter.js

@@ -1,12 +1,6 @@
-import { TwingFilter } from 'twing';
+import { createFilter } from 'twing';
 
 const newTwingFilter = (name, callable, options, acceptedArguments = []) =>
-  new TwingFilter(
-    name,
-    callable,
-    // @TODO File bug report; 3rd argument should be options.
-    acceptedArguments,
-    options,
-  );
+  createFilter(name, callable, acceptedArguments, options);
 
 export default newTwingFilter;

lib/helpers/twing/newTwingFunction.js

@@ -1,12 +1,6 @@
-import { TwingFunction } from 'twing';
+import { createFunction } from 'twing';
 
 const newTwingFunction = (name, callable, options, acceptedArguments = []) =>
-  new TwingFunction(
-    name,
-    callable,
-    // @TODO File bug report; 3rd argument should be options.
-    acceptedArguments,
-    options,
-  );
+  createFunction(name, callable, acceptedArguments, options);
 
 export default newTwingFunction;