miki-template 1.3.3 → 1.3.6

package/miki-template-extension/tests/grammar-tests.json

@@ -1,162 +1,162 @@
-{
-  "grammarTests": [
-    {
-      "name": "Basic template structure",
-      "input": "{% extends \"base.html\" %}\n{% block content %}\n{{ title }}\n{% endblock %}",
-      "expectedTokens": [
-        { "line": 0, "scope": "meta.tag.django" },
-        { "line": 0, "scope": "entity.name.tag.django" },
-        { "line": 1, "scope": "meta.tag.django" },
-        { "line": 2, "scope": "meta.variable.django" },
-        { "line": 2, "scope": "support.function.django" }
-      ]
-    },
-    {
-      "name": "If/else/endif tags",
-      "input": "{% if user.is_authenticated %}\n  <p>Hello</p>\n{% else %}\n  <p>Login</p>\n{% endif %}",
-      "expectedTags": ["if", "else", "endif"]
-    },
-    {
-      "name": "For loop with empty",
-      "input": "{% for item in items %}\n  {{ item }}\n{% empty %}\n  No items\n{% endfor %}",
-      "expectedTags": ["for", "empty", "endfor"]
-    },
-    {
-      "name": "Filter chain",
-      "input": "{{ name|lower|capfirst|truncatewords:10 }}",
-      "expectedFilters": ["lower", "capfirst", "truncatewords"]
-    },
-    {
-      "name": "Comment block",
-      "input": "{# This is a comment #}",
-      "scope": "comment.block.django"
-    },
-    {
-      "name": "Prettier ignore",
-      "input": "{# prettier-ignore #}",
-      "scope": "meta.prettier-ignore.django"
-    },
-    {
-      "name": "Include with context",
-      "input": "{% include \"partial.html\" with user=user %}",
-      "expectedTags": ["include"]
-    },
-    {
-      "name": "Partialdef and partial",
-      "input": "{% partialdef card %}\n<div>{{ title }}</div>\n{% endpartialdef %}\n{% partial card %}",
-      "expectedTags": ["partialdef", "endpartialdef", "partial"]
-    },
-    {
-      "name": "i18n tags",
-      "input": "{% trans \"Hello\" %}\n{% blocktrans with name=user.name %}\n  {{ name }}\n{% endblocktrans %}",
-      "expectedTags": ["trans", "blocktrans", "endblocktrans"]
-    },
-    {
-      "name": "Operators",
-      "input": "{% if user.age >= 18 and user.is_verified or user.is_admin %}",
-      "expectedOperators": ["and", "or"]
-    },
-    {
-      "name": "Cycle tag",
-      "input": "{% cycle 'odd' 'even' as marker silent %}",
-      "expectedTags": ["cycle"]
-    },
-    {
-      "name": "Widthratio",
-      "input": "{% widthratio this_value max_value 100 %}",
-      "expectedTags": ["widthratio"]
-    },
-    {
-      "name": "Cache tag",
-      "input": "{% cache 500 my_key %}\n{{ content }}\n{% endcache %}",
-      "expectedTags": ["cache", "endcache"]
-    },
-    {
-      "name": "Spaceless",
-      "input": "{% spaceless %}\n  <p>   </p>\n{% endspaceless %}",
-      "expectedTags": ["spaceless", "endspaceless"]
-    },
-    {
-      "name": "Autoescape",
-      "input": "{% autoescape off %}\n{{ html|safe }}\n{% endautoescape %}",
-      "expectedTags": ["autoescape", "endautoescape"]
-    },
-    {
-      "name": "With block",
-      "input": "{% with user.profile as profile %}\n  {{ profile.name }}\n{% endwith %}",
-      "expectedTags": ["with", "endwith"]
-    },
-    {
-      "name": "Regroup",
-      "input": "{% regroup items by category as grouped %}\n{% for group in grouped %}\n  {{ group.grouper }}\n{% endfor %}",
-      "expectedTags": ["regroup"]
-    },
-    {
-      "name": "Block.super",
-      "input": "{% block content %}\n  {{ block.super }}\n{% endblock %}",
-      "expectedTokens": [{ "scope": "variable.other.django" }]
-    },
-    {
-      "name": "CSRF token",
-      "input": "{% csrf_token %}",
-      "expectedTags": ["csrf_token"]
-    },
-    {
-      "name": "Static tag",
-      "input": "{% static \"css/style.css\" %}",
-      "expectedTags": ["static"]
-    },
-    {
-      "name": "URL tag",
-      "input": "{% url \"home\" user.id %}",
-      "expectedTags": ["url"]
-    },
-    {
-      "name": "Debug tag",
-      "input": "{% debug %}",
-      "expectedTags": ["debug"]
-    },
-    {
-      "name": "Verbatim",
-      "input": "{% verbatim %}\n  {{ not_a_variable }}\n  {% not_a_tag %}\n{% endverbatim %}",
-      "expectedTags": ["verbatim", "endverbatim"]
-    },
-    {
-      "name": "Filter block",
-      "input": "{% filter upper %}\n  {{ name }}\n{% endfilter %}",
-      "expectedTags": ["filter", "endfilter"]
-    },
-    {
-      "name": "Template tag symbol",
-      "input": "{% templatetag openblock %}",
-      "expectedTags": ["templatetag"]
-    },
-    {
-      "name": "Addtoblock",
-      "input": "{% addtoblock css %}\n.selector { color: red; }\n{% endaddtoblock %}",
-      "expectedTags": ["addtoblock", "endaddtoblock"]
-    }
-  ],
-  "validationTests": [
-    {
-      "name": "Unclosed if tag",
-      "input": "{% if condition %}\n  content\n{% endfor %}",
-      "expectedErrors": ["Unclosed tag: {% if %}"]
-    },
-    {
-      "name": "Mismatched tags",
-      "input": "{% if condition %}\n  content\n{% endfor %}",
-      "expectedErrors": ["Mismatched tag: expected {% endif %} but found {% endfor %}"]
-    },
-    {
-      "name": "Extends not first",
-      "input": "{% if true %}\n{% extends \"base.html\" %}\n{% endif %}",
-      "expectedErrors": ["{% extends %} must be the first tag"]
-    },
-    {
-      "name": "Tag after extends",
-      "input": "{% extends \"base.html\" %}\n{% if true %}\n{% include \"other.html\" %}\n{% endif %}",
-      "expectedErrors": []
-    }
-  ]
-}
+{
+  "grammarTests": [
+    {
+      "name": "Basic template structure",
+      "input": "{% extends \"base.html\" %}\n{% block content %}\n{{ title }}\n{% endblock %}",
+      "expectedTokens": [
+        { "line": 0, "scope": "meta.tag.django" },
+        { "line": 0, "scope": "entity.name.tag.django" },
+        { "line": 1, "scope": "meta.tag.django" },
+        { "line": 2, "scope": "meta.variable.django" },
+        { "line": 2, "scope": "support.function.django" }
+      ]
+    },
+    {
+      "name": "If/else/endif tags",
+      "input": "{% if user.is_authenticated %}\n  <p>Hello</p>\n{% else %}\n  <p>Login</p>\n{% endif %}",
+      "expectedTags": ["if", "else", "endif"]
+    },
+    {
+      "name": "For loop with empty",
+      "input": "{% for item in items %}\n  {{ item }}\n{% empty %}\n  No items\n{% endfor %}",
+      "expectedTags": ["for", "empty", "endfor"]
+    },
+    {
+      "name": "Filter chain",
+      "input": "{{ name|lower|capfirst|truncatewords:10 }}",
+      "expectedFilters": ["lower", "capfirst", "truncatewords"]
+    },
+    {
+      "name": "Comment block",
+      "input": "{# This is a comment #}",
+      "scope": "comment.block.django"
+    },
+    {
+      "name": "Prettier ignore",
+      "input": "{# prettier-ignore #}",
+      "scope": "meta.prettier-ignore.django"
+    },
+    {
+      "name": "Include with context",
+      "input": "{% include \"partial.html\" with user=user %}",
+      "expectedTags": ["include"]
+    },
+    {
+      "name": "Partialdef and partial",
+      "input": "{% partialdef card %}\n<div>{{ title }}</div>\n{% endpartialdef %}\n{% partial card %}",
+      "expectedTags": ["partialdef", "endpartialdef", "partial"]
+    },
+    {
+      "name": "i18n tags",
+      "input": "{% trans \"Hello\" %}\n{% blocktrans with name=user.name %}\n  {{ name }}\n{% endblocktrans %}",
+      "expectedTags": ["trans", "blocktrans", "endblocktrans"]
+    },
+    {
+      "name": "Operators",
+      "input": "{% if user.age >= 18 and user.is_verified or user.is_admin %}",
+      "expectedOperators": ["and", "or"]
+    },
+    {
+      "name": "Cycle tag",
+      "input": "{% cycle 'odd' 'even' as marker silent %}",
+      "expectedTags": ["cycle"]
+    },
+    {
+      "name": "Widthratio",
+      "input": "{% widthratio this_value max_value 100 %}",
+      "expectedTags": ["widthratio"]
+    },
+    {
+      "name": "Cache tag",
+      "input": "{% cache 500 my_key %}\n{{ content }}\n{% endcache %}",
+      "expectedTags": ["cache", "endcache"]
+    },
+    {
+      "name": "Spaceless",
+      "input": "{% spaceless %}\n  <p>   </p>\n{% endspaceless %}",
+      "expectedTags": ["spaceless", "endspaceless"]
+    },
+    {
+      "name": "Autoescape",
+      "input": "{% autoescape off %}\n{{ html|safe }}\n{% endautoescape %}",
+      "expectedTags": ["autoescape", "endautoescape"]
+    },
+    {
+      "name": "With block",
+      "input": "{% with user.profile as profile %}\n  {{ profile.name }}\n{% endwith %}",
+      "expectedTags": ["with", "endwith"]
+    },
+    {
+      "name": "Regroup",
+      "input": "{% regroup items by category as grouped %}\n{% for group in grouped %}\n  {{ group.grouper }}\n{% endfor %}",
+      "expectedTags": ["regroup"]
+    },
+    {
+      "name": "Block.super",
+      "input": "{% block content %}\n  {{ block.super }}\n{% endblock %}",
+      "expectedTokens": [{ "scope": "variable.other.django" }]
+    },
+    {
+      "name": "CSRF token",
+      "input": "{% csrf_token %}",
+      "expectedTags": ["csrf_token"]
+    },
+    {
+      "name": "Static tag",
+      "input": "{% static \"css/style.css\" %}",
+      "expectedTags": ["static"]
+    },
+    {
+      "name": "URL tag",
+      "input": "{% url \"home\" user.id %}",
+      "expectedTags": ["url"]
+    },
+    {
+      "name": "Debug tag",
+      "input": "{% debug %}",
+      "expectedTags": ["debug"]
+    },
+    {
+      "name": "Verbatim",
+      "input": "{% verbatim %}\n  {{ not_a_variable }}\n  {% not_a_tag %}\n{% endverbatim %}",
+      "expectedTags": ["verbatim", "endverbatim"]
+    },
+    {
+      "name": "Filter block",
+      "input": "{% filter upper %}\n  {{ name }}\n{% endfilter %}",
+      "expectedTags": ["filter", "endfilter"]
+    },
+    {
+      "name": "Template tag symbol",
+      "input": "{% templatetag openblock %}",
+      "expectedTags": ["templatetag"]
+    },
+    {
+      "name": "Addtoblock",
+      "input": "{% addtoblock css %}\n.selector { color: red; }\n{% endaddtoblock %}",
+      "expectedTags": ["addtoblock", "endaddtoblock"]
+    }
+  ],
+  "validationTests": [
+    {
+      "name": "Unclosed if tag",
+      "input": "{% if condition %}\n  content\n{% endfor %}",
+      "expectedErrors": ["Unclosed tag: {% if %}"]
+    },
+    {
+      "name": "Mismatched tags",
+      "input": "{% if condition %}\n  content\n{% endfor %}",
+      "expectedErrors": ["Mismatched tag: expected {% endif %} but found {% endfor %}"]
+    },
+    {
+      "name": "Extends not first",
+      "input": "{% if true %}\n{% extends \"base.html\" %}\n{% endif %}",
+      "expectedErrors": ["{% extends %} must be the first tag"]
+    },
+    {
+      "name": "Tag after extends",
+      "input": "{% extends \"base.html\" %}\n{% if true %}\n{% include \"other.html\" %}\n{% endif %}",
+      "expectedErrors": []
+    }
+  ]
+}

package/miki-template-extension/tests/run-grammar-tests.js

@@ -1,82 +1,82 @@
-const fs = require('fs');
-const path = require('path');
-
-const grammarTests = JSON.parse(fs.readFileSync(__dirname + '/grammar-tests.json', 'utf8'));
-
-let passed = 0;
-let failed = 0;
-
-console.log('Running grammar tests...\n');
-
-grammarTests.grammarTests.forEach(test => {
-  try {
-    console.log(`Test: ${test.name}`);
-
-    if (test.input) {
-      console.log(`  Input: ${test.input.substring(0, 50)}${test.input.length > 50 ? '...' : ''}`);
-    }
-
-    if (test.expectedTags) {
-      const missing = test.expectedTags.filter(tag => !test.input.includes(`{% ${tag}`));
-      if (missing.length > 0) {
-        console.log(`  FAIL: Missing tags: ${missing.join(', ')}`);
-        failed++;
-        return;
-      }
-    }
-
-    if (test.expectedFilters) {
-      const missing = test.expectedFilters.filter(f => !test.input.includes(`|${f}`));
-      if (missing.length > 0) {
-        console.log(`  FAIL: Missing filters: ${missing.join(', ')}`);
-        failed++;
-        return;
-      }
-    }
-
-    if (test.expectedOperators) {
-      const missing = test.expectedOperators.filter(op => !test.input.includes(op));
-      if (missing.length > 0) {
-        console.log(`  FAIL: Missing operators: ${missing.join(', ')}`);
-        failed++;
-        return;
-      }
-    }
-
-    console.log('  PASS');
-    passed++;
-  } catch (err) {
-    console.log(`  ERROR: ${err.message}`);
-    failed++;
-  }
-});
-
-console.log('\nValidation tests...\n');
-
-grammarTests.validationTests.forEach(test => {
-  try {
-    console.log(`Test: ${test.name}`);
-    console.log(`  Input: ${test.input.substring(0, 50)}${test.input.length > 50 ? '...' : ''}`);
-
-    // Simple validation checks
-    if (test.input.includes('{% extends') && test.input.indexOf('{% extends') > 0) {
-      const firstNonWhitespace = test.input.match(/^\s*({%)/);
-      if (firstNonWhitespace && firstNonWhitespace.index > 0) {
-        console.log(`  PASS: Detected extends not first`);
-        passed++;
-      }
-    }
-
-    console.log('  PASS');
-    passed++;
-  } catch (err) {
-    console.log(`  ERROR: ${err.message}`);
-    failed++;
-  }
-});
-
-console.log(`\n========================================`);
-console.log(`Tests: ${passed} passed, ${failed} failed`);
-console.log(`========================================`);
-
-process.exit(failed > 0 ? 1 : 0);
+const fs = require('fs');
+const path = require('path');
+
+const grammarTests = JSON.parse(fs.readFileSync(__dirname + '/grammar-tests.json', 'utf8'));
+
+let passed = 0;
+let failed = 0;
+
+console.log('Running grammar tests...\n');
+
+grammarTests.grammarTests.forEach(test => {
+  try {
+    console.log(`Test: ${test.name}`);
+
+    if (test.input) {
+      console.log(`  Input: ${test.input.substring(0, 50)}${test.input.length > 50 ? '...' : ''}`);
+    }
+
+    if (test.expectedTags) {
+      const missing = test.expectedTags.filter(tag => !test.input.includes(`{% ${tag}`));
+      if (missing.length > 0) {
+        console.log(`  FAIL: Missing tags: ${missing.join(', ')}`);
+        failed++;
+        return;
+      }
+    }
+
+    if (test.expectedFilters) {
+      const missing = test.expectedFilters.filter(f => !test.input.includes(`|${f}`));
+      if (missing.length > 0) {
+        console.log(`  FAIL: Missing filters: ${missing.join(', ')}`);
+        failed++;
+        return;
+      }
+    }
+
+    if (test.expectedOperators) {
+      const missing = test.expectedOperators.filter(op => !test.input.includes(op));
+      if (missing.length > 0) {
+        console.log(`  FAIL: Missing operators: ${missing.join(', ')}`);
+        failed++;
+        return;
+      }
+    }
+
+    console.log('  PASS');
+    passed++;
+  } catch (err) {
+    console.log(`  ERROR: ${err.message}`);
+    failed++;
+  }
+});
+
+console.log('\nValidation tests...\n');
+
+grammarTests.validationTests.forEach(test => {
+  try {
+    console.log(`Test: ${test.name}`);
+    console.log(`  Input: ${test.input.substring(0, 50)}${test.input.length > 50 ? '...' : ''}`);
+
+    // Simple validation checks
+    if (test.input.includes('{% extends') && test.input.indexOf('{% extends') > 0) {
+      const firstNonWhitespace = test.input.match(/^\s*({%)/);
+      if (firstNonWhitespace && firstNonWhitespace.index > 0) {
+        console.log(`  PASS: Detected extends not first`);
+        passed++;
+      }
+    }
+
+    console.log('  PASS');
+    passed++;
+  } catch (err) {
+    console.log(`  ERROR: ${err.message}`);
+    failed++;
+  }
+});
+
+console.log(`\n========================================`);
+console.log(`Tests: ${passed} passed, ${failed} failed`);
+console.log(`========================================`);
+
+process.exit(failed > 0 ? 1 : 0);

package/package.json

@@ -1,34 +1,37 @@
-{
-  "name": "miki-template",
-  "version": "1.3.3",
-  "description": "Django-Style template engine for Node.js and Express",
-  "main": "src/index.js",
-  "exports": {
-    ".": {
-      "import": "./src/esm.mjs",
-      "require": "./src/index.js",
-      "default": "./src/index.js"
-    }
-  },
-  "scripts": {
-    "test": "node -e \"const fs=require('fs');const path=require('path');function walk(d){const out=[];for(const e of fs.readdirSync(d,{withFileTypes:true})){const p=path.join(d,e.name);if(e.isDirectory())out.push(...walk(p));else if(/\\\\.test\\\\.(cjs|mjs|js)$/.test(e.name))out.push(p);}return out;}const files=walk('tests');require('child_process').execSync('node --test '+files.join(' '),{stdio:'inherit'})\"",
-    "bench": "node benchmarks/run.js"
-  },
-  "keywords": [
-    "django",
-    "template",
-    "engine",
-    "express",
-    "nodejs",
-    "esm"
-  ],
-  "author": "",
-  "license": "MIT",
-  "dependencies": {
-    "date-fns": "^3.6.0",
-    "he": "^1.2.0"
-  },
-  "devDependencies": {
-    "express": "^5.2.1"
-  }
-}
+{
+  "name": "miki-template",
+  "version": "1.3.6",
+  "description": "Django-Style template engine for Node.js and Express",
+  "main": "src/index.js",
+  "exports": {
+    ".": {
+      "import": "./src/esm.mjs",
+      "require": "./src/index.js",
+      "default": "./src/index.js"
+    }
+  },
+  "scripts": {
+    "test": "node -e \"const fs=require('fs');const path=require('path');function walk(d){const out=[];for(const e of fs.readdirSync(d,{withFileTypes:true})){const p=path.join(d,e.name);if(e.isDirectory())out.push(...walk(p));else if(/\\\\.test\\\\.(cjs|mjs|js)$/.test(e.name))out.push(p);}return out;}const files=walk('tests');require('child_process').execSync('node --test '+files.join(' '),{stdio:'inherit'})\"",
+    "bench": "node benchmarks/run.js",
+    "release:patch": "npm version patch --no-git-tag-version -m \"chore(release): v%s\" && git push origin main",
+    "release:minor": "npm version minor --no-git-tag-version -m \"chore(release): v%s\" && git push origin main",
+    "release:major": "npm version major --no-git-tag-version -m \"chore(release): v%s\" && git push origin main"
+  },
+  "keywords": [
+    "django",
+    "template",
+    "engine",
+    "express",
+    "nodejs",
+    "esm"
+  ],
+  "author": "",
+  "license": "MIT",
+  "dependencies": {
+    "date-fns": "^3.6.0",
+    "he": "^1.2.0"
+  },
+  "devDependencies": {
+    "express": "^5.2.1"
+  }
+}