sanity-plugin-studio-smartling 1.4.0 → 2.0.1

package/dist/adapter/createTask.d.ts

@@ -1,6 +1,12 @@
 import { Secrets } from 'sanity-translations-tab';
 export declare const createTask: (documentId: string, document: Record<string, any>, localeIds: string[], secrets: Secrets, workflowUid?: string) => Promise<{
+    documentId: string;
+    taskId: string;
+    locales: any[];
+    linkToVendorTask?: undefined;
+} | {
     documentId: string;
     locales: any[];
     taskId: string;
+    linkToVendorTask: string;
 }>;

package/dist/adapter/getTranslationTask.d.ts

@@ -1,6 +1,12 @@
 import { Secrets } from 'sanity-translations-tab';
 export declare const getTranslationTask: (documentId: string, secrets: Secrets) => Promise<{
+    documentId: string;
+    taskId: string;
+    locales: any[];
+    linkToVendorTask?: undefined;
+} | {
     documentId: string;
     locales: any[];
     taskId: string;
+    linkToVendorTask: string;
 }>;

package/dist/index.d.ts

@@ -1,14 +1,11 @@
-import { TranslationsTab } from 'sanity-translations-tab';
-import { BaseDocumentDeserializer, BaseDocumentSerializer, BaseDocumentMerger, defaultStopTypes, customSerializers } from 'sanity-naive-html-serializer';
+import { TranslationsTab, findLatestDraft, BaseDocumentDeserializer, BaseDocumentSerializer, BaseDocumentMerger, defaultStopTypes, customSerializers, Adapter } from 'sanity-translations-tab';
 import { SmartlingAdapter } from './adapter';
-declare const defaultDocumentLevelConfig: {
-    exportForTranslation: (id: string) => Promise<import("sanity-naive-html-serializer/dist/types").SerializedDocument>;
-    importTranslation: (id: string, localeId: string, document: string) => void;
-    adapter: import("sanity-translations-tab").Adapter;
-};
-declare const defaultFieldLevelConfig: {
-    exportForTranslation: (id: string) => Promise<import("sanity-naive-html-serializer/dist/types").SerializedDocument>;
-    importTranslation: (id: string, localeId: string, document: string) => void;
-    adapter: import("sanity-translations-tab").Adapter;
-};
-export { TranslationsTab, BaseDocumentDeserializer, BaseDocumentSerializer, BaseDocumentMerger, defaultStopTypes, customSerializers, SmartlingAdapter, defaultDocumentLevelConfig, defaultFieldLevelConfig, };
+interface ConfigOptions {
+    adapter: Adapter;
+    secretsNamespace: string | null;
+    exportForTranslation: (id: string) => Promise<Record<string, any>>;
+    importTranslation: (id: string, localeId: string, doc: string) => Promise<void>;
+}
+declare const defaultDocumentLevelConfig: ConfigOptions;
+declare const defaultFieldLevelConfig: ConfigOptions;
+export { TranslationsTab, findLatestDraft, BaseDocumentDeserializer, BaseDocumentSerializer, BaseDocumentMerger, defaultStopTypes, customSerializers, SmartlingAdapter, defaultDocumentLevelConfig, defaultFieldLevelConfig, };

package/dist/sanity-plugin-studio-smartling.cjs.development.js

@@ -1,10 +1,6 @@
 'use strict';
 
-function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
-
 var sanityTranslationsTab = require('sanity-translations-tab');
-var sanityNaiveHtmlSerializer = require('sanity-naive-html-serializer');
-var sanityClient = _interopDefault(require('part:@sanity/base/client'));
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
   try {
@@ -876,7 +872,16 @@ var findExistingJob = /*#__PURE__*/function () {
               return res.json();
             }).then(function (res) {
               if (res.response.data.items.length) {
-                return res.response.data.items[0].translationJobUid;
+                //smartling will fuzzy match job names. We need to be precise.
+                var correctJob = res.response.data.items.find(function (item) {
+                  return item.jobName && item.jobName === documentId;
+                });
+
+                if (correctJob) {
+                  return correctJob.translationJobUid;
+                } else {
+                  return '';
+                }
               } else {
                 return '';
               }
@@ -932,7 +937,7 @@ var getLocales = /*#__PURE__*/function () {
 
 var getTranslationTask = /*#__PURE__*/function () {
   var _ref = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee(documentId, secrets) {
-    var accessToken, taskId, url, smartlingTask, locales;
+    var accessToken, taskId, projectId, progressUrl, smartlingTask, locales;
     return runtime_1.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -960,18 +965,19 @@ var getTranslationTask = /*#__PURE__*/function () {
             });
 
           case 8:
-            url = "https://api.smartling.com/jobs-api/v3/projects/" + secrets.project + "/jobs/" + taskId + "/progress";
-            _context.next = 11;
+            projectId = secrets.project;
+            progressUrl = "https://api.smartling.com/jobs-api/v3/projects/" + projectId + "/jobs/" + taskId + "/progress";
+            _context.next = 12;
             return fetch(smartlingProxy, {
               method: 'POST',
-              headers: getHeaders(url, accessToken)
+              headers: getHeaders(progressUrl, accessToken)
             }).then(function (res) {
               return res.json();
             }).then(function (res) {
               return res.response.data;
             });
 
-          case 11:
+          case 12:
             smartlingTask = _context.sent;
             locales = [];
 
@@ -988,10 +994,11 @@ var getTranslationTask = /*#__PURE__*/function () {
               documentId: documentId,
               locales: locales,
               //since our download is tied to document id for smartling, keep track of it as a task
-              taskId: documentId
+              taskId: documentId,
+              linkToVendorTask: "https://dashboard.smartling.com/app/projects/" + projectId + "/account-jobs/" + projectId + ":" + taskId
             });
 
-          case 15:
+          case 16:
           case "end":
             return _context.stop();
         }
@@ -1207,7 +1214,14 @@ var getTranslation = /*#__PURE__*/function () {
             }).then(function (res) {
               return res.json();
             }).then(function (res) {
-              return res.body;
+              if (res.body) {
+                return res.body;
+              } else if (res.response.errors) {
+                var _res$response$errors$;
+
+                var errMsg = ((_res$response$errors$ = res.response.errors[0]) == null ? void 0 : _res$response$errors$.message) || 'Error retrieving translation from Smartling';
+                throw new Error(errMsg);
+              }
             });
 
           case 6:
@@ -1234,317 +1248,54 @@ var SmartlingAdapter = {
   getTranslation: getTranslation
 };
 
-var client = /*#__PURE__*/sanityClient.withConfig({
-  apiVersion: '2021-03-25'
-}); //document fetch
-
-var findLatestDraft = function findLatestDraft(documentId, ignoreI18n) {
-  if (ignoreI18n === void 0) {
-    ignoreI18n = true;
-  }
-
-  //eliminates i18n versions
-  var query = "*[_id match $id " + (ignoreI18n ? ' && (_id in path("drafts.*") || _id in path("*"))' : '') + "]";
-  var params = {
-    id: "*" + documentId
-  };
-  return client.fetch(query, params).then(function (docs) {
-    var _docs$find;
-
-    return (_docs$find = docs.find(function (doc) {
-      return doc._id.includes('draft');
-    })) != null ? _docs$find : docs[0];
-  });
-}; //revision fetch
-
-var findDocumentAtRevision = /*#__PURE__*/function () {
-  var _ref = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee(documentId, rev) {
-    var dataset, baseUrl, url, revisionDoc;
-    return runtime_1.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            dataset = client.config().dataset;
-            baseUrl = "/data/history/" + dataset + "/documents/" + documentId + "?revision=" + rev;
-            url = client.getUrl(baseUrl);
-            _context.next = 5;
-            return fetch(url, {
-              credentials: 'include'
-            }).then(function (req) {
-              return req.json();
-            }).then(function (req) {
-              return req.documents && req.documents[0];
-            });
-
-          case 5:
-            revisionDoc = _context.sent;
-
-            if (!(!revisionDoc || revisionDoc._rev !== rev)) {
-              _context.next = 12;
-              break;
-            }
-
-            baseUrl = "/data/history/" + dataset + "/documents/drafts." + documentId + "?revision=" + rev;
-            url = client.getUrl(baseUrl);
-            _context.next = 11;
-            return fetch(url, {
-              credentials: 'include'
-            }).then(function (req) {
-              return req.json();
-            }).then(function (req) {
-              return req.documents[0];
-            });
-
-          case 11:
-            revisionDoc = _context.sent;
-
-          case 12:
-            return _context.abrupt("return", revisionDoc);
-
-          case 13:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-
-  return function findDocumentAtRevision(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-}(); //document-level patch
-
-var documentLevelPatch = /*#__PURE__*/function () {
-  var _ref2 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(documentId, translatedFields, localeId) {
-    var baseDoc, merged, targetId, i18nDoc, cleanedMerge;
-    return runtime_1.wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            if (!translatedFields._rev) {
-              _context2.next = 6;
-              break;
-            }
-
-            _context2.next = 3;
-            return findDocumentAtRevision(documentId, translatedFields._rev);
-
-          case 3:
-            baseDoc = _context2.sent;
-            _context2.next = 9;
-            break;
-
-          case 6:
-            _context2.next = 8;
-            return findLatestDraft(documentId);
-
-          case 8:
-            baseDoc = _context2.sent;
-
-          case 9:
-            merged = sanityNaiveHtmlSerializer.BaseDocumentMerger.documentLevelMerge(translatedFields, baseDoc);
-            targetId = "i18n." + documentId + "." + localeId;
-            _context2.next = 13;
-            return findLatestDraft(targetId, false);
-
-          case 13:
-            i18nDoc = _context2.sent;
-
-            if (i18nDoc) {
-              cleanedMerge = {}; //don't overwrite any existing values on the i18n doc
-
-              Object.entries(merged).forEach(function (_ref3) {
-                var key = _ref3[0],
-                    value = _ref3[1];
-
-                if (Object.keys(translatedFields).includes(key) && !['_id', '_rev', '_updatedAt'].includes(key)) {
-                  cleanedMerge[key] = value;
-                }
-              });
-              client.transaction() //@ts-ignore
-              .patch(i18nDoc._id, function (p) {
-                return p.set(cleanedMerge);
-              }).commit();
-            } else {
-              merged._id = "drafts." + targetId; //account for legacy implementations of i18n plugin lang
-
-              if (baseDoc._lang) {
-                merged._lang = localeId;
-              } else if (baseDoc.__i18n_lang) {
-                merged.__i18n_lang = localeId;
-              }
-
-              client.create(merged);
-            }
-
-          case 15:
-          case "end":
-            return _context2.stop();
-        }
-      }
-    }, _callee2);
-  }));
-
-  return function documentLevelPatch(_x3, _x4, _x5) {
-    return _ref2.apply(this, arguments);
-  };
-}(); //field level patch
-
-var fieldLevelPatch = /*#__PURE__*/function () {
-  var _ref4 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee3(documentId, translatedFields, localeId) {
-    var baseDoc, merged;
-    return runtime_1.wrap(function _callee3$(_context3) {
-      while (1) {
-        switch (_context3.prev = _context3.next) {
-          case 0:
-            if (!translatedFields._rev) {
-              _context3.next = 6;
-              break;
-            }
-
-            _context3.next = 3;
-            return findDocumentAtRevision(documentId, translatedFields._rev);
-
-          case 3:
-            baseDoc = _context3.sent;
-            _context3.next = 9;
-            break;
-
-          case 6:
-            _context3.next = 8;
-            return findLatestDraft(documentId);
-
-          case 8:
-            baseDoc = _context3.sent;
-
-          case 9:
-            merged = sanityNaiveHtmlSerializer.BaseDocumentMerger.fieldLevelMerge(translatedFields, baseDoc, localeId, 'en');
-            client.patch(baseDoc._id).set(merged).commit();
-
-          case 11:
-          case "end":
-            return _context3.stop();
-        }
-      }
-    }, _callee3);
-  }));
-
-  return function fieldLevelPatch(_x6, _x7, _x8) {
-    return _ref4.apply(this, arguments);
-  };
-}();
-
-var defaultDocumentLevelConfig = {
-  exportForTranslation: /*#__PURE__*/function () {
-    var _exportForTranslation = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee(id) {
-      var doc, serialized;
-      return runtime_1.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return findLatestDraft(id);
-
-            case 2:
-              doc = _context.sent;
-              serialized = sanityNaiveHtmlSerializer.BaseDocumentSerializer.serializeDocument(doc, 'document'); //needed for lookup by translation tab
-
-              serialized.name = id;
-              return _context.abrupt("return", serialized);
-
-            case 6:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _callee);
-    }));
-
-    function exportForTranslation(_x) {
-      return _exportForTranslation.apply(this, arguments);
-    }
-
-    return exportForTranslation;
-  }(),
-  importTranslation: function importTranslation(id, localeId, document) {
-    var deserialized = sanityNaiveHtmlSerializer.BaseDocumentDeserializer.deserializeDocument(document);
-    documentLevelPatch(id, deserialized, localeId);
-  },
+var defaultDocumentLevelConfig = /*#__PURE__*/_extends({}, sanityTranslationsTab.baseDocumentLevelConfig, {
   adapter: SmartlingAdapter
-};
-var defaultFieldLevelConfig = {
-  exportForTranslation: /*#__PURE__*/function () {
-    var _exportForTranslation2 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(id) {
-      var doc, serialized;
-      return runtime_1.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 2;
-              return findLatestDraft(id);
-
-            case 2:
-              doc = _context2.sent;
-              serialized = sanityNaiveHtmlSerializer.BaseDocumentSerializer.serializeDocument(doc, 'field'); //needed for lookup by translation tab
-
-              serialized.name = id;
-              return _context2.abrupt("return", serialized);
-
-            case 6:
-            case "end":
-              return _context2.stop();
-          }
-        }
-      }, _callee2);
-    }));
-
-    function exportForTranslation(_x2) {
-      return _exportForTranslation2.apply(this, arguments);
-    }
+});
 
-    return exportForTranslation;
-  }(),
-  importTranslation: function importTranslation(id, localeId, document) {
-    var deserialized = sanityNaiveHtmlSerializer.BaseDocumentDeserializer.deserializeDocument(document);
-    fieldLevelPatch(id, deserialized, localeId);
-  },
+var defaultFieldLevelConfig = /*#__PURE__*/_extends({}, sanityTranslationsTab.baseFieldLevelConfig, {
   adapter: SmartlingAdapter
-};
+});
 
-Object.defineProperty(exports, 'TranslationsTab', {
+Object.defineProperty(exports, 'BaseDocumentDeserializer', {
   enumerable: true,
   get: function () {
-    return sanityTranslationsTab.TranslationsTab;
+    return sanityTranslationsTab.BaseDocumentDeserializer;
   }
 });
-Object.defineProperty(exports, 'BaseDocumentDeserializer', {
+Object.defineProperty(exports, 'BaseDocumentMerger', {
   enumerable: true,
   get: function () {
-    return sanityNaiveHtmlSerializer.BaseDocumentDeserializer;
+    return sanityTranslationsTab.BaseDocumentMerger;
   }
 });
-Object.defineProperty(exports, 'BaseDocumentMerger', {
+Object.defineProperty(exports, 'BaseDocumentSerializer', {
   enumerable: true,
   get: function () {
-    return sanityNaiveHtmlSerializer.BaseDocumentMerger;
+    return sanityTranslationsTab.BaseDocumentSerializer;
   }
 });
-Object.defineProperty(exports, 'BaseDocumentSerializer', {
+Object.defineProperty(exports, 'TranslationsTab', {
   enumerable: true,
   get: function () {
-    return sanityNaiveHtmlSerializer.BaseDocumentSerializer;
+    return sanityTranslationsTab.TranslationsTab;
   }
 });
 Object.defineProperty(exports, 'customSerializers', {
   enumerable: true,
   get: function () {
-    return sanityNaiveHtmlSerializer.customSerializers;
+    return sanityTranslationsTab.customSerializers;
   }
 });
 Object.defineProperty(exports, 'defaultStopTypes', {
   enumerable: true,
   get: function () {
-    return sanityNaiveHtmlSerializer.defaultStopTypes;
+    return sanityTranslationsTab.defaultStopTypes;
+  }
+});
+Object.defineProperty(exports, 'findLatestDraft', {
+  enumerable: true,
+  get: function () {
+    return sanityTranslationsTab.findLatestDraft;
   }
 });
 exports.SmartlingAdapter = SmartlingAdapter;