Remove most dependency on fs-extra
This commit is contained in:
parent
d0544aa518
commit
99793599dd
28
index.js
28
index.js
@ -1,12 +1,27 @@
|
|||||||
//Modules
|
//Modules
|
||||||
const AdmZip = require('adm-zip');
|
const AdmZip = require('adm-zip');
|
||||||
const fs = require('fs-extra');
|
const { emptyDirSync } = require('fs-extra');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const pcbStackup = require('pcb-stackup');
|
const pcbStackup = require('pcb-stackup');
|
||||||
const sharp = require('sharp');
|
const sharp = require('sharp');
|
||||||
const { Readable } = require('stream');
|
const { Readable } = require('node:stream');
|
||||||
const { Buffer } = require('node:buffer');
|
const { Buffer } = require('node:buffer');
|
||||||
const { existsSync, accessSync, constants } = require('node:fs');
|
const {
|
||||||
|
existsSync,
|
||||||
|
accessSync,
|
||||||
|
createReadStream,
|
||||||
|
mkdirSync,
|
||||||
|
chmodSync,
|
||||||
|
constants,
|
||||||
|
} = require('node:fs');
|
||||||
|
|
||||||
|
//ensureDirSync method
|
||||||
|
function ensureDirSync(directory) {
|
||||||
|
if (!existsSync(directory)) {
|
||||||
|
mkdirSync(directory, { recursive: true });
|
||||||
|
chmodSync(directory, 0o644);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//Class definition
|
//Class definition
|
||||||
class ImageGenerator {
|
class ImageGenerator {
|
||||||
@ -105,7 +120,7 @@ class ImageGenerator {
|
|||||||
// Construct array of layers that match the supplied filenames array
|
// Construct array of layers that match the supplied filenames array
|
||||||
const layers = layerNames.map((layerName) => ({
|
const layers = layerNames.map((layerName) => ({
|
||||||
filename: layerName,
|
filename: layerName,
|
||||||
gerber: fs.createReadStream(path.join(dir, layerName)),
|
gerber: createReadStream(path.join(dir, layerName)),
|
||||||
}));
|
}));
|
||||||
return resolve(layers);
|
return resolve(layers);
|
||||||
});
|
});
|
||||||
@ -118,7 +133,7 @@ class ImageGenerator {
|
|||||||
static cleanupFiles(dir) {
|
static cleanupFiles(dir) {
|
||||||
try {
|
try {
|
||||||
const folder = path.join(dir, 'archive');
|
const folder = path.join(dir, 'archive');
|
||||||
fs.emptyDirSync(folder);
|
emptyDirSync(folder);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw new Error(err);
|
throw new Error(err);
|
||||||
}
|
}
|
||||||
@ -133,7 +148,8 @@ class ImageGenerator {
|
|||||||
gerberToImage(gerber) {
|
gerberToImage(gerber) {
|
||||||
// Create output dir if it doesn't exist
|
// Create output dir if it doesn't exist
|
||||||
try {
|
try {
|
||||||
fs.ensureDirSync(this.imgDir, 0o644);
|
// fs.ensureDirSync(this.imgDir, 0o644);
|
||||||
|
ensureDirSync(this.imgDir);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
throw new Error(e);
|
throw new Error(e);
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
/* eslint-disable */
|
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const fs = require('fs-extra');
|
const { readdirSync, ReadStream } = require('node:fs');
|
||||||
const { readdirSync, Dirent } = require('node:fs');
|
const { Readable } = require('node:stream');
|
||||||
const Readable = require('stream').Readable;
|
|
||||||
const { ImageGenerator } = require('../index.js');
|
const { ImageGenerator } = require('../index.js');
|
||||||
require('../index.js');
|
require('../index.js');
|
||||||
|
|
||||||
@ -121,7 +119,7 @@ describe('Getting layers', () => {
|
|||||||
expect.arrayContaining([
|
expect.arrayContaining([
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
filename: expect.any(String),
|
filename: expect.any(String),
|
||||||
gerber: expect.any(fs.ReadStream),
|
gerber: expect.any(ReadStream),
|
||||||
}),
|
}),
|
||||||
]),
|
]),
|
||||||
);
|
);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user