tina4-nodejs 3.10.32 → 3.10.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tina4-nodejs",
-  "version": "3.10.32",
+  "version": "3.10.34",
   "type": "module",
   "description": "This is not a framework. Tina4 for Node.js/TypeScript — zero deps, 38 built-in features.",
   "keywords": ["tina4", "framework", "web", "api", "orm", "graphql", "websocket", "typescript"],

package/packages/core/src/devAdmin.ts

@@ -20,7 +20,7 @@ import { isTruthy } from "./dotenv.js";
 
 const cpuCount = osCpus().length;
 
-const TINA4_VERSION = "3.10.30";
+const TINA4_VERSION = "3.10.34";
 
 // ---------------------------------------------------------------------------
 // Types
@@ -2009,7 +2009,17 @@ function renderToolbarHtml(ctx: {
 }): string {
   const nodeVersion = process.version;
   return `<div id="tina4-dev-toolbar" style="position:fixed;bottom:0;left:0;right:0;background:#333;color:#fff;font-family:monospace;font-size:12px;padding:6px 16px;z-index:99999;display:flex;align-items:center;gap:16px;">
-    <span style="color:#2e7d32;font-weight:bold;">Tina4 v${ctx.version}</span>
+    <span id="tina4-ver-btn" style="color:#2e7d32;font-weight:bold;cursor:pointer;text-decoration:underline dotted;" onclick="tina4VersionModal()" title="Click to check for updates">Tina4 v${ctx.version}</span>
+    <div id="tina4-ver-modal" style="display:none;position:fixed;bottom:3rem;left:1rem;background:#1e1e2e;border:1px solid #2e7d32;border-radius:8px;padding:16px 20px;z-index:100000;min-width:320px;box-shadow:0 8px 32px rgba(0,0,0,0.5);font-family:monospace;font-size:13px;color:#cdd6f4;">
+      <div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:12px;">
+        <strong style="color:#89b4fa;">Version Info</strong>
+        <span onclick="document.getElementById('tina4-ver-modal').style.display='none'" style="cursor:pointer;color:#888;">&times;</span>
+      </div>
+      <div id="tina4-ver-body" style="line-height:1.8;">
+        <div>Current: <strong style="color:#a6e3a1;">v${ctx.version}</strong></div>
+        <div id="tina4-ver-latest" style="color:#888;">Checking for updates...</div>
+      </div>
+    </div>
     <span style="color:#4caf50;">${ctx.method}</span>
     <span>${ctx.path}</span>
     <span style="color:#666;">&rarr; ${ctx.matchedPattern}</span>
@@ -2018,5 +2028,50 @@ function renderToolbarHtml(ctx: {
     <span style="color:#888;">Node.js ${nodeVersion}</span>
     <a href="#" onclick="(function(e){e.preventDefault();var p=document.getElementById('tina4-dev-panel');if(p){p.style.display=p.style.display==='none'?'block':'none';return;}var c=document.createElement('div');c.id='tina4-dev-panel';c.style.cssText='position:fixed;bottom:2rem;right:1rem;width:min(90vw,1200px);height:min(80vh,700px);z-index:99998;transition:all 0.2s';var f=document.createElement('iframe');f.src='/__dev';f.style.cssText='width:100%;height:100%;border:1px solid #2e7d32;border-radius:0.5rem;box-shadow:0 8px 32px rgba(0,0,0,0.5);background:#0f172a';c.appendChild(f);document.body.appendChild(c);})(event)" style="color:#ef9a9a;margin-left:auto;text-decoration:none;cursor:pointer;">Dashboard &#8599;</a>
     <span onclick="this.parentElement.style.display='none'" style="cursor:pointer;color:#888;margin-left:8px;">&#10005;</span>
-</div>`;
+</div>
+<script>
+function tina4VersionModal(){
+    var m=document.getElementById('tina4-ver-modal');
+    if(m.style.display==='block'){m.style.display='none';return;}
+    m.style.display='block';
+    var el=document.getElementById('tina4-ver-latest');
+    el.innerHTML='Checking for updates...';
+    el.style.color='#888';
+    fetch('https://registry.npmjs.org/tina4-nodejs/latest')
+    .then(function(r){return r.json()})
+    .then(function(d){
+        var latest=d.version;
+        var current='${ctx.version}';
+        if(latest===current){
+            el.innerHTML='Latest: <strong style="color:#a6e3a1;">v'+latest+'</strong> &mdash; You are up to date!';
+            el.style.color='#a6e3a1';
+        }else{
+            var cParts=current.split('.').map(Number);
+            var lParts=latest.split('.').map(Number);
+            var isNewer=false;
+            for(var i=0;i<Math.max(cParts.length,lParts.length);i++){
+                var c=cParts[i]||0,l=lParts[i]||0;
+                if(l>c){isNewer=true;break;}
+                if(l<c)break;
+            }
+            if(isNewer){
+                var breaking=(lParts[0]!==cParts[0]||lParts[1]!==cParts[1]);
+                el.innerHTML='Latest: <strong style="color:#f9e2af;">v'+latest+'</strong>';
+                if(breaking){
+                    el.innerHTML+='<div style="color:#f38ba8;margin-top:6px;">&#9888; Major/minor version change &mdash; check the <a href="https://github.com/tina4stack/tina4-nodejs/releases" target="_blank" style="color:#89b4fa;">changelog</a> for breaking changes before upgrading.</div>';
+                }else{
+                    el.innerHTML+='<div style="color:#f9e2af;margin-top:6px;">Patch update available. Run: <code style="background:#313244;padding:2px 6px;border-radius:3px;">npm install tina4-nodejs@latest</code></div>';
+                }
+            }else{
+                el.innerHTML='Latest: <strong style="color:#a6e3a1;">v'+latest+'</strong> &mdash; You are up to date!';
+                el.style.color='#a6e3a1';
+            }
+        }
+    })
+    .catch(function(){
+        el.innerHTML='Could not check for updates (offline?)';
+        el.style.color='#f38ba8';
+    });
+}
+</script>`;
 }

package/packages/frond/src/engine.ts

@@ -1329,10 +1329,24 @@ export class Frond {
     childBlocks: Record<string, string>,
   ): string {
     const pattern = /\{%[-\s]*block\s+(\w+)\s*[-]?%\}([\s\S]*?)\{%[-\s]*endblock\s*[-]?%\}/g;
+    const engine = this;
+
+    const result = parentSource.replace(pattern, (_match, name: string, parentContent: string) => {
+      const blockSource = childBlocks[name] ?? parentContent;
+
+      // Make parent() and super() available inside child blocks
+      let renderedParent: SafeString | null = null;
+      const getParent = (): SafeString => {
+        if (renderedParent === null) {
+          renderedParent = new SafeString(
+            engine.renderTokens(tokenize(parentContent), context),
+          );
+        }
+        return renderedParent;
+      };
 
-    const result = parentSource.replace(pattern, (_match, name: string, defaultContent: string) => {
-      const blockSource = childBlocks[name] ?? defaultContent;
-      return this.renderTokens(tokenize(blockSource), context);
+      const blockCtx = { ...context, parent: getParent, super: getParent };
+      return this.renderTokens(tokenize(blockSource), blockCtx);
     });
 
     return this.renderTokens(tokenize(result), context);