@vocab/phrase 0.0.0-compiled-translation-import-order-20230328231631 → 0.0.0-global-key-support-20231025223328

package/dist/declarations/src/csv.d.ts

@@ -1,10 +1,10 @@
-import type { TranslationsByLanguage } from '@vocab/types';
+import type { TranslationsByLanguage } from '@vocab/core';
 export declare function translationsToCsv(translations: TranslationsByLanguage, devLanguage: string): {
-    csvString: string;
-    localeMapping: {
-        [k: string]: number;
+    csvFileStrings: {
+        [k: string]: string;
     };
     keyIndex: number;
+    messageIndex: number;
     commentIndex: number;
     tagColumn: number;
 };

package/dist/declarations/src/phrase-api.d.ts

@@ -1,4 +1,4 @@
-import type { TranslationsByLanguage } from '@vocab/types';
+import type { TranslationsByLanguage } from '@vocab/core';
 import fetch from 'node-fetch';
 export declare function callPhrase<T = any>(relativePath: string, options?: Parameters<typeof fetch>[1]): Promise<T>;
 export declare function pullAllTranslations(branch: string): Promise<TranslationsByLanguage>;
@@ -6,7 +6,7 @@ export declare function pushTranslations(translationsByLanguage: TranslationsByL
     devLanguage: string;
     branch: string;
 }): Promise<{
-    uploadId: string;
+    devLanguageUploadId: string;
 }>;
 export declare function deleteUnusedKeys(uploadId: string, branch: string): Promise<void>;
 export declare function ensureBranch(branch: string): Promise<void>;

package/dist/declarations/src/pull-translations.d.ts

@@ -1,7 +1,8 @@
-import type { UserConfig } from '@vocab/types';
+import type { UserConfig } from '@vocab/core';
 interface PullOptions {
     branch?: string;
     deleteUnusedKeys?: boolean;
+    errorOnNoGlobalKeyTranslation?: boolean;
 }
-export declare function pull({ branch }: PullOptions, config: UserConfig): Promise<void>;
+export declare function pull({ branch, errorOnNoGlobalKeyTranslation }: PullOptions, config: UserConfig): Promise<void>;
 export {};

package/dist/declarations/src/push-translations.d.ts

@@ -1,4 +1,4 @@
-import { UserConfig } from '@vocab/types';
+import type { UserConfig } from '@vocab/core';
 interface PushOptions {
     branch: string;
     deleteUnusedKeys?: boolean;

package/dist/vocab-phrase.cjs.dev.js

@@ -31,34 +31,43 @@ const log = (...params) => {
 function translationsToCsv(translations, devLanguage) {
   const languages = Object.keys(translations);
   const altLanguages = languages.filter(language => language !== devLanguage);
-  // Ensure languages are ordered for locale mapping
-  const orderedLanguages = [devLanguage, ...altLanguages];
   const devLanguageTranslations = translations[devLanguage];
-  const csv = Object.entries(devLanguageTranslations).map(([key, {
+  const csvFilesByLanguage = Object.fromEntries(languages.map(language => [language, []]));
+  Object.entries(devLanguageTranslations).map(([key, {
     message,
     description,
     tags
   }]) => {
-    const altTranslationMessages = altLanguages.map(language => {
+    const sharedData = [key, description, tags === null || tags === void 0 ? void 0 : tags.join(',')];
+    const devLanguageRow = [...sharedData, message];
+    csvFilesByLanguage[devLanguage].push(devLanguageRow);
+    altLanguages.map(language => {
       var _translations$languag, _translations$languag2;
-      return (_translations$languag = translations[language]) === null || _translations$languag === void 0 ? void 0 : (_translations$languag2 = _translations$languag[key]) === null || _translations$languag2 === void 0 ? void 0 : _translations$languag2.message;
+      const altTranslationMessage = (_translations$languag = translations[language]) === null || _translations$languag === void 0 ? void 0 : (_translations$languag2 = _translations$languag[key]) === null || _translations$languag2 === void 0 ? void 0 : _translations$languag2.message;
+      if (altTranslationMessage) {
+        csvFilesByLanguage[language].push([...sharedData, altTranslationMessage]);
+      }
     });
-    return [message, ...altTranslationMessages, key, description, tags === null || tags === void 0 ? void 0 : tags.join(',')];
-  });
-  const csvString = sync.stringify(csv, {
-    delimiter: ',',
-    header: false
   });
+  const csvFileStrings = Object.fromEntries(Object.entries(csvFilesByLanguage)
+  // Ensure CSV files are only created if the language has at least 1 translation
+  .filter(([_, csvFile]) => csvFile.length > 0).map(([language, csvFile]) => {
+    const csvFileString = sync.stringify(csvFile, {
+      delimiter: ',',
+      header: false
+    });
+    return [language, csvFileString];
+  }));
 
   // Column indices start at 1
-  const localeMapping = Object.fromEntries(orderedLanguages.map((language, index) => [language, index + 1]));
-  const keyIndex = orderedLanguages.length + 1;
+  const keyIndex = 1;
   const commentIndex = keyIndex + 1;
   const tagColumn = commentIndex + 1;
+  const messageIndex = tagColumn + 1;
   return {
-    csvString,
-    localeMapping,
+    csvFileStrings,
     keyIndex,
+    messageIndex,
     commentIndex,
     tagColumn
   };
@@ -139,45 +148,50 @@ async function pushTranslations(translationsByLanguage, {
   devLanguage,
   branch
 }) {
-  const formData = new FormData__default["default"]();
   const {
-    csvString,
-    localeMapping,
+    csvFileStrings,
     keyIndex,
     commentIndex,
-    tagColumn
+    tagColumn,
+    messageIndex
   } = translationsToCsv(translationsByLanguage, devLanguage);
-  const fileContents = Buffer.from(csvString);
-  formData.append('file', fileContents, {
-    contentType: 'text/csv',
-    filename: 'translations.csv'
-  });
-  formData.append('file_format', 'csv');
-  formData.append('branch', branch);
-  formData.append('update_translations', 'true');
-  for (const [locale, index] of Object.entries(localeMapping)) {
-    formData.append(`locale_mapping[${locale}]`, index);
-  }
-  formData.append('format_options[key_index]', keyIndex);
-  formData.append('format_options[comment_index]', commentIndex);
-  formData.append('format_options[tag_column]', tagColumn);
-  formData.append('format_options[enable_pluralization]', 'false');
-  log('Uploading translations');
-  const result = await callPhrase(`uploads`, {
-    method: 'POST',
-    body: formData
-  });
-  trace('Upload result:\n', result);
-  if (result && 'id' in result) {
-    log('Upload ID:', result.id, '\n');
-    log('Successfully Uploaded\n');
-  } else {
-    log(`Error uploading: ${result === null || result === void 0 ? void 0 : result.message}\n`);
-    log('Response:', result);
-    throw new Error('Error uploading');
+  let devLanguageUploadId = '';
+  for (const [language, csvFileString] of Object.entries(csvFileStrings)) {
+    const formData = new FormData__default["default"]();
+    const fileContents = Buffer.from(csvFileString);
+    formData.append('file', fileContents, {
+      contentType: 'text/csv',
+      filename: `${language}.translations.csv`
+    });
+    formData.append('file_format', 'csv');
+    formData.append('branch', branch);
+    formData.append('update_translations', 'true');
+    formData.append('update_descriptions', 'true');
+    formData.append(`locale_mapping[${language}]`, messageIndex);
+    formData.append('format_options[key_index]', keyIndex);
+    formData.append('format_options[comment_index]', commentIndex);
+    formData.append('format_options[tag_column]', tagColumn);
+    formData.append('format_options[enable_pluralization]', 'false');
+    log(`Uploading translations for language ${language}`);
+    const result = await callPhrase(`uploads`, {
+      method: 'POST',
+      body: formData
+    });
+    trace('Upload result:\n', result);
+    if (result && 'id' in result) {
+      log('Upload ID:', result.id, '\n');
+      log('Successfully Uploaded\n');
+    } else {
+      log(`Error uploading: ${result === null || result === void 0 ? void 0 : result.message}\n`);
+      log('Response:', result);
+      throw new Error('Error uploading');
+    }
+    if (language === devLanguage) {
+      devLanguageUploadId = result.id;
+    }
   }
   return {
-    uploadId: result.id
+    devLanguageUploadId
   };
 }
 async function deleteUnusedKeys(uploadId, branch) {
@@ -210,7 +224,8 @@ async function ensureBranch(branch) {
 }
 
 async function pull({
-  branch = 'local-development'
+  branch = 'local-development',
+  errorOnNoGlobalKeyTranslation
 }, config) {
   trace(`Pulling translations from branch ${branch}`);
   await ensureBranch(branch);
@@ -237,9 +252,10 @@ async function pull({
     };
     const localKeys = Object.keys(defaultValues);
     for (const key of localKeys) {
+      var _defaultValues$key$gl;
       defaultValues[key] = {
         ...defaultValues[key],
-        ...allPhraseTranslations[config.devLanguage][core.getUniqueKey(key, loadedTranslation.namespace)]
+        ...allPhraseTranslations[config.devLanguage][(_defaultValues$key$gl = defaultValues[key].globalKey) !== null && _defaultValues$key$gl !== void 0 ? _defaultValues$key$gl : core.getUniqueKey(key, loadedTranslation.namespace)]
       };
     }
 
@@ -255,11 +271,14 @@ async function pull({
         };
         const phraseAltTranslations = allPhraseTranslations[alternativeLanguage];
         for (const key of localKeys) {
-          var _phraseAltTranslation;
-          const phraseKey = core.getUniqueKey(key, loadedTranslation.namespace);
+          var _defaultValues$key$gl2, _phraseAltTranslation;
+          const phraseKey = (_defaultValues$key$gl2 = defaultValues[key].globalKey) !== null && _defaultValues$key$gl2 !== void 0 ? _defaultValues$key$gl2 : core.getUniqueKey(key, loadedTranslation.namespace);
           const phraseTranslationMessage = (_phraseAltTranslation = phraseAltTranslations[phraseKey]) === null || _phraseAltTranslation === void 0 ? void 0 : _phraseAltTranslation.message;
           if (!phraseTranslationMessage) {
             trace(`Missing translation. No translation for key ${key} in phrase as ${phraseKey} in language ${alternativeLanguage}.`);
+            if (errorOnNoGlobalKeyTranslation && defaultValues[key].globalKey) {
+              throw new Error(`Missing translation for global key ${key} in language ${alternativeLanguage}`);
+            }
             continue;
           }
           altTranslations[key] = {
@@ -310,7 +329,7 @@ async function push({
         }
       } = loadedTranslation;
       for (const localKey of Object.keys(localTranslations)) {
-        const phraseKey = core.getUniqueKey(localKey, loadedTranslation.namespace);
+        var _globalKey;
         const {
           tags = [],
           ...localTranslation
@@ -318,18 +337,23 @@ async function push({
         if (language === config.devLanguage) {
           localTranslation.tags = [...tags, ...sharedTags];
         }
+        let globalKey;
+        if (loadedTranslation.languages[config.devLanguage][localKey].globalKey) {
+          globalKey = loadedTranslation.languages[config.devLanguage][localKey].globalKey;
+        }
+        const phraseKey = (_globalKey = globalKey) !== null && _globalKey !== void 0 ? _globalKey : core.getUniqueKey(localKey, loadedTranslation.namespace);
         phraseTranslations[language][phraseKey] = localTranslation;
       }
     }
   }
   const {
-    uploadId
+    devLanguageUploadId
   } = await pushTranslations(phraseTranslations, {
     devLanguage: config.devLanguage,
     branch
   });
   if (deleteUnusedKeys$1) {
-    await deleteUnusedKeys(uploadId, branch);
+    await deleteUnusedKeys(devLanguageUploadId, branch);
   }
 }
 

package/dist/vocab-phrase.cjs.prod.js

@@ -31,34 +31,43 @@ const log = (...params) => {
 function translationsToCsv(translations, devLanguage) {
   const languages = Object.keys(translations);
   const altLanguages = languages.filter(language => language !== devLanguage);
-  // Ensure languages are ordered for locale mapping
-  const orderedLanguages = [devLanguage, ...altLanguages];
   const devLanguageTranslations = translations[devLanguage];
-  const csv = Object.entries(devLanguageTranslations).map(([key, {
+  const csvFilesByLanguage = Object.fromEntries(languages.map(language => [language, []]));
+  Object.entries(devLanguageTranslations).map(([key, {
     message,
     description,
     tags
   }]) => {
-    const altTranslationMessages = altLanguages.map(language => {
+    const sharedData = [key, description, tags === null || tags === void 0 ? void 0 : tags.join(',')];
+    const devLanguageRow = [...sharedData, message];
+    csvFilesByLanguage[devLanguage].push(devLanguageRow);
+    altLanguages.map(language => {
       var _translations$languag, _translations$languag2;
-      return (_translations$languag = translations[language]) === null || _translations$languag === void 0 ? void 0 : (_translations$languag2 = _translations$languag[key]) === null || _translations$languag2 === void 0 ? void 0 : _translations$languag2.message;
+      const altTranslationMessage = (_translations$languag = translations[language]) === null || _translations$languag === void 0 ? void 0 : (_translations$languag2 = _translations$languag[key]) === null || _translations$languag2 === void 0 ? void 0 : _translations$languag2.message;
+      if (altTranslationMessage) {
+        csvFilesByLanguage[language].push([...sharedData, altTranslationMessage]);
+      }
     });
-    return [message, ...altTranslationMessages, key, description, tags === null || tags === void 0 ? void 0 : tags.join(',')];
-  });
-  const csvString = sync.stringify(csv, {
-    delimiter: ',',
-    header: false
   });
+  const csvFileStrings = Object.fromEntries(Object.entries(csvFilesByLanguage)
+  // Ensure CSV files are only created if the language has at least 1 translation
+  .filter(([_, csvFile]) => csvFile.length > 0).map(([language, csvFile]) => {
+    const csvFileString = sync.stringify(csvFile, {
+      delimiter: ',',
+      header: false
+    });
+    return [language, csvFileString];
+  }));
 
   // Column indices start at 1
-  const localeMapping = Object.fromEntries(orderedLanguages.map((language, index) => [language, index + 1]));
-  const keyIndex = orderedLanguages.length + 1;
+  const keyIndex = 1;
   const commentIndex = keyIndex + 1;
   const tagColumn = commentIndex + 1;
+  const messageIndex = tagColumn + 1;
   return {
-    csvString,
-    localeMapping,
+    csvFileStrings,
     keyIndex,
+    messageIndex,
     commentIndex,
     tagColumn
   };
@@ -139,45 +148,50 @@ async function pushTranslations(translationsByLanguage, {
   devLanguage,
   branch
 }) {
-  const formData = new FormData__default["default"]();
   const {
-    csvString,
-    localeMapping,
+    csvFileStrings,
     keyIndex,
     commentIndex,
-    tagColumn
+    tagColumn,
+    messageIndex
   } = translationsToCsv(translationsByLanguage, devLanguage);
-  const fileContents = Buffer.from(csvString);
-  formData.append('file', fileContents, {
-    contentType: 'text/csv',
-    filename: 'translations.csv'
-  });
-  formData.append('file_format', 'csv');
-  formData.append('branch', branch);
-  formData.append('update_translations', 'true');
-  for (const [locale, index] of Object.entries(localeMapping)) {
-    formData.append(`locale_mapping[${locale}]`, index);
-  }
-  formData.append('format_options[key_index]', keyIndex);
-  formData.append('format_options[comment_index]', commentIndex);
-  formData.append('format_options[tag_column]', tagColumn);
-  formData.append('format_options[enable_pluralization]', 'false');
-  log('Uploading translations');
-  const result = await callPhrase(`uploads`, {
-    method: 'POST',
-    body: formData
-  });
-  trace('Upload result:\n', result);
-  if (result && 'id' in result) {
-    log('Upload ID:', result.id, '\n');
-    log('Successfully Uploaded\n');
-  } else {
-    log(`Error uploading: ${result === null || result === void 0 ? void 0 : result.message}\n`);
-    log('Response:', result);
-    throw new Error('Error uploading');
+  let devLanguageUploadId = '';
+  for (const [language, csvFileString] of Object.entries(csvFileStrings)) {
+    const formData = new FormData__default["default"]();
+    const fileContents = Buffer.from(csvFileString);
+    formData.append('file', fileContents, {
+      contentType: 'text/csv',
+      filename: `${language}.translations.csv`
+    });
+    formData.append('file_format', 'csv');
+    formData.append('branch', branch);
+    formData.append('update_translations', 'true');
+    formData.append('update_descriptions', 'true');
+    formData.append(`locale_mapping[${language}]`, messageIndex);
+    formData.append('format_options[key_index]', keyIndex);
+    formData.append('format_options[comment_index]', commentIndex);
+    formData.append('format_options[tag_column]', tagColumn);
+    formData.append('format_options[enable_pluralization]', 'false');
+    log(`Uploading translations for language ${language}`);
+    const result = await callPhrase(`uploads`, {
+      method: 'POST',
+      body: formData
+    });
+    trace('Upload result:\n', result);
+    if (result && 'id' in result) {
+      log('Upload ID:', result.id, '\n');
+      log('Successfully Uploaded\n');
+    } else {
+      log(`Error uploading: ${result === null || result === void 0 ? void 0 : result.message}\n`);
+      log('Response:', result);
+      throw new Error('Error uploading');
+    }
+    if (language === devLanguage) {
+      devLanguageUploadId = result.id;
+    }
   }
   return {
-    uploadId: result.id
+    devLanguageUploadId
   };
 }
 async function deleteUnusedKeys(uploadId, branch) {
@@ -210,7 +224,8 @@ async function ensureBranch(branch) {
 }
 
 async function pull({
-  branch = 'local-development'
+  branch = 'local-development',
+  errorOnNoGlobalKeyTranslation
 }, config) {
   trace(`Pulling translations from branch ${branch}`);
   await ensureBranch(branch);
@@ -237,9 +252,10 @@ async function pull({
     };
     const localKeys = Object.keys(defaultValues);
     for (const key of localKeys) {
+      var _defaultValues$key$gl;
       defaultValues[key] = {
         ...defaultValues[key],
-        ...allPhraseTranslations[config.devLanguage][core.getUniqueKey(key, loadedTranslation.namespace)]
+        ...allPhraseTranslations[config.devLanguage][(_defaultValues$key$gl = defaultValues[key].globalKey) !== null && _defaultValues$key$gl !== void 0 ? _defaultValues$key$gl : core.getUniqueKey(key, loadedTranslation.namespace)]
       };
     }
 
@@ -255,11 +271,14 @@ async function pull({
         };
         const phraseAltTranslations = allPhraseTranslations[alternativeLanguage];
         for (const key of localKeys) {
-          var _phraseAltTranslation;
-          const phraseKey = core.getUniqueKey(key, loadedTranslation.namespace);
+          var _defaultValues$key$gl2, _phraseAltTranslation;
+          const phraseKey = (_defaultValues$key$gl2 = defaultValues[key].globalKey) !== null && _defaultValues$key$gl2 !== void 0 ? _defaultValues$key$gl2 : core.getUniqueKey(key, loadedTranslation.namespace);
           const phraseTranslationMessage = (_phraseAltTranslation = phraseAltTranslations[phraseKey]) === null || _phraseAltTranslation === void 0 ? void 0 : _phraseAltTranslation.message;
           if (!phraseTranslationMessage) {
             trace(`Missing translation. No translation for key ${key} in phrase as ${phraseKey} in language ${alternativeLanguage}.`);
+            if (errorOnNoGlobalKeyTranslation && defaultValues[key].globalKey) {
+              throw new Error(`Missing translation for global key ${key} in language ${alternativeLanguage}`);
+            }
             continue;
           }
           altTranslations[key] = {
@@ -310,7 +329,7 @@ async function push({
         }
       } = loadedTranslation;
       for (const localKey of Object.keys(localTranslations)) {
-        const phraseKey = core.getUniqueKey(localKey, loadedTranslation.namespace);
+        var _globalKey;
         const {
           tags = [],
           ...localTranslation
@@ -318,18 +337,23 @@ async function push({
         if (language === config.devLanguage) {
           localTranslation.tags = [...tags, ...sharedTags];
         }
+        let globalKey;
+        if (loadedTranslation.languages[config.devLanguage][localKey].globalKey) {
+          globalKey = loadedTranslation.languages[config.devLanguage][localKey].globalKey;
+        }
+        const phraseKey = (_globalKey = globalKey) !== null && _globalKey !== void 0 ? _globalKey : core.getUniqueKey(localKey, loadedTranslation.namespace);
         phraseTranslations[language][phraseKey] = localTranslation;
       }
     }
   }
   const {
-    uploadId
+    devLanguageUploadId
   } = await pushTranslations(phraseTranslations, {
     devLanguage: config.devLanguage,
     branch
   });
   if (deleteUnusedKeys$1) {
-    await deleteUnusedKeys(uploadId, branch);
+    await deleteUnusedKeys(devLanguageUploadId, branch);
   }
 }
 

package/dist/vocab-phrase.esm.js

@@ -19,34 +19,43 @@ const log = (...params) => {
 function translationsToCsv(translations, devLanguage) {
   const languages = Object.keys(translations);
   const altLanguages = languages.filter(language => language !== devLanguage);
-  // Ensure languages are ordered for locale mapping
-  const orderedLanguages = [devLanguage, ...altLanguages];
   const devLanguageTranslations = translations[devLanguage];
-  const csv = Object.entries(devLanguageTranslations).map(([key, {
+  const csvFilesByLanguage = Object.fromEntries(languages.map(language => [language, []]));
+  Object.entries(devLanguageTranslations).map(([key, {
     message,
     description,
     tags
   }]) => {
-    const altTranslationMessages = altLanguages.map(language => {
+    const sharedData = [key, description, tags === null || tags === void 0 ? void 0 : tags.join(',')];
+    const devLanguageRow = [...sharedData, message];
+    csvFilesByLanguage[devLanguage].push(devLanguageRow);
+    altLanguages.map(language => {
       var _translations$languag, _translations$languag2;
-      return (_translations$languag = translations[language]) === null || _translations$languag === void 0 ? void 0 : (_translations$languag2 = _translations$languag[key]) === null || _translations$languag2 === void 0 ? void 0 : _translations$languag2.message;
+      const altTranslationMessage = (_translations$languag = translations[language]) === null || _translations$languag === void 0 ? void 0 : (_translations$languag2 = _translations$languag[key]) === null || _translations$languag2 === void 0 ? void 0 : _translations$languag2.message;
+      if (altTranslationMessage) {
+        csvFilesByLanguage[language].push([...sharedData, altTranslationMessage]);
+      }
     });
-    return [message, ...altTranslationMessages, key, description, tags === null || tags === void 0 ? void 0 : tags.join(',')];
-  });
-  const csvString = stringify(csv, {
-    delimiter: ',',
-    header: false
   });
+  const csvFileStrings = Object.fromEntries(Object.entries(csvFilesByLanguage)
+  // Ensure CSV files are only created if the language has at least 1 translation
+  .filter(([_, csvFile]) => csvFile.length > 0).map(([language, csvFile]) => {
+    const csvFileString = stringify(csvFile, {
+      delimiter: ',',
+      header: false
+    });
+    return [language, csvFileString];
+  }));
 
   // Column indices start at 1
-  const localeMapping = Object.fromEntries(orderedLanguages.map((language, index) => [language, index + 1]));
-  const keyIndex = orderedLanguages.length + 1;
+  const keyIndex = 1;
   const commentIndex = keyIndex + 1;
   const tagColumn = commentIndex + 1;
+  const messageIndex = tagColumn + 1;
   return {
-    csvString,
-    localeMapping,
+    csvFileStrings,
     keyIndex,
+    messageIndex,
     commentIndex,
     tagColumn
   };
@@ -127,45 +136,50 @@ async function pushTranslations(translationsByLanguage, {
   devLanguage,
   branch
 }) {
-  const formData = new FormData();
   const {
-    csvString,
-    localeMapping,
+    csvFileStrings,
     keyIndex,
     commentIndex,
-    tagColumn
+    tagColumn,
+    messageIndex
   } = translationsToCsv(translationsByLanguage, devLanguage);
-  const fileContents = Buffer.from(csvString);
-  formData.append('file', fileContents, {
-    contentType: 'text/csv',
-    filename: 'translations.csv'
-  });
-  formData.append('file_format', 'csv');
-  formData.append('branch', branch);
-  formData.append('update_translations', 'true');
-  for (const [locale, index] of Object.entries(localeMapping)) {
-    formData.append(`locale_mapping[${locale}]`, index);
-  }
-  formData.append('format_options[key_index]', keyIndex);
-  formData.append('format_options[comment_index]', commentIndex);
-  formData.append('format_options[tag_column]', tagColumn);
-  formData.append('format_options[enable_pluralization]', 'false');
-  log('Uploading translations');
-  const result = await callPhrase(`uploads`, {
-    method: 'POST',
-    body: formData
-  });
-  trace('Upload result:\n', result);
-  if (result && 'id' in result) {
-    log('Upload ID:', result.id, '\n');
-    log('Successfully Uploaded\n');
-  } else {
-    log(`Error uploading: ${result === null || result === void 0 ? void 0 : result.message}\n`);
-    log('Response:', result);
-    throw new Error('Error uploading');
+  let devLanguageUploadId = '';
+  for (const [language, csvFileString] of Object.entries(csvFileStrings)) {
+    const formData = new FormData();
+    const fileContents = Buffer.from(csvFileString);
+    formData.append('file', fileContents, {
+      contentType: 'text/csv',
+      filename: `${language}.translations.csv`
+    });
+    formData.append('file_format', 'csv');
+    formData.append('branch', branch);
+    formData.append('update_translations', 'true');
+    formData.append('update_descriptions', 'true');
+    formData.append(`locale_mapping[${language}]`, messageIndex);
+    formData.append('format_options[key_index]', keyIndex);
+    formData.append('format_options[comment_index]', commentIndex);
+    formData.append('format_options[tag_column]', tagColumn);
+    formData.append('format_options[enable_pluralization]', 'false');
+    log(`Uploading translations for language ${language}`);
+    const result = await callPhrase(`uploads`, {
+      method: 'POST',
+      body: formData
+    });
+    trace('Upload result:\n', result);
+    if (result && 'id' in result) {
+      log('Upload ID:', result.id, '\n');
+      log('Successfully Uploaded\n');
+    } else {
+      log(`Error uploading: ${result === null || result === void 0 ? void 0 : result.message}\n`);
+      log('Response:', result);
+      throw new Error('Error uploading');
+    }
+    if (language === devLanguage) {
+      devLanguageUploadId = result.id;
+    }
   }
   return {
-    uploadId: result.id
+    devLanguageUploadId
   };
 }
 async function deleteUnusedKeys(uploadId, branch) {
@@ -198,7 +212,8 @@ async function ensureBranch(branch) {
 }
 
 async function pull({
-  branch = 'local-development'
+  branch = 'local-development',
+  errorOnNoGlobalKeyTranslation
 }, config) {
   trace(`Pulling translations from branch ${branch}`);
   await ensureBranch(branch);
@@ -225,9 +240,10 @@ async function pull({
     };
     const localKeys = Object.keys(defaultValues);
     for (const key of localKeys) {
+      var _defaultValues$key$gl;
       defaultValues[key] = {
         ...defaultValues[key],
-        ...allPhraseTranslations[config.devLanguage][getUniqueKey(key, loadedTranslation.namespace)]
+        ...allPhraseTranslations[config.devLanguage][(_defaultValues$key$gl = defaultValues[key].globalKey) !== null && _defaultValues$key$gl !== void 0 ? _defaultValues$key$gl : getUniqueKey(key, loadedTranslation.namespace)]
       };
     }
 
@@ -243,11 +259,14 @@ async function pull({
         };
         const phraseAltTranslations = allPhraseTranslations[alternativeLanguage];
         for (const key of localKeys) {
-          var _phraseAltTranslation;
-          const phraseKey = getUniqueKey(key, loadedTranslation.namespace);
+          var _defaultValues$key$gl2, _phraseAltTranslation;
+          const phraseKey = (_defaultValues$key$gl2 = defaultValues[key].globalKey) !== null && _defaultValues$key$gl2 !== void 0 ? _defaultValues$key$gl2 : getUniqueKey(key, loadedTranslation.namespace);
           const phraseTranslationMessage = (_phraseAltTranslation = phraseAltTranslations[phraseKey]) === null || _phraseAltTranslation === void 0 ? void 0 : _phraseAltTranslation.message;
           if (!phraseTranslationMessage) {
             trace(`Missing translation. No translation for key ${key} in phrase as ${phraseKey} in language ${alternativeLanguage}.`);
+            if (errorOnNoGlobalKeyTranslation && defaultValues[key].globalKey) {
+              throw new Error(`Missing translation for global key ${key} in language ${alternativeLanguage}`);
+            }
             continue;
           }
           altTranslations[key] = {
@@ -298,7 +317,7 @@ async function push({
         }
       } = loadedTranslation;
       for (const localKey of Object.keys(localTranslations)) {
-        const phraseKey = getUniqueKey(localKey, loadedTranslation.namespace);
+        var _globalKey;
         const {
           tags = [],
           ...localTranslation
@@ -306,18 +325,23 @@ async function push({
         if (language === config.devLanguage) {
           localTranslation.tags = [...tags, ...sharedTags];
         }
+        let globalKey;
+        if (loadedTranslation.languages[config.devLanguage][localKey].globalKey) {
+          globalKey = loadedTranslation.languages[config.devLanguage][localKey].globalKey;
+        }
+        const phraseKey = (_globalKey = globalKey) !== null && _globalKey !== void 0 ? _globalKey : getUniqueKey(localKey, loadedTranslation.namespace);
         phraseTranslations[language][phraseKey] = localTranslation;
       }
     }
   }
   const {
-    uploadId
+    devLanguageUploadId
   } = await pushTranslations(phraseTranslations, {
     devLanguage: config.devLanguage,
     branch
   });
   if (deleteUnusedKeys$1) {
-    await deleteUnusedKeys(uploadId, branch);
+    await deleteUnusedKeys(devLanguageUploadId, branch);
   }
 }
 

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "@vocab/phrase",
-  "version": "0.0.0-compiled-translation-import-order-20230328231631",
+  "version": "0.0.0-global-key-support-20231025223328",
   "main": "dist/vocab-phrase.cjs.js",
   "module": "dist/vocab-phrase.esm.js",
   "author": "SEEK",
   "license": "MIT",
   "dependencies": {
-    "@vocab/core": "0.0.0-compiled-translation-import-order-20230328231631",
-    "@vocab/types": "^1.1.2",
+    "@vocab/core": "0.0.0-global-key-support-20231025223328",
     "chalk": "^4.1.0",
     "csv-stringify": "^6.2.3",
     "debug": "^4.3.1",