Skip to content

refactor: simplify tsconfig.json files computation #745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 4, 2024
Merged

refactor: simplify tsconfig.json files computation #745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ts/private/ts_config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def _write_tsconfig_rule(ctx):
src_files = []
for f in ctx.files.files:
# Only include typescript source files
if not (_lib.is_ts_src(f.basename, ctx.attr.allow_js, ctx.attr.resolve_json_module) or _lib.is_typings_src(f.basename)):
if not _lib.is_ts_src(f.basename, ctx.attr.allow_js, ctx.attr.resolve_json_module, True):
continue

if f.short_path.startswith(local_package_prefix):
Expand Down
8 changes: 4 additions & 4 deletions ts/private/ts_lib.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,9 @@ def _is_js_src(src, allow_js, resolve_json_module):

return False

def _is_ts_src(src, allow_js, resolve_json_module):
if (src.endswith(".ts") or src.endswith(".tsx") or src.endswith(".mts") or src.endswith(".cts")):
return not _is_typings_src(src)
def _is_ts_src(src, allow_js, resolve_json_module, include_typings):
if src.endswith(".ts") or src.endswith(".tsx") or src.endswith(".mts") or src.endswith(".cts"):
return include_typings or not _is_typings_src(src)

return _is_js_src(src, allow_js, resolve_json_module)

Expand All @@ -228,7 +228,7 @@ def _to_out_path(f, out_dir, root_dir):
def _to_js_out_paths(srcs, out_dir, root_dir, allow_js, resolve_json_module, ext_map, default_ext):
outs = []
for f in srcs:
if _is_ts_src(f, allow_js, resolve_json_module):
if _is_ts_src(f, allow_js, resolve_json_module, False):
out = _to_out_path(f, out_dir, root_dir)
ext_idx = out.rindex(".")
out = out[:ext_idx] + ext_map.get(out[ext_idx:], default_ext)
Expand Down
Loading