fix: claim tags in async templates too

thetutlage · thetutlage · commit 859f601274e3 · 2021-04-23T12:20:39.000+05:30
diff --git a/async-fixtures/component-labeled-args/components/modal.edge b/async-fixtures/component-labeled-args/components/modal.edge
@@ -0,0 +1 @@
+{{ title }}
diff --git a/async-fixtures/component-labeled-args/index.edge b/async-fixtures/component-labeled-args/index.edge
@@ -0,0 +1,2 @@
+@modal(title = 'Hello world')
+@endmodal
diff --git a/async-fixtures/component-labeled-args/index.json b/async-fixtures/component-labeled-args/index.json
@@ -0,0 +1 @@
+{}
diff --git a/async-fixtures/component-labeled-args/index.txt b/async-fixtures/component-labeled-args/index.txt
@@ -0,0 +1 @@
+Hello world
diff --git a/async-fixtures/component-multiline/components/modal.edge b/async-fixtures/component-multiline/components/modal.edge
@@ -0,0 +1 @@
+{{ title }}
diff --git a/async-fixtures/component-multiline/index.edge b/async-fixtures/component-multiline/index.edge
@@ -0,0 +1,6 @@
+@modal(
+ {
+  title: 'Hello world'
+ }
+)
+@endmodal
diff --git a/async-fixtures/component-multiline/index.json b/async-fixtures/component-multiline/index.json
@@ -0,0 +1 @@
+{}
diff --git a/async-fixtures/component-multiline/index.txt b/async-fixtures/component-multiline/index.txt
@@ -0,0 +1 @@
+Hello world
diff --git a/async-fixtures/component-self-closed/components/modal.edge b/async-fixtures/component-self-closed/components/modal.edge
@@ -0,0 +1 @@
+{{ title }}
diff --git a/async-fixtures/component-self-closed/index.edge b/async-fixtures/component-self-closed/index.edge
@@ -0,0 +1 @@
+@!modal({ title: 'Hello world' })
diff --git a/async-fixtures/component-self-closed/index.json b/async-fixtures/component-self-closed/index.json
@@ -0,0 +1 @@
+{}
diff --git a/async-fixtures/component-self-closed/index.txt b/async-fixtures/component-self-closed/index.txt
@@ -0,0 +1 @@
+Hello world
diff --git a/async-fixtures/component-with-args/components/modal.edge b/async-fixtures/component-with-args/components/modal.edge
@@ -0,0 +1 @@
+{{ title }}
diff --git a/async-fixtures/component-with-args/index.edge b/async-fixtures/component-with-args/index.edge
@@ -0,0 +1,2 @@
+@modal({ title: 'Hello world' })
+@endmodal
diff --git a/async-fixtures/component-with-args/index.json b/async-fixtures/component-with-args/index.json
@@ -0,0 +1 @@
+{}
diff --git a/async-fixtures/component-with-args/index.txt b/async-fixtures/component-with-args/index.txt
@@ -0,0 +1 @@
+Hello world
diff --git a/async-fixtures/component-with-no-args/components/modal.edge b/async-fixtures/component-with-no-args/components/modal.edge
@@ -0,0 +1 @@
+{{{ await $slots.main() }}}
diff --git a/async-fixtures/component-with-no-args/index.edge b/async-fixtures/component-with-no-args/index.edge
@@ -0,0 +1,3 @@
+@modal()
+<p> Hello world </p>
+@endmodal
diff --git a/async-fixtures/component-with-no-args/index.json b/async-fixtures/component-with-no-args/index.json
@@ -0,0 +1 @@
+{}
diff --git a/async-fixtures/component-with-no-args/index.txt b/async-fixtures/component-with-no-args/index.txt
@@ -0,0 +1 @@
+<p> Hello world </p>
diff --git a/async-fixtures/nested-paths/components/form/headless/input.edge b/async-fixtures/nested-paths/components/form/headless/input.edge
@@ -0,0 +1 @@
+<input type="{{ type }}" name="{{ name }}">
diff --git a/async-fixtures/nested-paths/index.edge b/async-fixtures/nested-paths/index.edge
@@ -0,0 +1,2 @@
+@form.headless.input({ type: 'text', name: 'name' })
+@end
diff --git a/async-fixtures/nested-paths/index.json b/async-fixtures/nested-paths/index.json
@@ -0,0 +1 @@
+{}
diff --git a/async-fixtures/nested-paths/index.txt b/async-fixtures/nested-paths/index.txt
@@ -0,0 +1 @@
+<input type="text" name="name">
diff --git a/src/Supercharged/index.ts b/src/Supercharged/index.ts
@@ -63,6 +63,12 @@ export class Supercharged {
       }
       return null
     })
+    edge.asyncCompiler.claimTag((name) => {
+      if (this.components[name]) {
+        return { seekable: true, block: true }
+      }
+      return null
+    })
 
     /**
      * Process tags
diff --git a/test/async-fixtures.spec.ts b/test/async-fixtures.spec.ts
@@ -0,0 +1,44 @@
+/*
+ * edge-supercharged
+ *
+ * (c) Harminder Virk <virk@adonisjs.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import './assert-extend'
+
+import test from 'japa'
+import { join } from 'path'
+import { Edge } from 'edge.js'
+import { Supercharged } from '../index'
+import { readdirSync, readFileSync, statSync } from 'fs'
+
+const basePath = join(__dirname, '../async-fixtures')
+
+test.group('Async Fixtures', () => {
+  const dirs = readdirSync(basePath).filter((file) => statSync(join(basePath, file)).isDirectory())
+
+  dirs.forEach((dir) => {
+    const dirBasePath = join(basePath, dir)
+    test(dir, async (assert) => {
+      const edge = new Edge()
+      const supercharged = new Supercharged()
+
+      edge.mount(dirBasePath)
+      edge.use(supercharged.wire)
+
+      const out = readFileSync(join(dirBasePath, 'index.txt'), 'utf-8')
+      const state = JSON.parse(readFileSync(join(dirBasePath, 'index.json'), 'utf-8'))
+
+      const output = await edge.render('index.edge', state)
+      const rawOutput = await edge.renderRaw(
+        readFileSync(join(dirBasePath, 'index.edge'), 'utf-8'),
+        state
+      )
+      assert.stringEqual(output.trim(), out)
+      assert.stringEqual(rawOutput.trim(), out)
+    })
+  })
+})
diff --git a/test/fixtures.spec.ts b/test/fixtures.spec.ts
@@ -22,7 +22,7 @@ test.group('Fixtures', () => {
 
   dirs.forEach((dir) => {
     const dirBasePath = join(basePath, dir)
-    test(dir, async (assert) => {
+    test(dir, (assert) => {
       const edge = new Edge()
       const supercharged = new Supercharged()
 
@@ -32,8 +32,8 @@ test.group('Fixtures', () => {
       const out = readFileSync(join(dirBasePath, 'index.txt'), 'utf-8')
       const state = JSON.parse(readFileSync(join(dirBasePath, 'index.json'), 'utf-8'))
 
-      const output = await edge.render('index.edge', state)
-      const rawOutput = await edge.renderRaw(
+      const output = edge.renderSync('index.edge', state)
+      const rawOutput = edge.renderRawSync(
         readFileSync(join(dirBasePath, 'index.edge'), 'utf-8'),
         state
       )

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+@modal(title = 'Hello world')`
	`2`	`+@endmodal`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +@modal(
 + {
 +  title: 'Hello world'
 + }
 +)
 +@endmodal