jcc-express-mvc 1.8.7 → 1.8.21

package/lib/Templating-engine/errors.js

@@ -0,0 +1,35 @@
+"use strict";
+/**
+ * Template engine errors with line/column context.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TemplateError = void 0;
+exports.getLineColumn = getLineColumn;
+class TemplateError extends Error {
+    constructor(message, line, column, templatePath) {
+        super(message);
+        this.line = line;
+        this.column = column;
+        this.templatePath = templatePath;
+        this.name = "TemplateError";
+        Object.setPrototypeOf(this, TemplateError.prototype);
+    }
+    toString() {
+        let msg = `TemplateError: ${this.message}`;
+        if (this.line != null)
+            msg += ` (line ${this.line}`;
+        if (this.column != null)
+            msg += `, column ${this.column}`;
+        if (this.line != null || this.column != null)
+            msg += ")";
+        if (this.templatePath)
+            msg += ` in ${this.templatePath}`;
+        return msg;
+    }
+}
+exports.TemplateError = TemplateError;
+function getLineColumn(source, index) {
+    const before = source.slice(0, index);
+    const lines = before.split("\n");
+    return { line: lines.length, column: (lines.pop()?.length ?? 0) + 1 };
+}

package/lib/Templating-engine/expressions.d.ts

@@ -2,15 +2,39 @@ export declare abstract class TemplateRegex {
     protected directives: {
         extends: RegExp;
         foreach: RegExp;
+        forelse: RegExp;
+        for: RegExp;
+        while: RegExp;
+        switch: RegExp;
         if: RegExp;
+        unless: RegExp;
+        isset: RegExp;
+        empty: RegExp;
+        includeUnless: RegExp;
+        includeWhen: RegExp;
+        includeIf: RegExp;
         include: RegExp;
+        production: RegExp;
+        env: RegExp;
+        push: RegExp;
+        prepend: RegExp;
+        stack: RegExp;
         ternary: RegExp;
+        bladeComment: RegExp;
         variable: RegExp;
+        rawVariable: RegExp;
+        verbatim: RegExp;
+        json: RegExp;
+        js: RegExp;
+        script: RegExp;
+        scriptPath: RegExp;
         auth: RegExp;
         guest: RegExp;
         inertia: RegExp;
         vite: RegExp;
         viteReactRefresh: RegExp;
+        csrf: RegExp;
+        methodField: RegExp;
     };
     protected sectionRegex: RegExp;
 }

package/lib/Templating-engine/expressions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expressions.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Templating-engine/expressions.ts"],"names":[],"mappings":"AAAA,8BAAsB,aAAa;IAEjC,SAAS,CAAC,UAAU;;;;;;;;;;;;MAclB;IAEF,SAAS,CAAC,YAAY,SAC2H;CAGlJ"}
+{"version":3,"file":"expressions.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Templating-engine/expressions.ts"],"names":[],"mappings":"AAAA,8BAAsB,aAAa;IACjC,SAAS,CAAC,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAuClB;IAEF,SAAS,CAAC,YAAY,SAC2H;CAClJ"}

package/lib/Templating-engine/expressions.js

@@ -3,22 +3,44 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TemplateRegex = void 0;
 class TemplateRegex {
     constructor() {
-        //
         this.directives = {
             extends: /@extends\((?<extendPath>['"]([^'"]+)['"])\)/,
             foreach: /@foreach\s*\((?<loopData>(.*?)+) as (?<loopvariable>(.*?)+)\)(?<loopBody>[\s\S\t\n\r]+?)@endforeach/,
-            if: /@if\s*\((?<ifData>(.*?))\)\s*(?<ifBody>[\s\S]*?)\s*(?:@else\s*(?<elseBody>[\s\S]*?)\s*)?@endif/g,
-            include: /@include\((?<includePath>['"]([^'"]+)['"])\)/,
-            ternary: /@ternary\s*\((?<condition>[a-zA-Z0-9_.-]+)\s*\?\s*(?<trueData>[\s\S]+?)\s*:\s*(?<falseData>[\s\S]+?)\)/,
+            forelse: /@forelse\s*\((?<loopData>(.*?)+) as (?<loopvariable>(.*?)+)\)(?<loopBody>[\s\S\t\n\r]+?)@empty(?<emptyBody>[\s\S\t\n\r]+?)@endforelse/,
+            for: /@for\s*\((?<forVar>\w+)\s*,\s*(?<forStart>-?\d+)\s*,\s*(?<forEnd>-?\d+)(?:\s*,\s*(?<forStep>-?\d+))?\)(?<forBody>[\s\S]*?)@endfor/,
+            while: /@while\s*\((?<whileCond>[^)]+)\)(?<whileBody>[\s\S]*?)@endwhile/,
+            switch: /@switch\s*\((?<switchVar>[^)]+)\)(?<switchBody>[\s\S]*?)@endswitch/,
+            if: /@if\s*\((?<ifData>(.*?))\)\s*(?<ifBody>[\s\S]*?)@endif/,
+            unless: /@unless\s*\((?<unlessData>(.*?))\)\s*(?<unlessBody>[\s\S]*?)@endunless/,
+            isset: /@isset\s*\((?<issetData>(.*?))\)\s*(?<issetBody>[\s\S]*?)@endisset/,
+            empty: /@empty\s*\((?<emptyData>(.*?))\)\s*(?<emptyBody>[\s\S]*?)@endempty/,
+            includeUnless: /@includeUnless\s*\((?<incUnlessCond>[^,]+),\s*(?<incUnlessPath>['"][^'"]+['"])\)/,
+            includeWhen: /@includeWhen\s*\((?<incWhenCond>[^,]+),\s*(?<incWhenPath>['"][^'"]+['"])\)/,
+            includeIf: /@includeIf\s*\((?<incIfPath>['"][^'"]+['"])\)/,
+            include: /@include\((?<includePath>['"]([^'"]+)['"]),?\s*(?<includeData>\{[^}]*\})?\s*\)/,
+            production: /@production(?<prodBody>[\s\S]*?)@endproduction/,
+            env: /@env\s*\((?<envNames>[^)]+)\)(?<envBody>[\s\S]*?)@endenv/,
+            push: /@push\s*\((?<pushName>['"][^'"]+['"])\)(?<pushBody>[\s\S]*?)@endpush/,
+            prepend: /@prepend\s*\((?<prependName>['"][^'"]+['"])\)(?<prependBody>[\s\S]*?)@endprepend/,
+            stack: /@stack\s*\((?<stackName>['"][^'"]+['"])\)/,
+            ternary: /@ternary\s*\((?<condition>[a-zA-Z0-9_.\s\-]+)\s*\?\s*(?<trueData>[\s\S]+?)\s*:\s*(?<falseData>[\s\S]+?)\)/,
+            bladeComment: /\{\{\-\-\s*[\s\S]*?\s*\-\-\}\}/,
             variable: /{{\s*(?<param>(.*?))\s*}}/,
+            rawVariable: /\{\!!\s*(?<param>(.*?))\s*!!\}/,
+            verbatim: /@verbatim(?<verbatimBody>[\s\S]*?)@endverbatim/,
+            json: /@json\s*\((?<jsonParam>(.*?))\)/,
+            js: /@js(?<jsBody>[\s\S]*?)@endjs/,
+            script: /@script(?<scriptBody>[\s\S]*?)@endscript/,
+            scriptPath: /@script\s*\(\s*['"](?<scriptPath>[^'"]+)['"]\s*\)/,
             auth: /@auth\s*(?:(\((?<authData>(.*?)*)\)))?(?<authBody>[\s\S]*?)@endauth/,
             guest: /@guest\s*(?<guestBody>[\s\S]*?)@endguest/,
             inertia: /@inertia/,
             vite: /@vite\s*\(\[\s*(?<resource>[^\]]*?)\s*\]\)/,
             viteReactRefresh: /@viteReactRefresh/,
+            csrf: /@csrf/,
+            methodField: /@method\s*\(\s*(?<methodValue>[^)]+)\s*\)/,
         };
         this.sectionRegex = /@section\((?<sectionValue>['"]([^'"]+)['"])\)(?<sectionBody>([\s\S\t\n\r]+?))(?<sectionEnd>@endsection)|@section\((?<placeholder>[\s\S]+?)\)/;
-        // protected interia = ;
     }
 }
 exports.TemplateRegex = TemplateRegex;

package/lib/Templating-engine/index.d.ts

@@ -1,22 +1,29 @@
 import { EngineHelpers } from "./engineHelper";
 declare class TemplatingEngine extends EngineHelpers {
     private option;
+    /** Directive dispatch - ordered by specificity (longest prefix first). */
+    private getDirectiveHandler;
+    /** Prefix -> directive key for regex lookup (avoids duplicate named groups in combined regex). */
+    private static readonly PREFIX_TO_KEY;
+    /** Find leftmost directive match (avoids duplicate named groups from combined regex). */
+    private findFirstMatch;
     /**
-     * Handles variable directives in the template content.
-     * @param {string} content - Template content.
-     * @param {Object} match - Match object from the regular expression.
-     * @param {Object} param - Local variables for rendering.
-     * @returns {string} - Rendered content.
+     * Handles Blade comments {{-- --}} - strips entirely from output.
+     */
+    private handleBladeComment;
+    /**
+     * Handles variable directives - {{ }} escaped (Laravel-style), {!! !!} raw.
+     * Supports JS methods: join, split, trim, toUpperCase, etc. e.g. {{ items.join(', ') }}
      */
     private handleVariable;
     /**
-     * Handles the @foreach directive in the template content.
-     * @param {string} content - Template content.
-     * @param {Object} match - Match object from the regular expression.
-     * @param {Object} param - Local variables for rendering.
-     * @returns {string} - Rendered content.
+     * Handles the @foreach directive (Laravel-style with $loop variable).
      */
     private handleLoop;
+    /**
+     * Handles @forelse - foreach with @empty fallback (Laravel-style).
+     */
+    private handleForelse;
     /**
      * Handles the @if directive in the template content.
      * @param {string} content - Template content.
@@ -24,6 +31,9 @@ declare class TemplatingEngine extends EngineHelpers {
      * @param {Object} param - Local variables for rendering.
      * @returns {string} - Rendered content.
      */
+    /**
+     * Handles @if with @elseif and @else (Laravel-style).
+     */
     private handleCondition;
     /**
      * Handles the @ternary directive in the template content.
@@ -47,6 +57,27 @@ declare class TemplatingEngine extends EngineHelpers {
      * @returns {string} - Rendered content with included file content.
      */
     private includes;
+    /**
+     * Parses the inline data object from @include("path", { key: value }).
+     * Supports string literals, numbers, booleans, and variable references (including dot notation).
+     * String concatenation with + is supported (e.g. "/path/" + job.id).
+     */
+    private parseIncludeData;
+    /** Split key:value pairs by comma, respecting quoted strings. */
+    private splitIncludeArgs;
+    /** Resolve a value expression: quoted string, number, boolean, concatenation, or variable. */
+    private resolveIncludeValue;
+    private includeIf;
+    private includeWhen;
+    private includeUnless;
+    private handleFor;
+    private handleWhile;
+    private handleSwitch;
+    private handleProduction;
+    private handleEnv;
+    private handlePush;
+    private handlePrepend;
+    private handleStack;
     /**
      * Handles the @auth directive in the template content.
      * @param {string} content - Template content.
@@ -66,23 +97,62 @@ declare class TemplatingEngine extends EngineHelpers {
     private inertia;
     private vite;
     private viteReactRefresh;
+    private static readonly MAX_PARSE_DEPTH;
+    private parseDepth;
     /**
      * Parses the template content based on the defined directives.
-     * @param {string} content - Template content.
-     * @param {Object} param - Local variables for rendering.
-     * @returns {string} - Rendered content.
+     * Uses pre-compiled regex for performance.
      */
     private parser;
+    private handleVerbatim;
+    private handleUnless;
+    private handleIsset;
+    private handleEmpty;
+    private handleJson;
+    /**
+     * Handles @csrf - outputs a hidden input with the CSRF token from res.locals._token.
+     */
+    private handleCsrf;
+    /**
+     * Handles @method('PUT') or @method(variable) - outputs a hidden input for HTTP method spoofing.
+     */
+    private handleMethod;
+    /**
+     * Handles @js ... @endjs - executes JavaScript on the server only.
+     * Variables and functions declared (const/let/var) are merged into template scope for use in {{ }}.
+     * Strip const/let/var so assignments go to sandbox (param) - var/undeclared assign to global.
+     */
+    private handleJs;
+    /**
+     * Handles @script ... @endscript - outputs content as a script block for client-side.
+     * Body is parsed for {{ }} so you can inject template variables.
+     */
+    private handleScript;
+    /**
+     * Handles @script('path') - includes a script from resources/js.
+     * Path is the filename (e.g. 'main' -> resources/js/main.jsx)
+     */
+    private handleScriptPath;
     /**
      * Compiles the template content by processing directives and extending layouts.
-     * @param {string} content - Template content.
-     * @returns {Promise<string>} - Compiled content.
+     * Caches extends result in production for performance.
      */
-    protected compiler(content: string): Promise<string>;
+    protected compiler(content: string, cacheKey?: string | null): Promise<string>;
+    private getExtendsCacheKey;
+    /** Pre-collects @push/@prepend so @stack works (layout typically has @stack before @push in doc order). */
+    private collectBladeStacks;
     render(filePath: string, locals: any, callback: any): Promise<any>;
     Content(path: string, option: any): string;
+    /** Compile template string with data (public for compileString, benchmarks). */
+    compileTemplate(template: string, data?: Record<string, any>): string;
+    /** No-op for API compatibility (call after registerDirective/clearCustomDirectives). */
+    clearCombinedRegex(): void;
 }
+/** Clear the extends cache and path cache (e.g. after file changes or plugin changes in dev). */
+declare function clearCache(): void;
 declare const compile: (path: string, option: any) => string;
+/** Compile a template string with data (for benchmarking, tests). */
+declare function compileString(template: string, data?: Record<string, any>): string;
 declare const jsBladeEngine: TemplatingEngine;
-export { jsBladeEngine, compile };
+export { jsBladeEngine, compile, compileString, clearCache };
 //# sourceMappingURL=index.d.ts.map

package/lib/Templating-engine/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Templating-engine/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAG/C,cAAM,gBAAiB,SAAQ,aAAa;IAC1C,OAAO,CAAC,MAAM,CAAM;IAEpB;;;;;;OAMG;IACH,OAAO,CAAC,cAAc;IAYtB;;;;;;OAMG;IACH,OAAO,CAAC,UAAU;IAuBlB;;;;;;OAMG;IACH,OAAO,CAAC,eAAe;IAevB;;;;;;OAMG;IACH,OAAO,CAAC,OAAO;IAYf;;;;OAIG;IACG,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAgB/C;;;;;;OAMG;IACH,OAAO,CAAC,QAAQ;IAYhB;;;;;;OAMG;IACH,OAAO,CAAC,IAAI;IAmBZ;;;;;;OAMG;IACH,OAAO,CAAC,KAAK;IASb,OAAO,CAAC,OAAO;IAQf,OAAO,CAAC,IAAI;IAqBZ,OAAO,CAAC,gBAAgB;IAUxB;;;;;OAKG;IACH,OAAO,CAAC,MAAM;IAyCd;;;;OAIG;cACa,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAQpD,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG;IAazD,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,MAAM;CAG3C;AAGD,QAAA,MAAM,OAAO,SANG,MAAM,UAAU,GAAG,KAAG,MAMK,CAAC;AAC5C,QAAA,MAAM,aAAa,kBAAS,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../jcc-express-mvc/lib/Templating-engine/index.ts"],"names":[],"mappings":"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"}