Skip to content

Commit 6d8ca52

Browse files
author
Lars Kölpin-Freese
committed
refactor: use prettier
1 parent 0140800 commit 6d8ca52

File tree

11 files changed

+760
-671
lines changed

11 files changed

+760
-671
lines changed

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
src/pattern-tree.snapshot.ts

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"scripts": {
88
"build": "webpack -p && webpack -p --config webpack.config.browser.js",
99
"prepublish": "npm run test && webpack -p",
10+
"prettier": "prettier --write \"{src,__{tests,mocks}__}/**/*.{tsx,ts}\"",
1011
"gen-tree": "ts-node ./src/create-snapshot.ts",
1112
"start": "babel-node example/node.js",
1213
"test": "jest",
@@ -45,7 +46,7 @@
4546
"babel-preset-env": "^1.6.1",
4647
"babel-preset-flow": "^6.23.0",
4748
"jest": "^27.0.6",
48-
"prettier": "^1.11.1",
49+
"prettier": "^1.19.1",
4950
"regenerator-runtime": "^0.11.1",
5051
"ts-jest": "^27.0.5",
5152
"typescript": "^4.3.5",

src/create-snapshot.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import tree from './model/pattern-tree';
1+
import tree from "./model/pattern-tree";
22

3-
require('fs')
4-
.createWriteStream(__dirname + '/pattern-tree.snapshot.ts')
3+
require("fs")
4+
.createWriteStream(__dirname + "/pattern-tree.snapshot.ts")
55
.write(
6-
'// THIS FILE IS AUTOGENERATED. DO NOT EDIT\nexport default ' +
7-
JSON.stringify(tree())
6+
"// THIS FILE IS AUTOGENERATED. DO NOT EDIT\nexport default " +
7+
JSON.stringify(tree()) +
8+
"\n"
89
);

src/index.spec.ts

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,50 @@
1-
import {filetypeinfo, filetypename, filetypemime, filetypeextension} from './index';
1+
import {
2+
filetypeinfo,
3+
filetypename,
4+
filetypemime,
5+
filetypeextension
6+
} from "./index";
27

38
describe("Tests the public API", () => {
49
it("filetypeinfo", () => {
5-
const bytes = [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a];
6-
expect(filetypeinfo(bytes)).toHaveLength(1)
7-
expect(filetypeinfo(bytes)[0]).toHaveProperty("typename")
8-
})
10+
const bytes = [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a];
11+
expect(filetypeinfo(bytes)).toHaveLength(1);
12+
expect(filetypeinfo(bytes)[0]).toHaveProperty("typename");
13+
});
914

1015
it("filetypename", () => {
1116
const bytes = [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a];
12-
expect(filetypename(bytes)).toHaveLength(1)
13-
expect(filetypename(bytes)).toEqual(["png"])
14-
})
15-
17+
expect(filetypename(bytes)).toHaveLength(1);
18+
expect(filetypename(bytes)).toEqual(["png"]);
19+
});
1620

1721
it("filetypename failure", () => {
1822
const bytes = [0x89, 0x00, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a];
19-
expect(filetypename(bytes)).toHaveLength(0)
20-
expect(filetypename(bytes)).toEqual([])
21-
})
23+
expect(filetypename(bytes)).toHaveLength(0);
24+
expect(filetypename(bytes)).toEqual([]);
25+
});
2226

23-
it('filetypemime', () => {
27+
it("filetypemime", () => {
2428
const bytes = [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a];
25-
expect(filetypemime(bytes)).toHaveLength(1)
26-
expect(filetypemime(bytes)).toEqual(["image/png"])
27-
})
29+
expect(filetypemime(bytes)).toHaveLength(1);
30+
expect(filetypemime(bytes)).toEqual(["image/png"]);
31+
});
2832

29-
it('filetypemime not found', () => {
33+
it("filetypemime not found", () => {
3034
const bytes = [0x89, 0x50, 0x00, 0x47, 0x00, 0x0a, 0x1a, 0x0a];
31-
expect(filetypemime(bytes)).toHaveLength(0)
32-
expect(filetypemime(bytes)).toEqual([])
33-
})
35+
expect(filetypemime(bytes)).toHaveLength(0);
36+
expect(filetypemime(bytes)).toEqual([]);
37+
});
3438

35-
it('filetypeextension', () => {
39+
it("filetypeextension", () => {
3640
const bytes = [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a];
37-
expect(filetypeextension(bytes)).toHaveLength(1)
38-
expect(filetypeextension(bytes)).toEqual(["png"])
39-
})
41+
expect(filetypeextension(bytes)).toHaveLength(1);
42+
expect(filetypeextension(bytes)).toEqual(["png"]);
43+
});
4044

4145
it("filetypextension not found", () => {
4246
const bytes = [0x89, 0x50, 0x4e, 0x47, 0x00, 0x0a, 0x1a, 0x0a];
43-
expect(filetypeextension(bytes)).toHaveLength(0)
44-
expect(filetypeextension(bytes)).toEqual([])
45-
})
46-
})
47+
expect(filetypeextension(bytes)).toHaveLength(0);
48+
expect(filetypeextension(bytes)).toEqual([]);
49+
});
50+
});

src/index.ts

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
import patternTree from './pattern-tree.snapshot';
2-
import {Leaf, Node} from "./model/tree";
1+
import patternTree from "./pattern-tree.snapshot";
2+
import { Leaf, Node } from "./model/tree";
33

44
const hex = num => new Number(num).toString(16).toLowerCase();
5-
const toHex = num => `0x${hex(num).length === 1 ? '0' + hex(num) : hex(num)}`;
5+
const toHex = num => `0x${hex(num).length === 1 ? "0" + hex(num) : hex(num)}`;
66

77
export const filetypeinfo = (bytes: number[]): Leaf[] => {
88
let currentByteIndex = 0;
99
let guessFile = [];
1010
let step: Node = patternTree;
1111
while (true) {
1212
const currentByte = toHex(bytes[currentByteIndex]);
13-
if (step.bytes['?'] && !step.bytes[currentByte]) {
14-
step = step.bytes['?'];
13+
if (step.bytes["?"] && !step.bytes[currentByte]) {
14+
step = step.bytes["?"];
1515
} else {
1616
step = step.bytes[currentByte];
1717
}
@@ -28,6 +28,9 @@ export const filetypeinfo = (bytes: number[]): Leaf[] => {
2828
};
2929
export default filetypeinfo;
3030

31-
export const filetypename = (bytes: any[]): string[] => filetypeinfo(bytes).map(e => e.typename)
32-
export const filetypemime = (bytes: any[]): string[] => filetypeinfo(bytes).map(e => e.mime ? e.mime : "")
33-
export const filetypeextension = (bytes: any[]): string[] => filetypeinfo(bytes).map(e => e.extension ? e.extension : "")
31+
export const filetypename = (bytes: any[]): string[] =>
32+
filetypeinfo(bytes).map(e => e.typename);
33+
export const filetypemime = (bytes: any[]): string[] =>
34+
filetypeinfo(bytes).map(e => (e.mime ? e.mime : ""));
35+
export const filetypeextension = (bytes: any[]): string[] =>
36+
filetypeinfo(bytes).map(e => (e.extension ? e.extension : ""));

src/model/pattern-tree.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import snapshot from '../pattern-tree.snapshot';
2-
import tree from './pattern-tree';
1+
import snapshot from "../pattern-tree.snapshot";
2+
import tree from "./pattern-tree";
33

4-
describe('Integrate all types', () => {
5-
it('Creates a whole tree', () => {
4+
describe("Integrate all types", () => {
5+
it("Creates a whole tree", () => {
66
expect(tree()).toEqual(snapshot);
77
});
88
});

0 commit comments

Comments
 (0)