fix: resolved conflicts and tested the changes

contentstack · Mar 28, 2023 · d0761f3 · d0761f3
2 parents 3482173 + 3913be7
commit d0761f3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "datasync-filesystem-sdk",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "JavaScript filesystem SDK to query data synced via @contentstack/datasync-content-store-filesystem",
   "main": "dist/index.js",
   "scripts": {

diff --git a/src/fs.ts b/src/fs.ts
@@ -15,11 +15,11 @@ import {
 
 const promisifiedReadFile = promisify(rf)
 
-export const readFile = async (path: string, type: string = 'utf-8') => {
+export const readFile = async (path: string) => {
   if (existsSync(path)) {
-    const contents: string = await promisifiedReadFile(path, type)
+    const contents: Buffer = await promisifiedReadFile(path)
 
-    return JSON.parse(contents)
+    return JSON.parse(contents.toString())
   }
 
   return []

diff --git a/typings/fs.d.ts b/typings/fs.d.ts
@@ -4,5 +4,5 @@
  * Copyright (c) Contentstack LLC
  * MIT Licensed
  */
-export declare const readFile: (path: string, type?: string) => Promise<any>;
+export declare const readFile: (path: string) => Promise<any>;
 export { existsSync, } from 'fs';
diff --git a/typings/utils.d.ts b/typings/utils.d.ts
@@ -4,7 +4,7 @@
  * Copyright (c) Contentstack LLC
  * MIT Licensed
  */
-export declare const difference: (obj: any, baseObj: any) => unknown[];
+export declare const difference: (obj: any, baseObj: any) => unknown;
 export declare const getBaseDir: ({ baseDir }: {
     baseDir: any;
 }) => {