@trustme24/flext 2.0.0 → 2.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trustme24/flext",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "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/dialects/index.ts

@@ -1,3 +1,2 @@
 export { default as Latest } from './latest';
-export { default as Legacy_1_0_beta3 } from './legacy-1-0-beta3';
 export { default as Legacy_1_0_beta4 } from './legacy-1-0-beta4';

package/src/dialects/legacy-1-0-beta4.ts

@@ -1,7 +1,75 @@
-import { Dialect } from '@flext/core';
+import { AST } from '@handlebars/parser';
+import { types, lib, Dialect, BaseError, BaseWarning } from '@flext/core';
+
+
+// Constants
+
+export const HANDLEBARS_COMMENT_BEGIN = '{{!--';
+
+export const DIALECT_MACRO = 'syntax';
+
+export const LEGACY_DIALECT_MACRO = 'v';
+
 
 export class LegacyDialect extends Dialect {
     public name = '1.0.beta4';
+
+    public testAst(val: AST.Program, doWarn?: boolean|null): boolean {
+
+        // Doing some checks
+
+        if (!this.name)
+            throw new BaseError(`Flext: Unable to test the template: 'name' param is not set in the dialect`);
+
+
+        // Doing some checks
+
+        const macros = lib.astToMacros(val);
+        const macro = macros?.find(m => m?.name === LEGACY_DIALECT_MACRO) ?? null;
+
+        if (!macro) {
+            if (doWarn)
+                throw new BaseWarning(`Flext: Unable to test the template: '@v' macro is not set`);
+            else
+                return false;
+        }
+
+
+        // Getting the dialect
+
+        const [ param ] = macro?.params ?? [];
+
+        if (!param) {
+            if (doWarn)
+                throw new BaseWarning(`Flext: Unable to test the template: Bad '@v' macro`);
+            else
+                return false;
+        }
+
+
+        if (this.aliases && this.aliases?.length)
+            return param?.value === this.name || lib.inarr(param?.value, ...this.aliases);
+        else
+            return param?.value === this.name;
+    }
+
+    public templateToStandard(template: types.Template): types.StandardTemplate {
+        let result = template;
+
+
+        // Defining the functions
+
+        const filter = (search: string, val: string): void => { result = result.replace(search, val); };
+
+
+        // Getting the template
+
+        filter(HANDLEBARS_COMMENT_BEGIN + ' @' + LEGACY_DIALECT_MACRO, HANDLEBARS_COMMENT_BEGIN + ' @' + DIALECT_MACRO); // '{{!-- @v' --> '{{!-- @syntax'
+        filter(HANDLEBARS_COMMENT_BEGIN + '@' + LEGACY_DIALECT_MACRO, HANDLEBARS_COMMENT_BEGIN + '@' + DIALECT_MACRO);   // '{{!--@v'  --> '{{!--@syntax'
+
+
+        return result;
+    }
 }
 
 export default LegacyDialect;

package/src/index.ts

@@ -4,6 +4,13 @@ import * as core from '@flext/core';
 import * as dialects from '@/dialects';
 
 
+// Constants
+
+export const DIALECT_MACRO = 'syntax';
+
+export const LEGACY_DIALECT_MACRO = 'v';
+
+
 // Variables
 
 export const latestDialect = new dialects.Latest();
@@ -17,7 +24,7 @@ export class Flext extends Processor implements types.FlextInterface {
 
         // Getting the macro
 
-        const macro = macros?.find(m => m?.name === 'syntax') ?? null;
+        const macro = macros?.find(m => lib.inarr(m?.name, DIALECT_MACRO, LEGACY_DIALECT_MACRO)) ?? null;
 
         if (!macro) {
             this.setDialect(latestDialect);

package/dist/dialects/legacy-1-0-beta3.d.ts

@@ -1,5 +0,0 @@
-import { Dialect } from '@flext/core';
-export declare class LegacyDialect extends Dialect {
-    name: string;
-}
-export default LegacyDialect;

package/src/dialects/legacy-1-0-beta3.ts

@@ -1,7 +0,0 @@
-import { Dialect } from '@flext/core';
-
-export class LegacyDialect extends Dialect {
-    public name = '1.0.beta3';
-}
-
-export default LegacyDialect;