Skip to content

Commit

Permalink
Rename convertDefineComponentImport to convertImportDeclaration
Browse files Browse the repository at this point in the history
  • Loading branch information
inouetakuya committed May 6, 2024
1 parent 25d7805 commit fe59bc9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
6 changes: 3 additions & 3 deletions packages/vue-script-setup-converter/src/lib/convertSrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
import { parse } from "@vue/compiler-sfc";
import { getNodeByKind } from "./helper";
import { hasNamedImportIdentifier } from "./helpers/module";
import { convertDefineComponentImport } from "./converter/importDeclarationConverter";
import { convertImportDeclaration } from "./converter/importDeclarationConverter";
import { convertPageMeta } from "./converter/pageMetaConverter";
import { convertProps } from "./converter/propsConverter";
import { convertSetup } from "./converter/setupConverter";
Expand Down Expand Up @@ -43,7 +43,7 @@ export const convertSrc = (input: string) => {
throw new Error("defineComponent is not found.");
}

const defineComponentImport = convertDefineComponentImport(sourceFile) ?? "";
const importDeclaration = convertImportDeclaration(sourceFile) ?? "";
const pageMeta = convertPageMeta(callexpression, lang) ?? "";
const props = convertProps(callexpression, lang) ?? "";
const emits = convertEmits(callexpression, lang) ?? "";
Expand All @@ -70,7 +70,7 @@ export const convertSrc = (input: string) => {
})
);

statements.addStatements(defineComponentImport);
statements.addStatements(importDeclaration);

if (isDefineNuxtComponent(callexpression)) {
statements.addStatements(pageMeta);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ScriptTarget, Project } from "ts-morph";
import { parse } from "@vue/compiler-sfc";
import prettier from "prettier";
import parserTypeScript from "prettier/parser-typescript";
import { convertDefineComponentImport } from "./importDeclarationConverter";
import { convertImportDeclaration } from "./importDeclarationConverter";

const parseScript = (input: string, lang: "js" | "ts" = "js") => {
const {
Expand All @@ -18,8 +18,7 @@ const parseScript = (input: string, lang: "js" | "ts" = "js") => {
});

const sourceFile = project.createSourceFile("s.tsx", script?.content ?? "");
const convertedImportDeclarationText =
convertDefineComponentImport(sourceFile);
const convertedImportDeclarationText = convertImportDeclaration(sourceFile);

const formatedText = prettier.format(convertedImportDeclarationText, {
parser: "typescript",
Expand All @@ -29,7 +28,7 @@ const parseScript = (input: string, lang: "js" | "ts" = "js") => {
return formatedText;
};

describe("convertDefineComponentImport", () => {
describe("convertImportDeclaration", () => {
describe("when defineComponent is imported", () => {
const source = `<script>
import { defineComponent, ref } from 'vue';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { ImportDeclaration, SourceFile } from "ts-morph";
import { hasNamedImportIdentifier } from "../helpers/module";

export const convertDefineComponentImport = (sourceFile: SourceFile) => {
export const convertImportDeclaration = (sourceFile: SourceFile) => {
let importDeclarationText = "";

sourceFile.getImportDeclarations().forEach((importDeclaration) => {
Expand Down

0 comments on commit fe59bc9

Please sign in to comment.