@sigil-sifter/magic 1.0.0 → 1.0.2

package/src/extensions/FormatExtension.js

@@ -1,15 +1,15 @@
-import defaultGameFormats from '../data/gameFormats.js';
-
-export default class FormatExtension {
-    constructor(data) {
-        this.gameFormats = data.gameFormats || defaultGameFormats;
-        this.gameFormats.forEach(format => {
-            if (format.expr) return;
-            format.expr = new RegExp(`^${format.name}$`, 'i')
-        });
-    }
-
-    resolveFormat(value) {
-        return this.gameFormats.find(g => g.expr.test(value));
-    }
-}
+import defaultGameFormats from '../data/gameFormats.js';
+
+export default class FormatExtension {
+    constructor(data) {
+        this.gameFormats = data.gameFormats || defaultGameFormats;
+        this.gameFormats.forEach(format => {
+            if (format.expr) return;
+            format.expr = new RegExp(`^${format.name}$`, 'i')
+        });
+    }
+
+    resolveFormat(value) {
+        return this.gameFormats.find(g => g.expr.test(value));
+    }
+}

package/src/extensions/GameExtension.js

@@ -1,15 +1,15 @@
-import defaultGames from '../data/games.js';
-
-export default class GameExtension {
-    constructor(data) {
-        this.games = data.games || defaultGames;
-        this.games.forEach(g => {
-            if (g.expr) return;
-            g.expr = new RegExp(`^${g.name}$`, 'i')
-        });
-    }
-
-    resolveGame(value) {
-        return this.games.find(g => g.expr.test(value));
-    }
-}
+import defaultGames from '../data/games.js';
+
+export default class GameExtension {
+    constructor(data) {
+        this.games = data.games || defaultGames;
+        this.games.forEach(g => {
+            if (g.expr) return;
+            g.expr = new RegExp(`^${g.name}$`, 'i')
+        });
+    }
+
+    resolveGame(value) {
+        return this.games.find(g => g.expr.test(value));
+    }
+}

package/src/extensions/KeywordExtension.js

@@ -1,11 +1,11 @@
-import defaultAbilityWords from '../data/abilityWords.js';
-
-export default class KeywordExtension {
-    constructor(data) {
-        this.abilityWords = data.abilityWords || defaultAbilityWords;
-    }
-
-    isAbilityWord(str) {
-        return this.abilityWords.includes(str);
-    }
-}
+import defaultAbilityWords from '../data/abilityWords.js';
+
+export default class KeywordExtension {
+    constructor(data) {
+        this.abilityWords = data.abilityWords || defaultAbilityWords;
+    }
+
+    isAbilityWord(str) {
+        return this.abilityWords.includes(str);
+    }
+}

package/src/extensions/LanguageExtension.js

@@ -1,15 +1,15 @@
-import defaultLanguages from '../data/languages.js';
-
-export default class LanguageExtension {
-    constructor(data) {
-        this.languages = data.languages || defaultLanguages;
-    }
-
-    resolveLanguage(str) {
-        const lcStr = str.toLowerCase();
-        return this.languages.find(lang => {
-            return lang.acronyms.includes(lcStr)
-                || lang.expr.test(str);
-        });
-    }
-}
+import defaultLanguages from '../data/languages.js';
+
+export default class LanguageExtension {
+    constructor(data) {
+        this.languages = data.languages || defaultLanguages;
+    }
+
+    resolveLanguage(str) {
+        const lcStr = str.toLowerCase();
+        return this.languages.find(lang => {
+            return lang.acronyms.includes(lcStr)
+                || lang.expr.test(str);
+        });
+    }
+}

package/src/extensions/RarityExtension.js

@@ -1,20 +1,20 @@
-import defaultRarities from '../data/rarities.js';
-
-export default class RarityExtension {
-    constructor(data) {
-        this.rarities = data.rarities || defaultRarities;
-        this.rarities.forEach(r => {
-            if (r.expr) return;
-            r.expr = new RegExp(`^(${r.char}|${r.name})$`, 'i')
-        });
-    }
-
-    resolveRarity(value) {
-        return this.rarities.find(r => r.expr.test(value));
-    }
-
-    get rarityExpr() {
-        const namesAndChars = this.rarities.flatMap(r => [r.char, r.name]);
-        return new RegExp(`^(${namesAndChars.join('|')})$`, 'i');
-    }
-}
+import defaultRarities from '../data/rarities.js';
+
+export default class RarityExtension {
+    constructor(data) {
+        this.rarities = data.rarities || defaultRarities;
+        this.rarities.forEach(r => {
+            if (r.expr) return;
+            r.expr = new RegExp(`^(${r.char}|${r.name})$`, 'i')
+        });
+    }
+
+    resolveRarity(value) {
+        return this.rarities.find(r => r.expr.test(value));
+    }
+
+    get rarityExpr() {
+        const namesAndChars = this.rarities.flatMap(r => [r.char, r.name]);
+        return new RegExp(`^(${namesAndChars.join('|')})\\b`, 'i');
+    }
+}

package/src/extensions/SetExtension.js

@@ -1,13 +1,13 @@
-export default class SetExtension {
-    constructor(data) {
-        this.sets = data.sets || [];
-        this.sets.forEach(set => {
-            if (set.expr) return;
-            set.expr = new RegExp(`^(${set.name}|${set.code})$`, 'i');
-        });
-    }
-
-    resolveSet(str) {
-        return this.sets.find(set => set.expr.test(str));
-    }
-}
+export default class SetExtension {
+    constructor(data) {
+        this.sets = data.sets || [];
+        this.sets.forEach(set => {
+            if (set.expr) return;
+            set.expr = new RegExp(`^(${set.name}|${set.code})$`, 'i');
+        });
+    }
+
+    resolveSet(str) {
+        return this.sets.find(set => set.expr.test(str));
+    }
+}

package/src/index.js

@@ -1,36 +1,30 @@
-import MagicCard from './core/MagicCard.js';
-import ColorExtension from './extensions/ColorExtension.js';
-import FormatExtension from './extensions/FormatExtension.js';
-import GameExtension from './extensions/GameExtension.js';
-import KeywordExtension from './extensions/KeywordExtension.js';
-import LanguageExtension from './extensions/LanguageExtension.js';
-import RarityExtension from './extensions/RarityExtension.js';
-import SetExtension from './extensions/SetExtension.js';
-import * as keywords from './keywords/index.js';
-
-export default function register(sifter, Card, data = {}) {
-    if (!Card)
-        throw new Error('A valid Card class must be provided.');
-    if (!(Card.prototype instanceof MagicCard))
-        throw new Error('Card class must inherit from MagicCard');
-
-    sifter.addKeywords(Object.values(keywords));
-
-    sifter.setBaseStringParser((sifter, operator, expression) => {
-        const keyword = new keywords.NameKeyword(sifter);
-        keyword.operator = operator;
-        keyword.expression = expression;
-        keyword.remainingStr = expression.remainingStr;
-        return keyword;
-    });
-
-    sifter.setInputAdapter(Card);
-
-    sifter.extend(ColorExtension, data);
-    sifter.extend(FormatExtension, data);
-    sifter.extend(GameExtension, data);
-    sifter.extend(KeywordExtension, data);
-    sifter.extend(LanguageExtension, data);
-    sifter.extend(SetExtension, data);
-    sifter.extend(RarityExtension, data);
-};
+import ColorExtension from './extensions/ColorExtension.js';
+import FormatExtension from './extensions/FormatExtension.js';
+import GameExtension from './extensions/GameExtension.js';
+import KeywordExtension from './extensions/KeywordExtension.js';
+import LanguageExtension from './extensions/LanguageExtension.js';
+import RarityExtension from './extensions/RarityExtension.js';
+import SetExtension from './extensions/SetExtension.js';
+import * as keywords from './keywords/index.js';
+
+export default function register(sifter, Card, data = {}) {
+    sifter.addKeywords(Object.values(keywords));
+
+    sifter.setBaseStringParser((sifter, operator, expression) => {
+        const keyword = new keywords.NameKeyword(sifter);
+        keyword.operator = operator;
+        keyword.expression = expression;
+        keyword.remainingStr = expression.remainingStr;
+        return keyword;
+    });
+
+    if (Card) sifter.setInputAdapter(Card);
+
+    sifter.extend(ColorExtension, data);
+    sifter.extend(FormatExtension, data);
+    sifter.extend(GameExtension, data);
+    sifter.extend(KeywordExtension, data);
+    sifter.extend(LanguageExtension, data);
+    sifter.extend(SetExtension, data);
+    sifter.extend(RarityExtension, data);
+};

package/src/keywords/AbilityKeyword.js

@@ -1,16 +1,16 @@
-import { Keyword } from 'sigil-sifter/keywords';
-import KeywordAbilityExpression from '../expressions/KeywordAbilityExpression.js';
-
-export default class AbilityKeyword extends Keyword {
-    static get keys() {
-        return ['keyword', 'kw'];
-    }
-
-    static get supportedExpressions() {
-        return [KeywordAbilityExpression];
-    }
-
-    test(card) {
-        return this.operator.testValue(card.keywords, this.expression);
-    }
-}
+import { Keyword } from 'sigil-sifter/keywords';
+import KeywordAbilityExpression from '../expressions/KeywordAbilityExpression.js';
+
+export default class AbilityKeyword extends Keyword {
+    static get keys() {
+        return ['keyword', 'kw'];
+    }
+
+    static get supportedExpressions() {
+        return [KeywordAbilityExpression];
+    }
+
+    test(card) {
+        return this.operator.testValue(card.keywords, this.expression);
+    }
+}

package/src/keywords/ArtistKeyword.js

@@ -1,11 +1,11 @@
-import { StringKeyword } from 'sigil-sifter/keywords';
-
-export default class ArtistKeyword extends StringKeyword {
-    static get keys() {
-        return ['artist', 'a'];
-    }
-
-    test(card) {
-        return card.artists.some(a => super.test(a));
-    }
-}
+import { StringKeyword } from 'sigil-sifter/keywords';
+
+export default class ArtistKeyword extends StringKeyword {
+    static get keys() {
+        return ['artist', 'a'];
+    }
+
+    test(card) {
+        return card.artists.some(a => super.test(a));
+    }
+}

package/src/keywords/BannedKeyword.js

@@ -1,21 +1,21 @@
-import { Keyword } from 'sigil-sifter/keywords';
-import FormatExpression from '../expressions/FormatExpression.js';
-import { EqualsOperator, IncludesOperator } from 'sigil-sifter/operators';
-
-export default class BannedKeyword extends Keyword {
-    static get keys() {
-        return ['banned'];
-    }
-
-    static get supportedOperators() {
-        return [IncludesOperator, EqualsOperator];
-    }
-
-    static get supportedExpressions() {
-        return [FormatExpression];
-    }
-
-    test(card) {
-        return card.banned.some(formatName => super.test(formatName));
-    }
-}
+import { Keyword } from 'sigil-sifter/keywords';
+import FormatExpression from '../expressions/FormatExpression.js';
+import { EqualsOperator, IncludesOperator } from 'sigil-sifter/operators';
+
+export default class BannedKeyword extends Keyword {
+    static get keys() {
+        return ['banned'];
+    }
+
+    static get supportedOperators() {
+        return [IncludesOperator, EqualsOperator];
+    }
+
+    static get supportedExpressions() {
+        return [FormatExpression];
+    }
+
+    test(card) {
+        return card.banned.some(formatName => super.test(formatName));
+    }
+}

package/src/keywords/BorderKeyword.js

@@ -1,21 +1,21 @@
-import { Keyword } from 'sigil-sifter/keywords';
-import ExactStringExpression from '../expressions/ExactStringExpression.js';
-import { EqualsOperator, IncludesOperator } from 'sigil-sifter/operators';
-
-export default class BorderKeyword extends Keyword {
-    static get keys() {
-        return ['border'];
-    }
-
-    static get supportedOperators() {
-        return [IncludesOperator, EqualsOperator];
-    }
-
-    static get supportedExpressions() {
-        return [ExactStringExpression];
-    }
-
-    test(card) {
-        return super.test(card.border);
-    }
-}
+import { Keyword } from 'sigil-sifter/keywords';
+import ExactStringExpression from '../expressions/ExactStringExpression.js';
+import { EqualsOperator, IncludesOperator } from 'sigil-sifter/operators';
+
+export default class BorderKeyword extends Keyword {
+    static get keys() {
+        return ['border'];
+    }
+
+    static get supportedOperators() {
+        return [IncludesOperator, EqualsOperator];
+    }
+
+    static get supportedExpressions() {
+        return [ExactStringExpression];
+    }
+
+    test(card) {
+        return super.test(card.border);
+    }
+}

package/src/keywords/CardTypeKeyword.js

@@ -1,11 +1,11 @@
-import { StringKeyword } from 'sigil-sifter/keywords';
-
-export default class CardTypeKeyword extends StringKeyword {
-    static get keys() {
-        return ['type', 't'];
-    }
-
-    test(card) {
-        return card.typeLines.some(t => super.test(t));
-    }
-}
+import { StringKeyword } from 'sigil-sifter/keywords';
+
+export default class CardTypeKeyword extends StringKeyword {
+    static get keys() {
+        return ['type', 't'];
+    }
+
+    test(card) {
+        return card.typeLines.some(t => super.test(t));
+    }
+}

package/src/keywords/CollectorNumberKeyword.js

@@ -1,16 +1,16 @@
-import { NumericExpression } from 'sigil-sifter/expressions';
-import { Keyword } from 'sigil-sifter/keywords';
-
-export default class CollectorNumberKeyword extends Keyword {
-    static get keys() {
-        return ['number', 'cn'];
-    }
-
-    static get supportedExpressions() {
-        return [NumericExpression];
-    }
-
-    test(card) {
-        return super.test(card.collectorNumber);
-    }
-}
+import { NumericExpression } from 'sigil-sifter/expressions';
+import { Keyword } from 'sigil-sifter/keywords';
+
+export default class CollectorNumberKeyword extends Keyword {
+    static get keys() {
+        return ['number', 'cn'];
+    }
+
+    static get supportedExpressions() {
+        return [NumericExpression];
+    }
+
+    test(card) {
+        return super.test(card.collectorNumber);
+    }
+}

package/src/keywords/ColorIdentityKeyword.js

@@ -1,11 +1,11 @@
-import ColorKeyword from './ColorKeyword.js';
-
-export default class ColorIdentityKeyword extends ColorKeyword {
-    static get keys() {
-        return ['identity', 'id'];
-    }
-
-    test(card) {
-        return this.operator.testValue(card.colorIdentity, this.expression);
-    }
-}
+import ColorKeyword from './ColorKeyword.js';
+
+export default class ColorIdentityKeyword extends ColorKeyword {
+    static get keys() {
+        return ['identity', 'id'];
+    }
+
+    test(card) {
+        return this.operator.testValue(card.colorIdentity, this.expression);
+    }
+}

package/src/keywords/ColorKeyword.js

@@ -1,17 +1,17 @@
-import { Keyword } from 'sigil-sifter/keywords';
-import ColorExpression from '../expressions/ColorExpression.js';
-import ArrayLengthExpression from '../expressions/ArrayLengthExpression.js';
-
-export default class ColorKeyword extends Keyword {
-    static get keys() {
-        return ['colors', 'color', 'c'];
-    }
-
-    static get supportedExpressions() {
-        return [ColorExpression, ArrayLengthExpression];
-    }
-
-    test(card) {
-        return this.operator.testValue(card.colors, this.expression);
-    }
-}
+import { Keyword } from 'sigil-sifter/keywords';
+import ColorExpression from '../expressions/ColorExpression.js';
+import ArrayLengthExpression from '../expressions/ArrayLengthExpression.js';
+
+export default class ColorKeyword extends Keyword {
+    static get keys() {
+        return ['colors', 'color', 'c'];
+    }
+
+    static get supportedExpressions() {
+        return [ColorExpression, ArrayLengthExpression];
+    }
+
+    test(card) {
+        return this.operator.testValue(card.colors, this.expression);
+    }
+}

package/src/keywords/DevotionKeyword.js

@@ -1,21 +1,21 @@
-import { Keyword } from 'sigil-sifter/keywords';
-import { ManaCost } from 'mana-scribe';
-import DevotionExpression from '../expressions/DevotionExpression.js';
-
-export default class DevotionKeyword extends Keyword {
-    static get keys() {
-        return  ['devotion'];
-    }
-
-    static get supportedExpressions() {
-        return [DevotionExpression];
-    }
-
-    test(card) {
-        if (!card.isPermanent) return false;
-        const manaCosts = card.cache('manaCosts', () => {
-            return card.manaCosts.map(costStr => ManaCost.parse(costStr));
-        });
-        return manaCosts.some(manaCost => super.test(manaCost));
-    }
-}
+import { Keyword } from 'sigil-sifter/keywords';
+import { ManaCost } from 'mana-scribe';
+import DevotionExpression from '../expressions/DevotionExpression.js';
+
+export default class DevotionKeyword extends Keyword {
+    static get keys() {
+        return  ['devotion'];
+    }
+
+    static get supportedExpressions() {
+        return [DevotionExpression];
+    }
+
+    test(card) {
+        if (!card.isPermanent) return false;
+        const manaCosts = card.cache('manaCosts', () => {
+            return card.manaCosts.map(costStr => ManaCost.parse(costStr));
+        });
+        return manaCosts.some(manaCost => super.test(manaCost));
+    }
+}

package/src/keywords/FlavorTextKeyword.js

@@ -1,11 +1,11 @@
-import { StringKeyword } from 'sigil-sifter/keywords';
-
-export default class FlavorTextKeyword extends StringKeyword {
-    static get keys() {
-        return ['flavor', 'ft'];
-    }
-
-    test(card) {
-        return card.flavorTexts.some(flavorText => super.test(flavorText));
-    }
-}
+import { StringKeyword } from 'sigil-sifter/keywords';
+
+export default class FlavorTextKeyword extends StringKeyword {
+    static get keys() {
+        return ['flavor', 'ft'];
+    }
+
+    test(card) {
+        return card.flavorTexts.some(flavorText => super.test(flavorText));
+    }
+}

package/src/keywords/FormatKeyword.js

@@ -1,21 +1,21 @@
-import { Keyword } from 'sigil-sifter/keywords';
-import FormatExpression from '../expressions/FormatExpression.js';
-import { EqualsOperator, IncludesOperator } from 'sigil-sifter/operators';
-
-export default class FormatKeyword extends Keyword {
-    static get keys() {
-        return ['format', 'f'];
-    }
-
-    static get supportedOperators() {
-        return [IncludesOperator, EqualsOperator];
-    }
-
-    static get supportedExpressions() {
-        return [FormatExpression];
-    }
-
-    test(card) {
-        return card.formats.some(formatName => super.test(formatName));
-    }
-}
+import { Keyword } from 'sigil-sifter/keywords';
+import FormatExpression from '../expressions/FormatExpression.js';
+import { EqualsOperator, IncludesOperator } from 'sigil-sifter/operators';
+
+export default class FormatKeyword extends Keyword {
+    static get keys() {
+        return ['format', 'f'];
+    }
+
+    static get supportedOperators() {
+        return [IncludesOperator, EqualsOperator];
+    }
+
+    static get supportedExpressions() {
+        return [FormatExpression];
+    }
+
+    test(card) {
+        return card.formats.some(formatName => super.test(formatName));
+    }
+}