Comparing version 2.6.0 to 2.7.0
@@ -44,3 +44,3 @@ #! /usr/bin/env node | ||
resolvedDirectories.forEach(({ rootPath, baseUrl }) => __awaiter(this, void 0, void 0, function* () { | ||
var _e; | ||
var _e, _f; | ||
// Build the directory tree. | ||
@@ -53,3 +53,3 @@ const rootTree = (0, fileTree_1.buildTree)(rootPath, barrelName, logger); | ||
// Potentially there are some existing barrels that need removing. | ||
(0, purge_1.purge)(rootTree, (_e = args.delete) !== null && _e !== void 0 ? _e : false, barrelName, logger); | ||
(0, purge_1.purge)(rootTree, (_e = args.delete) !== null && _e !== void 0 ? _e : false, (_f = args.noHeader) !== null && _f !== void 0 ? _f : false, barrelName, logger); | ||
// Create the barrels. | ||
@@ -56,0 +56,0 @@ const quoteCharacter = (0, quoteCharacter_1.getQuoteCharacter)(args.singleQuotes); |
import { Logger } from './options/logger'; | ||
import { Directory } from './interfaces/directory.interface'; | ||
export declare function purge(rootTree: Directory, shouldPurge: boolean, barrelName: string, logger: Logger): void; | ||
export declare function purge(rootTree: Directory, shouldPurge: boolean, noHeader: boolean, barrelName: string, logger: Logger): void; |
@@ -9,3 +9,3 @@ "use strict"; | ||
const fileTree_1 = require("./fileTree"); | ||
function purge(rootTree, shouldPurge, barrelName, logger) { | ||
function purge(rootTree, shouldPurge, noHeader, barrelName, logger) { | ||
// Delete any existing barrels. | ||
@@ -20,4 +20,6 @@ if (shouldPurge) { | ||
.filter(file => { | ||
const isGenerated = fs_1.default.readFileSync(file.path).includes('@file Automatically generated by barrelsby.'); | ||
return file.name === barrelName && isGenerated; | ||
if (noHeader) { | ||
return true; | ||
} | ||
return fs_1.default.readFileSync(file.path).includes('@file Automatically generated by barrelsby.'); | ||
}) | ||
@@ -24,0 +26,0 @@ .forEach((file) => { |
{ | ||
"name": "barrelsby", | ||
"version": "2.6.0", | ||
"version": "2.7.0", | ||
"description": "Automatic TypeScript barrels for your entire code base", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -78,3 +78,3 @@ import * as Destinations from './destinations'; | ||
expect(getDestinationsSpy.calledOnceWithExactly(builtTree, args.location, barrelName, signale)).toBeTruthy(); | ||
expect(purgeSpy.calledOnceWithExactly(builtTree, args.delete, barrelName, signale)).toBeTruthy(); | ||
expect(purgeSpy.calledOnceWithExactly(builtTree, args.delete, args.noHeader, barrelName, signale)).toBeTruthy(); | ||
expect(buildBarrelsSpy).toHaveBeenCalledWith({ | ||
@@ -81,0 +81,0 @@ addHeader: true, |
@@ -49,3 +49,3 @@ #! /usr/bin/env node | ||
// Potentially there are some existing barrels that need removing. | ||
purge(rootTree, args.delete ?? false, barrelName, logger); | ||
purge(rootTree, args.delete ?? false, args.noHeader ?? false, barrelName, logger); | ||
@@ -52,0 +52,0 @@ // Create the barrels. |
@@ -16,2 +16,3 @@ import fs from 'fs'; | ||
const barrelName = 'barrel.ts'; | ||
const barrelNoHeaderName = 'index.ts'; | ||
beforeEach(() => { | ||
@@ -28,3 +29,3 @@ MockFs(TestUtilities.mockFsConfiguration()); | ||
it('should delete existing barrels if the delete flag is enabled', () => { | ||
Purge.purge(directory, true, barrelName, logger); | ||
Purge.purge(directory, true, false, barrelName, logger); | ||
@@ -39,3 +40,3 @@ // Check directory has been manipulated. | ||
it('should do nothing if the delete flag is disabled', () => { | ||
Purge.purge(directory, false, barrelName, logger); | ||
Purge.purge(directory, false, false, barrelName, logger); | ||
@@ -50,7 +51,17 @@ // Check directory has not been manipulated. | ||
it('should log useful information to the logger', () => { | ||
Purge.purge(directory, true, barrelName, logger); | ||
Purge.purge(directory, true, false, barrelName, logger); | ||
expect(loggerSpy).toHaveBeenCalledTimes(2); | ||
}); | ||
it('should delete files without header if noHeader flag is enabled', () => { | ||
Purge.purge(directory, true, true, barrelNoHeaderName, logger); | ||
// Check directory has been manipulated. | ||
expect(directory.files.length).toBe(2); | ||
expect(directory.files.filter(file => file.name === 'index.ts').length).toBe(0); | ||
// Check FS has been manipulated. | ||
expect(fs.existsSync('directory/index.ts')).toBeFalsy(); | ||
}); | ||
}); | ||
}); |
@@ -8,3 +8,3 @@ import fs from 'fs'; | ||
export function purge(rootTree: Directory, shouldPurge: boolean, barrelName: string, logger: Logger) { | ||
export function purge(rootTree: Directory, shouldPurge: boolean, noHeader: boolean, barrelName: string, logger: Logger) { | ||
// Delete any existing barrels. | ||
@@ -19,4 +19,6 @@ if (shouldPurge) { | ||
.filter(file => { | ||
const isGenerated = fs.readFileSync(file.path).includes('@file Automatically generated by barrelsby.'); | ||
return file.name === barrelName && isGenerated; | ||
if(noHeader) { | ||
return true; | ||
} | ||
return fs.readFileSync(file.path).includes('@file Automatically generated by barrelsby.'); | ||
}) | ||
@@ -23,0 +25,0 @@ .forEach((file: FileTreeLocation) => { |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
167428
3011