Skip to content

Refactoring of charges #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Refactoring of charges #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1217aab
Allow imports relative to the root dir
antoineluong Apr 14, 2020
50f17ca
Refactoring of charges
antoineluong Apr 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module.exports = {
testEnvironment: 'jsdom',
moduleNameMapper: {
'\\.(css|less)$': 'identity-obj-proxy',
'~(.*)': '<rootDir>/src/$1',
},
modulePathIgnorePatterns: ['node_modules'],
setupFiles: ['./src/utils/tests/jest-polyfill.js'],
Expand Down
101 changes: 45 additions & 56 deletions src/app/blason-parser/blasonParser.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ import {
vert,
} from '../model/tincture';
import { Blason, QuarterlyBlason, SimpleBlason } from '../model/blason';
import { Cross } from '~/plugins/charges/cross/cross';
import { Escutcheon } from '~/plugins/charges/escutcheon/escutcheon';
import { FleurDeLys } from '~/plugins/charges/fleurdelys/fleurdelys';
import { Lion } from '~/plugins/charges/lion/lion';
import { Lozenge } from '~/plugins/charges/lozenge/lozenge';
import { Mullet } from '~/plugins/charges/mullet/mullet';
import { Roundel } from '~/plugins/charges/roundel/roundel';

describe('parseBlason', () => {
it('should parse a plain blason', () => {
Expand Down Expand Up @@ -73,15 +80,14 @@ describe('parseBlason', () => {
const expected: Blason = {
kind: 'simple',
field: { kind: 'plain', tincture: gules },
charge: {
name: 'lion',
charge: new Lion({
countAndDisposition: { count: 1, disposition: 'default' },
attitude: 'rampant',
head: null,
tail: null,
tincture: sable,
armedAndLangued: azure,
},
}),
};

expect(result).toEqual(expected);
Expand All @@ -92,15 +98,14 @@ describe('parseBlason', () => {
const expected: Blason = {
kind: 'simple',
field: { kind: 'plain', tincture: gules },
charge: {
name: 'lion',
charge: new Lion({
tincture: or,
armedAndLangued: azure,
attitude: 'passant',
tail: null,
head: 'guardant',
countAndDisposition: { count: 3, disposition: 'pale' },
},
}),
};

expect(result).toEqual(expected);
Expand Down Expand Up @@ -181,7 +186,7 @@ Argent, Azure, Barry, Barry and per chevron throughout, Barry and per pale, Barr
const expected: Blason = {
kind: 'simple',
field: { kind: 'party', per: { name: 'pale', tinctures: [azure, sable], line: 'straight' } },
charge: { name: 'fleurdelys', countAndDisposition: { count: 3, disposition: 'default' }, tincture: or },
charge: new FleurDeLys({ countAndDisposition: { count: 3, disposition: 'default' }, tincture: or }),
};

expect(result).toEqual(expected);
Expand All @@ -193,15 +198,14 @@ Argent, Azure, Barry, Barry and per chevron throughout, Barry and per pale, Barr
const expected: Blason = {
kind: 'simple',
field: { kind: 'plain', tincture: gules },
charge: {
name: 'lion',
charge: new Lion({
attitude: 'rampant',
tincture: or,
head: null,
tail: null,
armedAndLangued: gules,
countAndDisposition: { count: 1, disposition: 'default' },
},
}),
ordinary: {
line: 'engrailed',
name: 'bordure',
Expand All @@ -218,15 +222,14 @@ Argent, Azure, Barry, Barry and per chevron throughout, Barry and per pale, Barr
const expected: Blason = {
kind: 'simple',
field: { kind: 'plain', tincture: or },
charge: {
name: 'lion',
charge: new Lion({
attitude: 'rampant',
tincture: gules,
head: null,
tail: null,
armedAndLangued: azure,
countAndDisposition: { count: 1, disposition: 'default' },
},
}),
};
expect(result).toEqual(expected);
});
Expand Down Expand Up @@ -275,12 +278,11 @@ Argent, Azure, Barry, Barry and per chevron throughout, Barry and per pale, Barr
const expected: Blason = {
kind: 'simple',
field: { kind: 'plain', tincture: argent },
charge: {
name: 'roundel',
charge: new Roundel({
tincture: argent,
countAndDisposition: { count: 18, disposition: 'default' },
inside: 'nothing',
},
}),
};
expect(parseBlason('Argent, eighteen roundels argent')).toEqual(expected);
});
Expand All @@ -289,12 +291,11 @@ Argent, Azure, Barry, Barry and per chevron throughout, Barry and per pale, Barr
const expected: Blason = {
kind: 'simple',
field: { kind: 'plain', tincture: azure },
charge: {
name: 'roundel',
charge: new Roundel({
tincture: sable,
countAndDisposition: { count: 17, disposition: 'default' },
inside: 'voided',
},
}),
};
expect(parseBlason('Azure, seventeen annulets sable')).toEqual(expected);
});
Expand All @@ -303,7 +304,7 @@ Argent, Azure, Barry, Barry and per chevron throughout, Barry and per pale, Barr
const expected: Blason = {
kind: 'simple',
field: { kind: 'plain', tincture: azure },
charge: { name: 'fleurdelys', tincture: or, countAndDisposition: { count: 12, disposition: 'pale' } },
charge: new FleurDeLys({ tincture: or, countAndDisposition: { count: 12, disposition: 'pale' } }),
};
expect(parseBlason('Azure, twelve fleur de lys in pale or')).toEqual(expected);
});
Expand All @@ -313,12 +314,11 @@ Argent, Azure, Barry, Barry and per chevron throughout, Barry and per pale, Barr
kind: 'simple',
field: { kind: 'paly', tinctures: [argent, gules] },
ordinary: { name: 'chief', line: 'engrailed', tincture: sable, fimbriated: null, charge: null },
charge: {
name: 'lozenge',
charge: new Lozenge({
tincture: azure,
countAndDisposition: { count: 4, disposition: 'fess' },
inside: 'nothing',
},
}),
};
expect(parseBlason('Paly argent and gules, a chief engrailed sable, four lozenges in fess azure')).toEqual(
expected
Expand Down Expand Up @@ -390,12 +390,11 @@ Argent, Azure, Barry, Barry and per chevron throughout, Barry and per pale, Barr
const expected: Blason = {
kind: 'simple',
field: { kind: 'plain', tincture: gules },
charge: {
name: 'cross',
charge: new Cross({
limbs: 'hummetty',
tincture: or,
countAndDisposition: { count: 3, disposition: 'pale' },
},
}),
};
expect(parseBlason('Gules, three crosses hummetty in pale or ')).toEqual(expected);
});
Expand All @@ -404,12 +403,11 @@ Argent, Azure, Barry, Barry and per chevron throughout, Barry and per pale, Barr
const expected: Blason = {
kind: 'simple',
field: { kind: 'plain', tincture: gules },
charge: {
name: 'cross',
charge: new Cross({
limbs: 'potent',
tincture: argent,
countAndDisposition: { count: 1, disposition: 'default' },
},
}),
};
expect(parseBlason('Gules, a cross potent argent')).toEqual(expected);
});
Expand All @@ -429,15 +427,14 @@ Argent, Azure, Barry, Barry and per chevron throughout, Barry and per pale, Barr
const expected: Blason = {
kind: 'simple',
field: { kind: 'plain', tincture: gules },
charge: {
name: 'lion',
charge: new Lion({
attitude: 'passant',
tincture: or,
head: 'guardant',
tail: null,
armedAndLangued: gules,
countAndDisposition: { count: 1, disposition: 'default' },
},
}),
};
expect(parseBlason('Gules, a lion passant gardant or')).toEqual(expected);
});
Expand Down Expand Up @@ -508,30 +505,28 @@ Argent, Azure, Barry, Barry and per chevron throughout, Barry and per pale, Barr
{
kind: 'simple',
field: { kind: 'plain', tincture: or },
charge: {
name: 'lion',
charge: new Lion({
attitude: 'passant',
tincture: gules,
armedAndLangued: gules,
countAndDisposition: { count: 2, disposition: 'default' },
head: null,
tail: null,
},
}),
},
{ kind: 'simple', field: { kind: 'chequy', tinctures: [or, gules] } },
{ kind: 'simple', field: { kind: 'bendy', number: 10, tinctures: [or, gules], line: 'straight' } },
{
kind: 'simple',
field: { kind: 'plain', tincture: or },
charge: {
name: 'lion',
charge: new Lion({
attitude: 'rampant',
tincture: azure,
armedAndLangued: gules,
countAndDisposition: { count: 3, disposition: 'default' },
head: null,
tail: null,
},
}),
},
],
};
Expand Down Expand Up @@ -570,13 +565,12 @@ Argent, Azure, Barry, Barry and per chevron throughout, Barry and per pale, Barr
const expected: SimpleBlason = {
kind: 'simple',
field: { kind: 'plain', tincture: or },
charge: {
name: 'mullet',
charge: new Mullet({
points: 5,
countAndDisposition: { count: 1, disposition: 'default' },
tincture: argent,
inside: 'nothing',
},
}),
};

expect(parseBlason('Or, a mullet argent ')).toEqual(expected);
Expand All @@ -586,13 +580,12 @@ Argent, Azure, Barry, Barry and per chevron throughout, Barry and per pale, Barr
const expected: SimpleBlason = {
kind: 'simple',
field: { kind: 'plain', tincture: or },
charge: {
name: 'mullet',
charge: new Mullet({
points: 8,
countAndDisposition: { count: 2, disposition: 'pale' },
tincture: gules,
inside: 'nothing',
},
}),
};

expect(parseBlason('Or, two mullets of eight points in pale gules ')).toEqual(expected);
Expand All @@ -601,13 +594,12 @@ Argent, Azure, Barry, Barry and per chevron throughout, Barry and per pale, Barr
const expected: SimpleBlason = {
kind: 'simple',
field: { kind: 'plain', tincture: or },
charge: {
name: 'mullet',
charge: new Mullet({
points: 5,
countAndDisposition: { count: 1, disposition: 'default' },
tincture: gules,
inside: 'pierced',
},
}),
};

expect(parseBlason('Or, a mullet pierced gules ')).toEqual(expected);
Expand All @@ -616,13 +608,12 @@ Argent, Azure, Barry, Barry and per chevron throughout, Barry and per pale, Barr
const expected: SimpleBlason = {
kind: 'simple',
field: { kind: 'plain', tincture: or },
charge: {
name: 'mullet',
charge: new Mullet({
points: 6,
countAndDisposition: { count: 3, disposition: 'default' },
tincture: gules,
inside: 'pierced',
},
}),
};

expect(parseBlason('Or, three mullets of six points pierced gules ')).toEqual(expected);
Expand Down Expand Up @@ -812,11 +803,10 @@ Argent, Azure, Barry, Barry and per chevron throughout, Barry and per pale, Barr
const expected: SimpleBlason = {
kind: 'simple',
field: { kind: 'plain', tincture: argent },
charge: {
charge: new Escutcheon({
countAndDisposition: { disposition: 'default', count: 3 },
name: 'escutcheon',
tincture: gules,
},
}),
};

expect(parseBlason(' Argent, three escutcheons gules')).toEqual(expected);
Expand Down Expand Up @@ -1011,16 +1001,15 @@ Argent, Azure, Barry, Barry and per chevron throughout, Barry and per pale, Barr
line: 'straight',
tincture: azure,
fimbriated: null,
charge: {
name: 'mullet',
charge: new Mullet({
tincture: or,
countAndDisposition: {
count: 2,
disposition: 'default',
},
inside: 'nothing',
points: 5,
},
}),
},
};

Expand Down
24 changes: 5 additions & 19 deletions src/app/blason-parser/blasonParser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import * as P from 'parsimmon';
import { Blason, QuarterlyBlason, SimpleBlason } from '../model/blason';
import { Ordinary, OrdinaryCross } from '../model/ordinary';
import { Charge, Cross } from '../model/charge';
import { Charge } from '../model/charge';
import { ordinaryParser } from './ordinaryParser';
import { chargeParser, crossParser } from './chargeParser';
import { chargeParser } from './chargeParser';
import { fieldParser } from './fieldParser';
import { constStr } from './parser.helper';

Expand All @@ -15,16 +15,6 @@ type AppliedLanguage = { [K in keyof Language]: ReturnType<Language[K]> };

const language: Language = {
SimpleBlason(): P.Parser<SimpleBlason> {
// a cross depending on different thing, can be either and ordinary or chager
const crossParserToObj: P.Parser<{ charge: Cross } | { ordinary: OrdinaryCross }> = crossParser().map(
(crossPartial) => {
if ('limbs' in crossPartial) {
return { charge: crossPartial };
} else {
return { ordinary: crossPartial };
}
}
);
const ordinaryToObj = ordinaryParser().map((ordinary) => ({ ordinary }));
const chargeToObj = chargeParser().map((charge) => ({ charge }));

Expand All @@ -34,14 +24,10 @@ const language: Language = {
.trim(P.optWhitespace)
.chain(() =>
P.sepBy(
P.alt(crossParserToObj, ordinaryToObj, chargeToObj).fallback({}),
P.alt(chargeToObj, ordinaryToObj).fallback({}),
P.string(',').trim(P.optWhitespace)
).map(
(
arr: Array<
{ charge: Cross } | { ordinary: OrdinaryCross } | { ordinary?: Ordinary } | { charge?: Charge }
>
) => arr.reduce((acc, obj): { ordinary?: Ordinary; charge?: Charge } => ({ ...acc, ...obj }), {})
).map((arr: Array<{ ordinary: OrdinaryCross } | { ordinary?: Ordinary } | { charge?: Charge }>) =>
arr.reduce((acc, obj): { ordinary?: Ordinary; charge?: Charge } => ({ ...acc, ...obj }), {})
)
)
.fallback({})
Expand Down
Loading