From 0537de92480f2813a6dfea4ca7f5bf8660aa2272 Mon Sep 17 00:00:00 2001 From: INOUE Takuya Date: Tue, 7 May 2024 09:28:06 +0900 Subject: [PATCH] refactor(vue-script-setup-converter): move it to the suitable directory (#54) * renamed: packages/vue-script-setup-converter/src/lib/helper.ts -> packages/vue-script-setup-converter/src/lib/helpers/node.ts * test: fix it --- packages/vue-script-setup-converter/src/lib/convertSrc.ts | 2 +- .../src/lib/converter/emitsConverter.test.ts | 2 +- .../src/lib/converter/emitsConverter.ts | 2 +- .../src/lib/converter/pageMetaConverter.test.ts | 2 +- .../src/lib/converter/pageMetaConverter.ts | 2 +- .../src/lib/converter/propsConverter.test.ts | 2 +- .../src/lib/converter/propsConverter.ts | 2 +- .../src/lib/converter/setupConverter.test.ts | 2 +- .../src/lib/converter/setupConverter.ts | 4 ++-- .../vue-script-setup-converter/src/lib/helpers/module.test.ts | 2 +- .../src/lib/{helper.ts => helpers/node.ts} | 1 - 11 files changed, 11 insertions(+), 12 deletions(-) rename packages/vue-script-setup-converter/src/lib/{helper.ts => helpers/node.ts} (97%) diff --git a/packages/vue-script-setup-converter/src/lib/convertSrc.ts b/packages/vue-script-setup-converter/src/lib/convertSrc.ts index e098022..b328c77 100644 --- a/packages/vue-script-setup-converter/src/lib/convertSrc.ts +++ b/packages/vue-script-setup-converter/src/lib/convertSrc.ts @@ -7,7 +7,7 @@ import { ts, } from "ts-morph"; import { parse } from "@vue/compiler-sfc"; -import { getNodeByKind } from "./helper"; +import { getNodeByKind } from "./helpers/node"; import { hasNamedImportIdentifier } from "./helpers/module"; import { convertImportDeclaration } from "./converter/importDeclarationConverter"; import { convertPageMeta } from "./converter/pageMetaConverter"; diff --git a/packages/vue-script-setup-converter/src/lib/converter/emitsConverter.test.ts b/packages/vue-script-setup-converter/src/lib/converter/emitsConverter.test.ts index bbd8b03..4b5f0af 100644 --- a/packages/vue-script-setup-converter/src/lib/converter/emitsConverter.test.ts +++ b/packages/vue-script-setup-converter/src/lib/converter/emitsConverter.test.ts @@ -3,7 +3,7 @@ import { CallExpression, ScriptTarget, SyntaxKind, Project } from "ts-morph"; import { parse } from "@vue/compiler-sfc"; import prettier from "prettier"; import parserTypeScript from "prettier/parser-typescript"; -import { getNodeByKind } from "../helper"; +import { getNodeByKind } from "../helpers/node"; import { convertEmits } from "./emitsConverter"; const parseScript = (input: string, lang: "js" | "ts" = "js") => { diff --git a/packages/vue-script-setup-converter/src/lib/converter/emitsConverter.ts b/packages/vue-script-setup-converter/src/lib/converter/emitsConverter.ts index bea3a4b..f272ce2 100644 --- a/packages/vue-script-setup-converter/src/lib/converter/emitsConverter.ts +++ b/packages/vue-script-setup-converter/src/lib/converter/emitsConverter.ts @@ -5,7 +5,7 @@ import { SyntaxKind, ArrowFunction, } from "ts-morph"; -import { getOptionsNode } from "../helper"; +import { getOptionsNode } from "../helpers/node"; // ctx.emit('event') -> emit('event') export const replaceEmit = (expression: string, contextName: string) => { diff --git a/packages/vue-script-setup-converter/src/lib/converter/pageMetaConverter.test.ts b/packages/vue-script-setup-converter/src/lib/converter/pageMetaConverter.test.ts index fa2f090..a63815d 100644 --- a/packages/vue-script-setup-converter/src/lib/converter/pageMetaConverter.test.ts +++ b/packages/vue-script-setup-converter/src/lib/converter/pageMetaConverter.test.ts @@ -3,7 +3,7 @@ import { CallExpression, ScriptTarget, SyntaxKind, Project } from "ts-morph"; import { parse } from "@vue/compiler-sfc"; import prettier from "prettier"; import parserTypeScript from "prettier/parser-typescript"; -import { getNodeByKind } from "../helper"; +import { getNodeByKind } from "../helpers/node"; import { convertPageMeta } from "./pageMetaConverter"; const parseScript = (input: string, lang: "js" | "ts" = "js") => { diff --git a/packages/vue-script-setup-converter/src/lib/converter/pageMetaConverter.ts b/packages/vue-script-setup-converter/src/lib/converter/pageMetaConverter.ts index 70cbf5f..180145f 100644 --- a/packages/vue-script-setup-converter/src/lib/converter/pageMetaConverter.ts +++ b/packages/vue-script-setup-converter/src/lib/converter/pageMetaConverter.ts @@ -1,5 +1,5 @@ import { CallExpression, PropertyAssignment } from "ts-morph"; -import { getOptionsNode } from "../helper"; +import { getOptionsNode } from "../helpers/node"; export const convertPageMeta = (node: CallExpression, lang: string = "js") => { const nameNode = getOptionsNode(node, "name"); diff --git a/packages/vue-script-setup-converter/src/lib/converter/propsConverter.test.ts b/packages/vue-script-setup-converter/src/lib/converter/propsConverter.test.ts index 5feffa5..524a484 100644 --- a/packages/vue-script-setup-converter/src/lib/converter/propsConverter.test.ts +++ b/packages/vue-script-setup-converter/src/lib/converter/propsConverter.test.ts @@ -3,7 +3,7 @@ import { CallExpression, ScriptTarget, SyntaxKind, Project } from "ts-morph"; import { parse } from "@vue/compiler-sfc"; import prettier from "prettier"; import parserTypeScript from "prettier/parser-typescript"; -import { getNodeByKind } from "../helper"; +import { getNodeByKind } from "../helpers/node"; import { convertProps } from "./propsConverter"; const parseScript = (input: string, lang: "js" | "ts" = "js") => { diff --git a/packages/vue-script-setup-converter/src/lib/converter/propsConverter.ts b/packages/vue-script-setup-converter/src/lib/converter/propsConverter.ts index 5b419d2..61be651 100644 --- a/packages/vue-script-setup-converter/src/lib/converter/propsConverter.ts +++ b/packages/vue-script-setup-converter/src/lib/converter/propsConverter.ts @@ -10,7 +10,7 @@ import { AsExpression, ArrowFunction, } from "ts-morph"; -import { getNodeByKind, getOptionsNode } from "../helper"; +import { getNodeByKind, getOptionsNode } from "../helpers/node"; export const convertProps = (node: CallExpression, lang: string = "js") => { const propsNode = getOptionsNode(node, "props"); diff --git a/packages/vue-script-setup-converter/src/lib/converter/setupConverter.test.ts b/packages/vue-script-setup-converter/src/lib/converter/setupConverter.test.ts index 7509628..c62f26e 100644 --- a/packages/vue-script-setup-converter/src/lib/converter/setupConverter.test.ts +++ b/packages/vue-script-setup-converter/src/lib/converter/setupConverter.test.ts @@ -5,7 +5,7 @@ import { parse } from "@vue/compiler-sfc"; import prettier from "prettier"; import parserTypeScript from "prettier/parser-typescript"; import optionsApi from "../../samples/composition-api.txt?raw"; -import { getNodeByKind } from "../helper"; +import { getNodeByKind } from "../helpers/node"; test("setup statements", () => { const { diff --git a/packages/vue-script-setup-converter/src/lib/converter/setupConverter.ts b/packages/vue-script-setup-converter/src/lib/converter/setupConverter.ts index f14d8c5..3522420 100644 --- a/packages/vue-script-setup-converter/src/lib/converter/setupConverter.ts +++ b/packages/vue-script-setup-converter/src/lib/converter/setupConverter.ts @@ -1,4 +1,4 @@ -import { getNodeByKind } from "./../helper"; +import { getNodeByKind } from "../helpers/node"; import { CallExpression, SyntaxKind, MethodDeclaration } from "ts-morph"; import { replaceEmit } from "./emitsConverter"; @@ -27,7 +27,7 @@ export const convertSetup = (node: CallExpression) => { if (!contextName) { return x.getFullText(); } - return replaceEmit(x.getFullText(), contextName) + return replaceEmit(x.getFullText(), contextName); }) .join(""); }; diff --git a/packages/vue-script-setup-converter/src/lib/helpers/module.test.ts b/packages/vue-script-setup-converter/src/lib/helpers/module.test.ts index 990952b..4ac2346 100644 --- a/packages/vue-script-setup-converter/src/lib/helpers/module.test.ts +++ b/packages/vue-script-setup-converter/src/lib/helpers/module.test.ts @@ -38,7 +38,7 @@ describe("helpers/module", () => { describe("when importDeclaration does not include target namedImport", () => { const source = ``; - it("returns true", () => { + it("returns false", () => { const sourceFile = getSourceFile(source); const importDeclaration = sourceFile.getImportDeclaration("vue"); const result = hasNamedImportIdentifier( diff --git a/packages/vue-script-setup-converter/src/lib/helper.ts b/packages/vue-script-setup-converter/src/lib/helpers/node.ts similarity index 97% rename from packages/vue-script-setup-converter/src/lib/helper.ts rename to packages/vue-script-setup-converter/src/lib/helpers/node.ts index 7fc9c95..87994c0 100644 --- a/packages/vue-script-setup-converter/src/lib/helper.ts +++ b/packages/vue-script-setup-converter/src/lib/helpers/node.ts @@ -1,4 +1,3 @@ -// TODO: Move to helpers/node.ts import { SyntaxKind, Node, PropertyAssignment, CallExpression } from "ts-morph"; export const getNodeByKind = (