@agility/content-sync 1.1.0 → 1.1.3

package/dist/agility-sync-sdk.node.js

@@ -10856,27 +10856,26 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {try
             itemCount = 0;
             busy = false;
             waitMS = 0;
-            waitMaxMS = 60000;
-            waitIntervalMS = 1000;case 7:
+            waitMaxMS = 10 * 60 * 1000;
+            waitIntervalMS = 1000;case 7:_context.next = 9;return (
 
 
-            syncRet = null;
 
 
-            //sync content items...
-            _context.next = 10;return this.agilityClient.getSyncContent({
-              syncToken: token,
-              pageSize: 100,
-              languageCode: languageCode });case 10:syncRet = _context.sent;if (!(
 
+              this.agilityClient.getSyncContent({
+                syncToken: token,
+                pageSize: 100,
+                languageCode: languageCode }));case 9:syncRet = _context.sent;if (!(
 
 
 
-            syncRet === undefined || syncRet.busy !== undefined && syncRet.busy === true)) {_context.next = 20;break;}
+
+            syncRet === undefined || syncRet === null || syncRet.busy !== undefined && syncRet.busy === true)) {_context.next = 19;break;}
             //if the api is being updated, wait a few ms and try again...
             waitMS += waitIntervalMS;if (!(
-            waitMS > waitMaxMS)) {_context.next = 16;break;}
-            Object(util["logWarning"])("Sync API has been busy for too long, canceling.");return _context.abrupt("break", 37);case 16:
+            waitMS > waitMaxMS)) {_context.next = 15;break;}
+            Object(util["logWarning"])("Sync API has been busy for too long, canceling.");return _context.abrupt("break", 36);case 15:
 
 
 
@@ -10884,9 +10883,9 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {try
               //first time we're busy...
               busy = true;
               Object(util["logInfo"])("Sync API is busy.  Waiting...");
-            }_context.next = 19;return (
+            }_context.next = 18;return (
 
-              Object(util["sleep"])(waitIntervalMS));case 19:return _context.abrupt("continue", 36);case 20:
+              Object(util["sleep"])(waitIntervalMS));case 18:return _context.abrupt("continue", 35);case 19:
 
 
 
@@ -10899,22 +10898,22 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {try
             syncItems = syncRet.items;
 
             //if we don't get anything back, kick out
-            if (!(syncItems.length > 0)) {_context.next = 30;break;}
+            if (!(syncItems.length > 0)) {_context.next = 29;break;}
 
-            index = 0;case 24:if (!(index < syncItems.length)) {_context.next = 30;break;}_context.next = 27;return (
-              storeInterface.saveContentItem({ contentItem: syncItems[index], languageCode: languageCode }));case 27:index++;_context.next = 24;break;case 30:if (!(
+            index = 0;case 23:if (!(index < syncItems.length)) {_context.next = 29;break;}_context.next = 26;return (
+              storeInterface.saveContentItem({ contentItem: syncItems[index], languageCode: languageCode }));case 26:index++;_context.next = 23;break;case 29:if (!(
 
 
 
-            syncRet.syncToken > token)) {_context.next = 34;break;}
-            token = syncRet.syncToken;_context.next = 35;break;case 34:return _context.abrupt("break", 37);case 35:
+            syncRet.syncToken > token)) {_context.next = 33;break;}
+            token = syncRet.syncToken;_context.next = 34;break;case 33:return _context.abrupt("break", 36);case 34:
 
 
 
 
-            itemCount += syncItems.length;case 36:if (
+            itemCount += syncItems.length;case 35:if (
 
-            token > 0 || busy === true) {_context.next = 7;break;}case 37:
+            token > 0 || busy === true) {_context.next = 7;break;}case 36:
 
             if (itemCount > 0) {
               Object(util["logInfo"])("Content Sync returned ".concat(itemCount, " item(s)."));
@@ -10922,7 +10921,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {try
               Object(util["logInfo"])("Content Sync returned no item(s).");
             }return _context.abrupt("return",
 
-            token);case 39:case "end":return _context.stop();}}}, _callee, this);}));return syncContent_ref.apply(this, arguments);}
+            token);case 38:case "end":return _context.stop();}}}, _callee, this);}));return syncContent_ref.apply(this, arguments);}
 // CONCATENATED MODULE: ./src/methods/clearSync.js
 function clearSync_asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {try {var info = gen[key](arg);var value = info.value;} catch (error) {reject(error);return;}if (info.done) {resolve(value);} else {Promise.resolve(value).then(_next, _throw);}}function clearSync_asyncToGenerator(fn) {return function () {var self = this,args = arguments;return new Promise(function (resolve, reject) {var gen = fn.apply(self, args);function _next(value) {clearSync_asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);}function _throw(err) {clearSync_asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);}_next(undefined);});};}
 
@@ -10941,8 +10940,8 @@ function syncPages_asyncGeneratorStep(gen, resolve, reject, _next, _throw, key,
 
             busy = false;
             waitMS = 0;
-            waitMaxMS = 30000;
-            waitIntervalMS = 500;case 7:_context.next = 9;return (
+            waitMaxMS = 10 * 60 * 1000;
+            waitIntervalMS = 1000;case 7:_context.next = 9;return (
 
 
 
@@ -10953,8 +10952,7 @@ function syncPages_asyncGeneratorStep(gen, resolve, reject, _next, _throw, key,
                 languageCode: languageCode }));case 9:syncRet = _context.sent;if (!(
 
 
-            syncRet.busy !== undefined &&
-            syncRet.busy === true)) {_context.next = 19;break;}
+            syncRet === undefined || syncRet === null || syncRet.busy !== undefined && syncRet.busy === true)) {_context.next = 19;break;}
             //if the api is being updated, wait a few ms and try again...
             waitMS += waitIntervalMS;if (!(
             waitMS > waitMaxMS)) {_context.next = 15;break;}
@@ -11399,7 +11397,7 @@ var expandContentItem = /*#__PURE__*/function () {var _ref19 = store_interface_a
             }case 42:_context10.next = 35;break;case 44:_context10.next = 49;break;case 46:_context10.prev = 46;_context10.t2 = _context10["catch"](33);_iterator.e(_context10.t2);case 49:_context10.prev = 49;_iterator.f();return _context10.finish(49);case 52:_iterator2 = store_interface_createForOfIteratorHelper(
 
 
-            list);_context10.prev = 53;_iterator2.s();case 55:if ((_step2 = _iterator2.n()).done) {_context10.next = 69;break;}listItem = _step2.value;
+            list.items);_context10.prev = 53;_iterator2.s();case 55:if ((_step2 = _iterator2.n()).done) {_context10.next = 69;break;}listItem = _step2.value;
             itemCount++;if (!(
             itemCount > 50)) {_context10.next = 60;break;}return _context10.abrupt("break", 69);case 60:
 
@@ -11463,21 +11461,27 @@ var expandContentItem = /*#__PURE__*/function () {var _ref19 = store_interface_a
  * @param {number} [requestParams.skip] - The number of items to skip from the list. Used for implementing pagination.
  * @returns {Promise<[] | Object>} - Returns a list of content items, or, if skip or take has been specified, an object with an items array and totalCount property.
 */
-var getContentList = /*#__PURE__*/function () {var _ref21 = store_interface_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11(_ref20) {var referenceName, languageCode, _ref20$depth, depth, _ref20$expandAllConte, expandAllContentLinks, _ref20$skip, skip, _ref20$take, take, lst, totalCount, i;return regeneratorRuntime.wrap(function _callee11$(_context11) {while (1) {switch (_context11.prev = _context11.next) {case 0:referenceName = _ref20.referenceName, languageCode = _ref20.languageCode, _ref20$depth = _ref20.depth, depth = _ref20$depth === void 0 ? 0 : _ref20$depth, _ref20$expandAllConte = _ref20.expandAllContentLinks, expandAllContentLinks = _ref20$expandAllConte === void 0 ? false : _ref20$expandAllConte, _ref20$skip = _ref20.skip, skip = _ref20$skip === void 0 ? -1 : _ref20$skip, _ref20$take = _ref20.take, take = _ref20$take === void 0 ? -1 : _ref20$take;_context11.next = 3;return (
+var getContentList = /*#__PURE__*/function () {var _ref21 = store_interface_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11(_ref20) {var referenceName, languageCode, depth, contentLinkDepth, _ref20$expandAllConte, expandAllContentLinks, _ref20$skip, skip, _ref20$take, take, lst, totalCount, i;return regeneratorRuntime.wrap(function _callee11$(_context11) {while (1) {switch (_context11.prev = _context11.next) {case 0:referenceName = _ref20.referenceName, languageCode = _ref20.languageCode, depth = _ref20.depth, contentLinkDepth = _ref20.contentLinkDepth, _ref20$expandAllConte = _ref20.expandAllContentLinks, expandAllContentLinks = _ref20$expandAllConte === void 0 ? false : _ref20$expandAllConte, _ref20$skip = _ref20.skip, skip = _ref20$skip === void 0 ? -1 : _ref20$skip, _ref20$take = _ref20.take, take = _ref20$take === void 0 ? -1 : _ref20$take;
+
+            if (depth === undefined && contentLinkDepth !== undefined) {
+              depth = contentLinkDepth;
+            } else if (depth === undefined && contentLinkDepth === undefined) {
+              depth = 2;
+            }_context11.next = 4;return (
 
               store_interface_store.getItem({
                 options: options,
                 itemType: "list",
                 languageCode: languageCode,
-                itemID: referenceName }));case 3:_context11.t0 = _context11.sent;if (_context11.t0) {_context11.next = 6;break;}_context11.t0 =
-            [];case 6:lst = _context11.t0;if (!(
+                itemID: referenceName }));case 4:_context11.t0 = _context11.sent;if (_context11.t0) {_context11.next = 7;break;}_context11.t0 =
+            [];case 7:lst = _context11.t0;if (!(
 
-            depth > 0 && take === -1)) {_context11.next = 9;break;}throw (
-              new Error("If you specify depth > 0, you must also specify the take parameter."));case 9:if (!(
+            depth > 0 && take === -1)) {_context11.next = 10;break;}throw (
+              new Error("If you specify depth > 0, you must also specify the take parameter."));case 10:if (!(
 
 
-            expandAllContentLinks && take === -1)) {_context11.next = 11;break;}throw (
-              new Error("If you specify expandAllContentLinks=true, you must also specify the take parameter."));case 11:
+            expandAllContentLinks && take === -1)) {_context11.next = 12;break;}throw (
+              new Error("If you specify expandAllContentLinks=true, you must also specify the take parameter."));case 12:
 
 
             totalCount = lst.length;
@@ -11490,26 +11494,26 @@ var getContentList = /*#__PURE__*/function () {var _ref21 = store_interface_asyn
               lst = lst.slice(0, take);
             }if (!(
 
-            depth > 0)) {_context11.next = 23;break;}
-            i = 0;case 16:if (!(i < lst.length)) {_context11.next = 23;break;}_context11.next = 19;return (
+            depth > 0)) {_context11.next = 24;break;}
+            i = 0;case 17:if (!(i < lst.length)) {_context11.next = 24;break;}_context11.next = 20;return (
               expandContentItem({
                 contentItem: lst[i],
                 depth: depth - 1,
                 languageCode: languageCode,
-                expandAllContentLinks: expandAllContentLinks }));case 19:lst[i] = _context11.sent;case 20:i++;_context11.next = 16;break;case 23:if (!(
+                expandAllContentLinks: expandAllContentLinks }));case 20:lst[i] = _context11.sent;case 21:i++;_context11.next = 17;break;case 24:if (!(
 
 
 
 
-            skip > 0 || take > 0)) {_context11.next = 27;break;}return _context11.abrupt("return",
+            skip > 0 || take > 0)) {_context11.next = 28;break;}return _context11.abrupt("return",
 
             {
               items: lst,
-              totalCount: totalCount });case 27:return _context11.abrupt("return",
+              totalCount: totalCount });case 28:return _context11.abrupt("return",
 
 
 
-            lst);case 28:case "end":return _context11.stop();}}}, _callee11);}));return function getContentList(_x11) {return _ref21.apply(this, arguments);};}();
+            lst);case 29:case "end":return _context11.stop();}}}, _callee11);}));return function getContentList(_x11) {return _ref21.apply(this, arguments);};}();
 
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agility/content-sync",
-  "version": "1.1.0",
+  "version": "1.1.3",
   "description": "JavaScript SDK for synchronizing content from Agility CMS",
   "main": "dist/agility-sync-sdk.node.js",
   "scripts": {

package/src/methods/syncContent.js

@@ -12,15 +12,14 @@ export default async function (languageCode, token) {
 	let itemCount = 0
 	let busy = false
 	let waitMS = 0
-	const waitMaxMS = 60000
+	const waitMaxMS = 10 * 60 * 1000
 	const waitIntervalMS = 1000
 
 	do {
-		let syncRet = null
 
 
 		//sync content items...
-		syncRet = await this.agilityClient.getSyncContent({
+		const syncRet = await this.agilityClient.getSyncContent({
 			syncToken: token,
 			pageSize: 100,
 			languageCode: languageCode,
@@ -28,7 +27,7 @@ export default async function (languageCode, token) {
 		});
 
 
-		if (syncRet === undefined || (syncRet.busy !== undefined && syncRet.busy === true)) {
+		if (syncRet === undefined || syncRet === null || (syncRet.busy !== undefined && syncRet.busy === true)) {
 			//if the api is being updated, wait a few ms and try again...
 			waitMS += waitIntervalMS
 			if (waitMS > waitMaxMS) {

package/src/methods/syncPages.js

@@ -8,8 +8,8 @@ export default async function (languageCode, token) {
 
 	let busy = false
 	let waitMS = 0
-	const waitMaxMS = 30000
-	const waitIntervalMS = 500
+	const waitMaxMS = 10 * 60 * 1000
+	const waitIntervalMS = 1000
 
 
 	do {
@@ -20,8 +20,7 @@ export default async function (languageCode, token) {
 			languageCode: languageCode
 		});
 
-		if (syncRet.busy !== undefined
-			&& syncRet.busy === true) {
+		if (syncRet === undefined || syncRet === null || (syncRet.busy !== undefined && syncRet.busy === true)) {
 			//if the api is being updated, wait a few ms and try again...
 			waitMS += waitIntervalMS
 			if (waitMS > waitMaxMS) {

package/src/store-interface.js

@@ -300,7 +300,7 @@ const expandContentItem = async ({ contentItem, languageCode, depth, expandAllCo
 					}
 				}
 
-				for (const listItem of list) {
+				for (const listItem of list.items) {
 					itemCount++
 					if (itemCount > 50) break;
 
@@ -364,7 +364,13 @@ const expandContentItem = async ({ contentItem, languageCode, depth, expandAllCo
  * @param {number} [requestParams.skip] - The number of items to skip from the list. Used for implementing pagination.
  * @returns {Promise<[] | Object>} - Returns a list of content items, or, if skip or take has been specified, an object with an items array and totalCount property.
 */
-const getContentList = async ({ referenceName, languageCode, depth = 0, expandAllContentLinks = false, skip = -1, take = -1 }) => {
+const getContentList = async ({ referenceName, languageCode, depth, contentLinkDepth, expandAllContentLinks = false, skip = -1, take = -1 }) => {
+
+	if (depth === undefined && contentLinkDepth !== undefined) {
+		depth = contentLinkDepth
+	} else if (depth === undefined && contentLinkDepth === undefined) {
+		depth = 0
+	}
 
 	let lst = await store.getItem({
 		options,

package/test/04-store.getContentList.tests.js

@@ -42,5 +42,26 @@ describe('store.getContentList:', async function() {
 		assert.strictEqual(contentList.items.length, 1,  'retrieved only the item of the content list we asked for')
 
     })
+
+
+    it('should be able to expand a nested list with expandAllContentLinks', async function () {
+        var syncClient = createSyncClient();
+
+        const contentList = await syncClient.store.getContentList({
+            referenceName: 'listwithnestedcontentlink',
+            languageCode: languageCode,
+            depth: 10,
+            take: 50,
+            skip: 0,
+            expandAllContentLinks: true
+        })
+
+        assert.isAtLeast(contentList.totalCount, 1, 'retrieved the totalCount of the content list we asked for')
+        assert.exists(contentList.items, 'retrieved the items of the content list we asked for')
+        assert.exists(contentList.items[0].fields, 'retrieved the item of the content list we asked for')
+        assert.isAtLeast(contentList.items[0].fields.posts.length, 1, 'expanded the linked cotnent of the posts field')
+
+
+    })
 });
 

package/test/_syncClients.config.js

@@ -15,7 +15,8 @@ function createSyncClient() {
         apiKey: apiKeyFetch,
         isPreview: false,
         channels: [ 'website'],
-		languages: ['en-us']
+        languages: ['en-us'],
+        baseUrl: "https://api-dev.aglty.io"
 	});
 
     return syncClient;
@@ -31,7 +32,8 @@ function createSyncClientUsingConsoleStore() {
         store: {
             interface: storeInterfaceConsole,
             options: {}
-        }
+        },
+        baseUrl: "https://api-dev.aglty.io"
     });
     return syncClient;
 }
@@ -43,7 +45,8 @@ function createPreviewSyncClient() {
         apiKey: apiKeyPreview,
         isPreview: true,
         channels: [ 'website'],
-        languages: ['en-us']
+        languages: ['en-us'],
+        baseUrl: "https://api-dev.aglty.io"
     });
     return syncClient;
 }