From 6a207ebfb0b915bcb848e8e17425757314116ce3 Mon Sep 17 00:00:00 2001 From: Andrew Kushnir Date: Mon, 24 Mar 2025 18:14:16 -0700 Subject: [PATCH] refactor(localize): convert scripts within `packages/localize` to relative imports (#60540) This commit updates scripts within `packages/localize` to relative imports as a prep work to the upcoming infra updates. PR Close #60540 --- goldens/public-api/localize/init/index.api.md | 22 ++++++++---- .../public-api/localize/tools/index.api.md | 35 ++++++++----------- packages/localize/init/index.ts | 2 +- packages/localize/test/translate_spec.ts | 2 +- .../localize/tools/src/extract/duplicates.ts | 2 +- .../localize/tools/src/extract/extraction.ts | 2 +- packages/localize/tools/src/extract/index.ts | 2 +- .../source_files/es2015_extract_plugin.ts | 2 +- .../source_files/es5_extract_plugin.ts | 2 +- .../arb_translation_serializer.ts | 2 +- .../json_translation_serializer.ts | 2 +- .../legacy_message_id_migration_serializer.ts | 2 +- .../translation_serializer.ts | 2 +- .../src/extract/translation_files/utils.ts | 2 +- .../xliff1_translation_serializer.ts | 2 +- .../xliff2_translation_serializer.ts | 2 +- .../xmb_translation_serializer.ts | 2 +- .../localize/tools/src/source_file_utils.ts | 2 +- .../source_files/es2015_translate_plugin.ts | 2 +- .../source_files/es5_translate_plugin.ts | 2 +- .../target_message_renderer.ts | 2 +- .../arb_translation_parser.ts | 2 +- .../serialize_translation_message.ts | 2 +- .../simple_json_translation_parser.ts | 2 +- .../translation_parsers/translation_parser.ts | 2 +- .../tools/src/translate/translator.ts | 2 +- .../source_files/es5_extract_plugin_spec.ts | 2 +- .../arb_translation_serializer_spec.ts | 2 +- .../json_translation_serializer_spec.ts | 2 +- ...cy_message_id_migration_serializer_spec.ts | 2 +- .../extract/translation_files/mock_message.ts | 4 +-- .../xliff1_translation_serializer_spec.ts | 2 +- .../xliff2_translation_serializer_spec.ts | 2 +- .../xmb_translation_serializer_spec.ts | 2 +- .../tools/test/source_file_utils_spec.ts | 2 +- .../es2015_translate_plugin_spec.ts | 4 +-- .../source_files/es5_translate_plugin_spec.ts | 4 +-- .../translation_loader_spec.ts | 2 +- .../arb_translation_parser_spec.ts | 2 +- .../translation_parsers/simple_json_spec.ts | 2 +- .../xliff1_translation_parser_spec.ts | 2 +- .../xliff2_translation_parser_spec.ts | 2 +- .../xtb_translation_parser_spec.ts | 2 +- 43 files changed, 74 insertions(+), 71 deletions(-) diff --git a/goldens/public-api/localize/init/index.api.md b/goldens/public-api/localize/init/index.api.md index bd1134a904d..8b21f13e32a 100644 --- a/goldens/public-api/localize/init/index.api.md +++ b/goldens/public-api/localize/init/index.api.md @@ -4,15 +4,23 @@ ```ts -import { ɵ$localize as $localize } from '@angular/localize'; -import { ɵLocalizeFn as LocalizeFn } from '@angular/localize'; -import { ɵTranslateFn as TranslateFn } from '@angular/localize'; +// @public +const $localize_2: LocalizeFn; +export { $localize_2 as $localize } -export { $localize } +// @public (undocumented) +export interface LocalizeFn { + // (undocumented) + (messageParts: TemplateStringsArray, ...expressions: readonly any[]): string; + locale?: string; + translate?: TranslateFn; +} -export { LocalizeFn } - -export { TranslateFn } +// @public (undocumented) +export interface TranslateFn { + // (undocumented) + (messageParts: TemplateStringsArray, expressions: readonly any[]): [TemplateStringsArray, readonly any[]]; +} // (No @packageDocumentation comment for this package) diff --git a/goldens/public-api/localize/tools/index.api.md b/goldens/public-api/localize/tools/index.api.md index 8979c812114..5f03495ba68 100644 --- a/goldens/public-api/localize/tools/index.api.md +++ b/goldens/public-api/localize/tools/index.api.md @@ -7,17 +7,12 @@ import { AbsoluteFsPath } from '@angular/compiler-cli/private/localize'; import { Element as Element_2 } from '@angular/compiler'; import { Logger } from '@angular/compiler-cli/private/localize'; -import { MessageId } from '@angular/localize'; import { NodePath } from '@babel/core'; import { ParseError } from '@angular/compiler'; import { PathManipulation } from '@angular/compiler-cli/private/localize'; import { PluginObj } from '@babel/core'; import { ReadonlyFileSystem } from '@angular/compiler-cli/private/localize'; import { types } from '@babel/core'; -import { ɵParsedMessage } from '@angular/localize'; -import { ɵParsedTranslation } from '@angular/localize'; -import { ɵSourceLocation } from '@angular/localize'; -import { ɵSourceMessage } from '@angular/localize'; // @public export class ArbTranslationParser implements TranslationParser { @@ -31,14 +26,14 @@ export class ArbTranslationParser implements TranslationParser { export class ArbTranslationSerializer implements TranslationSerializer { constructor(sourceLocale: string, basePath: AbsoluteFsPath, fs: PathManipulation); // (undocumented) - serialize(messages: ɵParsedMessage[]): string; + serialize(messages: ParsedMessage[]): string; } // @public export function buildLocalizeReplacement(messageParts: TemplateStringsArray, substitutions: readonly types.Expression[]): types.Expression; // @public -export function checkDuplicateMessages(fs: PathManipulation, messages: ɵParsedMessage[], duplicateMessageHandling: DiagnosticHandlingStrategy, basePath: AbsoluteFsPath): Diagnostics; +export function checkDuplicateMessages(fs: PathManipulation, messages: ParsedMessage[], duplicateMessageHandling: DiagnosticHandlingStrategy, basePath: AbsoluteFsPath): Diagnostics; // @public export type DiagnosticHandlingStrategy = 'error' | 'warning' | 'ignore'; @@ -71,14 +66,14 @@ export function isGlobalIdentifier(identifier: NodePath): bool export class LegacyMessageIdMigrationSerializer implements TranslationSerializer { constructor(_diagnostics: Diagnostics); // (undocumented) - serialize(messages: ɵParsedMessage[]): string; + serialize(messages: ParsedMessage[]): string; } // @public -export function makeEs2015TranslatePlugin(diagnostics: Diagnostics, translations: Record, { missingTranslation, localizeName }?: TranslatePluginOptions, fs?: PathManipulation): PluginObj; +export function makeEs2015TranslatePlugin(diagnostics: Diagnostics, translations: Record, { missingTranslation, localizeName }?: TranslatePluginOptions, fs?: PathManipulation): PluginObj; // @public -export function makeEs5TranslatePlugin(diagnostics: Diagnostics, translations: Record, { missingTranslation, localizeName }?: TranslatePluginOptions, fs?: PathManipulation): PluginObj; +export function makeEs5TranslatePlugin(diagnostics: Diagnostics, translations: Record, { missingTranslation, localizeName }?: TranslatePluginOptions, fs?: PathManipulation): PluginObj; // @public export function makeLocalePlugin(locale: string, { localizeName }?: TranslatePluginOptions): PluginObj; @@ -87,7 +82,7 @@ export function makeLocalePlugin(locale: string, { localizeName }?: TranslatePlu export class MessageExtractor { constructor(fs: ReadonlyFileSystem, logger: Logger, { basePath, useSourceMaps, localizeName }: ExtractionOptions); // (undocumented) - extractMessages(filename: string): ɵParsedMessage[]; + extractMessages(filename: string): ParsedMessage[]; } // @public @@ -102,23 +97,23 @@ export class SimpleJsonTranslationParser implements TranslationParser, messageParts: TemplateStringsArray, substitutions: readonly any[], missingTranslation: DiagnosticHandlingStrategy): [TemplateStringsArray, readonly any[]]; +export function translate(diagnostics: Diagnostics, translations: Record, messageParts: TemplateStringsArray, substitutions: readonly any[], missingTranslation: DiagnosticHandlingStrategy): [TemplateStringsArray, readonly any[]]; // @public -export function unwrapExpressionsFromTemplateLiteral(quasi: NodePath, fs?: PathManipulation): [types.Expression[], (ɵSourceLocation | undefined)[]]; +export function unwrapExpressionsFromTemplateLiteral(quasi: NodePath, fs?: PathManipulation): [types.Expression[], (SourceLocation | undefined)[]]; // @public -export function unwrapMessagePartsFromLocalizeCall(call: NodePath, fs?: PathManipulation): [TemplateStringsArray, (ɵSourceLocation | undefined)[]]; +export function unwrapMessagePartsFromLocalizeCall(call: NodePath, fs?: PathManipulation): [TemplateStringsArray, (SourceLocation | undefined)[]]; // @public -export function unwrapMessagePartsFromTemplateLiteral(elements: NodePath[], fs?: PathManipulation): [TemplateStringsArray, (ɵSourceLocation | undefined)[]]; +export function unwrapMessagePartsFromTemplateLiteral(elements: NodePath[], fs?: PathManipulation): [TemplateStringsArray, (SourceLocation | undefined)[]]; // @public -export function unwrapSubstitutionsFromLocalizeCall(call: NodePath, fs?: PathManipulation): [types.Expression[], (ɵSourceLocation | undefined)[]]; +export function unwrapSubstitutionsFromLocalizeCall(call: NodePath, fs?: PathManipulation): [types.Expression[], (SourceLocation | undefined)[]]; // @public export class Xliff1TranslationParser implements TranslationParser { @@ -132,7 +127,7 @@ export class Xliff1TranslationParser implements TranslationParser