Unalias FluentMessage, FluentAttribute, FluentAttributes

Author: Pike

frontend/src/core/editor/actions.js

@@ -13,7 +13,7 @@ import * as unsavedchanges from 'modules/unsavedchanges';
 
 import type { Entity, SourceType } from 'core/api';
 import type { Locale } from 'core/locale';
-import type { FluentMessage } from 'core/utils/fluent/types';
+import type { Entry } from '@fluent/syntax';
 
 export const END_UPDATE_TRANSLATION: 'editor/END_UPDATE_TRANSLATION' =
     'editor/END_UPDATE_TRANSLATION';
@@ -40,7 +40,7 @@ export const UPDATE_SELECTION: 'editor/UPDATE_SELECTION' =
 export const UPDATE_MACHINERY_SOURCES: 'editor/UPDATE_MACHINERY_SOURCES' =
     'editor/UPDATE_MACHINERY_SOURCES';
 
-export type Translation = string | FluentMessage;
+export type Translation = string | Entry;
 
 /**
  * Update the current translation of the selected entity.

frontend/src/core/utils/fluent/convertSyntax.js

@@ -7,7 +7,7 @@ import getSimplePreview from './getSimplePreview';
 import parser from './parser';
 import serializer from './serializer';
 
-import type { FluentMessage } from './types';
+import type { Entry } from '@fluent/syntax';
 import type { Locale } from 'core/locale';
 
 type SyntaxType = 'simple' | 'rich' | 'complex' | '';
@@ -60,7 +60,7 @@ export function getRichFromComplex(
     original: string,
     initial: string,
     locale: Locale,
-): [FluentMessage, FluentMessage] {
+): [Entry, Entry] {
     let translationContent = parser.parseEntry(current);
 
     // If the parsed content is invalid, create an empty message instead.
@@ -87,7 +87,7 @@ export function getRichFromComplex(
 }
 
 export function getComplexFromRich(
-    current: FluentMessage,
+    current: Entry,
     original: string,
     initial: string,
     locale: Locale,
@@ -114,21 +114,21 @@ export function getComplexFromRich(
  *
  * @param {string} fromSyntax Syntax of the current translation.
  * @param {string} toSyntax Expected syntax of the output.
- * @param {string | FluentMessage} current Current content of the translation, as entered by the user.
+ * @param {string | Entry} current Current content of the translation, as entered by the user.
  * @param {string} original Original string of the entity.
  * @param {string} initial Currently active translation, if any.
  * @param {Locale} locale Current locale.
  *
- * @returns {[ string | FluentMessage, string ]} The converted current translation and initial translation.
+ * @returns {[ string | Entry, string ]} The converted current translation and initial translation.
  */
 export default function convertSyntax(
     fromSyntax: SyntaxType,
     toSyntax: SyntaxType,
-    current: string | FluentMessage,
+    current: string | Entry,
     original: string,
     initial: string,
     locale: Locale,
-): [FluentMessage, FluentMessage] | [string, string] {
+): [Entry, Entry] | [string, string] {
     if (
         fromSyntax === 'complex' &&
         toSyntax === 'simple' &&

frontend/src/core/utils/fluent/flattenMessage.js

@@ -2,20 +2,20 @@
 
 import flattenPatternElements from './flattenPatternElements';
 
-import type { FluentMessage } from './types';
+import type { Entry } from '@fluent/syntax';
 
 /**
  * Return a flattened Fluent message.
  *
  * Takes a Fluent message and returns a copy with flattened value and
  * attributes elements.
  *
- * @param {FluentMessage} message A Fluent message to flatten.
+ * @param {Entry} message A Fluent message to flatten.
  *
- * @returns {FluentMessage} A copy of the given Fluent message with flattened
+ * @returns {Entry} A copy of the given Fluent message with flattened
  * value and attributes elements.
  */
-export default function flattenMessage(message: FluentMessage): FluentMessage {
+export default function flattenMessage(message: Entry): Entry {
     const flatMessage = message.clone();
     if (flatMessage.type !== 'Message' && flatMessage.type !== 'Term') {
         return flatMessage;

frontend/src/core/utils/fluent/getEmptyMessage.js

@@ -13,7 +13,7 @@ import isPluralExpression from './isPluralExpression';
 
 import { CLDR_PLURALS } from 'core/plural';
 
-import type { FluentMessage } from './types';
+import type { Entry } from '@fluent/syntax';
 import type { Locale } from 'core/locale';
 
 /**
@@ -78,13 +78,10 @@ function withDefaultVariant(variants: Array<Variant>): Array<Variant> {
  * Note that this produces "junk" Fluent messages. Serializing the AST works,
  * but parsing it afterwards will result in a Junk message.
  *
- * @param {FluentMessage} source A Fluent AST to empty.
- * @returns {FluentMessage} An emptied copy of the source.
+ * @param {Entry} source A Fluent AST to empty.
+ * @returns {Entry} An emptied copy of the source.
  */
-export default function getEmptyMessage(
-    source: FluentMessage,
-    locale: Locale,
-): FluentMessage {
+export default function getEmptyMessage(source: Entry, locale: Locale): Entry {
     class EmptyTransformer extends Transformer {
         // Empty Text Elements
         visitTextElement(node: TextElement): TextElement {
@@ -119,5 +116,5 @@ export default function getEmptyMessage(
 
     // Empty TextElements
     const transformer = new EmptyTransformer();
-    return ((transformer.visit(flatMessage): any): FluentMessage);
+    return ((transformer.visit(flatMessage): any): Entry);
 }

frontend/src/core/utils/fluent/getReconstructedMessage.js

@@ -2,7 +2,7 @@
 
 import parser from './parser';
 
-import type { FluentMessage } from './types';
+import type { Entry } from '@fluent/syntax';
 
 /**
  * Return a reconstructed Fluent message from the original message and some
@@ -11,7 +11,7 @@ import type { FluentMessage } from './types';
 export default function getReconstructedMessage(
     original: string,
     translation: string,
-): FluentMessage {
+): Entry {
     const message = parser.parseEntry(original);
     if (message.type !== 'Message' && message.type !== 'Term') {
         throw new Error(

frontend/src/core/utils/fluent/getSyntaxType.js

@@ -4,19 +4,20 @@ import isSimpleMessage from './isSimpleMessage';
 import isSimpleSingleAttributeMessage from './isSimpleSingleAttributeMessage';
 import isSupportedMessage from './isSupportedMessage';
 
-import type { FluentMessage, SyntaxType } from './types';
+import type { SyntaxType } from './types';
+import type { Entry } from '@fluent/syntax';
 
 /**
  * Return the syntax type of a given Fluent message.
  *
- * @param {FluentMessage} message A Fluent message (AST) to analyze.
+ * @param {Entry} message A Fluent message (AST) to analyze.
  *
  * @returns {string} The syntax type of the Fluent message. Can be one of:
  *      - "simple": can be shown as a simple string in generic editor;
  *      - "rich": can be shown in a rich editor;
  *      - "complex": can only be shown in a source editor.
  */
-export default function getSyntaxType(message: FluentMessage): SyntaxType {
+export default function getSyntaxType(message: Entry): SyntaxType {
     if (!isSupportedMessage(message)) {
         return 'complex';
     }

frontend/src/core/utils/fluent/isSimpleSingleAttributeMessage.js

@@ -1,14 +1,14 @@
 /* @flow */
 
 import isSimpleElement from './isSimpleElement';
-import type { FluentMessage } from './types';
+import type { Entry } from '@fluent/syntax';
 
 /**
  * Return true when message has no value and a single attribute with only simple
  * elements.
  */
 export default function isSimpleSingleAttributeMessage(
-    message: FluentMessage,
+    message: Entry,
 ): boolean {
     if (
         message.type === 'Message' &&

frontend/src/core/utils/fluent/types.js

@@ -1,13 +1,5 @@
 /* @flow */
 
-import type { Attribute, Entry } from '@fluent/syntax';
-
-export type FluentAttribute = Attribute;
-
-export type FluentAttributes = Array<FluentAttribute>;
-
-export type FluentMessage = Entry;
-
 // Type of syntax of the translation to show in the editor.
 // `simple` => SimpleEditor (the message can be simplified to a single text element)
 // `rich` => RichEditor (the message can be displayed in our rich interface)

frontend/src/modules/fluenteditor/components/FluentEditor.js

@@ -10,7 +10,8 @@ import * as entities from 'core/entities';
 import * as notification from 'core/notification';
 import * as plural from 'core/plural';
 import { fluent } from 'core/utils';
-import type { FluentMessage, SyntaxType } from 'core/utils/fluent/types';
+import type { SyntaxType } from 'core/utils/fluent/types';
+import type { Entry } from '@fluent/syntax';
 
 import SourceEditor from './source/SourceEditor';
 import SimpleEditor from './simple/SimpleEditor';
@@ -81,7 +82,7 @@ function useLoadTranslation(forceSource) {
             activeTranslationString || entity.original,
         );
 
-        let translationContent: string | FluentMessage = '';
+        let translationContent: string | Entry = '';
         if (syntax === 'complex') {
             // Use the actual content that we get from the server: a Fluent message as a string.
             translationContent = activeTranslationString;

frontend/src/modules/fluenteditor/components/rich/RichTranslationForm.js

@@ -14,7 +14,7 @@ import { CLDR_PLURALS } from 'core/plural';
 import { fluent } from 'core/utils';
 
 import type { Translation } from 'core/editor';
-import type { FluentAttributes, FluentMessage } from 'core/utils/fluent/types';
+import type { Attribute, Entry } from '@fluent/syntax';
 import type {
     Pattern,
     PatternElement,
@@ -30,7 +30,7 @@ type Child = SyntaxNode | Array<SyntaxNode>;
  * value.
  */
 function getUpdatedTranslation(
-    translation: FluentMessage,
+    translation: Entry,
     value: string,
     path: MessagePath,
 ) {
@@ -483,7 +483,7 @@ export default function RichTranslationForm(
     }
 
     function renderAttributes(
-        attributes: ?FluentAttributes,
+        attributes: ?Array<Attribute>,
         path: MessagePath,
     ) {
         if (!attributes) {