From c68d6e3c2b365a2d9cbdfe353f279d95e22bb911 Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Tue, 14 Jan 2020 18:58:42 +0800 Subject: [PATCH] Move `doc` directory to `document` (#7272) --- scripts/build/config.js | 2 +- src/common/util-shared.js | 2 +- src/{doc => document}/doc-builders.js | 0 src/{doc => document}/doc-debug.js | 0 src/{doc => document}/doc-printer.js | 0 src/{doc => document}/doc-utils.js | 0 src/{doc => document}/index.js | 0 src/index.js | 2 +- src/language-css/embed.js | 2 +- src/language-css/printer-postcss.js | 2 +- src/language-graphql/printer-graphql.js | 2 +- src/language-handlebars/printer-glimmer.js | 2 +- src/language-html/printer-html.js | 2 +- src/language-html/syntax-attribute.js | 2 +- src/language-html/syntax-vue.js | 2 +- src/language-js/embed.js | 2 +- src/language-js/html-binding.js | 2 +- src/language-js/printer-estree-json.js | 2 +- src/language-js/printer-estree.js | 2 +- src/language-markdown/embed.js | 2 +- src/language-markdown/printer-markdown.js | 2 +- src/language-yaml/printer-yaml.js | 2 +- src/main/ast-to-doc.js | 2 +- src/main/comments.js | 2 +- src/main/core.js | 2 +- src/standalone.js | 2 +- 26 files changed, 21 insertions(+), 21 deletions(-) rename src/{doc => document}/doc-builders.js (100%) rename src/{doc => document}/doc-debug.js (100%) rename src/{doc => document}/doc-printer.js (100%) rename src/{doc => document}/doc-utils.js (100%) rename src/{doc => document}/index.js (100%) diff --git a/scripts/build/config.js b/scripts/build/config.js index acfc0ef22..9758bd879 100644 --- a/scripts/build/config.js +++ b/scripts/build/config.js @@ -147,7 +147,7 @@ const coreBundles = [ } }, { - input: "src/doc/index.js", + input: "src/document/index.js", name: "doc", type: "core", output: "doc.js", diff --git a/src/common/util-shared.js b/src/common/util-shared.js index 5d95260d4..a7581c08e 100644 --- a/src/common/util-shared.js +++ b/src/common/util-shared.js @@ -1,7 +1,7 @@ "use strict"; const util = require("./util"); -const { mapDoc } = require("../doc").utils; +const { mapDoc } = require("../document").utils; function isNextLineEmpty(text, node, options) { return util.isNextLineEmpty(text, node, options.locEnd); diff --git a/src/doc/doc-builders.js b/src/document/doc-builders.js similarity index 100% rename from src/doc/doc-builders.js rename to src/document/doc-builders.js diff --git a/src/doc/doc-debug.js b/src/document/doc-debug.js similarity index 100% rename from src/doc/doc-debug.js rename to src/document/doc-debug.js diff --git a/src/doc/doc-printer.js b/src/document/doc-printer.js similarity index 100% rename from src/doc/doc-printer.js rename to src/document/doc-printer.js diff --git a/src/doc/doc-utils.js b/src/document/doc-utils.js similarity index 100% rename from src/doc/doc-utils.js rename to src/document/doc-utils.js diff --git a/src/doc/index.js b/src/document/index.js similarity index 100% rename from src/doc/index.js rename to src/document/index.js diff --git a/src/index.js b/src/index.js index ef908ea75..a3efaa471 100644 --- a/src/index.js +++ b/src/index.js @@ -10,7 +10,7 @@ const loadPlugins = require("./common/load-plugins"); const config = require("./config/resolve-config"); -const doc = require("./doc"); +const doc = require("./document"); // Luckily `opts` is always the 2nd argument function _withPlugins(fn) { diff --git a/src/language-css/embed.js b/src/language-css/embed.js index 6d2ad0142..67cc472fd 100644 --- a/src/language-css/embed.js +++ b/src/language-css/embed.js @@ -3,7 +3,7 @@ const { builders: { hardline, literalline, concat, markAsRoot }, utils: { mapDoc } -} = require("../doc"); +} = require("../document"); function embed(path, print, textToDoc /*, options */) { const node = path.getValue(); diff --git a/src/language-css/printer-postcss.js b/src/language-css/printer-postcss.js index b070c15ac..11ec7be9a 100644 --- a/src/language-css/printer-postcss.js +++ b/src/language-css/printer-postcss.js @@ -25,7 +25,7 @@ const { ifBreak }, utils: { removeLines } -} = require("../doc"); +} = require("../document"); const { getAncestorNode, diff --git a/src/language-graphql/printer-graphql.js b/src/language-graphql/printer-graphql.js index 9ee35aa48..d121c59cd 100644 --- a/src/language-graphql/printer-graphql.js +++ b/src/language-graphql/printer-graphql.js @@ -9,7 +9,7 @@ const { group, indent, ifBreak -} = require("../doc").builders; +} = require("../document").builders; const { hasIgnoreComment } = require("../common/util"); const { isNextLineEmpty } = require("../common/util-shared"); const { insertPragma } = require("./pragma"); diff --git a/src/language-handlebars/printer-glimmer.js b/src/language-handlebars/printer-glimmer.js index 9c05c49fd..1c7e382cc 100644 --- a/src/language-handlebars/printer-glimmer.js +++ b/src/language-handlebars/printer-glimmer.js @@ -9,7 +9,7 @@ const { group, indent, ifBreak -} = require("../doc").builders; +} = require("../document").builders; // http://w3c.github.io/html/single-page.html#void-elements const voidTags = [ diff --git a/src/language-html/printer-html.js b/src/language-html/printer-html.js index 5afd14d67..4d2ea8799 100644 --- a/src/language-html/printer-html.js +++ b/src/language-html/printer-html.js @@ -4,7 +4,7 @@ const clean = require("./clean"); const { builders, utils: { stripTrailingHardline, mapDoc } -} = require("../doc"); +} = require("../document"); const { breakParent, dedentToRoot, diff --git a/src/language-html/syntax-attribute.js b/src/language-html/syntax-attribute.js index 751a71aa1..0389810a8 100644 --- a/src/language-html/syntax-attribute.js +++ b/src/language-html/syntax-attribute.js @@ -2,7 +2,7 @@ const { builders: { concat, ifBreak, join, line } -} = require("../doc"); +} = require("../document"); const parseSrcset = require("parse-srcset"); function printImgSrcset(value) { diff --git a/src/language-html/syntax-vue.js b/src/language-html/syntax-vue.js index b6cf0b02f..2509b16a0 100644 --- a/src/language-html/syntax-vue.js +++ b/src/language-html/syntax-vue.js @@ -2,7 +2,7 @@ const { builders: { concat, group } -} = require("../doc"); +} = require("../document"); /** * v-for="... in ..." diff --git a/src/language-js/embed.js b/src/language-js/embed.js index 0954451dd..6cfa5e32e 100644 --- a/src/language-js/embed.js +++ b/src/language-js/embed.js @@ -14,7 +14,7 @@ const { dedentToRoot }, utils: { mapDoc, stripTrailingHardline } -} = require("../doc"); +} = require("../document"); function embed(path, print, textToDoc, options) { const node = path.getValue(); diff --git a/src/language-js/html-binding.js b/src/language-js/html-binding.js index 0bcb25c17..36b337132 100644 --- a/src/language-js/html-binding.js +++ b/src/language-js/html-binding.js @@ -2,7 +2,7 @@ const { builders: { concat, join, line } -} = require("../doc"); +} = require("../document"); function printHtmlBinding(path, options, print) { const node = path.getValue(); diff --git a/src/language-js/printer-estree-json.js b/src/language-js/printer-estree-json.js index 2b5348272..92e8b3bb0 100644 --- a/src/language-js/printer-estree-json.js +++ b/src/language-js/printer-estree-json.js @@ -1,6 +1,6 @@ "use strict"; -const { concat, hardline, indent, join } = require("../doc").builders; +const { concat, hardline, indent, join } = require("../document").builders; const preprocess = require("./preprocess"); function genericPrint(path, options, print) { diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js index 0f837cf3f..1d169c2d0 100644 --- a/src/language-js/printer-estree.js +++ b/src/language-js/printer-estree.js @@ -114,7 +114,7 @@ const { }, utils: { willBreak, isLineNext, isEmpty, removeLines }, printer: { printDocToString } -} = require("../doc"); +} = require("../document"); let uid = 0; diff --git a/src/language-markdown/embed.js b/src/language-markdown/embed.js index d06de68f6..84dbdd1dd 100644 --- a/src/language-markdown/embed.js +++ b/src/language-markdown/embed.js @@ -5,7 +5,7 @@ const support = require("../main/support"); const { builders: { hardline, literalline, concat, markAsRoot }, utils: { mapDoc } -} = require("../doc"); +} = require("../document"); const { getFencedCodeBlockValue } = require("./utils"); function embed(path, print, textToDoc, options) { diff --git a/src/language-markdown/printer-markdown.js b/src/language-markdown/printer-markdown.js index 8434886f7..f4f196999 100644 --- a/src/language-markdown/printer-markdown.js +++ b/src/language-markdown/printer-markdown.js @@ -22,7 +22,7 @@ const { }, utils: { mapDoc }, printer: { printDocToString } -} = require("../doc"); +} = require("../document"); const { getFencedCodeBlockValue, hasGitDiffFriendlyOrderedList, diff --git a/src/language-yaml/printer-yaml.js b/src/language-yaml/printer-yaml.js index 96d757a2b..e07031dca 100644 --- a/src/language-yaml/printer-yaml.js +++ b/src/language-yaml/printer-yaml.js @@ -20,7 +20,7 @@ const { defineShortcut, mapNode } = require("./utils"); -const docBuilders = require("../doc").builders; +const docBuilders = require("../document").builders; const { conditionalGroup, breakParent, diff --git a/src/main/ast-to-doc.js b/src/main/ast-to-doc.js index 181389b9e..77b43e9db 100644 --- a/src/main/ast-to-doc.js +++ b/src/main/ast-to-doc.js @@ -5,7 +5,7 @@ const comments = require("./comments"); const FastPath = require("../common/fast-path"); const multiparser = require("./multiparser"); -const doc = require("../doc"); +const doc = require("../document"); const docBuilders = doc.builders; const concat = docBuilders.concat; const hardline = docBuilders.hardline; diff --git a/src/main/comments.js b/src/main/comments.js index 84e9dc284..cfae39ff2 100644 --- a/src/main/comments.js +++ b/src/main/comments.js @@ -9,7 +9,7 @@ const { lineSuffix, join, cursor -} = require("../doc").builders; +} = require("../document").builders; const { hasNewline, skipNewline, diff --git a/src/main/core.js b/src/main/core.js index 0f37afe6a..2b94e17e6 100644 --- a/src/main/core.js +++ b/src/main/core.js @@ -17,7 +17,7 @@ const { utils: { mapDoc }, printer: { printDocToString }, debug: { printDocToDebug } -} = require("../doc"); +} = require("../document"); const UTF8BOM = 0xfeff; diff --git a/src/standalone.js b/src/standalone.js index 0aaf0d10e..7580d3404 100644 --- a/src/standalone.js +++ b/src/standalone.js @@ -6,7 +6,7 @@ const core = require("./main/core"); const getSupportInfo = require("./main/support").getSupportInfo; const sharedUtil = require("./common/util-shared"); -const doc = require("./doc"); +const doc = require("./document"); const internalPlugins = [ require("./language-css"),