fix: Ordering failing when one value is null (#490)

Co-authored-by: Avior <git@avior.me>

.bruno/bruno.json

@@ -0,0 +1,8 @@
+{
+  "version": "1",
+  "name": "TCGdex",
+  "type": "collection",
+  "presets": {
+    "requestType": "http"
+  }
+}

.bruno/cards/get-cards-list.bru

@@ -0,0 +1,28 @@
+meta {
+  name: Get the cards list
+  type: http
+  seq: 1
+}
+
+get {
+  url: {{BASE_URL}}/v2/en/cards?sort:field=name&sort:order=DESC&pagination:page=1&pagination:itemsPerPage=4
+  body: none
+  auth: none
+}
+
+query {
+  sort:field: name
+  sort:order: DESC
+  pagination:page: 1
+  pagination:itemsPerPage: 4
+  ~name: furret
+}
+
+assert {
+  res.status: eq 200
+  res.body.length: eq 4
+}
+
+docs {
+  Fully describe the card list request, it also has every parameters it can
+}

.bruno/cards/get-one-card.bru

@@ -0,0 +1,16 @@
+meta {
+  name: Get one card
+  type: http
+  seq: 2
+}
+
+get {
+  url: {{BASE_URL}}/v2/en/cards/swsh3-136
+  body: none
+  auth: none
+}
+
+assert {
+  res.status: eq 200
+  res.body.id: eq swsh3-136
+}

.bruno/environments/Developpement.bru

@@ -0,0 +1,3 @@
+vars {
+  BASE_URL: http://localhost:3000
+}

.bruno/environments/Production.bru

@@ -0,0 +1,3 @@
+vars {
+  BASE_URL: https://api.tcgdex.net
+}

.bruno/fixes/466-invalid-sorting.bru

@@ -0,0 +1,22 @@
+meta {
+  name: 466 - Invalid Sorting
+  type: http
+  seq: 1
+}
+
+get {
+  url: {{BASE_URL}}/v2/en/sets/swsh8/53
+  body: none
+  auth: none
+}
+
+assert {
+  res.body.id: eq swsh8-53
+  res.status: eq 200
+}
+
+docs {
+  Validate the issue seen in
+
+  https://github.com/tcgdex/cards-database/issues/466
+}

.bruno/fixes/467-options-not-working-correctly.bru

@@ -0,0 +1,15 @@
+meta {
+  name: 467 - Validate that we can run OPTIONS
+  type: http
+  seq: 2
+}
+
+options {
+  url: {{BASE_URL}}/status
+  body: none
+  auth: none
+}
+
+assert {
+  res.status: eq 200
+}

.bruno/fixes/471-invalid-set-sorting.bru

@@ -0,0 +1,22 @@
+meta {
+  name: 471 - Invalid Set Sorting
+  type: http
+  seq: 3
+}
+
+get {
+  url: {{BASE_URL}}/v2/en/sets/swsh12/10
+  body: none
+  auth: none
+}
+
+assert {
+  res.body.id: eq swsh12-010
+  res.status: eq 200
+}
+
+docs {
+  Validate the issue seen in
+
+  https://github.com/tcgdex/cards-database/issues/471
+}

.bruno/fixes/474-queries-crashing-the-server.bru

@@ -0,0 +1,25 @@
+meta {
+  name: 474 - Queries crashing the server
+  type: http
+  seq: 4
+}
+
+get {
+  url: {{BASE_URL}}/v2/en/cards?legal.standard=true
+  body: none
+  auth: none
+}
+
+query {
+  legal.standard: true
+}
+
+assert {
+  res.status: eq 200
+}
+
+docs {
+  Validate the issue seen in
+  
+  https://github.com/tcgdex/cards-database/issues/474
+}

.bruno/fixes/475-ability-query-subfields.bru

@@ -0,0 +1,25 @@
+meta {
+  name: 475 - Ability to query subfileds
+  type: http
+  seq: 5
+}
+
+get {
+  url: {{BASE_URL}}/v2/en/cards?legal.standard=true
+  body: none
+  auth: none
+}
+
+query {
+  legal.standard: true
+}
+
+assert {
+  res.status: eq 200
+}
+
+docs {
+  Validate the issue seen in
+  
+  https://github.com/tcgdex/cards-database/issues/474
+}

.bruno/fixes/489-crash-when-sorting-with-null-values.bru

@@ -0,0 +1,17 @@
+meta {
+  name: 489 - Crash When sorting with Null values
+  type: http
+  seq: 6
+}
+
+get {
+  url: {{BASE_URL}}/v2/en/cards?name=pikachu&sort:field=hp&sort:order=DESC
+  body: none
+  auth: none
+}
+
+query {
+  name: pikachu
+  sort:field: hp
+  sort:order: DESC
+}

.bruno/graphql.bru

@@ -0,0 +1,33 @@
+meta {
+  name: GraphQL API
+  type: graphql
+  seq: 1
+}
+
+post {
+  url: {{BASE_URL}}/v2/graphql
+  body: graphql
+  auth: none
+}
+
+body:graphql {
+  query Pouet {
+    cards {
+      id
+      localId
+      name
+      set {
+        id
+        name
+        serie {
+          id
+          name
+        }
+      }
+    }
+  }
+}
+
+assert {
+  res.status: eq 200
+}

.bruno/random/Random Card.bru

@@ -0,0 +1,20 @@
+meta {
+  name: Random Card
+  type: http
+  seq: 1
+}
+
+get {
+  url: {{BASE_URL}}/v2/en/random/card?name=furret
+  body: none
+  auth: none
+}
+
+query {
+  name: furret
+}
+
+assert {
+  res.status: eq 200
+  res.body.name: contains Furret
+}

.bruno/random/Random Serie.bru

@@ -0,0 +1,19 @@
+meta {
+  name: Random Serie
+  type: http
+  seq: 3
+}
+
+get {
+  url: {{BASE_URL}}/v2/en/random/serie?name=p
+  body: none
+  auth: none
+}
+
+query {
+  name: p
+}
+
+assert {
+  res.status: eq 200
+}

.bruno/random/Random Set.bru

@@ -0,0 +1,20 @@
+meta {
+  name: Random Set
+  type: http
+  seq: 2
+}
+
+get {
+  url: {{BASE_URL}}/v2/en/random/set?name=sword
+  body: none
+  auth: none
+}
+
+query {
+  name: sword
+}
+
+assert {
+  res.status: eq 200
+  res.body.name: contains Sword
+}

.bruno/sets/get-a-list-of-sets.bru

@@ -0,0 +1,25 @@
+meta {
+  name: Get a list of sets
+  type: http
+  seq: 3
+}
+
+get {
+  url: {{BASE_URL}}/v2/en/sets?sort:field=name&sort:order=DESC&pagination:page=1&pagination:itemsPerPage=1&name=Dark
+  body: none
+  auth: none
+}
+
+query {
+  sort:field: name
+  sort:order: DESC
+  pagination:page: 1
+  pagination:itemsPerPage: 1
+  name: Dark
+}
+
+assert {
+  res.status: eq 200
+  res.body[0].id: eq swsh3
+  res.body.length: eq 1
+}

.bruno/sets/get-a-set.bru

@@ -0,0 +1,16 @@
+meta {
+  name: Get a set
+  type: http
+  seq: 2
+}
+
+get {
+  url: {{BASE_URL}}/v2/en/sets/swsh3
+  body: none
+  auth: none
+}
+
+assert {
+  res.status: eq 200
+  res.body.id: eq swsh3
+}

.bruno/sets/get-one-card-from-a-set.bru

@@ -0,0 +1,16 @@
+meta {
+  name: Get one card from a set
+  type: http
+  seq: 1
+}
+
+get {
+  url: {{BASE_URL}}/v2/en/sets/swsh3/136
+  body: none
+  auth: none
+}
+
+assert {
+  res.status: eq 200
+  res.body.id: eq swsh3-136
+}

.github/workflows/build.yml

@@ -6,7 +6,7 @@ on:
     tags:
       - v*
   pull_request:
-    branches: 
+    branches:
       - master
 
 jobs:
@@ -15,8 +15,10 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
-      
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
     - name: Docker meta
       id: meta
       uses: docker/metadata-action@v5
@@ -31,7 +33,7 @@ jobs:
           type=semver,pattern={{version}}
           type=semver,pattern={{major}}.{{minor}}
           type=semver,pattern={{major}}
-          type=semver,pattern=latest                              
+          type=semver,pattern=latest
 
     - name: Login to Docker Hub
       uses: docker/login-action@v3

.github/workflows/conventionnal-commit.yml

@@ -5,8 +5,8 @@ jobs:
     name: Conventional PR
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
       - uses: beemojs/conventional-pr-action@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

@@ -0,0 +1,33 @@
+name: Test the Data
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+
+    - name: Setup BunJS
+      uses: oven-sh/setup-bun@v1
+
+    - name: Install deps
+      run: |
+        bun install --frozen-lockfile
+        cd server
+        bun install --frozen-lockfile
+        bun run compile
+
+    - name: Validate the data & the server
+      run: |
+        bun run validate
+        cd server
+        bun run validate

.vscode/settings.json

@@ -1,5 +0,0 @@
-{
-	"files.exclude": {
-		"**/*.js": true
-	}
-}

Dockerfile

@@ -1,44 +1,53 @@
-FROM node:alpine as BUILD_IMAGE
+FROM docker.io/oven/bun:1-alpine as BUILD_IMAGE
 
-WORKDIR /app
+# go to work folder
+WORKDIR /usr/src/app
 
-ADD package.json package-lock.json ./
-ADD server/package.json server/package-lock.json ./server/
+# Add git as it is used to fetch updated times
+RUN apk add git &&\
+git config --global safe.directory '*'
+
+ADD --chown=bun:bun package.json bun.lockb ./
+ADD --chown=bun:bun server/package.json server/bun.lockb ./server/
 
 # install dependencies
-RUN npm ci && \
+RUN bun install --frozen-lockfile && \
 cd server && \
-npm ci
+bun install --frozen-lockfile
 
 # Add project files
-ADD . .
+ADD --chown=bun:bun . .
 
 # build
-RUN npm run compile && \
-cd server && \
-npm run compile && \
-npm run build
+RUN cd server && \
+bun run compile
 
-# remove dev dependencies
-RUN npm prune --production && \
-cd server && \
-npm prune --production
+# remove dev dependencies (bun do not yet support "prune")
+RUN cd server && \
+rm -rf node_modules && \
+bun install --frozen-install --production
 
 # go to another VM
-FROM node:alpine
+FROM docker.io/oven/bun:1-alpine as PROD_IMAGE
 
-# go to folder
-WORKDIR /app
+# inform software to be in production
+ENV NODE_ENV=production
+
+# run as non root user
+USER bun
+
+# go to work folder
+WORKDIR /usr/src/app
 
 # copy from build image
-COPY --from=BUILD_IMAGE /app/server/generated ./generated
-COPY --from=BUILD_IMAGE /app/server/node_modules ./node_modules
-COPY --from=BUILD_IMAGE /app/server/dist ./dist
-COPY --from=BUILD_IMAGE /app/server/public ./public
-COPY --from=BUILD_IMAGE /app/server/package.json ./package.json
+COPY --chown=bun:bun --from=BUILD_IMAGE /usr/src/app/server/generated ./generated
+COPY --chown=bun:bun --from=BUILD_IMAGE /usr/src/app/server/node_modules ./node_modules
+COPY --chown=bun:bun --from=BUILD_IMAGE /usr/src/app/server/src ./src
+COPY --chown=bun:bun --from=BUILD_IMAGE /usr/src/app/server/public ./public
+COPY --chown=bun:bun --from=BUILD_IMAGE /usr/src/app/server/package.json ./package.json
 
 # Expose port
 EXPOSE 3000
 
 # run it !
-CMD ["npm", "run", "start"]
+CMD ["bun", "run", "start"]

data/Call of Legends/Call of Legends/1.ts

@@ -7,7 +7,7 @@ const card: Card = {
 		de: "Pixi"
 	},
 	illustrator: "sui",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/10.ts

@@ -7,7 +7,7 @@ const card: Card = {
 		de: "Hundemon"
 	},
 	illustrator: "Kagemaru Himeno",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/11.ts

@@ -7,7 +7,7 @@ const card: Card = {
 		de: "Jirachi"
 	},
 	illustrator: "match",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/12.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Kyogre"
 	},
 	illustrator: "Ryo Ueda",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/13.ts

@@ -7,7 +7,7 @@ const card: Card = {
 		de: "Folipurba"
 	},
 	illustrator: "match",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/14.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Lucario"
 	},
 	illustrator: "Takashi Yamaguchi",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/15.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Lugia"
 	},
 	illustrator: "Ryo Ueda",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/16.ts

@@ -7,7 +7,7 @@ const card: Card = {
 		de: "Magbrant"
 	},
 	illustrator: "Hajime Kusajima",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/17.ts

@@ -7,7 +7,7 @@ const card: Card = {
 		de: "Vulnona"
 	},
 	illustrator: "TOKIYA",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/18.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Pachirisu"
 	},
 	illustrator: "Noriko Hotta",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/19.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Palkia"
 	},
 	illustrator: "Daisuke Iwamoto",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/2.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Deoxys"
 	},
 	illustrator: "Ryo Ueda",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/20.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Rayquaza"
 	},
 	illustrator: "Ryo Ueda",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/21.ts

@@ -7,7 +7,7 @@ const card: Card = {
 		de: "Farbeagle"
 	},
 	illustrator: "Midori Harada",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/22.ts

@@ -7,7 +7,7 @@ const card: Card = {
 		de: "Nachtara"
 	},
 	illustrator: "Mitsuhiro Arita",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/3.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Dialga"
 	},
 	illustrator: "Ayaka Yoshida",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/4.ts

@@ -7,7 +7,7 @@ const card: Card = {
 		de: "Psiana"
 	},
 	illustrator: "match",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/5.ts

@@ -7,7 +7,7 @@ const card: Card = {
 		de: "Forstellka"
 	},
 	illustrator: "Kyoko Umemoto",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/6.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Groudon"
 	},
 	illustrator: "Ryo Ueda",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/7.ts

@@ -7,7 +7,7 @@ const card: Card = {
 		de: "Garados"
 	},
 	illustrator: "Mitsuhiro Arita",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/8.ts

@@ -7,7 +7,7 @@ const card: Card = {
 		de: "Kapoera"
 	},
 	illustrator: "Shigenori Negishi",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/9.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Ho-Oh"
 	},
 	illustrator: "Ryo Ueda",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/SL1.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Deoxys"
 	},
 	illustrator: "Noriko Hotta",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/SL10.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Rayquaza"
 	},
 	illustrator: "Noriko Hotta",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/SL11.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Suicune"
 	},
 	illustrator: "Ayaka Yoshida",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/SL2.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Dialga"
 	},
 	illustrator: "Ayaka Yoshida",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/SL3.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Entei"
 	},
 	illustrator: "Yuri Umemura",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/SL4.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Groudon"
 	},
 	illustrator: "Yuri Umemura",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/SL5.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Ho-Oh"
 	},
 	illustrator: "Hideaki Hakozaki",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/SL6.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Kyogre"
 	},
 	illustrator: "Yuri Umemura",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/SL7.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Lugia"
 	},
 	illustrator: "Hideaki Hakozaki",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/SL8.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Palkia"
 	},
 	illustrator: "Ayaka Yoshida",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Call of Legends/Call of Legends/SL9.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Raikou"
 	},
 	illustrator: "Noriko Hotta",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Diamond & Pearl/1.ts

@@ -9,7 +9,7 @@ const card: Card = {
 	},
 
 	illustrator: "Nakaoka",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 	set: Set,
 

data/Diamond & Pearl/Diamond & Pearl/10.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Traunmagil"
 	},
 	illustrator: "Mikiko Takeda",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Diamond & Pearl/11.ts

@@ -9,7 +9,7 @@ const card: Card = {
 	},
 
 	illustrator: "Nakaoka",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 	set: Set,
 

data/Diamond & Pearl/Diamond & Pearl/12.ts

@@ -9,7 +9,7 @@ const card: Card = {
 	},
 
 	illustrator: "Nakaoka",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 	set: Set,
 

data/Diamond & Pearl/Diamond & Pearl/120.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Impoleon"
 	},
 	illustrator: "Shizurow",
-	rarity: "Rare",
+	rarity: "Rare Holo LV.X",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Diamond & Pearl/121.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Panferno"
 	},
 	illustrator: "Shizurow",
-	rarity: "Rare",
+	rarity: "Rare Holo LV.X",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Diamond & Pearl/122.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Chelterrar"
 	},
 	illustrator: "Shizurow",
-	rarity: "Rare",
+	rarity: "Rare Holo LV.X",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Diamond & Pearl/13.ts

@@ -9,7 +9,7 @@ const card: Card = {
 	},
 
 	illustrator: "Nakaoka",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 	set: Set,
 

data/Diamond & Pearl/Diamond & Pearl/14.ts

@@ -9,7 +9,7 @@ const card: Card = {
 	},
 
 	illustrator: "Masakazu Fukuda",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 	set: Set,
 

data/Diamond & Pearl/Diamond & Pearl/15.ts

@@ -9,7 +9,7 @@ const card: Card = {
 	},
 
 	illustrator: "Hiroaki Ito",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 	set: Set,
 

data/Diamond & Pearl/Diamond & Pearl/16.ts

@@ -9,7 +9,7 @@ const card: Card = {
 	},
 
 	illustrator: "Masahiko Ishii",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 	set: Set,
 

data/Diamond & Pearl/Diamond & Pearl/17.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Chelterrar"
 	},
 	illustrator: "Masahiko Ishii",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Diamond & Pearl/2.ts

@@ -9,7 +9,7 @@ const card: Card = {
 	},
 
 	illustrator: "Takabon",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 	set: Set,
 

data/Diamond & Pearl/Diamond & Pearl/3.ts

@@ -9,7 +9,7 @@ const card: Card = {
 	},
 
 	illustrator: "Nakaoka",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 	set: Set,
 

data/Diamond & Pearl/Diamond & Pearl/4.ts

@@ -9,7 +9,7 @@ const card: Card = {
 	},
 
 	illustrator: "Nakaoka",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 	set: Set,
 

data/Diamond & Pearl/Diamond & Pearl/5.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Panferno"
 	},
 	illustrator: "Nakaoka",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Diamond & Pearl/6.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Lucario"
 	},
 	illustrator: "Ken Sugimori",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Diamond & Pearl/7.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Luxtra"
 	},
 	illustrator: "Mikiko Takeda",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Diamond & Pearl/8.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Magnezone"
 	},
 	illustrator: "Nakaoka",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Diamond & Pearl/9.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Manaphy"
 	},
 	illustrator: "Nakaoka",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Great Encounters/1.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Lohgock"
 	},
 	illustrator: "Kagemaru Himeno",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Great Encounters/10.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Tangoloss"
 	},
 	illustrator: "Kent Kanetsuna",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Great Encounters/103.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Cresselia"
 	},
 	illustrator: "Shizurow",
-	rarity: "Rare",
+	rarity: "Rare Holo LV.X",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Great Encounters/104.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Darkrai"
 	},
 	illustrator: "Shizurow",
-	rarity: "Rare",
+	rarity: "Rare Holo LV.X",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Great Encounters/105.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Dialga"
 	},
 	illustrator: "Ryo Ueda",
-	rarity: "Rare",
+	rarity: "Rare Holo LV.X",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Great Encounters/106.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Palkia"
 	},
 	illustrator: "Ryo Ueda",
-	rarity: "Rare",
+	rarity: "Rare Holo LV.X",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Great Encounters/11.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Togekiss"
 	},
 	illustrator: "Kent Kanetsuna",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Great Encounters/2.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Cresselia"
 	},
 	illustrator: "Ryo Ueda",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Great Encounters/3.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Darkrai"
 	},
 	illustrator: "Masakazu Fukuda",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Great Encounters/4.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Darkrai"
 	},
 	illustrator: "Ryo Ueda",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Great Encounters/5.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Pachirisu"
 	},
 	illustrator: "Hironobu Yoshida",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Great Encounters/6.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Porygon-Z"
 	},
 	illustrator: "Kent Kanetsuna",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Great Encounters/7.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Rotom"
 	},
 	illustrator: "Daisuke Ito",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Great Encounters/8.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Gewaldro"
 	},
 	illustrator: "Masakazu Fukuda",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Great Encounters/9.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Sumpex"
 	},
 	illustrator: "Kouki Saitou",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Legends Awakened/1.ts

@@ -9,7 +9,7 @@ const card: Card = {
 	},
 
 	illustrator: "Kent Kanetsuna",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 	set: Set,
 

data/Diamond & Pearl/Legends Awakened/10.ts

@@ -9,7 +9,7 @@ const card: Card = {
 	},
 
 	illustrator: "Kent Kanetsuna",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 	set: Set,
 

data/Diamond & Pearl/Legends Awakened/11.ts

@@ -9,7 +9,7 @@ const card: Card = {
 	},
 
 	illustrator: "Ken Sugimori",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 	set: Set,
 

data/Diamond & Pearl/Legends Awakened/12.ts

@@ -9,7 +9,7 @@ const card: Card = {
 	},
 
 	illustrator: "Masakazu Fukuda",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 	set: Set,
 

data/Diamond & Pearl/Legends Awakened/13.ts

@@ -9,7 +9,7 @@ const card: Card = {
 	},
 
 	illustrator: "Kent Kanetsuna",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 	set: Set,
 

data/Diamond & Pearl/Legends Awakened/14.ts

@@ -9,7 +9,7 @@ const card: Card = {
 	},
 
 	illustrator: "Kent Kanetsuna",
-	rarity: "Rare",
+	rarity: "Rare Holo",
 	category: "Pokemon",
 	set: Set,
 

data/Diamond & Pearl/Legends Awakened/140.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Tobutz"
 	},
 	illustrator: "Shizurow",
-	rarity: "Rare",
+	rarity: "Rare Holo LV.X",
 	category: "Pokemon",
 
 	set: Set,

data/Diamond & Pearl/Legends Awakened/141.ts

@@ -8,7 +8,7 @@ const card: Card = {
 		de: "Skorgro"
 	},
 	illustrator: "Ryo Ueda",
-	rarity: "Rare",
+	rarity: "Rare Holo LV.X",
 	category: "Pokemon",
 
 	set: Set,