From 23157bde6fc6b88fa255bf9439b135c8c017f665 Mon Sep 17 00:00:00 2001 From: overlookmotel <557937+overlookmotel@users.noreply.github.com> Date: Sat, 26 Oct 2024 17:10:31 +0000 Subject: [PATCH] refactor(napi): types file in root of types package (#6929) Move `types.d.ts` file to root of `@oxc-project/types` package. I think this is cleaner. --- .github/.generated_ast_watch_list.yml | 2 +- npm/oxc-types/package.json | 6 +++--- npm/oxc-types/{src/generated => }/types.d.ts | 0 tasks/ast_tools/src/generators/typescript.rs | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) rename npm/oxc-types/{src/generated => }/types.d.ts (100%) diff --git a/.github/.generated_ast_watch_list.yml b/.github/.generated_ast_watch_list.yml index 40be7863e3da6..6ab21c6537885 100644 --- a/.github/.generated_ast_watch_list.yml +++ b/.github/.generated_ast_watch_list.yml @@ -32,6 +32,6 @@ src: - 'crates/oxc_ast/src/generated/ast_builder.rs' - 'crates/oxc_ast/src/generated/visit.rs' - 'crates/oxc_ast/src/generated/visit_mut.rs' - - 'npm/oxc-types/src/generated/types.d.ts' + - 'npm/oxc-types/types.d.ts' - 'tasks/ast_tools/src/**' - '.github/.generated_ast_watch_list.yml' diff --git a/npm/oxc-types/package.json b/npm/oxc-types/package.json index 116c0526b2142..74177b854f1d9 100644 --- a/npm/oxc-types/package.json +++ b/npm/oxc-types/package.json @@ -18,8 +18,8 @@ "funding": { "url": "https://github.com/sponsors/Boshen" }, - "types": "src/generated/types.d.ts", + "types": "types.d.ts", "files": [ - "src/generated/types.d.ts" + "types.d.ts" ] -} \ No newline at end of file +} diff --git a/npm/oxc-types/src/generated/types.d.ts b/npm/oxc-types/types.d.ts similarity index 100% rename from npm/oxc-types/src/generated/types.d.ts rename to npm/oxc-types/types.d.ts diff --git a/tasks/ast_tools/src/generators/typescript.rs b/tasks/ast_tools/src/generators/typescript.rs index 4f693006e3ec9..a71edf51b351c 100644 --- a/tasks/ast_tools/src/generators/typescript.rs +++ b/tasks/ast_tools/src/generators/typescript.rs @@ -3,7 +3,7 @@ use itertools::Itertools; use crate::{ codegen::LateCtx, - output::{output_path, Output}, + output::Output, schema::{ serialize::{enum_variant_name, get_type_tag}, EnumDef, GetIdent, StructDef, TypeDef, TypeName, @@ -37,7 +37,7 @@ impl Generator for TypescriptGenerator { code.push_str("\n\n"); } - Output::Javascript { path: output_path(crate::TYPESCRIPT_PACKAGE, "types.d.ts"), code } + Output::Javascript { path: format!("{}/types.d.ts", crate::TYPESCRIPT_PACKAGE), code } } }