@unchainedshop/core-files 2.0.0-beta7 → 2.0.0-beta9

package/jest.config.js

@@ -2,4 +2,13 @@
 export default {
   preset: 'ts-jest',
   testEnvironment: 'node',
+  extensionsToTreatAsEsm: ['.ts'],
+  transform: {
+    '^.+\\.tsx?$': [
+      'ts-jest',
+      {
+        useESM: true,
+      },
+    ],
+  },
 };

package/lib/module/configureFilesModule.js

@@ -28,7 +28,7 @@ export const configureFilesModule = async ({ db, options: filesOptions = {}, })
                     const finalURL = new URL(transformedURLString, process.env.ROOT_URL);
                     return finalURL.href;
                 }
-                catch (err) {
+                catch (e2) {
                     // else return the transformed string because it's not an URL
                     return transformedURLString;
                 }
@@ -37,38 +37,26 @@ export const configureFilesModule = async ({ db, options: filesOptions = {}, })
         findFile: async ({ fileId }, options) => {
             return Files.findOne(generateDbFilterById(fileId), options);
         },
-        findFiles: async (selector) => {
-            return Files.find(selector).toArray();
+        findFiles: async (selector, options) => {
+            return Files.find(selector, options).toArray();
         },
         deleteMany: async (fileIds) => {
-            await Files.deleteMany({ _id: { $in: fileIds } });
+            const deletionResult = await Files.deleteMany({ _id: { $in: fileIds } });
+            return deletionResult.deletedCount;
         },
-        findFilesByMetaData: async ({ meta }, options) => {
-            const metaKeys = Object.keys(meta);
-            if (metaKeys.length === 0)
-                return [];
-            const selector = metaKeys.reduce((currentSelector, key) => meta[key] !== undefined
-                ? {
-                    ...currentSelector,
-                    [`meta.${key}`]: meta[key],
-                }
-                : currentSelector, {});
-            const files = Files.find(selector, options);
-            return files.toArray();
-        },
-        create: async (doc, userId) => {
-            const fileId = await mutations.create(doc, userId);
-            emit('FILE_CREATE', { fileId });
+        create: async (doc) => {
+            const fileId = await mutations.create(doc);
+            await emit('FILE_CREATE', { fileId });
             return fileId;
         },
-        update: async (_id, doc, userId) => {
-            const fileId = await mutations.update(_id, { $set: doc }, userId);
-            emit('FILE_UPDATE', { fileId });
+        update: async (_id, doc) => {
+            const fileId = await mutations.update(_id, { $set: doc });
+            await emit('FILE_UPDATE', { fileId });
             return fileId;
         },
-        delete: async (fileId, userId) => {
-            const deletedCount = await mutations.delete(fileId, userId);
-            emit('FILE_REMOVE', { fileId });
+        delete: async (fileId) => {
+            const deletedCount = await mutations.delete(fileId);
+            await emit('FILE_REMOVE', { fileId });
             return deletedCount;
         },
         deletePermanently: mutations.deletePermanently,

package/lib/module/configureFilesModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"configureFilesModule.js","sourceRoot":"","sources":["../../src/module/configureFilesModule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"configureFilesModule.js","sourceRoot":"","sources":["../../src/module/configureFilesModule.ts"],"names":[],"mappings":"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"}

package/lib/service/createSignedURLService.js

@@ -1,11 +1,11 @@
 import { getFileAdapter } from '../utils/getFileAdapter';
 import { getFileFromFileData } from '../utils/getFileFromFileData';
-export const createSignedURLService = async ({ directoryName, fileName, meta, userId }, unchainedContext) => {
+export const createSignedURLService = async ({ directoryName, fileName, meta }, unchainedContext) => {
     const { modules: { files }, } = unchainedContext;
     const fileUploadAdapter = getFileAdapter();
     const preparedFileData = await fileUploadAdapter.createSignedURL(directoryName, fileName, unchainedContext);
     const fileData = getFileFromFileData(preparedFileData, meta);
-    const fileId = await files.create(fileData, userId);
+    const fileId = await files.create(fileData);
     const file = await files.findFile({ fileId });
     return {
         ...file,

package/lib/service/createSignedURLService.js.map

@@ -1 +1 @@
-{"version":3,"file":"createSignedURLService.js","sourceRoot":"","sources":["../../src/service/createSignedURLService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAEnE,MAAM,CAAC,MAAM,sBAAsB,GAA2B,KAAK,EACjE,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EACzC,gBAAgB,EAChB,EAAE;IACF,MAAM,EACJ,OAAO,EAAE,EAAE,KAAK,EAAE,GACnB,GAAG,gBAAgB,CAAC;IACrB,MAAM,iBAAiB,GAAG,cAAc,EAAE,CAAC;IAC3C,MAAM,gBAAgB,GAAG,MAAM,iBAAiB,CAAC,eAAe,CAC9D,aAAa,EACb,QAAQ,EACR,gBAAgB,CACjB,CAAC;IACF,MAAM,QAAQ,GAAG,mBAAmB,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACpD,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAE9C,OAAO;QACL,GAAG,IAAI;QACP,MAAM,EAAE,gBAAgB,CAAC,MAAgB;KAC1C,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"createSignedURLService.js","sourceRoot":"","sources":["../../src/service/createSignedURLService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAEnE,MAAM,CAAC,MAAM,sBAAsB,GAA2B,KAAK,EACjE,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,EACjC,gBAAgB,EAChB,EAAE;IACF,MAAM,EACJ,OAAO,EAAE,EAAE,KAAK,EAAE,GACnB,GAAG,gBAAgB,CAAC;IACrB,MAAM,iBAAiB,GAAG,cAAc,EAAE,CAAC;IAC3C,MAAM,gBAAgB,GAAG,MAAM,iBAAiB,CAAC,eAAe,CAC9D,aAAa,EACb,QAAQ,EACR,gBAAgB,CACjB,CAAC;IACF,MAAM,QAAQ,GAAG,mBAAmB,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAE9C,OAAO;QACL,GAAG,IAAI;QACP,MAAM,EAAE,gBAAgB,CAAC,MAAgB;KAC1C,CAAC;AACJ,CAAC,CAAC"}

package/lib/service/linkFileService.js

@@ -1,11 +1,11 @@
 import { FileDirector } from '@unchainedshop/file-upload';
-export const linkFileService = async ({ fileId, size, type }, requestContext) => {
-    const { modules: { files }, userId, } = requestContext;
+export const linkFileService = async ({ fileId, size, type }, unchainedAPI) => {
+    const { modules: { files }, } = unchainedAPI;
     const file = await files.findFile({ fileId });
     if (!file)
         throw new Error(`Media with id ${fileId} Not found`);
-    await files.update(file._id, { size, type, expires: null }, userId);
-    await FileDirector.getFileUploadCallback(file.path)(file, requestContext);
+    await files.update(file._id, { size, type, expires: null });
+    await FileDirector.getFileUploadCallback(file.path)(file, unchainedAPI);
     return files.findFile({ fileId });
 };
 //# sourceMappingURL=linkFileService.js.map

package/lib/service/linkFileService.js.map

@@ -1 +1 @@
-{"version":3,"file":"linkFileService.js","sourceRoot":"","sources":["../../src/service/linkFileService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,MAAM,CAAC,MAAM,eAAe,GAAoB,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,cAAc,EAAE,EAAE;IAC/F,MAAM,EACJ,OAAO,EAAE,EAAE,KAAK,EAAE,EAClB,MAAM,GACP,GAAG,cAAc,CAAC;IACnB,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9C,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,MAAM,YAAY,CAAC,CAAC;IAChE,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;IACpE,MAAM,YAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC1E,OAAO,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;AACpC,CAAC,CAAC"}
+{"version":3,"file":"linkFileService.js","sourceRoot":"","sources":["../../src/service/linkFileService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,MAAM,CAAC,MAAM,eAAe,GAAoB,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,YAAY,EAAE,EAAE;IAC7F,MAAM,EACJ,OAAO,EAAE,EAAE,KAAK,EAAE,GACnB,GAAG,YAAY,CAAC;IACjB,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9C,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,MAAM,YAAY,CAAC,CAAC;IAChE,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5D,MAAM,YAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IACxE,OAAO,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;AACpC,CAAC,CAAC"}

package/lib/service/removeFilesService.js

@@ -1,6 +1,6 @@
 import { getFileAdapter } from '../utils/getFileAdapter';
-export const removeFilesService = async ({ fileIds }, requestContext) => {
-    const { modules: { files }, } = requestContext;
+export const removeFilesService = async ({ fileIds }, unchainedAPI) => {
+    const { modules: { files }, } = unchainedAPI;
     if (fileIds && typeof fileIds !== 'string' && !Array.isArray(fileIds))
         throw Error('Media id/s to be removed not provided as a string or array');
     const selector = {
@@ -9,7 +9,7 @@ export const removeFilesService = async ({ fileIds }, requestContext) => {
     const fileUploadAdapter = getFileAdapter();
     const fileObjects = await files.findFiles(selector);
     try {
-        await fileUploadAdapter.removeFiles(fileObjects, requestContext);
+        await fileUploadAdapter.removeFiles(fileObjects, unchainedAPI);
     }
     catch (e) {
         console.warn(e); // eslint-disable-line

package/lib/service/removeFilesService.js.map

@@ -1 +1 @@
-{"version":3,"file":"removeFilesService.js","sourceRoot":"","sources":["../../src/service/removeFilesService.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,MAAM,CAAC,MAAM,kBAAkB,GAAuB,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,cAAc,EAAE,EAAE;IAC1F,MAAM,EACJ,OAAO,EAAE,EAAE,KAAK,EAAE,GACnB,GAAG,cAAc,CAAC;IAEnB,IAAI,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QACnE,MAAM,KAAK,CAAC,4DAA4D,CAAC,CAAC;IAE5E,MAAM,QAAQ,GAAU;QACtB,GAAG,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE;KACtB,CAAC;IAEF,MAAM,iBAAiB,GAAG,cAAc,EAAE,CAAC;IAE3C,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAEpD,IAAI;QACF,MAAM,iBAAiB,CAAC,WAAW,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;KAClE;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,sBAAsB;KACxC;IAED,MAAM,eAAe,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEtE,MAAM,KAAK,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IAExC,OAAO,eAAe,CAAC,MAAM,CAAC;AAChC,CAAC,CAAC"}
+{"version":3,"file":"removeFilesService.js","sourceRoot":"","sources":["../../src/service/removeFilesService.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,MAAM,CAAC,MAAM,kBAAkB,GAAuB,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,YAAY,EAAE,EAAE;IACxF,MAAM,EACJ,OAAO,EAAE,EAAE,KAAK,EAAE,GACnB,GAAG,YAAY,CAAC;IAEjB,IAAI,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QACnE,MAAM,KAAK,CAAC,4DAA4D,CAAC,CAAC;IAE5E,MAAM,QAAQ,GAAU;QACtB,GAAG,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE;KACtB,CAAC;IAEF,MAAM,iBAAiB,GAAG,cAAc,EAAE,CAAC;IAE3C,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAEpD,IAAI;QACF,MAAM,iBAAiB,CAAC,WAAW,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;KAChE;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,sBAAsB;KACxC;IAED,MAAM,eAAe,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEtE,MAAM,KAAK,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IAExC,OAAO,eAAe,CAAC,MAAM,CAAC;AAChC,CAAC,CAAC"}

package/lib/service/uploadFileFromStreamService.js

@@ -1,11 +1,11 @@
 import { getFileAdapter } from '../utils/getFileAdapter';
 import { getFileFromFileData } from '../utils/getFileFromFileData';
-export const uploadFileFromStreamService = async ({ directoryName, rawFile, meta, userId }, unchainedContext) => {
+export const uploadFileFromStreamService = async ({ directoryName, rawFile, meta }, unchainedContext) => {
     const { modules: { files }, } = unchainedContext;
     const fileUploadAdapter = getFileAdapter();
     const uploadFileData = await fileUploadAdapter.uploadFileFromStream(directoryName, rawFile, unchainedContext);
     const fileData = getFileFromFileData(uploadFileData, meta);
-    const fileId = await files.create(fileData, userId);
+    const fileId = await files.create(fileData);
     return files.findFile({ fileId });
 };
 //# sourceMappingURL=uploadFileFromStreamService.js.map

package/lib/service/uploadFileFromStreamService.js.map

@@ -1 +1 @@
-{"version":3,"file":"uploadFileFromStreamService.js","sourceRoot":"","sources":["../../src/service/uploadFileFromStreamService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAEnE,MAAM,CAAC,MAAM,2BAA2B,GAAgC,KAAK,EAC3E,EAAE,aAAa,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EACxC,gBAAgB,EAChB,EAAE;IACF,MAAM,EACJ,OAAO,EAAE,EAAE,KAAK,EAAE,GACnB,GAAG,gBAAgB,CAAC;IACrB,MAAM,iBAAiB,GAAG,cAAc,EAAE,CAAC;IAC3C,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,oBAAoB,CACjE,aAAa,EACb,OAAO,EACP,gBAAgB,CACjB,CAAC;IACF,MAAM,QAAQ,GAAG,mBAAmB,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACpD,OAAO,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;AACpC,CAAC,CAAC"}
+{"version":3,"file":"uploadFileFromStreamService.js","sourceRoot":"","sources":["../../src/service/uploadFileFromStreamService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAEnE,MAAM,CAAC,MAAM,2BAA2B,GAAgC,KAAK,EAC3E,EAAE,aAAa,EAAE,OAAO,EAAE,IAAI,EAAE,EAChC,gBAAgB,EAChB,EAAE;IACF,MAAM,EACJ,OAAO,EAAE,EAAE,KAAK,EAAE,GACnB,GAAG,gBAAgB,CAAC;IACrB,MAAM,iBAAiB,GAAG,cAAc,EAAE,CAAC;IAC3C,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,oBAAoB,CACjE,aAAa,EACb,OAAO,EACP,gBAAgB,CACjB,CAAC;IACF,MAAM,QAAQ,GAAG,mBAAmB,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC5C,OAAO,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;AACpC,CAAC,CAAC"}

package/lib/service/uploadFileFromURLService.js

@@ -1,11 +1,11 @@
 import { getFileAdapter } from '../utils/getFileAdapter';
 import { getFileFromFileData } from '../utils/getFileFromFileData';
-export const uploadFileFromURLService = async ({ directoryName, fileInput, meta, userId }, unchainedContext) => {
+export const uploadFileFromURLService = async ({ directoryName, fileInput, meta }, unchainedContext) => {
     const { modules: { files }, } = unchainedContext;
     const fileUploadAdapter = getFileAdapter();
     const uploadFileData = await fileUploadAdapter.uploadFileFromURL(directoryName, fileInput, unchainedContext);
     const fileData = getFileFromFileData(uploadFileData, meta);
-    const fileId = await files.create(fileData, userId);
+    const fileId = await files.create(fileData);
     return files.findFile({ fileId });
 };
 //# sourceMappingURL=uploadFileFromURLService.js.map

package/lib/service/uploadFileFromURLService.js.map

@@ -1 +1 @@
-{"version":3,"file":"uploadFileFromURLService.js","sourceRoot":"","sources":["../../src/service/uploadFileFromURLService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAEnE,MAAM,CAAC,MAAM,wBAAwB,GAA6B,KAAK,EACrE,EAAE,aAAa,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,EAC1C,gBAAgB,EAChB,EAAE;IACF,MAAM,EACJ,OAAO,EAAE,EAAE,KAAK,EAAE,GACnB,GAAG,gBAAgB,CAAC;IACrB,MAAM,iBAAiB,GAAG,cAAc,EAAE,CAAC;IAE3C,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,iBAAiB,CAC9D,aAAa,EACb,SAAS,EACT,gBAAgB,CACjB,CAAC;IACF,MAAM,QAAQ,GAAG,mBAAmB,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACpD,OAAO,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;AACpC,CAAC,CAAC"}
+{"version":3,"file":"uploadFileFromURLService.js","sourceRoot":"","sources":["../../src/service/uploadFileFromURLService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAEnE,MAAM,CAAC,MAAM,wBAAwB,GAA6B,KAAK,EACrE,EAAE,aAAa,EAAE,SAAS,EAAE,IAAI,EAAE,EAClC,gBAAgB,EAChB,EAAE;IACF,MAAM,EACJ,OAAO,EAAE,EAAE,KAAK,EAAE,GACnB,GAAG,gBAAgB,CAAC;IACrB,MAAM,iBAAiB,GAAG,cAAc,EAAE,CAAC;IAE3C,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,iBAAiB,CAC9D,aAAa,EACb,SAAS,EACT,gBAAgB,CACjB,CAAC;IACF,MAAM,QAAQ,GAAG,mBAAmB,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC5C,OAAO,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;AACpC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/core-files",
-  "version": "2.0.0-beta7",
+  "version": "2.0.0-beta9",
   "main": "lib/files-index.js",
   "exports": {
     ".": "./lib/files-index.js",
@@ -12,7 +12,8 @@
     "clean": "rm -rf lib",
     "build": "npm run clean && tsc",
     "watch": "tsc -w",
-    "test": "jest --watch"
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest --detectOpenHandles --forceExit",
+    "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch --detectOpenHandles --forceExit"
   },
   "repository": {
     "type": "git",
@@ -30,20 +31,20 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/events": "^2.0.0-beta7",
-    "@unchainedshop/file-upload": "^2.0.0-beta7",
-    "@unchainedshop/logger": "^2.0.0-beta7",
-    "@unchainedshop/utils": "^2.0.0-beta7",
+    "@unchainedshop/events": "^2.0.0-beta9",
+    "@unchainedshop/file-upload": "^2.0.0-beta9",
+    "@unchainedshop/logger": "^2.0.0-beta9",
+    "@unchainedshop/utils": "^2.0.0-beta9",
     "mime-types": "^2.1.35",
     "minio": "^7.0.32",
-    "simpl-schema": "^3.0.1"
+    "simpl-schema": "^3.2.0"
   },
   "devDependencies": {
-    "@types/minio": "^7.0.14",
-    "@types/node": "^18.11.9",
-    "@unchainedshop/types": "^2.0.0-beta7",
+    "@types/minio": "^7.0.15",
+    "@types/node": "^18.11.12",
+    "@unchainedshop/types": "^2.0.0-beta9",
     "jest": "^29.3.1",
     "ts-jest": "^29.0.3",
-    "typescript": "^4.8.4"
+    "typescript": "^4.9.4"
   }
 }

package/src/module/configureFilesModule.ts

@@ -1,4 +1,3 @@
-import { Query } from '@unchainedshop/types/common';
 import { ModuleInput, ModuleMutations } from '@unchainedshop/types/core';
 import { File, FilesModule, FilesSettingsOptions } from '@unchainedshop/types/files';
 import { emit, registerEvents } from '@unchainedshop/events';
@@ -37,7 +36,7 @@ export const configureFilesModule = async ({
           // else try to fix by using ROOT_URL env
           const finalURL = new URL(transformedURLString, process.env.ROOT_URL);
           return finalURL.href;
-        } catch (err) {
+        } catch (e2) {
           // else return the transformed string because it's not an URL
           return transformedURLString;
         }
@@ -48,48 +47,28 @@ export const configureFilesModule = async ({
       return Files.findOne(generateDbFilterById(fileId), options);
     },
 
-    findFiles: async (selector) => {
-      return Files.find(selector).toArray();
+    findFiles: async (selector, options) => {
+      return Files.find(selector, options).toArray();
     },
 
     deleteMany: async (fileIds) => {
-      await Files.deleteMany({ _id: { $in: fileIds } });
+      const deletionResult = await Files.deleteMany({ _id: { $in: fileIds } });
+      return deletionResult.deletedCount;
     },
 
-    findFilesByMetaData: async ({ meta }, options) => {
-      const metaKeys = Object.keys(meta);
-
-      if (metaKeys.length === 0) return [];
-
-      const selector: Query = metaKeys.reduce(
-        (currentSelector, key) =>
-          meta[key] !== undefined
-            ? {
-                ...currentSelector,
-                [`meta.${key}`]: meta[key],
-              }
-            : currentSelector,
-        {},
-      );
-
-      const files = Files.find(selector, options);
-
-      return files.toArray();
-    },
-
-    create: async (doc: File, userId: string) => {
-      const fileId = await mutations.create(doc, userId);
-      emit('FILE_CREATE', { fileId });
+    create: async (doc: File) => {
+      const fileId = await mutations.create(doc);
+      await emit('FILE_CREATE', { fileId });
       return fileId;
     },
-    update: async (_id: string, doc: File, userId: string) => {
-      const fileId = await mutations.update(_id, { $set: doc }, userId);
-      emit('FILE_UPDATE', { fileId });
+    update: async (_id: string, doc: File) => {
+      const fileId = await mutations.update(_id, { $set: doc });
+      await emit('FILE_UPDATE', { fileId });
       return fileId;
     },
-    delete: async (fileId: string, userId: string) => {
-      const deletedCount = await mutations.delete(fileId, userId);
-      emit('FILE_REMOVE', { fileId });
+    delete: async (fileId: string) => {
+      const deletedCount = await mutations.delete(fileId);
+      await emit('FILE_REMOVE', { fileId });
       return deletedCount;
     },
     deletePermanently: mutations.deletePermanently,

package/src/service/createSignedURLService.ts

@@ -3,7 +3,7 @@ import { getFileAdapter } from '../utils/getFileAdapter';
 import { getFileFromFileData } from '../utils/getFileFromFileData';
 
 export const createSignedURLService: CreateSignedURLService = async (
-  { directoryName, fileName, meta, userId },
+  { directoryName, fileName, meta },
   unchainedContext,
 ) => {
   const {
@@ -16,7 +16,7 @@ export const createSignedURLService: CreateSignedURLService = async (
     unchainedContext,
   );
   const fileData = getFileFromFileData(preparedFileData, meta);
-  const fileId = await files.create(fileData, userId);
+  const fileId = await files.create(fileData);
   const file = await files.findFile({ fileId });
 
   return {

package/src/service/linkFileService.ts

@@ -1,14 +1,13 @@
 import { LinkFileService } from '@unchainedshop/types/files';
 import { FileDirector } from '@unchainedshop/file-upload';
 
-export const linkFileService: LinkFileService = async ({ fileId, size, type }, requestContext) => {
+export const linkFileService: LinkFileService = async ({ fileId, size, type }, unchainedAPI) => {
   const {
     modules: { files },
-    userId,
-  } = requestContext;
+  } = unchainedAPI;
   const file = await files.findFile({ fileId });
   if (!file) throw new Error(`Media with id ${fileId} Not found`);
-  await files.update(file._id, { size, type, expires: null }, userId);
-  await FileDirector.getFileUploadCallback(file.path)(file, requestContext);
+  await files.update(file._id, { size, type, expires: null });
+  await FileDirector.getFileUploadCallback(file.path)(file, unchainedAPI);
   return files.findFile({ fileId });
 };

package/src/service/removeFilesService.ts

@@ -2,10 +2,10 @@ import { Query } from '@unchainedshop/types/common';
 import { RemoveFilesService } from '@unchainedshop/types/files';
 import { getFileAdapter } from '../utils/getFileAdapter';
 
-export const removeFilesService: RemoveFilesService = async ({ fileIds }, requestContext) => {
+export const removeFilesService: RemoveFilesService = async ({ fileIds }, unchainedAPI) => {
   const {
     modules: { files },
-  } = requestContext;
+  } = unchainedAPI;
 
   if (fileIds && typeof fileIds !== 'string' && !Array.isArray(fileIds))
     throw Error('Media id/s to be removed not provided as a string or array');
@@ -19,7 +19,7 @@ export const removeFilesService: RemoveFilesService = async ({ fileIds }, reques
   const fileObjects = await files.findFiles(selector);
 
   try {
-    await fileUploadAdapter.removeFiles(fileObjects, requestContext);
+    await fileUploadAdapter.removeFiles(fileObjects, unchainedAPI);
   } catch (e) {
     console.warn(e); // eslint-disable-line
   }

package/src/service/uploadFileFromStreamService.ts

@@ -3,7 +3,7 @@ import { getFileAdapter } from '../utils/getFileAdapter';
 import { getFileFromFileData } from '../utils/getFileFromFileData';
 
 export const uploadFileFromStreamService: UploadFileFromStreamService = async (
-  { directoryName, rawFile, meta, userId },
+  { directoryName, rawFile, meta },
   unchainedContext,
 ) => {
   const {
@@ -16,6 +16,6 @@ export const uploadFileFromStreamService: UploadFileFromStreamService = async (
     unchainedContext,
   );
   const fileData = getFileFromFileData(uploadFileData, meta);
-  const fileId = await files.create(fileData, userId);
+  const fileId = await files.create(fileData);
   return files.findFile({ fileId });
 };

package/src/service/uploadFileFromURLService.ts

@@ -3,7 +3,7 @@ import { getFileAdapter } from '../utils/getFileAdapter';
 import { getFileFromFileData } from '../utils/getFileFromFileData';
 
 export const uploadFileFromURLService: UploadFileFromURLService = async (
-  { directoryName, fileInput, meta, userId },
+  { directoryName, fileInput, meta },
   unchainedContext,
 ) => {
   const {
@@ -17,6 +17,6 @@ export const uploadFileFromURLService: UploadFileFromURLService = async (
     unchainedContext,
   );
   const fileData = getFileFromFileData(uploadFileData, meta);
-  const fileId = await files.create(fileData, userId);
+  const fileId = await files.create(fileData);
   return files.findFile({ fileId });
 };

package/tests/files-index.test.ts

@@ -1,29 +1,5 @@
-import { assert } from 'chai';
-import { initDb } from '@unchainedshop/mongodb';
-import {
-  configureFilesModule,
-  fileServices,
-} from '@unchainedshop/core-files';
-import { FilesModule } from '@unchainedshop/types/files';
-
-describe('Test exports', () => {
-  let module: FilesModule;
-
-  before(async () => {
-    const db = await initDb();
-    module = await configureFilesModule({ db });
-  });
-
-  it('Check files module', () => {
-    assert.ok(module);
-    assert.isFunction(module.findFile);
-    assert.isFunction(module.create);
-    assert.isFunction(module.update);
-    assert.isFunction(module.delete);
-  });
-
-  it('Check file services', () => {
-    assert.ok(fileServices);
-    assert.ok(fileServices.linkFileService);
+describe('Files', () => {
+  it('Init', async () => {
+    expect(true).toBeTruthy()
   });
 });