@trustme24/flext 1.10.4 → 1.10.6

package/dist/modules/put/index.d.ts

@@ -2,5 +2,6 @@ import { SafeString } from 'handlebars';
 export declare const DEFAULT_COLOR = "text-blue-500";
 export declare function put(state: any): string;
 export declare function putWithColor(state: any): SafeString;
+export declare function defaultGetContent(): null;
 declare const _default: any;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trustme24/flext",
-  "version": "1.10.4",
+  "version": "1.10.6",
   "description": "A technology for building reliable document templates",
   "keywords": ["templates", "templating engine", "documents", "document engine", "handlebars"],
   "repository": "https://github.com/TrustMe-kz/flext.git",

package/src/lib/index.ts

@@ -628,8 +628,8 @@ export function ensureDate<T extends boolean = true>(val: Date | string | number
     const dbDate = <R extends boolean = true>(_val: string, _doWarn: R = true as R): R extends true ? Date : Date | null => {
         const [ year, month, day ] = _val?.split('-')?.map(Number) ?? [];
 
-        if (year && month && day)
-            return DateTime.fromtypes.Object({ year, month, day }).toJSDate();
+        if (isset(year) && isset(month) && isset(day))
+            return DateTime.fromObject({ year, month, day }).toJSDate();
         else if (_doWarn)
             throw new BaseError('Flext: Unable to get date: The date is invalid: ' + audit(_val));
         else

package/src/modules/date/index.ts

@@ -24,7 +24,7 @@ export function op(state: any): DateTime | string | number | null {
     let newDate: DateTime = DateTime.local();
 
     if (date !== 'now')
-        newDate = DateTime.fromJSDate(ensureDate(date));
+        newDate = DateTime.fromJSDate(ensureDate(date, true));
 
     if (timeZone || flext?.timeZone)
         newDate = newDate.setZone(timeZone ?? flext?.timeZone);

package/src/modules/put/index.ts

@@ -12,14 +12,29 @@ export const DEFAULT_COLOR = 'text-blue-500';
 // Functions
 
 export function put(state: any): string {
+    const flext = state?.flext ?? {};
     const args = state?.args ?? [];
     const [ val, fallback ] = args;
+    const options = state?.options ?? {};
+    const namedArgs = state?.namedArgs ?? {};
+    const self = state?.self ?? {};
+    const getContent = state?.getContent ?? defaultGetContent;
     const date = ensureDate(val, false);
 
-    if (date && !isNumber(val) && !inarr(val, true, false))
-        return format(date);
-    else
-        return val ?? fallback ?? '';
+
+    // If the value is a valid date
+
+    if (date && !isNumber(val) && !inarr(val, true, false)) return format({
+        flext: flext,
+        args: [ date ],
+        options: options,
+        namedArgs: { ...namedArgs, fallback },
+        self: self,
+        getContent: getContent,
+    });
+
+
+    return val ?? fallback ?? '';
 }
 
 export function putWithColor(state: any): SafeString {
@@ -32,6 +47,11 @@ export function putWithColor(state: any): SafeString {
         return new SafeString(state);
 }
 
+export function defaultGetContent(): null {
+    // The default 'getContent' function does nothing...
+    return null;
+}
+
 
 export default defineModule({
     helpers: {