@atlaskit/editor-card-provider 3.0.5 → 3.1.1

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-card-provider
 
+## 3.1.1
+
+### Patch Changes
+
+- [`1e7190077d4`](https://bitbucket.org/atlassian/atlassian-frontend/commits/1e7190077d4) - Move off deprecated @atlaskit/linking-common/extractors to @atlaskit/link-extractors
+- Updated dependencies
+
+## 3.1.0
+
+### Minor Changes
+
+- [`04295e9d5bc`](https://bitbucket.org/atlassian/atlassian-frontend/commits/04295e9d5bc) - [ux] Updating ORS response to include datasources and facilitating pasting JQL links turning into datasource tables
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 3.0.5
 
 ### Patch Changes

package/dist/cjs/provider.js

@@ -15,7 +15,7 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _setPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/setPrototypeOf"));
 require("setimmediate");
 var _dataloader = _interopRequireDefault(require("dataloader"));
-var _linkingCommon = require("@atlaskit/linking-common");
+var _linkExtractors = require("@atlaskit/link-extractors");
 var _transformer = require("./transformer");
 var _environments = require("./environments");
 var _utils = require("./utils");
@@ -97,9 +97,9 @@ var EditorCardProvider = /*#__PURE__*/function () {
       return batchProviders;
     }()
   }, {
-    key: "check",
+    key: "checkLinkResolved",
     value: function () {
-      var _check = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(resourceUrl) {
+      var _checkLinkResolved = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(resourceUrl) {
         var response;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -127,10 +127,10 @@ var EditorCardProvider = /*#__PURE__*/function () {
           }
         }, _callee2, this, [[0, 8]]);
       }));
-      function check(_x2) {
-        return _check.apply(this, arguments);
+      function checkLinkResolved(_x2) {
+        return _checkLinkResolved.apply(this, arguments);
       }
-      return check;
+      return checkLinkResolved;
     }()
   }, {
     key: "fetchProvidersData",
@@ -210,7 +210,7 @@ var EditorCardProvider = /*#__PURE__*/function () {
                 break;
               }
               _context5.next = 6;
-              return this.check(url);
+              return this.checkLinkResolved(url);
             case 6:
               _context5.t0 = !!_context5.sent;
             case 7:
@@ -327,8 +327,6 @@ var EditorCardProvider = /*#__PURE__*/function () {
 
     /**
      * Make a /resolve call and find out if result has embed capability
-     * @param url
-     * @private
      */
   }, {
     key: "canBeResolvedAsEmbed",
@@ -356,7 +354,7 @@ var EditorCardProvider = /*#__PURE__*/function () {
               }
               return _context8.abrupt("return", false);
             case 9:
-              preview = (0, _linkingCommon.extractPreview)(data, 'web');
+              preview = (0, _linkExtractors.extractPreview)(data, 'web');
               return _context8.abrupt("return", !!preview);
             case 13:
               _context8.prev = 13;
@@ -373,48 +371,88 @@ var EditorCardProvider = /*#__PURE__*/function () {
       }
       return canBeResolvedAsEmbed;
     }()
+    /**
+     * Make a /resolve call and find out if result has datasource capability
+     */
   }, {
-    key: "resolve",
+    key: "getDatasourceFromResolveResponse",
     value: function () {
-      var _resolve = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9(url, appearance, shouldForceAppearance) {
-        var hardCodedAppearance, _yield$Promise$all, _yield$Promise$all2, matchedProviderPattern, userPreference, isSupported, providerDefaultAppearance, preferredAppearance, canItBeEmbed;
+      var _getDatasourceFromResolveResponse = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9(url) {
+        var response, datasources;
         return _regenerator.default.wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
               _context9.prev = 0;
+              _context9.next = 3;
+              return this.cardClient.fetchData(url);
+            case 3:
+              response = _context9.sent;
+              datasources = response && response.datasources || [];
+              if (!(datasources.length > 0)) {
+                _context9.next = 7;
+                break;
+              }
+              return _context9.abrupt("return", datasources[0]);
+            case 7:
+              _context9.next = 12;
+              break;
+            case 9:
+              _context9.prev = 9;
+              _context9.t0 = _context9["catch"](0);
+              return _context9.abrupt("return", undefined);
+            case 12:
+            case "end":
+              return _context9.stop();
+          }
+        }, _callee9, this, [[0, 9]]);
+      }));
+      function getDatasourceFromResolveResponse(_x7) {
+        return _getDatasourceFromResolveResponse.apply(this, arguments);
+      }
+      return getDatasourceFromResolveResponse;
+    }()
+  }, {
+    key: "resolve",
+    value: function () {
+      var _resolve = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10(url, appearance, shouldForceAppearance) {
+        var hardCodedAppearance, _yield$Promise$all, _yield$Promise$all2, matchedProviderPattern, userPreference, isSupported, providerDefaultAppearance, preferredAppearance, canItBeEmbed, datasource, id, parameters;
+        return _regenerator.default.wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
+            case 0:
+              _context10.prev = 0;
               if (!(shouldForceAppearance === true)) {
-                _context9.next = 3;
+                _context10.next = 3;
                 break;
               }
-              return _context9.abrupt("return", this.transformer.toAdf(url, appearance));
+              return _context10.abrupt("return", this.transformer.toSmartlinkAdf(url, appearance));
             case 3:
               hardCodedAppearance = this.getHardCodedAppearance(url);
-              _context9.next = 6;
+              _context10.next = 6;
               return Promise.all([this.findPatternData(url), this.findUserPreference(url)]);
             case 6:
-              _yield$Promise$all = _context9.sent;
+              _yield$Promise$all = _context10.sent;
               _yield$Promise$all2 = (0, _slicedToArray2.default)(_yield$Promise$all, 2);
               matchedProviderPattern = _yield$Promise$all2[0];
               userPreference = _yield$Promise$all2[1];
               if (!(shouldForceAppearance === false && userPreference === 'url')) {
-                _context9.next = 12;
+                _context10.next = 12;
                 break;
               }
-              return _context9.abrupt("return", Promise.reject(undefined));
+              return _context10.abrupt("return", Promise.reject(undefined));
             case 12:
-              _context9.t0 = !!matchedProviderPattern;
-              if (_context9.t0) {
-                _context9.next = 17;
+              _context10.t0 = !!matchedProviderPattern;
+              if (_context10.t0) {
+                _context10.next = 17;
                 break;
               }
-              _context9.next = 16;
-              return this.check(url);
+              _context10.next = 16;
+              return this.checkLinkResolved(url);
             case 16:
-              _context9.t0 = _context9.sent;
+              _context10.t0 = _context10.sent;
             case 17:
-              isSupported = _context9.t0;
+              isSupported = _context10.t0;
               if (!isSupported) {
-                _context9.next = 27;
+                _context10.next = 33;
                 break;
               }
               providerDefaultAppearance = matchedProviderPattern === null || matchedProviderPattern === void 0 ? void 0 : matchedProviderPattern.defaultView;
@@ -432,35 +470,54 @@ var EditorCardProvider = /*#__PURE__*/function () {
               // If not, we pick what editor (or any other client) requested
               appearance;
               if (!(preferredAppearance === userPreference && userPreference === 'embed')) {
-                _context9.next = 26;
+                _context10.next = 26;
                 break;
               }
-              _context9.next = 24;
+              _context10.next = 24;
               return this.canBeResolvedAsEmbed(url);
             case 24:
-              canItBeEmbed = _context9.sent;
+              canItBeEmbed = _context10.sent;
               if (!canItBeEmbed) {
                 preferredAppearance = 'inline';
               }
             case 26:
-              return _context9.abrupt("return", this.transformer.toAdf(url, preferredAppearance));
-            case 27:
-              _context9.next = 32;
-              break;
-            case 29:
-              _context9.prev = 29;
-              _context9.t1 = _context9["catch"](0);
-              // eslint-disable-next-line
-              console.warn("Error when trying to check Smart Card url \"".concat(url, "\"").concat(_context9.t1 instanceof Error ? " - ".concat(_context9.t1.name, " ").concat(_context9.t1.message) : ''), _context9.t1);
+              _context10.next = 28;
+              return this.getDatasourceFromResolveResponse(url);
+            case 28:
+              datasource = _context10.sent;
+              if (!datasource) {
+                _context10.next = 32;
+                break;
+              }
+              id = datasource.id, parameters = datasource.parameters;
+              return _context10.abrupt("return", this.transformer.toDatasourceAdf({
+                id: id,
+                parameters: parameters,
+                // in the future when we support multiple views, we will need to pass this in as a parameter
+                // transform toDatasourceAdf to accept multiple views (like how how appearance for other other transforms are handled)
+                views: [{
+                  type: 'table'
+                }]
+              }, url));
             case 32:
-              return _context9.abrupt("return", Promise.reject(undefined));
+              return _context10.abrupt("return", this.transformer.toSmartlinkAdf(url, preferredAppearance));
             case 33:
+              _context10.next = 38;
+              break;
+            case 35:
+              _context10.prev = 35;
+              _context10.t1 = _context10["catch"](0);
+              // eslint-disable-next-line
+              console.warn("Error when trying to check Smart Card url \"".concat(url, "\"").concat(_context10.t1 instanceof Error ? " - ".concat(_context10.t1.name, " ").concat(_context10.t1.message) : ''), _context10.t1);
+            case 38:
+              return _context10.abrupt("return", Promise.reject(undefined));
+            case 39:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
-        }, _callee9, this, [[0, 29]]);
+        }, _callee10, this, [[0, 35]]);
       }));
-      function resolve(_x7, _x8, _x9) {
+      function resolve(_x8, _x9, _x10) {
         return _resolve.apply(this, arguments);
       }
       return resolve;

package/dist/cjs/transformer.js

@@ -43,8 +43,19 @@ var Transformer = /*#__PURE__*/function () {
       };
     }
   }, {
-    key: "toAdf",
-    value: function toAdf(url, appearance) {
+    key: "buildDatasourceAdf",
+    value: function buildDatasourceAdf(datasource, url) {
+      return {
+        type: 'blockCard',
+        attrs: {
+          url: url,
+          datasource: datasource
+        }
+      };
+    }
+  }, {
+    key: "toSmartlinkAdf",
+    value: function toSmartlinkAdf(url, appearance) {
       switch (appearance) {
         case 'inline':
           return this.buildInlineAdf(url);
@@ -54,6 +65,11 @@ var Transformer = /*#__PURE__*/function () {
           return this.buildEmbedAdf(url);
       }
     }
+  }, {
+    key: "toDatasourceAdf",
+    value: function toDatasourceAdf(datasource, url) {
+      return this.buildDatasourceAdf(datasource, url);
+    }
   }]);
   return Transformer;
 }();

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-card-provider",
-	"version": "3.0.5",
+	"version": "3.1.1",
 	"sideEffects": false
 }

package/dist/es2019/provider.js

@@ -2,7 +2,7 @@
 // @see https://github.com/graphql/dataloader/issues/249
 import 'setimmediate';
 import DataLoader from 'dataloader';
-import { extractPreview } from '@atlaskit/linking-common';
+import { extractPreview } from '@atlaskit/link-extractors';
 import { Transformer } from './transformer';
 import { getBaseUrl, getResolverUrl } from './environments';
 import { getStatus } from './utils';
@@ -37,7 +37,7 @@ export class EditorCardProvider {
     const providersData = await this.fetchProvidersData();
     return keys.map(() => providersData);
   }
-  async check(resourceUrl) {
+  async checkLinkResolved(resourceUrl) {
     try {
       const response = await this.cardClient.fetchData(resourceUrl);
       if (getStatus(response) !== 'not_found') {
@@ -68,7 +68,7 @@ export class EditorCardProvider {
     }
   }
   async findPattern(url) {
-    return !!(await this.findPatternData(url)) || !!(await this.check(url));
+    return !!(await this.findPatternData(url)) || !!(await this.checkLinkResolved(url));
   }
   doesUrlMatchPath(path, url) {
     // Using [a-zA-Z0-9] here instead of \w since that includes underscores
@@ -116,8 +116,6 @@ export class EditorCardProvider {
 
   /**
    * Make a /resolve call and find out if result has embed capability
-   * @param url
-   * @private
    */
   async canBeResolvedAsEmbed(url) {
     try {
@@ -139,20 +137,37 @@ export class EditorCardProvider {
       return false;
     }
   }
+
+  /**
+   * Make a /resolve call and find out if result has datasource capability
+   */
+  async getDatasourceFromResolveResponse(url) {
+    try {
+      const response = await this.cardClient.fetchData(url);
+      const datasources = response && response.datasources || [];
+      if (datasources.length > 0) {
+        // For now we only have one datasource expected even though it is in an array.
+        // When we have resources returning more than one we will have revisit this part.
+        return datasources[0];
+      }
+    } catch (e) {
+      return undefined;
+    }
+  }
   async resolve(url, appearance, shouldForceAppearance) {
     try {
       if (shouldForceAppearance === true) {
         // At this point we don't need to check pattern nor call `check` because manual change means
         // this url is already supported and can be resolved. We want to ignore all other options and
         // respect user's choice.
-        return this.transformer.toAdf(url, appearance);
+        return this.transformer.toSmartlinkAdf(url, appearance);
       }
       const hardCodedAppearance = this.getHardCodedAppearance(url);
       const [matchedProviderPattern, userPreference] = await Promise.all([this.findPatternData(url), this.findUserPreference(url)]);
       if (shouldForceAppearance === false && userPreference === 'url') {
         return Promise.reject(undefined);
       }
-      let isSupported = !!matchedProviderPattern || (await this.check(url));
+      let isSupported = !!matchedProviderPattern || (await this.checkLinkResolved(url));
       if (isSupported) {
         const providerDefaultAppearance = matchedProviderPattern === null || matchedProviderPattern === void 0 ? void 0 : matchedProviderPattern.defaultView;
         let preferredAppearance = shouldForceAppearance === undefined ?
@@ -174,7 +189,23 @@ export class EditorCardProvider {
             preferredAppearance = 'inline';
           }
         }
-        return this.transformer.toAdf(url, preferredAppearance);
+        const datasource = await this.getDatasourceFromResolveResponse(url);
+        if (datasource) {
+          const {
+            id,
+            parameters
+          } = datasource;
+          return this.transformer.toDatasourceAdf({
+            id,
+            parameters,
+            // in the future when we support multiple views, we will need to pass this in as a parameter
+            // transform toDatasourceAdf to accept multiple views (like how how appearance for other other transforms are handled)
+            views: [{
+              type: 'table'
+            }]
+          }, url);
+        }
+        return this.transformer.toSmartlinkAdf(url, preferredAppearance);
       }
     } catch (e) {
       // eslint-disable-next-line

package/dist/es2019/transformer.js

@@ -24,7 +24,16 @@ export class Transformer {
       }
     };
   }
-  toAdf(url, appearance) {
+  buildDatasourceAdf(datasource, url) {
+    return {
+      type: 'blockCard',
+      attrs: {
+        url,
+        datasource
+      }
+    };
+  }
+  toSmartlinkAdf(url, appearance) {
     switch (appearance) {
       case 'inline':
         return this.buildInlineAdf(url);
@@ -34,4 +43,7 @@ export class Transformer {
         return this.buildEmbedAdf(url);
     }
   }
+  toDatasourceAdf(datasource, url) {
+    return this.buildDatasourceAdf(datasource, url);
+  }
 }

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-card-provider",
-	"version": "3.0.5",
+	"version": "3.1.1",
 	"sideEffects": false
 }

package/dist/esm/provider.js

@@ -11,7 +11,7 @@ function _wrapRegExp() { _wrapRegExp = function _wrapRegExp(re, groups) { return
 // @see https://github.com/graphql/dataloader/issues/249
 import 'setimmediate';
 import DataLoader from 'dataloader';
-import { extractPreview } from '@atlaskit/linking-common';
+import { extractPreview } from '@atlaskit/link-extractors';
 import { Transformer } from './transformer';
 import { getBaseUrl, getResolverUrl } from './environments';
 import { getStatus } from './utils';
@@ -89,9 +89,9 @@ export var EditorCardProvider = /*#__PURE__*/function () {
       return batchProviders;
     }()
   }, {
-    key: "check",
+    key: "checkLinkResolved",
     value: function () {
-      var _check = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(resourceUrl) {
+      var _checkLinkResolved = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(resourceUrl) {
         var response;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -119,10 +119,10 @@ export var EditorCardProvider = /*#__PURE__*/function () {
           }
         }, _callee2, this, [[0, 8]]);
       }));
-      function check(_x2) {
-        return _check.apply(this, arguments);
+      function checkLinkResolved(_x2) {
+        return _checkLinkResolved.apply(this, arguments);
       }
-      return check;
+      return checkLinkResolved;
     }()
   }, {
     key: "fetchProvidersData",
@@ -202,7 +202,7 @@ export var EditorCardProvider = /*#__PURE__*/function () {
                 break;
               }
               _context5.next = 6;
-              return this.check(url);
+              return this.checkLinkResolved(url);
             case 6:
               _context5.t0 = !!_context5.sent;
             case 7:
@@ -319,8 +319,6 @@ export var EditorCardProvider = /*#__PURE__*/function () {
 
     /**
      * Make a /resolve call and find out if result has embed capability
-     * @param url
-     * @private
      */
   }, {
     key: "canBeResolvedAsEmbed",
@@ -365,48 +363,88 @@ export var EditorCardProvider = /*#__PURE__*/function () {
       }
       return canBeResolvedAsEmbed;
     }()
+    /**
+     * Make a /resolve call and find out if result has datasource capability
+     */
   }, {
-    key: "resolve",
+    key: "getDatasourceFromResolveResponse",
     value: function () {
-      var _resolve = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(url, appearance, shouldForceAppearance) {
-        var hardCodedAppearance, _yield$Promise$all, _yield$Promise$all2, matchedProviderPattern, userPreference, isSupported, providerDefaultAppearance, preferredAppearance, canItBeEmbed;
+      var _getDatasourceFromResolveResponse = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(url) {
+        var response, datasources;
         return _regeneratorRuntime.wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
               _context9.prev = 0;
+              _context9.next = 3;
+              return this.cardClient.fetchData(url);
+            case 3:
+              response = _context9.sent;
+              datasources = response && response.datasources || [];
+              if (!(datasources.length > 0)) {
+                _context9.next = 7;
+                break;
+              }
+              return _context9.abrupt("return", datasources[0]);
+            case 7:
+              _context9.next = 12;
+              break;
+            case 9:
+              _context9.prev = 9;
+              _context9.t0 = _context9["catch"](0);
+              return _context9.abrupt("return", undefined);
+            case 12:
+            case "end":
+              return _context9.stop();
+          }
+        }, _callee9, this, [[0, 9]]);
+      }));
+      function getDatasourceFromResolveResponse(_x7) {
+        return _getDatasourceFromResolveResponse.apply(this, arguments);
+      }
+      return getDatasourceFromResolveResponse;
+    }()
+  }, {
+    key: "resolve",
+    value: function () {
+      var _resolve = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(url, appearance, shouldForceAppearance) {
+        var hardCodedAppearance, _yield$Promise$all, _yield$Promise$all2, matchedProviderPattern, userPreference, isSupported, providerDefaultAppearance, preferredAppearance, canItBeEmbed, datasource, id, parameters;
+        return _regeneratorRuntime.wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
+            case 0:
+              _context10.prev = 0;
               if (!(shouldForceAppearance === true)) {
-                _context9.next = 3;
+                _context10.next = 3;
                 break;
               }
-              return _context9.abrupt("return", this.transformer.toAdf(url, appearance));
+              return _context10.abrupt("return", this.transformer.toSmartlinkAdf(url, appearance));
             case 3:
               hardCodedAppearance = this.getHardCodedAppearance(url);
-              _context9.next = 6;
+              _context10.next = 6;
               return Promise.all([this.findPatternData(url), this.findUserPreference(url)]);
             case 6:
-              _yield$Promise$all = _context9.sent;
+              _yield$Promise$all = _context10.sent;
               _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
               matchedProviderPattern = _yield$Promise$all2[0];
               userPreference = _yield$Promise$all2[1];
               if (!(shouldForceAppearance === false && userPreference === 'url')) {
-                _context9.next = 12;
+                _context10.next = 12;
                 break;
               }
-              return _context9.abrupt("return", Promise.reject(undefined));
+              return _context10.abrupt("return", Promise.reject(undefined));
             case 12:
-              _context9.t0 = !!matchedProviderPattern;
-              if (_context9.t0) {
-                _context9.next = 17;
+              _context10.t0 = !!matchedProviderPattern;
+              if (_context10.t0) {
+                _context10.next = 17;
                 break;
               }
-              _context9.next = 16;
-              return this.check(url);
+              _context10.next = 16;
+              return this.checkLinkResolved(url);
             case 16:
-              _context9.t0 = _context9.sent;
+              _context10.t0 = _context10.sent;
             case 17:
-              isSupported = _context9.t0;
+              isSupported = _context10.t0;
               if (!isSupported) {
-                _context9.next = 27;
+                _context10.next = 33;
                 break;
               }
               providerDefaultAppearance = matchedProviderPattern === null || matchedProviderPattern === void 0 ? void 0 : matchedProviderPattern.defaultView;
@@ -424,35 +462,54 @@ export var EditorCardProvider = /*#__PURE__*/function () {
               // If not, we pick what editor (or any other client) requested
               appearance;
               if (!(preferredAppearance === userPreference && userPreference === 'embed')) {
-                _context9.next = 26;
+                _context10.next = 26;
                 break;
               }
-              _context9.next = 24;
+              _context10.next = 24;
               return this.canBeResolvedAsEmbed(url);
             case 24:
-              canItBeEmbed = _context9.sent;
+              canItBeEmbed = _context10.sent;
               if (!canItBeEmbed) {
                 preferredAppearance = 'inline';
               }
             case 26:
-              return _context9.abrupt("return", this.transformer.toAdf(url, preferredAppearance));
-            case 27:
-              _context9.next = 32;
-              break;
-            case 29:
-              _context9.prev = 29;
-              _context9.t1 = _context9["catch"](0);
-              // eslint-disable-next-line
-              console.warn("Error when trying to check Smart Card url \"".concat(url, "\"").concat(_context9.t1 instanceof Error ? " - ".concat(_context9.t1.name, " ").concat(_context9.t1.message) : ''), _context9.t1);
+              _context10.next = 28;
+              return this.getDatasourceFromResolveResponse(url);
+            case 28:
+              datasource = _context10.sent;
+              if (!datasource) {
+                _context10.next = 32;
+                break;
+              }
+              id = datasource.id, parameters = datasource.parameters;
+              return _context10.abrupt("return", this.transformer.toDatasourceAdf({
+                id: id,
+                parameters: parameters,
+                // in the future when we support multiple views, we will need to pass this in as a parameter
+                // transform toDatasourceAdf to accept multiple views (like how how appearance for other other transforms are handled)
+                views: [{
+                  type: 'table'
+                }]
+              }, url));
             case 32:
-              return _context9.abrupt("return", Promise.reject(undefined));
+              return _context10.abrupt("return", this.transformer.toSmartlinkAdf(url, preferredAppearance));
             case 33:
+              _context10.next = 38;
+              break;
+            case 35:
+              _context10.prev = 35;
+              _context10.t1 = _context10["catch"](0);
+              // eslint-disable-next-line
+              console.warn("Error when trying to check Smart Card url \"".concat(url, "\"").concat(_context10.t1 instanceof Error ? " - ".concat(_context10.t1.name, " ").concat(_context10.t1.message) : ''), _context10.t1);
+            case 38:
+              return _context10.abrupt("return", Promise.reject(undefined));
+            case 39:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
-        }, _callee9, this, [[0, 29]]);
+        }, _callee10, this, [[0, 35]]);
       }));
-      function resolve(_x7, _x8, _x9) {
+      function resolve(_x8, _x9, _x10) {
         return _resolve.apply(this, arguments);
       }
       return resolve;

package/dist/esm/transformer.js

@@ -36,8 +36,19 @@ export var Transformer = /*#__PURE__*/function () {
       };
     }
   }, {
-    key: "toAdf",
-    value: function toAdf(url, appearance) {
+    key: "buildDatasourceAdf",
+    value: function buildDatasourceAdf(datasource, url) {
+      return {
+        type: 'blockCard',
+        attrs: {
+          url: url,
+          datasource: datasource
+        }
+      };
+    }
+  }, {
+    key: "toSmartlinkAdf",
+    value: function toSmartlinkAdf(url, appearance) {
       switch (appearance) {
         case 'inline':
           return this.buildInlineAdf(url);
@@ -47,6 +58,11 @@ export var Transformer = /*#__PURE__*/function () {
           return this.buildEmbedAdf(url);
       }
     }
+  }, {
+    key: "toDatasourceAdf",
+    value: function toDatasourceAdf(datasource, url) {
+      return this.buildDatasourceAdf(datasource, url);
+    }
   }]);
   return Transformer;
 }();

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-card-provider",
-	"version": "3.0.5",
+	"version": "3.1.1",
 	"sideEffects": false
 }

package/dist/types/provider.d.ts

@@ -1,5 +1,5 @@
 import 'setimmediate';
-import { CardAdf, CardAppearance } from '@atlaskit/linking-common';
+import { CardAdf, CardAppearance, DatasourceAdf } from '@atlaskit/linking-common';
 import { CardProvider } from './types';
 import { EnvironmentsKeys } from './environments';
 export declare class EditorCardProvider implements CardProvider {
@@ -12,7 +12,7 @@ export declare class EditorCardProvider implements CardProvider {
     private cardClient;
     constructor(envKey?: EnvironmentsKeys, baseUrlOverride?: string);
     private batchProviders;
-    private check;
+    private checkLinkResolved;
     private fetchProvidersData;
     private loadProviderData;
     findPattern(url: string): Promise<boolean>;
@@ -22,11 +22,13 @@ export declare class EditorCardProvider implements CardProvider {
     private getHardCodedAppearance;
     /**
      * Make a /resolve call and find out if result has embed capability
-     * @param url
-     * @private
      */
     private canBeResolvedAsEmbed;
-    resolve(url: string, appearance: CardAppearance, shouldForceAppearance?: boolean): Promise<CardAdf>;
+    /**
+     * Make a /resolve call and find out if result has datasource capability
+     */
+    private getDatasourceFromResolveResponse;
+    resolve(url: string, appearance: CardAppearance, shouldForceAppearance?: boolean): Promise<CardAdf | DatasourceAdf>;
 }
 export declare const editorCardProvider: EditorCardProvider;
 export type { CardProvider } from './types';

package/dist/types/transformer.d.ts

@@ -1,7 +1,9 @@
-import { CardAppearance, CardAdf } from '@atlaskit/linking-common';
+import { CardAppearance, CardAdf, DatasourceAdf, Datasource } from '@atlaskit/linking-common';
 export declare class Transformer {
     private buildInlineAdf;
     private buildBlockAdf;
     private buildEmbedAdf;
-    toAdf(url: string, appearance: CardAppearance): CardAdf;
+    private buildDatasourceAdf;
+    toSmartlinkAdf(url: string, appearance: CardAppearance): CardAdf;
+    toDatasourceAdf(datasource: Datasource, url?: string): DatasourceAdf;
 }

package/dist/types-ts4.5/provider.d.ts

@@ -1,5 +1,5 @@
 import 'setimmediate';
-import { CardAdf, CardAppearance } from '@atlaskit/linking-common';
+import { CardAdf, CardAppearance, DatasourceAdf } from '@atlaskit/linking-common';
 import { CardProvider } from './types';
 import { EnvironmentsKeys } from './environments';
 export declare class EditorCardProvider implements CardProvider {
@@ -12,7 +12,7 @@ export declare class EditorCardProvider implements CardProvider {
     private cardClient;
     constructor(envKey?: EnvironmentsKeys, baseUrlOverride?: string);
     private batchProviders;
-    private check;
+    private checkLinkResolved;
     private fetchProvidersData;
     private loadProviderData;
     findPattern(url: string): Promise<boolean>;
@@ -22,11 +22,13 @@ export declare class EditorCardProvider implements CardProvider {
     private getHardCodedAppearance;
     /**
      * Make a /resolve call and find out if result has embed capability
-     * @param url
-     * @private
      */
     private canBeResolvedAsEmbed;
-    resolve(url: string, appearance: CardAppearance, shouldForceAppearance?: boolean): Promise<CardAdf>;
+    /**
+     * Make a /resolve call and find out if result has datasource capability
+     */
+    private getDatasourceFromResolveResponse;
+    resolve(url: string, appearance: CardAppearance, shouldForceAppearance?: boolean): Promise<CardAdf | DatasourceAdf>;
 }
 export declare const editorCardProvider: EditorCardProvider;
 export type { CardProvider } from './types';

package/dist/types-ts4.5/transformer.d.ts

@@ -1,7 +1,9 @@
-import { CardAppearance, CardAdf } from '@atlaskit/linking-common';
+import { CardAppearance, CardAdf, DatasourceAdf, Datasource } from '@atlaskit/linking-common';
 export declare class Transformer {
     private buildInlineAdf;
     private buildBlockAdf;
     private buildEmbedAdf;
-    toAdf(url: string, appearance: CardAppearance): CardAdf;
+    private buildDatasourceAdf;
+    toSmartlinkAdf(url: string, appearance: CardAppearance): CardAdf;
+    toDatasourceAdf(datasource: Datasource, url?: string): DatasourceAdf;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-card-provider",
-  "version": "3.0.5",
+  "version": "3.1.1",
   "description": "Contains the EditorCardProvider, for determining smart card behaviour in the editor.",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -34,7 +34,9 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/linking-common": "^3.0.0",
+    "@atlaskit/link-client-extension": "^1.5.0",
+    "@atlaskit/link-extractors": "^1.1.0",
+    "@atlaskit/linking-common": "^3.2.0",
     "@babel/runtime": "^7.0.0",
     "dataloader": "^2.0.0",
     "json-ld-types": "3.7.0",

package/report.api.md

@@ -17,6 +17,7 @@
 ```ts
 import { CardAdf } from '@atlaskit/linking-common';
 import { CardAppearance } from '@atlaskit/linking-common';
+import { DatasourceAdf } from '@atlaskit/linking-common';
 
 // @public (undocumented)
 const BaseUrls: {
@@ -49,7 +50,7 @@ export class EditorCardProvider implements CardProvider {
     url: string,
     appearance: CardAppearance,
     shouldForceAppearance?: boolean,
-  ): Promise<CardAdf>;
+  ): Promise<CardAdf | DatasourceAdf>;
 }
 
 // @public (undocumented)

package/tmp/api-report-tmp.d.ts

@@ -6,6 +6,7 @@
 
 import { CardAdf } from '@atlaskit/linking-common';
 import { CardAppearance } from '@atlaskit/linking-common';
+import { DatasourceAdf } from '@atlaskit/linking-common';
 
 // @public (undocumented)
 const BaseUrls: {
@@ -30,7 +31,7 @@ export class EditorCardProvider implements CardProvider {
     // (undocumented)
     findPattern(url: string): Promise<boolean>;
     // (undocumented)
-    resolve(url: string, appearance: CardAppearance, shouldForceAppearance?: boolean): Promise<CardAdf>;
+    resolve(url: string, appearance: CardAppearance, shouldForceAppearance?: boolean): Promise<CardAdf | DatasourceAdf>;
 }
 
 // @public (undocumented)