cozy-pouch-link 60.23.2 → 60.24.1

package/dist/files.js

@@ -23,19 +23,23 @@ exports.TYPE_FILE = TYPE_FILE;
 
 var queryFileById = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(client, id) {
-    var queryOpts;
+    var definition, options;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            queryOpts = {
+            definition = (0, _cozyClient.Q)('io.cozy.files').getById(id);
+            options = {
               as: "io.cozy.files/".concat(id),
               fetchPolicy: defaultFetchPolicy,
               singleDocData: true
             };
-            return _context.abrupt("return", client.query((0, _cozyClient.Q)('io.cozy.files').getById(id), queryOpts));
+            return _context.abrupt("return", client.fetchQueryAndGetFromState({
+              definition: definition,
+              options: options
+            }));
 
-          case 2:
+          case 3:
           case "end":
             return _context.stop();
         }

package/dist/files.spec.js

@@ -0,0 +1,25 @@
+import { Q } from 'cozy-client'
+
+import { queryFileById } from './files'
+
+describe('queryFileById', () => {
+  it('should call client.fetchQueryAndGetFromState with the expected definition and options', async () => {
+    const expectedResult = { data: { _id: 'parent', path: '/parent' } }
+    const client = {
+      fetchQueryAndGetFromState: jest.fn().mockResolvedValue(expectedResult)
+    }
+
+    const res = await queryFileById(client, 'parent')
+
+    expect(res).toBe(expectedResult)
+    expect(client.fetchQueryAndGetFromState).toHaveBeenCalledTimes(1)
+    expect(client.fetchQueryAndGetFromState).toHaveBeenCalledWith({
+      definition: expect.objectContaining(Q('io.cozy.files').getById('parent')),
+      options: {
+        as: 'io.cozy.files/parent',
+        fetchPolicy: expect.any(Function),
+        singleDocData: true
+      }
+    })
+  })
+})

package/dist/jsonapi.js

@@ -167,7 +167,7 @@ var buildPathWithName = function buildPathWithName(parentPath, fileName) {
 
 var computeFileFullpath = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(client, file) {
-    var _file$path, newPath, filePath, parentPath, builtPath, path, _yield$queryFileById, parentDir, _path;
+    var _file$path, newPath, filePath, parentPath, builtPath, path, result, parentDir, _path;
 
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
@@ -246,8 +246,8 @@ var computeFileFullpath = /*#__PURE__*/function () {
             return (0, _files.queryFileById)(client, file.dir_id);
 
           case 27:
-            _yield$queryFileById = _context.sent;
-            parentDir = _yield$queryFileById.data;
+            result = _context.sent;
+            parentDir = result === null || result === void 0 ? void 0 : result.data;
 
             if (parentDir !== null && parentDir !== void 0 && parentDir.path) {
               _path = buildPathWithName(parentDir.path, file.name);

package/dist/jsonapi.spec.js

@@ -719,4 +719,35 @@ describe('computeFileFullpath', () => {
     const res2 = await computeFileFullpath(client, updFile)
     expect(res2.path).toEqual('ROOT/MYDIR/file3.1')
   })
+
+  it('should return the file unchanged when queryFileById resolves to undefined', async () => {
+    // This happens offline when the link chain returns nothing for the
+    // parent dir lookup. Before the fix, destructuring `.data` from
+    // `undefined` crashed with "Cannot read property 'data' of undefined".
+    queryFileById.mockResolvedValue(undefined)
+    const file = {
+      _id: 'offline-file-1',
+      _type: 'io.cozy.files',
+      type: 'file',
+      dir_id: 'unknown-dir',
+      name: 'offline.txt'
+    }
+    const res = await computeFileFullpath(client, file)
+    expect(res).toBe(file)
+    expect(res.path).toBeUndefined()
+  })
+
+  it('should return the file unchanged when queryFileById resolves with null data', async () => {
+    queryFileById.mockResolvedValue({ data: null })
+    const file = {
+      _id: 'offline-file-2',
+      _type: 'io.cozy.files',
+      type: 'file',
+      dir_id: 'unknown-dir',
+      name: 'offline2.txt'
+    }
+    const res = await computeFileFullpath(client, file)
+    expect(res).toBe(file)
+    expect(res.path).toBeUndefined()
+  })
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-pouch-link",
-  "version": "60.23.2",
+  "version": "60.24.1",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -13,7 +13,7 @@
     "url": "git+https://github.com/linagora/cozy-client.git"
   },
   "dependencies": {
-    "cozy-client": "^60.23.2",
+    "cozy-client": "^60.24.0",
     "pouchdb-browser": "^7.2.2",
     "pouchdb-find": "^7.2.2"
   },
@@ -41,5 +41,5 @@
     "typecheck": "tsc -p tsconfig.json"
   },
   "sideEffects": false,
-  "gitHead": "973a40f4d79a8456961df6838c8391904a2b9720"
+  "gitHead": "97abc13aa043737c338d0e25694320432675b43a"
 }