diff --git a/package-lock.json b/package-lock.json index 6a31ecf4..23af300c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "json-mask": "0.3.8", "lodash": "^4.17.21", - "mkdirp": "^1.0.4", + "mkdirp": "^2.0.0", "sift": "8.5.0" }, "devDependencies": { @@ -2618,6 +2618,18 @@ "node": ">=8" } }, + "node_modules/jsdoc/node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true, + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", @@ -2844,14 +2856,17 @@ "dev": true }, "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-2.0.0.tgz", + "integrity": "sha512-M9ecBPkCu6jZ+H19zruhjw/JB97qqVhyi1H2Lxxo2XAoIMdpHKQ8MfQiMzXk9SH/oJXIbM3oSAfLB8qSWJdCLA==", "bin": { - "mkdirp": "bin/cmd.js" + "mkdirp": "dist/cjs/bin.js" }, "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/ms": { @@ -5985,6 +6000,12 @@ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", "dev": true + }, + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true } } }, @@ -6169,9 +6190,9 @@ "dev": true }, "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-2.0.0.tgz", + "integrity": "sha512-M9ecBPkCu6jZ+H19zruhjw/JB97qqVhyi1H2Lxxo2XAoIMdpHKQ8MfQiMzXk9SH/oJXIbM3oSAfLB8qSWJdCLA==" }, "ms": { "version": "2.1.2", diff --git a/package.json b/package.json index d74c8ac1..6fd2cbf8 100644 --- 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": { @@ -27,7 +27,7 @@ "dependencies": { "json-mask": "0.3.8", "lodash": "^4.17.21", - "mkdirp": "^1.0.4", + "mkdirp": "^2.0.0", "sift": "8.5.0" }, "devDependencies": { diff --git a/src/fs.ts b/src/fs.ts index 2dd263b8..ce72dfd1 100644 --- 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 index 293f6e98..af3b108c 100644 --- 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; +export declare const readFile: (path: string) => Promise; export { existsSync, } from 'fs'; diff --git a/typings/utils.d.ts b/typings/utils.d.ts index 99c18520..f67aed4a 100644 --- 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; }) => {