From 8ea2d91f1dbe89fc8e91292a00dc04ecd2dc8e57 Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Thu, 2 Jul 2020 09:45:15 +0800 Subject: [PATCH] Change handlebars `preprocess` to `postprocess` (#8644) --- src/language-handlebars/parser-glimmer.js | 10 +++++++--- .../{preprocess.js => postprocess.js} | 12 +++++------- src/language-handlebars/printer-glimmer.js | 2 -- 3 files changed, 12 insertions(+), 12 deletions(-) rename src/language-handlebars/{preprocess.js => postprocess.js} (66%) diff --git a/src/language-handlebars/parser-glimmer.js b/src/language-handlebars/parser-glimmer.js index ae282d9e0..8fbbe600e 100644 --- a/src/language-handlebars/parser-glimmer.js +++ b/src/language-handlebars/parser-glimmer.js @@ -1,11 +1,13 @@ "use strict"; const createError = require("../common/parser-create-error"); +const postprocess = require("./postprocess"); -function parse(text) { +function parse(text, parsers, options) { + const { preprocess: glimmer, traverse } = require("@glimmer/syntax"); + let ast; try { - const glimmer = require("@glimmer/syntax").preprocess; - return glimmer(text, { mode: "codemod" }); + ast = glimmer(text, { mode: "codemod" }); /* istanbul ignore next */ } catch (error) { const matches = error.message.match(/on line (\d+)/); @@ -17,6 +19,8 @@ function parse(text) { throw error; } } + + return postprocess(ast, options, traverse); } module.exports = { diff --git a/src/language-handlebars/preprocess.js b/src/language-handlebars/postprocess.js similarity index 66% rename from src/language-handlebars/preprocess.js rename to src/language-handlebars/postprocess.js index fd376682d..882eed1c9 100644 --- a/src/language-handlebars/preprocess.js +++ b/src/language-handlebars/postprocess.js @@ -1,8 +1,6 @@ "use strict"; -const transform = require("@glimmer/syntax").traverse; - -const PREPROCESS_PIPELINE = [addBackslash]; +const PIPELINE = [addBackslash]; /* VISITORS */ @@ -22,13 +20,13 @@ function addBackslash(/* options*/) { }; } -function preprocess(ast, options) { - for (const fn of PREPROCESS_PIPELINE) { +function postprocess(ast, options, traverse) { + for (const fn of PIPELINE) { const visitor = fn(options); - transform(ast, visitor); + traverse(ast, visitor); } return ast; } -module.exports = preprocess; +module.exports = postprocess; diff --git a/src/language-handlebars/printer-glimmer.js b/src/language-handlebars/printer-glimmer.js index f540ba4ff..68235f09d 100644 --- a/src/language-handlebars/printer-glimmer.js +++ b/src/language-handlebars/printer-glimmer.js @@ -12,7 +12,6 @@ const { } = require("../document").builders; const clean = require("./clean"); -const preprocess = require("./preprocess"); const { getNextNode, getPreviousNode, @@ -676,5 +675,4 @@ function doesNotHavePositionalParams(node) { module.exports = { print, massageAstNode: clean, - preprocess, };