refactor: simplify pushOnceTo tag

Author: thetutlage

src/edge/stacks.ts

@@ -10,6 +10,8 @@
 import { EOL } from 'node:os'
 
 export default class Stacks {
+  #contentSources: Map<string, Set<string>> = new Map()
+
   /**
    * Pre-seeded content before the placeholder has been
    * defined.
@@ -71,6 +73,28 @@ export default class Stacks {
     return this
   }
 
+  /**
+   * Push contents to a stack with a unique source id. A
+   * source can only push once to a given stack.
+   */
+  pushOnceTo(name: string, sourceId: string, contents: string) {
+    const contentSources = this.#contentSources.get(name)
+    if (contentSources && contentSources.has(sourceId)) {
+      return
+    }
+
+    this.pushTo(name, contents)
+
+    /**
+     * Track source
+     */
+    if (contentSources) {
+      contentSources.add(sourceId)
+    } else {
+      this.#contentSources.set(name, new Set([sourceId]))
+    }
+  }
+
   /**
    * Fill placeholders with their actual content
    */

src/tags/push_once_to.ts

@@ -12,7 +12,6 @@ import { expressions } from 'edge-parser'
 
 import { nanoid } from '../utils.js'
 import { TagContract } from '../types.js'
-import type { Template } from '../template.js'
 
 declare module '../template.js' {
   export interface Template {
@@ -32,29 +31,6 @@ export const pushOnceToTag: TagContract & { generateId(): string } = {
   generateId() {
     return `stack_${nanoid()}`
   },
-  boot(template) {
-    /**
-     * Tracking stack sources to avoid duplicate calls
-     * from the same file:line:col
-     */
-    template.getter(
-      'stackSources',
-      () => {
-        return {}
-      },
-      true
-    )
-
-    template.macro('trackStackSource', function (this: Template, stack, filename, line, col) {
-      const key = `${stack}_${filename}_${line}_${col}`
-      if (this.stackSources[key]) {
-        return false
-      }
-
-      this.stackSources[key] = true
-      return true
-    })
-  },
   compile(parser, buffer, token) {
     const parsed = parser.utils.transformAst(
       parser.utils.generateAST(token.properties.jsArg, token.loc, token.filename),
@@ -80,23 +56,13 @@ export const pushOnceToTag: TagContract & { generateId(): string } = {
      * Each stack must be unique
      */
     const stackId = this.generateId()
-    const stackName = parser.utils.stringify(parsed)
 
     /**
      * Create a custom buffer for the stack. Since we do not want to the write
      * to the main buffer
      */
     const stackBuffer = buffer.create(token.filename, { outputVar: stackId })
 
-    const { line, col } = token.loc.start
-    const normalizedFileName = token.filename.replace(/\\|\//g, '_')
-    const conditional = `template.trackStackSource(${stackName}, '${normalizedFileName}', ${line}, ${col})`
-
-    /**
-     * Start if block
-     */
-    buffer.writeStatement(`if (${conditional}) {`, token.filename, line)
-
     /**
      * Process children
      */
@@ -114,18 +80,17 @@ export const pushOnceToTag: TagContract & { generateId(): string } = {
         .disableTryCatchBlock()
         .flush(),
       token.filename,
-      line
+      token.loc.start.line
     )
 
+    const { line, col } = token.loc.start
+    const normalizedFileName = token.filename.replace(/\\|\//g, '_')
+    const sourceId = `${normalizedFileName}-${line}-${col}`
+
     buffer.writeExpression(
-      `template.stacks.pushTo(${parser.utils.stringify(parsed)}, ${stackId})`,
+      `template.stacks.pushOnceTo(${parser.utils.stringify(parsed)}, '${sourceId}', ${stackId})`,
       token.filename,
       line
     )
-
-    /**
-     * End if block
-     */
-    buffer.writeStatement('}', token.filename, line)
   },
 }