gt-sanity 1.0.11 → 1.1.1

package/src/translation/downloadTranslations.ts

@@ -1,22 +1,8 @@
 import { gt, overrideConfig } from '../adapter/core';
+import { FileProperties } from '../adapter/types';
+import { DownloadedFile } from 'generaltranslation/types';
 import type { Secrets } from '../types';
 
-export type BatchedFiles = Array<{
-  documentId: string;
-  versionId: string;
-  translationId: string;
-  locale: string;
-}>;
-
-export type DownloadedFile = {
-  docData: {
-    documentId: string;
-    versionId: string;
-    translationId: string;
-    locale: string;
-  };
-  data: string;
-};
 /**
  * Downloads multiple translation files in a single batch request
  * @param files - Array of files to download with their output paths
@@ -25,38 +11,27 @@ export type DownloadedFile = {
  * @returns Object containing successful and failed file IDs
  */
 export async function downloadTranslations(
-  files: BatchedFiles,
+  files: FileProperties[],
   secrets: Secrets,
   maxRetries = 3,
   retryDelay = 1000
 ): Promise<DownloadedFile[]> {
   overrideConfig(secrets);
   let retries = 0;
-  const fileIds = files.map((file) => file.translationId);
-
-  const map = new Map(files.map((file) => [file.translationId, file]));
-  const result = [] as DownloadedFile[];
 
   while (retries <= maxRetries) {
     try {
       // Download the files
-      const responseData = await gt.downloadFileBatch(fileIds);
+      const responseData = await gt.downloadFileBatch(
+        files.map((file) => ({
+          fileId: file.fileId,
+          branchId: file.branchId,
+          versionId: file.versionId,
+          locale: file.locale,
+        }))
+      );
       const downloadedFiles = responseData.files || [];
-
-      // Process each file in the response
-      for (const file of downloadedFiles) {
-        const documentData = map.get(file.id);
-        if (!documentData) {
-          continue;
-        }
-
-        result.push({
-          docData: documentData,
-          data: file.data,
-        });
-      }
-
-      return result;
+      return downloadedFiles;
     } catch (error) {
       // Increment retry counter and wait before next attempt
       retries++;
@@ -64,5 +39,5 @@ export async function downloadTranslations(
     }
   }
 
-  return result;
+  return [];
 }

package/src/translation/initProject.ts

@@ -27,14 +27,17 @@ export async function initProject(
     let setupFailedMessage: string | null = null;
 
     while (true) {
-      const status = await gt.checkSetupStatus(setupJobId);
-
-      if (status.status === 'completed') {
+      const status = await gt.checkJobStatus([setupJobId]);
+      if (!status[0]) {
+        setupFailedMessage = 'Unknown error';
+        break;
+      }
+      if (status[0].status === 'completed') {
         setupCompleted = true;
         break;
       }
-      if (status.status === 'failed') {
-        setupFailedMessage = status.error?.message || 'Unknown error';
+      if (status[0].status === 'failed') {
+        setupFailedMessage = status[0].error?.message || 'Unknown error';
         break;
       }
       if (Date.now() - start > setupTimeoutMs) {

package/src/utils/importUtils.ts

@@ -1,16 +1,8 @@
 import { SanityDocument } from 'sanity';
-import { GTFile, Secrets, TranslationFunctionContext } from '../types';
-import {
-  downloadTranslations,
-  BatchedFiles,
-} from '../translation/downloadTranslations';
+import { Secrets, TranslationFunctionContext } from '../types';
+import { downloadTranslations } from '../translation/downloadTranslations';
 import { processImportBatch, ImportBatchItem } from './batchProcessor';
-
-export interface TranslationStatus {
-  progress: number;
-  isReady: boolean;
-  translationId?: string;
-}
+import type { FileProperties, TranslationStatus } from '../adapter/types';
 
 export interface ImportResult {
   successCount: number;
@@ -25,32 +17,20 @@ export interface ImportOptions {
 }
 
 export async function getReadyFilesForImport(
-  documents: SanityDocument[],
   translationStatuses: Map<string, TranslationStatus>,
   options: ImportOptions = {}
-): Promise<BatchedFiles> {
+): Promise<FileProperties[]> {
   const { filterReadyFiles = () => true } = options;
-  const readyFiles: BatchedFiles = [];
+  const readyFiles: FileProperties[] = [];
 
   for (const [key, status] of translationStatuses.entries()) {
-    if (
-      status.isReady &&
-      status.translationId &&
-      filterReadyFiles(key, status)
-    ) {
-      const [documentId, locale] = key.split(':');
-      const document = documents.find(
-        (doc) => (doc._id?.replace('drafts.', '') || doc._id) === documentId
-      );
-
-      if (document) {
-        readyFiles.push({
-          documentId,
-          versionId: document._rev,
-          translationId: status.translationId,
-          locale,
-        });
-      }
+    if (status.isReady && filterReadyFiles(key, status)) {
+      readyFiles.push({
+        fileId: status.fileData.fileId,
+        versionId: status.fileData.versionId,
+        branchId: status.fileData.branchId,
+        locale: status.fileData.locale,
+      });
     }
   }
 
@@ -58,7 +38,7 @@ export async function getReadyFilesForImport(
 }
 
 export async function importTranslations(
-  readyFiles: BatchedFiles,
+  readyFiles: FileProperties[],
   secrets: Secrets,
   translationContext: TranslationFunctionContext,
   options: ImportOptions = {}
@@ -71,13 +51,13 @@ export async function importTranslations(
 
   const importItems: ImportBatchItem[] = downloadedFiles.map((file) => ({
     docInfo: {
-      documentId: file.docData.documentId,
-      versionId: file.docData.versionId,
+      documentId: file.fileId,
+      versionId: file.versionId,
     },
-    locale: file.docData.locale,
+    locale: file.locale!,
     data: file.data,
     translationContext,
-    key: `${file.docData.documentId}:${file.docData.locale}`,
+    key: `${file.branchId}:${file.fileId}:${file.versionId}:${file.locale}`,
   }));
 
   const result = await processImportBatch(importItems, {