diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 72e2bc56dd5a2292f1743d720b4a8469580b3125..f7c1eb96f48ca9be16f2a232c00da7b859b0e282 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,12 +9,16 @@ cache:
- node_modules/
stages:
+ - get-data
+ - format-data
- build
- deploy
.build:
stage: build
image: docker:24
+ needs:
+ - format-pfam
variables:
CONTEXT: "."
DOCKERFILE: "Dockerfile"
@@ -39,6 +43,36 @@ stages:
# when: on_success
# expire_in: "30 days"
+get-pfam:
+ image: ubuntu:23.04
+ stage: get-data
+ before_script:
+ - apt update && apt install -y curl
+ - curl https://ftp.ebi.ac.uk/pub/databases/Pfam/current_release/Pfam-A.hmm.dat.gz --output Pfam-A.hmm.dat.gz
+ - ls -al
+ script:
+ - gunzip Pfam-A.hmm.dat.gz
+ - ls -al
+ artifacts:
+ paths:
+ - Pfam-A.hmm.dat
+
+format-pfam:
+ image: python:3.11
+ stage: format-data
+ needs:
+ - "get-pfam"
+ before_script:
+ - pip install pandas
+ - ls -al
+ # - mv Pfam-A.hmm.dat scripts/
+ script:
+ - ./scripts/pfam-a-hmm-to-csv.py
+ - mv Pfam-A.hmm.dat.csv content/_partials/_pfam-a-hmm.csv
+ artifacts:
+ paths:
+ - content/_partials/_pfam-a-hmm.csv
+
build:dev:
extends: .build
rules:
@@ -86,7 +120,6 @@ deploy:dev:
name: k8sdev-01
url: "https://defense-finder.dev.pasteur.cloud"
-
delete-helm-release:
except:
- master
diff --git a/Dockerfile b/Dockerfile
index b7e87c1cbce41b77126c5420aa550ed78dcc171c..2420a62e64c5701465918a23dab4474b6f11d883 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,9 @@ RUN npm install
### STAGE: Dev
FROM node:19.5-bullseye-slim as dev
+ARG BASE_URL=/
+ENV NUXT_APP_BASE_URL=${BASE_URL}
WORKDIR /usr/src/app
COPY --from=install /usr/src/app ./
COPY . /usr/src/app
diff --git a/components/Nav/BackToTop.vue b/components/Nav/BackToTop.vue
new file mode 100644
index 0000000000000000000000000000000000000000..faf1a66086224943736dca5b51c141fac76b8d8d
--- /dev/null
+++ b/components/Nav/BackToTop.vue
@@ -0,0 +1,53 @@
+
+<!-- from https://github.com/vuetifyjs/vuetify/blob/master/packages/docs/src/components/app/BackToTop.vue -->
+<template>
+ <v-layout-item
+ v-scroll="onScroll"
+ class="text-end pointer-events-none"
+ model-value
+ position="bottom"
+ size="88"
+ >
+ <div class="ma-4">
+ <v-fab-transition>
+ <v-btn
+ v-show="model"
+ class="mt-auto pointer-events-initial"
+ color="primary"
+ elevation="8"
+ icon="mdi-chevron-up"
+ size="large"
+ @click="onClick"
+ />
+ </v-fab-transition>
+ </div>
+ </v-layout-item>
+ </template>
+
+ <script setup>
+ import { ref } from 'vue'
+
+ const model = ref(false)
+
+ function onScroll () {
+ model.value = window.scrollY > 200
+ }
+
+ function onClick () {
+ window.scrollTo({
+ top: 0,
+ behavior: 'smooth',
+ })
+ }
+ </script>
+
+ <style scoped>
+ .pointer-events-none {
+ pointer-events: none;
+ }
+
+ .pointer-events-initial {
+ pointer-events: initial;
+ }
+ </style>
+
\ No newline at end of file
diff --git a/components/Nav/Navbar.vue b/components/Nav/Navbar.vue
index a2ba7c72d598b6dd21fc12716f1d18a1a4517a82..b427149910b1aafae0b17e47bbcae34800d71b21 100644
--- a/components/Nav/Navbar.vue
+++ b/components/Nav/Navbar.vue
@@ -1,61 +1,81 @@
+<script setup lang="ts">
+// import { useCustomTheme } from '~/composables/useCustomTheme'
+import { useDisplay, useTheme } from "vuetify";
+
+const runtimeConfig = useRuntimeConfig();
+
+const { navigation } = useContent();
+const { mobile } = useDisplay();
+const theme = useTheme();
+
+
+function toggleTheme() {
+ theme.global.name.value = theme.global.current.value.dark ? "light" : "dark";
+}
+
+
+
+const sections = ref([
+ {
+ id: "webservice",
+ label: "webservice",
+ href: runtimeConfig.public.defenseFinderWebservice,
+ },
+ { id: "wiki", label: "Wiki", to: '/', },
+ { id: "refseq", label: "REFSEQ", to: '/refseq/' },
+ { id: "help", label: "Help", to: '/help/' },
+]);
+
+
+// const computedSections = computed(() => {
+// return sections.value.map(section => {
+
+// if (section?.to) {
+// const { refinedUrl } = useRefinedUrl(section.to)
+// return { ...section, to: refinedUrl.value }
+// }
+// else {
+// return section
+// }
+
+
+// })
+// })
+
+
+const drawer = ref(true);
+
+const computedNavigation = computed(() => {
+ return navigation.value
+ .filter(({ _path }) => {
+ return _path !== "/refseq";
+ })
+
+});
+</script>
<template>
- <v-app-bar :elevation="0" border>
+ <v-app-bar :elevation="0" border density="prominent" scroll-behavior="hide">
<template #prepend>
<v-app-bar-nav-icon @click.stop="drawer = !drawer"></v-app-bar-nav-icon>
<!-- <Logo height="45px" /> -->
</template>
<v-app-bar-title>
<span class="d-flex align-center">
- <span class="text-medium-emphasis">Knowledge database of all known anti-phage systems by
- </span><span></span>
+ Knowledge database of all known anti-phage systems by
</span>
</v-app-bar-title>
<template #append v-if="!mobile">
- <v-btn v-for="section in sections" :key="section.id" color="primary" :href="section.href">
+ <v-btn v-for="section in sections" :key="section.id" color="primary" :to="section?.to ?? null"
+ :href="section?.href ?? null" exact>
{{ section.label }}
</v-btn>
- <v-btn @click="toggleTheme" color="primary"
- :icon="theme.global.current.value.dark ? 'md:light_mode' : 'md:dark_mode'"></v-btn>
+ <v-btn @click="toggleTheme" color="primary" :icon="theme.global.current.value.dark ? 'md:light_mode' : 'md:dark_mode'
+ "></v-btn>
</template>
</v-app-bar>
<v-navigation-drawer v-model="drawer" :border="1">
-
<v-list nav density="compact" :lines="false">
<NavNavigation :navigation="computedNavigation" />
</v-list>
</v-navigation-drawer>
-</template>
-<script setup lang="ts">
-// import { useCustomTheme } from '~/composables/useCustomTheme'
-import { useDisplay, useTheme } from 'vuetify'
-
-const runtimeConfig = useRuntimeConfig()
-const { navigation } = useContent();
-const { mobile } = useDisplay();
-const theme = useTheme()
-
-function toggleTheme() {
- theme.global.name.value = theme.global.current.value.dark ? 'light' : 'dark'
-}
-const sections = ref([
- { id: "webservice", label: "webservice", href: runtimeConfig.public.defenseFinderWebservice }
-])
-const drawer = ref(true);
-
-
-const computedNavigation = computed(() => {
- return navigation.value.map(navItem => {
- if (navItem._path === '/') {
- return { ...navItem, icon: "md:home" }
- }
- if (navItem._path === '/defense-systems') {
- return { ...navItem, icon: "md:list" }
- }
- if (navItem._path === '/general-concepts') {
- return { ...navItem, icon: "md:history_edu" }
- }
- return navItem
- })
-})
-
-</script>
+</template>
\ No newline at end of file
diff --git a/components/Nav/Navigation.vue b/components/Nav/Navigation.vue
index 52de4514918ae23c1e2d24103e1fd21a375c4edc..6bc1162f81400456d94cfa4c219128493a23cca5 100644
--- a/components/Nav/Navigation.vue
+++ b/components/Nav/Navigation.vue
@@ -3,8 +3,6 @@ const props = defineProps<{
navigation: any;
}>();
-// const { navigation } = useContent();
-// console.log(navigation.value);
</script>
<template>
diff --git a/components/Nav/PrevNext.vue b/components/Nav/PrevNext.vue
new file mode 100644
index 0000000000000000000000000000000000000000..f35a9450a6441368d0903a7f5e210e9bf47a60c2
--- /dev/null
+++ b/components/Nav/PrevNext.vue
@@ -0,0 +1,13 @@
+<script setup lang="ts">
+const { surround } = useContent();
+
+</script>
+<template>
+ <v-row justify="space-between">
+ <v-col v-for="(surroundPage, i) in surround" :key="surroundPage?._id" :cols="mobile ? '12' : 'auto'">
+ <v-btn v-if="surroundPage" :prepend-icon="i === 0 ? 'mdi-arrow-left' : undefined"
+ :append-icon="i === 1 ? 'mdi-arrow-right' : undefined" :block="mobile ? true : false" variant="outlined"
+ color="primary" :to="surroundPage?._path">{{ surroundPage?.title }}</v-btn>
+ </v-col>
+ </v-row>
+</template>
\ No newline at end of file
diff --git a/components/Nav/TableOfContent.vue b/components/Nav/TableOfContent.vue
index 45b9639eb3c3921656e60cc169c6be7674c9d049..da744b193fde2a7fd233384ce21bea4112ea5e57 100644
--- a/components/Nav/TableOfContent.vue
+++ b/components/Nav/TableOfContent.vue
@@ -11,19 +11,14 @@ const { mobile } = useDisplay();
</script>
<template>
- <v-navigation-drawer
- v-if="!mobile"
- id="app-toc"
- location="right"
- :border="0"
- permanent
- >
+ <v-navigation-drawer v-if="!mobile" id="app-toc" location="right" :border="0" permanent>
<template #prepend>
<div class="text-h6 font-weight-medium mt-4 mb-2 ms-4">Contents</div>
</template>
<ul class="px-2 py-2">
- <NavTableOfContentItem :links="props.links" /></ul
- ></v-navigation-drawer>
+ <NavTableOfContentItem :links="props.links" />
+ </ul>
+ </v-navigation-drawer>
</template>
<style scoped>
#app-toc ul {
diff --git a/components/PlotFigure.js b/components/PlotFigure.js
new file mode 100644
index 0000000000000000000000000000000000000000..ab49d09eae10a4d025e945673ac5408e8ab65256
--- /dev/null
+++ b/components/PlotFigure.js
@@ -0,0 +1,230 @@
+
+// From https://github.com/observablehq/plot/ examples
+import * as Plot from "@observablehq/plot";
+import { h, withDirectives } from "vue";
+
+class Document {
+ constructor() {
+ this.documentElement = new Element(this, "html");
+ }
+ createElementNS(namespace, tagName) {
+ return new Element(this, tagName);
+ }
+ createElement(tagName) {
+ return new Element(this, tagName);
+ }
+ createTextNode(value) {
+ return new TextNode(this, value);
+ }
+ querySelector() {
+ return null;
+ }
+ querySelectorAll() {
+ return [];
+ }
+}
+
+class Style {
+ static empty = new Style();
+ setProperty() { }
+ removeProperty() { }
+}
+
+class Element {
+ constructor(ownerDocument, tagName) {
+ this.ownerDocument = ownerDocument;
+ this.tagName = tagName;
+ this.attributes = {};
+ this.children = [];
+ this.parentNode = null;
+ }
+ setAttribute(name, value) {
+ this.attributes[name] = String(value);
+ }
+ setAttributeNS(namespace, name, value) {
+ this.setAttribute(name, value);
+ }
+ getAttribute(name) {
+ return this.attributes[name];
+ }
+ getAttributeNS(name) {
+ return this.getAttribute(name);
+ }
+ hasAttribute(name) {
+ return name in this.attributes;
+ }
+ hasAttributeNS(name) {
+ return this.hasAttribute(name);
+ }
+ removeAttribute(name) {
+ delete this.attributes[name];
+ }
+ removeAttributeNS(namespace, name) {
+ this.removeAttribute(name);
+ }
+ addEventListener() {
+ // ignored; interaction needs real DOM
+ }
+ removeEventListener() {
+ // ignored; interaction needs real DOM
+ }
+ dispatchEvent() {
+ // ignored; interaction needs real DOM
+ }
+ append(...children) {
+ for (const child of children) {
+ this.appendChild(child?.ownerDocument ? child : this.ownerDocument.createTextNode(child));
+ }
+ }
+ appendChild(child) {
+ this.children.push(child);
+ child.parentNode = this;
+ return child;
+ }
+ insertBefore(child, after) {
+ if (after == null) {
+ this.children.push(child);
+ } else {
+ const i = this.children.indexOf(after);
+ if (i < 0) throw new Error("insertBefore reference node not found");
+ this.children.splice(i, 0, child);
+ }
+ child.parentNode = this;
+ return child;
+ }
+ querySelector() {
+ return null;
+ }
+ querySelectorAll() {
+ return [];
+ }
+ set textContent(value) {
+ this.children = [this.ownerDocument.createTextNode(value)];
+ }
+ set style(value) {
+ this.attributes.style = value;
+ }
+ get style() {
+ return Style.empty;
+ }
+ toHyperScript() {
+ return h(
+ this.tagName,
+ this.attributes,
+ this.children.map((c) => c.toHyperScript())
+ );
+ }
+}
+
+class TextNode {
+ constructor(ownerDocument, nodeValue) {
+ this.ownerDocument = ownerDocument;
+ this.nodeValue = String(nodeValue);
+ }
+ toHyperScript() {
+ return this.nodeValue;
+ }
+}
+
+// Converts the real DOM to virtual DOM (for client-side hydration).
+function toHyperScript(node) {
+ if (node.nodeType === 3) return node.nodeValue; // TextNode
+ const props = {};
+ for (const name of node.getAttributeNames()) props[name] = node.getAttribute(name);
+ const children = [];
+ for (let child = node.firstChild; child; child = child.nextSibling) children.push(toHyperScript(child));
+ return h(node.tagName, props, children);
+}
+
+export default {
+ props: {
+ options: Object,
+ mark: Object,
+ defer: Boolean,
+ method: { type: String, default: "plot" }
+ },
+ render() {
+ const { method } = this;
+ const options = {
+ ...(method === "plot" && {
+ marks: this.mark == null ? [] : [this.mark],
+ width: 688 // better default for VitePress
+ }),
+ ...this.options,
+ className: "plot"
+ };
+ if (this.defer) {
+ const mounted = (el) => {
+ disconnect(); // remove old listeners
+ function observed() {
+ unmounted(el); // remove old plot (and listeners)
+ el.append(Plot[method](options));
+ }
+ const rect = el.getBoundingClientRect();
+ if (rect.bottom > 0 && rect.top < window.innerHeight) {
+ observed();
+ } else {
+ this._observer = new IntersectionObserver(
+ ([entry]) => {
+ if (entry.isIntersecting) observed();
+ },
+ { rootMargin: "100px" }
+ );
+ this._observer.observe(el);
+ if (typeof requestIdleCallback === "function") {
+ this._idling = requestIdleCallback(observed);
+ }
+ }
+ };
+ const unmounted = (el) => {
+ while (el.lastChild) el.lastChild.remove();
+ disconnect();
+ };
+ const disconnect = () => {
+ if (this._observer !== undefined) {
+ this._observer.disconnect();
+ this._observer = undefined;
+ }
+ if (this._idling !== undefined) {
+ cancelIdleCallback(this._idling);
+ this._idling = undefined;
+ }
+ };
+ const { height = 400 } = this.options;
+ return withDirectives(
+ h(
+ "span",
+ method === "plot"
+ ? [
+ h("div", {
+ style: {
+ maxWidth: "100%",
+ width: `688px`,
+ aspectRatio: `688 / ${height}`
+ }
+ })
+ ]
+ : []
+ ),
+ [
+ [
+ {
+ mounted,
+ updated: mounted,
+ unmounted
+ }
+ ]
+ ]
+ );
+ }
+ if (typeof document !== "undefined") {
+ const plot = Plot[method](options);
+ const replace = (el) => {
+ while (el.lastChild) el.lastChild.remove();
+ el.append(plot);
+ };
+ return withDirectives(h("span", [toHyperScript(plot)]), [[{ mounted: replace, updated: replace }]]);
+ }
+ return h("span", [Plot[method]({ ...options, document: new Document() }).toHyperScript()]);
+ }
+};
diff --git a/components/content/ListSystems.vue b/components/content/ListSystems.vue
index ebff12739e35405d8e47b213c4b14a707c56ce58..7816bd5b7bb72b2634b582b68b6bd6875a8461c2 100644
--- a/components/content/ListSystems.vue
+++ b/components/content/ListSystems.vue
@@ -37,61 +37,33 @@ const { initPfam } = usePfamStore();
initPfam();
</script>
<template>
- <v-card flat color="transparent" class="my-5">
- <v-toolbar>
+ <v-card variant="outlined" class="my-5">
+ <v-toolbar color="primary">
<v-toolbar-title>Defense Systems</v-toolbar-title>
- <v-text-field
- v-model="search"
- density="compact"
- variant="underlined"
- prepend-inner-icon="mdi-magnify"
- label="Search for defense systems"
- single-line
- hide-details
- class="mx-2"
- clearable
- ></v-text-field>
+ <v-text-field v-model="search" density="compact" variant="underlined" prepend-inner-icon="mdi-magnify"
+ label="Search for defense systems" single-line hide-details class="mx-2" clearable></v-text-field>
</v-toolbar>
- <v-data-table-virtual
- :height="height"
- :items-per-page="itemsPerParge"
- v-model:sort-by="sortBy"
- :headers="props.headers"
- density="compact"
- :custom-filter="filterOnlyCapsText"
- :items="props.systems"
- :search="search"
- item-value="system"
- >
+ <v-data-table-virtual :height="height" :items-per-page="itemsPerParge" v-model:sort-by="sortBy"
+ :headers="props.headers" density="compact" :custom-filter="filterOnlyCapsText" :items="props.systems"
+ :search="search" item-value="system.name">
<template #[`item.system`]="{ item }">
- <v-chip variant="text" link :to="`${item.columns.system.path}`">{{
- item.columns.system.name
+ <v-chip variant="text" link :to="item?.system?.path ? `${item?.system?.path}` : null">{{
+ item?.system?.name ?? 'None'
}}</v-chip>
</template>
<template #[`item.article`]="{ item }">
- <ArticleDoi
- v-if="item.columns?.article"
- :doi="item.columns.article.doi"
- :title="item.columns.article?.title"
- :abstract="item.columns.article?.abstract"
- :divider="false"
- :enumerate="false"
- />
+ <ArticleDoi v-if="item?.article" :doi="item.article.doi" :title="item.article?.title"
+ :abstract="item.article?.abstract" :divider="false" :enumerate="false" />
</template>
<template #[`item.PFAM`]="{ item }">
- <pfam-chips :pfam-string="item.columns.PFAM"></pfam-chips>
+
+ <pfam-chips v-if="item.columns?.PFAM" :pfam-string="item.columns.PFAM"></pfam-chips>
</template>
<template #expanded-row="{ columns, item }">
<tr>
- <td
- :colspan="columns.length"
- class="v-data-table__td v-data-table-column--align-start"
- >
- <pfam-chips
- :pfam-string="item.columns.PFAM"
- :items-to-display="-1"
- ></pfam-chips>
+ <td :colspan="columns.length" class="v-data-table__td v-data-table-column--align-start">
+ <pfam-chips :pfam-string="item.columns.PFAM" :items-to-display="-1"></pfam-chips>
</td>
</tr>
</template>
diff --git a/composables/useFetchArticle.ts b/composables/useFetchArticle.ts
index dcaa8976034e77fe353547bd00b699bf4c1f659c..127060d6ca53bc9e31e7a7a7dda455cfab620d6e 100644
--- a/composables/useFetchArticle.ts
+++ b/composables/useFetchArticle.ts
@@ -88,7 +88,7 @@ export function useFetchArticle(doi: string) {
watchEffect(async () => {
if (store.articles.size === 0) {
- const localArticles = await queryContent('/_partial/articles').where({ _partial: true }).findOne()
+ const localArticles = await queryContent('/_partials/_articles').where({ _partial: true }).findOne()
if (localArticles.body && store.articles.size <= 0) {
for (const article of localArticles.body) {
store.add(article)
diff --git a/composables/useRefinedUrl.ts b/composables/useRefinedUrl.ts
new file mode 100644
index 0000000000000000000000000000000000000000..5dae55fbef92e88cd88426e274abb779d4e5b65d
--- /dev/null
+++ b/composables/useRefinedUrl.ts
@@ -0,0 +1,21 @@
+import { withTrailingSlash, withLeadingSlash, joinURL } from "ufo";
+
+
+export function useRefinedUrl(url: string | Ref<string>) {
+ console.log(useRuntimeConfig().app.baseURL)
+ const refinedUrl = computed(() => {
+ const sanitzedUrl = toValue(url)
+
+ if (sanitzedUrl.startsWith("/") && !sanitzedUrl.startsWith("//")) {
+ const _base = withLeadingSlash(
+ withTrailingSlash(useRuntimeConfig().app.baseURL)
+ );
+ console.log(_base)
+ if (_base !== "/" && !sanitzedUrl.startsWith(_base)) {
+ return joinURL(_base, sanitzedUrl);
+ }
+ }
+ return toValue(url);
+ });
+ return { refinedUrl }
+}
\ No newline at end of file
diff --git a/content/0.index.md b/content/0.index.md
index dcf8f3e5ff8090ae162756e0f5e2a13771e3fde5..5fc9d6328f9f53512bdb61bb4e9bf917ef212eb7 100644
--- a/content/0.index.md
+++ b/content/0.index.md
@@ -1,6 +1,8 @@
---
title: DefenseFinder Wiki
layout: article
+navigation:
+ icon: 'md:home'
---
## Introduction
diff --git a/content/1.help.md b/content/1.help.md
new file mode 100644
index 0000000000000000000000000000000000000000..08b693b17a8df2607ecbd65031b4b8556d27fec0
--- /dev/null
+++ b/content/1.help.md
@@ -0,0 +1,11 @@
+---
+title: help
+layout: article
+navigation:
+ icon: 'md:help'
+---
+
+
+
+## test
+de l'aide
\ No newline at end of file
diff --git a/content/1.general-concepts/0.index.md b/content/2.general-concepts/0.index.md
similarity index 100%
rename from content/1.general-concepts/0.index.md
rename to content/2.general-concepts/0.index.md
diff --git a/content/1.general-concepts/1.abortive-infection.md b/content/2.general-concepts/1.abortive-infection.md
similarity index 100%
rename from content/1.general-concepts/1.abortive-infection.md
rename to content/2.general-concepts/1.abortive-infection.md
diff --git a/content/1.general-concepts/2.defense-islands.md b/content/2.general-concepts/2.defense-islands.md
similarity index 100%
rename from content/1.general-concepts/2.defense-islands.md
rename to content/2.general-concepts/2.defense-islands.md
diff --git a/content/2.general-concepts/_dir.yml b/content/2.general-concepts/_dir.yml
new file mode 100644
index 0000000000000000000000000000000000000000..2e76f830bf8a82e3da6e6eb6da1e8ec4a9d57546
--- /dev/null
+++ b/content/2.general-concepts/_dir.yml
@@ -0,0 +1,2 @@
+navigation.icon: "md:history_edu"
+
diff --git a/content/2.defense-systems/0.index.md b/content/3.defense-systems/0.index.md
similarity index 94%
rename from content/2.defense-systems/0.index.md
rename to content/3.defense-systems/0.index.md
index 9d3a66933ef6eb9c04cc04158fcd45f3426e14bc..798b183dc630c17d181d793ad42a4f615df53332 100644
--- a/content/2.defense-systems/0.index.md
+++ b/content/3.defense-systems/0.index.md
@@ -1,6 +1,6 @@
---
title: List of defense systems
-layout: article
+layout: article-no-toc
---
diff --git a/content/3.defense-systems/_dir.yml b/content/3.defense-systems/_dir.yml
new file mode 100644
index 0000000000000000000000000000000000000000..06c1b3d676d02dc034865cf54abfaf8255194e20
--- /dev/null
+++ b/content/3.defense-systems/_dir.yml
@@ -0,0 +1,2 @@
+title: Defense Systems
+navigation.icon: 'md:list'
\ No newline at end of file
diff --git a/content/2.defense-systems/abi2.md b/content/3.defense-systems/abi2.md
similarity index 100%
rename from content/2.defense-systems/abi2.md
rename to content/3.defense-systems/abi2.md
diff --git a/content/2.defense-systems/abia.md b/content/3.defense-systems/abia.md
similarity index 100%
rename from content/2.defense-systems/abia.md
rename to content/3.defense-systems/abia.md
diff --git a/content/2.defense-systems/abib.md b/content/3.defense-systems/abib.md
similarity index 100%
rename from content/2.defense-systems/abib.md
rename to content/3.defense-systems/abib.md
diff --git a/content/2.defense-systems/abic.md b/content/3.defense-systems/abic.md
similarity index 100%
rename from content/2.defense-systems/abic.md
rename to content/3.defense-systems/abic.md
diff --git a/content/2.defense-systems/abid.md b/content/3.defense-systems/abid.md
similarity index 100%
rename from content/2.defense-systems/abid.md
rename to content/3.defense-systems/abid.md
diff --git a/content/2.defense-systems/abie.md b/content/3.defense-systems/abie.md
similarity index 100%
rename from content/2.defense-systems/abie.md
rename to content/3.defense-systems/abie.md
diff --git a/content/2.defense-systems/abig.md b/content/3.defense-systems/abig.md
similarity index 100%
rename from content/2.defense-systems/abig.md
rename to content/3.defense-systems/abig.md
diff --git a/content/2.defense-systems/abih.md b/content/3.defense-systems/abih.md
similarity index 100%
rename from content/2.defense-systems/abih.md
rename to content/3.defense-systems/abih.md
diff --git a/content/2.defense-systems/abii.md b/content/3.defense-systems/abii.md
similarity index 100%
rename from content/2.defense-systems/abii.md
rename to content/3.defense-systems/abii.md
diff --git a/content/2.defense-systems/abij.md b/content/3.defense-systems/abij.md
similarity index 100%
rename from content/2.defense-systems/abij.md
rename to content/3.defense-systems/abij.md
diff --git a/content/2.defense-systems/abik.md b/content/3.defense-systems/abik.md
similarity index 100%
rename from content/2.defense-systems/abik.md
rename to content/3.defense-systems/abik.md
diff --git a/content/2.defense-systems/abil.md b/content/3.defense-systems/abil.md
similarity index 100%
rename from content/2.defense-systems/abil.md
rename to content/3.defense-systems/abil.md
diff --git a/content/2.defense-systems/abin.md b/content/3.defense-systems/abin.md
similarity index 100%
rename from content/2.defense-systems/abin.md
rename to content/3.defense-systems/abin.md
diff --git a/content/2.defense-systems/abio.md b/content/3.defense-systems/abio.md
similarity index 100%
rename from content/2.defense-systems/abio.md
rename to content/3.defense-systems/abio.md
diff --git a/content/2.defense-systems/abip2.md b/content/3.defense-systems/abip2.md
similarity index 100%
rename from content/2.defense-systems/abip2.md
rename to content/3.defense-systems/abip2.md
diff --git a/content/2.defense-systems/abiq.md b/content/3.defense-systems/abiq.md
similarity index 100%
rename from content/2.defense-systems/abiq.md
rename to content/3.defense-systems/abiq.md
diff --git a/content/2.defense-systems/abir.md b/content/3.defense-systems/abir.md
similarity index 100%
rename from content/2.defense-systems/abir.md
rename to content/3.defense-systems/abir.md
diff --git a/content/2.defense-systems/abit.md b/content/3.defense-systems/abit.md
similarity index 100%
rename from content/2.defense-systems/abit.md
rename to content/3.defense-systems/abit.md
diff --git a/content/2.defense-systems/abiu.md b/content/3.defense-systems/abiu.md
similarity index 100%
rename from content/2.defense-systems/abiu.md
rename to content/3.defense-systems/abiu.md
diff --git a/content/2.defense-systems/abiv.md b/content/3.defense-systems/abiv.md
similarity index 100%
rename from content/2.defense-systems/abiv.md
rename to content/3.defense-systems/abiv.md
diff --git a/content/2.defense-systems/abiz.md b/content/3.defense-systems/abiz.md
similarity index 100%
rename from content/2.defense-systems/abiz.md
rename to content/3.defense-systems/abiz.md
diff --git a/content/2.defense-systems/aditi.md b/content/3.defense-systems/aditi.md
similarity index 100%
rename from content/2.defense-systems/aditi.md
rename to content/3.defense-systems/aditi.md
diff --git a/content/2.defense-systems/avs.md b/content/3.defense-systems/avs.md
similarity index 100%
rename from content/2.defense-systems/avs.md
rename to content/3.defense-systems/avs.md
diff --git a/content/2.defense-systems/azaca.md b/content/3.defense-systems/azaca.md
similarity index 100%
rename from content/2.defense-systems/azaca.md
rename to content/3.defense-systems/azaca.md
diff --git a/content/2.defense-systems/borvo.md b/content/3.defense-systems/borvo.md
similarity index 100%
rename from content/2.defense-systems/borvo.md
rename to content/3.defense-systems/borvo.md
diff --git a/content/2.defense-systems/brex.md b/content/3.defense-systems/brex.md
similarity index 100%
rename from content/2.defense-systems/brex.md
rename to content/3.defense-systems/brex.md
diff --git a/content/2.defense-systems/bsta.md b/content/3.defense-systems/bsta.md
similarity index 100%
rename from content/2.defense-systems/bsta.md
rename to content/3.defense-systems/bsta.md
diff --git a/content/2.defense-systems/bunzi.md b/content/3.defense-systems/bunzi.md
similarity index 100%
rename from content/2.defense-systems/bunzi.md
rename to content/3.defense-systems/bunzi.md
diff --git a/content/2.defense-systems/butters_gp30_gp31.md b/content/3.defense-systems/butters_gp30_gp31.md
similarity index 100%
rename from content/2.defense-systems/butters_gp30_gp31.md
rename to content/3.defense-systems/butters_gp30_gp31.md
diff --git a/content/2.defense-systems/butters_gp57r.md b/content/3.defense-systems/butters_gp57r.md
similarity index 100%
rename from content/2.defense-systems/butters_gp57r.md
rename to content/3.defense-systems/butters_gp57r.md
diff --git a/content/2.defense-systems/caprel.md b/content/3.defense-systems/caprel.md
similarity index 100%
rename from content/2.defense-systems/caprel.md
rename to content/3.defense-systems/caprel.md
diff --git a/content/2.defense-systems/card_nlr.md b/content/3.defense-systems/card_nlr.md
similarity index 100%
rename from content/2.defense-systems/card_nlr.md
rename to content/3.defense-systems/card_nlr.md
diff --git a/content/2.defense-systems/cbass.md b/content/3.defense-systems/cbass.md
similarity index 100%
rename from content/2.defense-systems/cbass.md
rename to content/3.defense-systems/cbass.md
diff --git a/content/2.defense-systems/charlie_gp32.md b/content/3.defense-systems/charlie_gp32.md
similarity index 100%
rename from content/2.defense-systems/charlie_gp32.md
rename to content/3.defense-systems/charlie_gp32.md
diff --git a/content/2.defense-systems/dartg.md b/content/3.defense-systems/dartg.md
similarity index 100%
rename from content/2.defense-systems/dartg.md
rename to content/3.defense-systems/dartg.md
diff --git a/content/2.defense-systems/dazbog.md b/content/3.defense-systems/dazbog.md
similarity index 100%
rename from content/2.defense-systems/dazbog.md
rename to content/3.defense-systems/dazbog.md
diff --git a/content/2.defense-systems/dctpdeaminase.md b/content/3.defense-systems/dctpdeaminase.md
similarity index 100%
rename from content/2.defense-systems/dctpdeaminase.md
rename to content/3.defense-systems/dctpdeaminase.md
diff --git a/content/2.defense-systems/detocs.md b/content/3.defense-systems/detocs.md
similarity index 100%
rename from content/2.defense-systems/detocs.md
rename to content/3.defense-systems/detocs.md
diff --git a/content/2.defense-systems/dgtpase.md b/content/3.defense-systems/dgtpase.md
similarity index 100%
rename from content/2.defense-systems/dgtpase.md
rename to content/3.defense-systems/dgtpase.md
diff --git a/content/2.defense-systems/disarm.md b/content/3.defense-systems/disarm.md
similarity index 100%
rename from content/2.defense-systems/disarm.md
rename to content/3.defense-systems/disarm.md
diff --git a/content/2.defense-systems/dmdde.md b/content/3.defense-systems/dmdde.md
similarity index 100%
rename from content/2.defense-systems/dmdde.md
rename to content/3.defense-systems/dmdde.md
diff --git a/content/2.defense-systems/dnd.md b/content/3.defense-systems/dnd.md
similarity index 100%
rename from content/2.defense-systems/dnd.md
rename to content/3.defense-systems/dnd.md
diff --git a/content/2.defense-systems/dodola.md b/content/3.defense-systems/dodola.md
similarity index 100%
rename from content/2.defense-systems/dodola.md
rename to content/3.defense-systems/dodola.md
diff --git a/content/2.defense-systems/dpd.md b/content/3.defense-systems/dpd.md
similarity index 100%
rename from content/2.defense-systems/dpd.md
rename to content/3.defense-systems/dpd.md
diff --git a/content/2.defense-systems/drt.md b/content/3.defense-systems/drt.md
similarity index 100%
rename from content/2.defense-systems/drt.md
rename to content/3.defense-systems/drt.md
diff --git a/content/2.defense-systems/druantia.md b/content/3.defense-systems/druantia.md
similarity index 100%
rename from content/2.defense-systems/druantia.md
rename to content/3.defense-systems/druantia.md
diff --git a/content/2.defense-systems/dsr.md b/content/3.defense-systems/dsr.md
similarity index 100%
rename from content/2.defense-systems/dsr.md
rename to content/3.defense-systems/dsr.md
diff --git a/content/2.defense-systems/eleos.md b/content/3.defense-systems/eleos.md
similarity index 100%
rename from content/2.defense-systems/eleos.md
rename to content/3.defense-systems/eleos.md
diff --git a/content/2.defense-systems/fs_giy_yig.md b/content/3.defense-systems/fs_giy_yig.md
similarity index 100%
rename from content/2.defense-systems/fs_giy_yig.md
rename to content/3.defense-systems/fs_giy_yig.md
diff --git a/content/2.defense-systems/fs_hepn_tm.md b/content/3.defense-systems/fs_hepn_tm.md
similarity index 100%
rename from content/2.defense-systems/fs_hepn_tm.md
rename to content/3.defense-systems/fs_hepn_tm.md
diff --git a/content/2.defense-systems/fs_hp.md b/content/3.defense-systems/fs_hp.md
similarity index 100%
rename from content/2.defense-systems/fs_hp.md
rename to content/3.defense-systems/fs_hp.md
diff --git a/content/2.defense-systems/fs_hp_sdh_sah.md b/content/3.defense-systems/fs_hp_sdh_sah.md
similarity index 100%
rename from content/2.defense-systems/fs_hp_sdh_sah.md
rename to content/3.defense-systems/fs_hp_sdh_sah.md
diff --git a/content/2.defense-systems/fs_hsdr_like.md b/content/3.defense-systems/fs_hsdr_like.md
similarity index 100%
rename from content/2.defense-systems/fs_hsdr_like.md
rename to content/3.defense-systems/fs_hsdr_like.md
diff --git a/content/2.defense-systems/fs_sma.md b/content/3.defense-systems/fs_sma.md
similarity index 100%
rename from content/2.defense-systems/fs_sma.md
rename to content/3.defense-systems/fs_sma.md
diff --git a/content/2.defense-systems/gabija.md b/content/3.defense-systems/gabija.md
similarity index 100%
rename from content/2.defense-systems/gabija.md
rename to content/3.defense-systems/gabija.md
diff --git a/content/2.defense-systems/gao_ape.md b/content/3.defense-systems/gao_ape.md
similarity index 100%
rename from content/2.defense-systems/gao_ape.md
rename to content/3.defense-systems/gao_ape.md
diff --git a/content/2.defense-systems/gao_her.md b/content/3.defense-systems/gao_her.md
similarity index 100%
rename from content/2.defense-systems/gao_her.md
rename to content/3.defense-systems/gao_her.md
diff --git a/content/2.defense-systems/gao_hhe.md b/content/3.defense-systems/gao_hhe.md
similarity index 100%
rename from content/2.defense-systems/gao_hhe.md
rename to content/3.defense-systems/gao_hhe.md
diff --git a/content/2.defense-systems/gao_iet.md b/content/3.defense-systems/gao_iet.md
similarity index 100%
rename from content/2.defense-systems/gao_iet.md
rename to content/3.defense-systems/gao_iet.md
diff --git a/content/2.defense-systems/gao_mza.md b/content/3.defense-systems/gao_mza.md
similarity index 100%
rename from content/2.defense-systems/gao_mza.md
rename to content/3.defense-systems/gao_mza.md
diff --git a/content/2.defense-systems/gao_ppl.md b/content/3.defense-systems/gao_ppl.md
similarity index 100%
rename from content/2.defense-systems/gao_ppl.md
rename to content/3.defense-systems/gao_ppl.md
diff --git a/content/2.defense-systems/gao_qat.md b/content/3.defense-systems/gao_qat.md
similarity index 100%
rename from content/2.defense-systems/gao_qat.md
rename to content/3.defense-systems/gao_qat.md
diff --git a/content/2.defense-systems/gao_rl.md b/content/3.defense-systems/gao_rl.md
similarity index 100%
rename from content/2.defense-systems/gao_rl.md
rename to content/3.defense-systems/gao_rl.md
diff --git a/content/2.defense-systems/gao_tery.md b/content/3.defense-systems/gao_tery.md
similarity index 100%
rename from content/2.defense-systems/gao_tery.md
rename to content/3.defense-systems/gao_tery.md
diff --git a/content/2.defense-systems/gao_tmn.md b/content/3.defense-systems/gao_tmn.md
similarity index 100%
rename from content/2.defense-systems/gao_tmn.md
rename to content/3.defense-systems/gao_tmn.md
diff --git a/content/2.defense-systems/gao_upx.md b/content/3.defense-systems/gao_upx.md
similarity index 100%
rename from content/2.defense-systems/gao_upx.md
rename to content/3.defense-systems/gao_upx.md
diff --git a/content/2.defense-systems/gaps1.md b/content/3.defense-systems/gaps1.md
similarity index 100%
rename from content/2.defense-systems/gaps1.md
rename to content/3.defense-systems/gaps1.md
diff --git a/content/2.defense-systems/gaps2.md b/content/3.defense-systems/gaps2.md
similarity index 100%
rename from content/2.defense-systems/gaps2.md
rename to content/3.defense-systems/gaps2.md
diff --git a/content/2.defense-systems/gaps4.md b/content/3.defense-systems/gaps4.md
similarity index 100%
rename from content/2.defense-systems/gaps4.md
rename to content/3.defense-systems/gaps4.md
diff --git a/content/2.defense-systems/gaps6.md b/content/3.defense-systems/gaps6.md
similarity index 100%
rename from content/2.defense-systems/gaps6.md
rename to content/3.defense-systems/gaps6.md
diff --git a/content/2.defense-systems/gasdermin.md b/content/3.defense-systems/gasdermin.md
similarity index 100%
rename from content/2.defense-systems/gasdermin.md
rename to content/3.defense-systems/gasdermin.md
diff --git a/content/2.defense-systems/hachiman.md b/content/3.defense-systems/hachiman.md
similarity index 100%
rename from content/2.defense-systems/hachiman.md
rename to content/3.defense-systems/hachiman.md
diff --git a/content/2.defense-systems/hna.md b/content/3.defense-systems/hna.md
similarity index 100%
rename from content/2.defense-systems/hna.md
rename to content/3.defense-systems/hna.md
diff --git a/content/2.defense-systems/isg15-like.md b/content/3.defense-systems/isg15-like.md
similarity index 100%
rename from content/2.defense-systems/isg15-like.md
rename to content/3.defense-systems/isg15-like.md
diff --git a/content/2.defense-systems/jukab.md b/content/3.defense-systems/jukab.md
similarity index 100%
rename from content/2.defense-systems/jukab.md
rename to content/3.defense-systems/jukab.md
diff --git a/content/2.defense-systems/kiwa.md b/content/3.defense-systems/kiwa.md
similarity index 100%
rename from content/2.defense-systems/kiwa.md
rename to content/3.defense-systems/kiwa.md
diff --git a/content/2.defense-systems/lamassu-fam.md b/content/3.defense-systems/lamassu-fam.md
similarity index 100%
rename from content/2.defense-systems/lamassu-fam.md
rename to content/3.defense-systems/lamassu-fam.md
diff --git a/content/2.defense-systems/lit.md b/content/3.defense-systems/lit.md
similarity index 100%
rename from content/2.defense-systems/lit.md
rename to content/3.defense-systems/lit.md
diff --git a/content/2.defense-systems/mads.md b/content/3.defense-systems/mads.md
similarity index 100%
rename from content/2.defense-systems/mads.md
rename to content/3.defense-systems/mads.md
diff --git a/content/2.defense-systems/mazef.md b/content/3.defense-systems/mazef.md
similarity index 100%
rename from content/2.defense-systems/mazef.md
rename to content/3.defense-systems/mazef.md
diff --git a/content/2.defense-systems/menshen.md b/content/3.defense-systems/menshen.md
similarity index 100%
rename from content/2.defense-systems/menshen.md
rename to content/3.defense-systems/menshen.md
diff --git a/content/2.defense-systems/mmb_gp29_gp30.md b/content/3.defense-systems/mmb_gp29_gp30.md
similarity index 100%
rename from content/2.defense-systems/mmb_gp29_gp30.md
rename to content/3.defense-systems/mmb_gp29_gp30.md
diff --git a/content/2.defense-systems/mok_hok_sok.md b/content/3.defense-systems/mok_hok_sok.md
similarity index 100%
rename from content/2.defense-systems/mok_hok_sok.md
rename to content/3.defense-systems/mok_hok_sok.md
diff --git a/content/2.defense-systems/mokosh.md b/content/3.defense-systems/mokosh.md
similarity index 100%
rename from content/2.defense-systems/mokosh.md
rename to content/3.defense-systems/mokosh.md
diff --git a/content/2.defense-systems/mqsrac.md b/content/3.defense-systems/mqsrac.md
similarity index 100%
rename from content/2.defense-systems/mqsrac.md
rename to content/3.defense-systems/mqsrac.md
diff --git a/content/2.defense-systems/nhi.md b/content/3.defense-systems/nhi.md
similarity index 100%
rename from content/2.defense-systems/nhi.md
rename to content/3.defense-systems/nhi.md
diff --git a/content/2.defense-systems/nixi.md b/content/3.defense-systems/nixi.md
similarity index 100%
rename from content/2.defense-systems/nixi.md
rename to content/3.defense-systems/nixi.md
diff --git a/content/2.defense-systems/nlr.md b/content/3.defense-systems/nlr.md
similarity index 100%
rename from content/2.defense-systems/nlr.md
rename to content/3.defense-systems/nlr.md
diff --git a/content/2.defense-systems/old_exonuclease.md b/content/3.defense-systems/old_exonuclease.md
similarity index 100%
rename from content/2.defense-systems/old_exonuclease.md
rename to content/3.defense-systems/old_exonuclease.md
diff --git a/content/2.defense-systems/olokun.md b/content/3.defense-systems/olokun.md
similarity index 100%
rename from content/2.defense-systems/olokun.md
rename to content/3.defense-systems/olokun.md
diff --git a/content/2.defense-systems/pago.md b/content/3.defense-systems/pago.md
similarity index 100%
rename from content/2.defense-systems/pago.md
rename to content/3.defense-systems/pago.md
diff --git a/content/2.defense-systems/panchino_gp28.md b/content/3.defense-systems/panchino_gp28.md
similarity index 100%
rename from content/2.defense-systems/panchino_gp28.md
rename to content/3.defense-systems/panchino_gp28.md
diff --git a/content/2.defense-systems/paris.md b/content/3.defense-systems/paris.md
similarity index 100%
rename from content/2.defense-systems/paris.md
rename to content/3.defense-systems/paris.md
diff --git a/content/2.defense-systems/pd-lambda-1.md b/content/3.defense-systems/pd-lambda-1.md
similarity index 100%
rename from content/2.defense-systems/pd-lambda-1.md
rename to content/3.defense-systems/pd-lambda-1.md
diff --git a/content/2.defense-systems/pd-lambda-2.md b/content/3.defense-systems/pd-lambda-2.md
similarity index 100%
rename from content/2.defense-systems/pd-lambda-2.md
rename to content/3.defense-systems/pd-lambda-2.md
diff --git a/content/2.defense-systems/pd-lambda-3.md b/content/3.defense-systems/pd-lambda-3.md
similarity index 100%
rename from content/2.defense-systems/pd-lambda-3.md
rename to content/3.defense-systems/pd-lambda-3.md
diff --git a/content/2.defense-systems/pd-lambda-4.md b/content/3.defense-systems/pd-lambda-4.md
similarity index 100%
rename from content/2.defense-systems/pd-lambda-4.md
rename to content/3.defense-systems/pd-lambda-4.md
diff --git a/content/2.defense-systems/pd-lambda-5.md b/content/3.defense-systems/pd-lambda-5.md
similarity index 100%
rename from content/2.defense-systems/pd-lambda-5.md
rename to content/3.defense-systems/pd-lambda-5.md
diff --git a/content/2.defense-systems/pd-lambda-6.md b/content/3.defense-systems/pd-lambda-6.md
similarity index 100%
rename from content/2.defense-systems/pd-lambda-6.md
rename to content/3.defense-systems/pd-lambda-6.md
diff --git a/content/2.defense-systems/pd-t4-1.md b/content/3.defense-systems/pd-t4-1.md
similarity index 100%
rename from content/2.defense-systems/pd-t4-1.md
rename to content/3.defense-systems/pd-t4-1.md
diff --git a/content/2.defense-systems/pd-t4-10.md b/content/3.defense-systems/pd-t4-10.md
similarity index 100%
rename from content/2.defense-systems/pd-t4-10.md
rename to content/3.defense-systems/pd-t4-10.md
diff --git a/content/2.defense-systems/pd-t4-2.md b/content/3.defense-systems/pd-t4-2.md
similarity index 100%
rename from content/2.defense-systems/pd-t4-2.md
rename to content/3.defense-systems/pd-t4-2.md
diff --git a/content/2.defense-systems/pd-t4-3.md b/content/3.defense-systems/pd-t4-3.md
similarity index 100%
rename from content/2.defense-systems/pd-t4-3.md
rename to content/3.defense-systems/pd-t4-3.md
diff --git a/content/2.defense-systems/pd-t4-4.md b/content/3.defense-systems/pd-t4-4.md
similarity index 100%
rename from content/2.defense-systems/pd-t4-4.md
rename to content/3.defense-systems/pd-t4-4.md
diff --git a/content/2.defense-systems/pd-t4-5.md b/content/3.defense-systems/pd-t4-5.md
similarity index 100%
rename from content/2.defense-systems/pd-t4-5.md
rename to content/3.defense-systems/pd-t4-5.md
diff --git a/content/2.defense-systems/pd-t4-6.md b/content/3.defense-systems/pd-t4-6.md
similarity index 100%
rename from content/2.defense-systems/pd-t4-6.md
rename to content/3.defense-systems/pd-t4-6.md
diff --git a/content/2.defense-systems/pd-t4-7.md b/content/3.defense-systems/pd-t4-7.md
similarity index 100%
rename from content/2.defense-systems/pd-t4-7.md
rename to content/3.defense-systems/pd-t4-7.md
diff --git a/content/2.defense-systems/pd-t4-8.md b/content/3.defense-systems/pd-t4-8.md
similarity index 100%
rename from content/2.defense-systems/pd-t4-8.md
rename to content/3.defense-systems/pd-t4-8.md
diff --git a/content/2.defense-systems/pd-t4-9.md b/content/3.defense-systems/pd-t4-9.md
similarity index 100%
rename from content/2.defense-systems/pd-t4-9.md
rename to content/3.defense-systems/pd-t4-9.md
diff --git a/content/2.defense-systems/pd-t7-1.md b/content/3.defense-systems/pd-t7-1.md
similarity index 100%
rename from content/2.defense-systems/pd-t7-1.md
rename to content/3.defense-systems/pd-t7-1.md
diff --git a/content/2.defense-systems/pd-t7-2.md b/content/3.defense-systems/pd-t7-2.md
similarity index 100%
rename from content/2.defense-systems/pd-t7-2.md
rename to content/3.defense-systems/pd-t7-2.md
diff --git a/content/2.defense-systems/pd-t7-3.md b/content/3.defense-systems/pd-t7-3.md
similarity index 100%
rename from content/2.defense-systems/pd-t7-3.md
rename to content/3.defense-systems/pd-t7-3.md
diff --git a/content/2.defense-systems/pd-t7-4.md b/content/3.defense-systems/pd-t7-4.md
similarity index 100%
rename from content/2.defense-systems/pd-t7-4.md
rename to content/3.defense-systems/pd-t7-4.md
diff --git a/content/2.defense-systems/pd-t7-5.md b/content/3.defense-systems/pd-t7-5.md
similarity index 100%
rename from content/2.defense-systems/pd-t7-5.md
rename to content/3.defense-systems/pd-t7-5.md
diff --git a/content/2.defense-systems/pfiat.md b/content/3.defense-systems/pfiat.md
similarity index 100%
rename from content/2.defense-systems/pfiat.md
rename to content/3.defense-systems/pfiat.md
diff --git a/content/2.defense-systems/phrann_gp29_gp30.md b/content/3.defense-systems/phrann_gp29_gp30.md
similarity index 100%
rename from content/2.defense-systems/phrann_gp29_gp30.md
rename to content/3.defense-systems/phrann_gp29_gp30.md
diff --git a/content/2.defense-systems/pif.md b/content/3.defense-systems/pif.md
similarity index 100%
rename from content/2.defense-systems/pif.md
rename to content/3.defense-systems/pif.md
diff --git a/content/2.defense-systems/prrc.md b/content/3.defense-systems/prrc.md
similarity index 100%
rename from content/2.defense-systems/prrc.md
rename to content/3.defense-systems/prrc.md
diff --git a/content/2.defense-systems/psyrta.md b/content/3.defense-systems/psyrta.md
similarity index 100%
rename from content/2.defense-systems/psyrta.md
rename to content/3.defense-systems/psyrta.md
diff --git a/content/2.defense-systems/pycsar.md b/content/3.defense-systems/pycsar.md
similarity index 100%
rename from content/2.defense-systems/pycsar.md
rename to content/3.defense-systems/pycsar.md
diff --git a/content/2.defense-systems/radar.md b/content/3.defense-systems/radar.md
similarity index 100%
rename from content/2.defense-systems/radar.md
rename to content/3.defense-systems/radar.md
diff --git a/content/2.defense-systems/retron.md b/content/3.defense-systems/retron.md
similarity index 100%
rename from content/2.defense-systems/retron.md
rename to content/3.defense-systems/retron.md
diff --git a/content/2.defense-systems/rexab.md b/content/3.defense-systems/rexab.md
similarity index 100%
rename from content/2.defense-systems/rexab.md
rename to content/3.defense-systems/rexab.md
diff --git a/content/2.defense-systems/rloc.md b/content/3.defense-systems/rloc.md
similarity index 100%
rename from content/2.defense-systems/rloc.md
rename to content/3.defense-systems/rloc.md
diff --git a/content/2.defense-systems/rm.md b/content/3.defense-systems/rm.md
similarity index 100%
rename from content/2.defense-systems/rm.md
rename to content/3.defense-systems/rm.md
diff --git a/content/2.defense-systems/rnlab.md b/content/3.defense-systems/rnlab.md
similarity index 100%
rename from content/2.defense-systems/rnlab.md
rename to content/3.defense-systems/rnlab.md
diff --git a/content/2.defense-systems/rosmerta.md b/content/3.defense-systems/rosmerta.md
similarity index 100%
rename from content/2.defense-systems/rosmerta.md
rename to content/3.defense-systems/rosmerta.md
diff --git a/content/2.defense-systems/rst_2tm_1tm_tir.md b/content/3.defense-systems/rst_2tm_1tm_tir.md
similarity index 100%
rename from content/2.defense-systems/rst_2tm_1tm_tir.md
rename to content/3.defense-systems/rst_2tm_1tm_tir.md
diff --git a/content/2.defense-systems/rst_3hp.md b/content/3.defense-systems/rst_3hp.md
similarity index 100%
rename from content/2.defense-systems/rst_3hp.md
rename to content/3.defense-systems/rst_3hp.md
diff --git a/content/2.defense-systems/rst_duf4238.md b/content/3.defense-systems/rst_duf4238.md
similarity index 100%
rename from content/2.defense-systems/rst_duf4238.md
rename to content/3.defense-systems/rst_duf4238.md
diff --git a/content/2.defense-systems/rst_gop_beta_cll.md b/content/3.defense-systems/rst_gop_beta_cll.md
similarity index 100%
rename from content/2.defense-systems/rst_gop_beta_cll.md
rename to content/3.defense-systems/rst_gop_beta_cll.md
diff --git a/content/2.defense-systems/rst_helicaseduf2290.md b/content/3.defense-systems/rst_helicaseduf2290.md
similarity index 100%
rename from content/2.defense-systems/rst_helicaseduf2290.md
rename to content/3.defense-systems/rst_helicaseduf2290.md
diff --git a/content/2.defense-systems/rst_hydrolase-3tm.md b/content/3.defense-systems/rst_hydrolase-3tm.md
similarity index 100%
rename from content/2.defense-systems/rst_hydrolase-3tm.md
rename to content/3.defense-systems/rst_hydrolase-3tm.md
diff --git a/content/2.defense-systems/rst_rt-nitrilase-tm.md b/content/3.defense-systems/rst_rt-nitrilase-tm.md
similarity index 100%
rename from content/2.defense-systems/rst_rt-nitrilase-tm.md
rename to content/3.defense-systems/rst_rt-nitrilase-tm.md
diff --git a/content/2.defense-systems/rst_tir-nlr.md b/content/3.defense-systems/rst_tir-nlr.md
similarity index 100%
rename from content/2.defense-systems/rst_tir-nlr.md
rename to content/3.defense-systems/rst_tir-nlr.md
diff --git a/content/2.defense-systems/sanata.md b/content/3.defense-systems/sanata.md
similarity index 100%
rename from content/2.defense-systems/sanata.md
rename to content/3.defense-systems/sanata.md
diff --git a/content/2.defense-systems/sefir.md b/content/3.defense-systems/sefir.md
similarity index 100%
rename from content/2.defense-systems/sefir.md
rename to content/3.defense-systems/sefir.md
diff --git a/content/2.defense-systems/septu.md b/content/3.defense-systems/septu.md
similarity index 100%
rename from content/2.defense-systems/septu.md
rename to content/3.defense-systems/septu.md
diff --git a/content/2.defense-systems/shango.md b/content/3.defense-systems/shango.md
similarity index 100%
rename from content/2.defense-systems/shango.md
rename to content/3.defense-systems/shango.md
diff --git a/content/2.defense-systems/shedu.md b/content/3.defense-systems/shedu.md
similarity index 100%
rename from content/2.defense-systems/shedu.md
rename to content/3.defense-systems/shedu.md
diff --git a/content/2.defense-systems/shosta.md b/content/3.defense-systems/shosta.md
similarity index 100%
rename from content/2.defense-systems/shosta.md
rename to content/3.defense-systems/shosta.md
diff --git a/content/2.defense-systems/sofic.md b/content/3.defense-systems/sofic.md
similarity index 100%
rename from content/2.defense-systems/sofic.md
rename to content/3.defense-systems/sofic.md
diff --git a/content/2.defense-systems/spbk.md b/content/3.defense-systems/spbk.md
similarity index 100%
rename from content/2.defense-systems/spbk.md
rename to content/3.defense-systems/spbk.md
diff --git a/content/2.defense-systems/sspbcde.md b/content/3.defense-systems/sspbcde.md
similarity index 100%
rename from content/2.defense-systems/sspbcde.md
rename to content/3.defense-systems/sspbcde.md
diff --git a/content/2.defense-systems/stk2.md b/content/3.defense-systems/stk2.md
similarity index 100%
rename from content/2.defense-systems/stk2.md
rename to content/3.defense-systems/stk2.md
diff --git a/content/2.defense-systems/thoeris.md b/content/3.defense-systems/thoeris.md
similarity index 100%
rename from content/2.defense-systems/thoeris.md
rename to content/3.defense-systems/thoeris.md
diff --git a/content/2.defense-systems/tiamat.md b/content/3.defense-systems/tiamat.md
similarity index 100%
rename from content/2.defense-systems/tiamat.md
rename to content/3.defense-systems/tiamat.md
diff --git a/content/2.defense-systems/uzume.md b/content/3.defense-systems/uzume.md
similarity index 100%
rename from content/2.defense-systems/uzume.md
rename to content/3.defense-systems/uzume.md
diff --git a/content/2.defense-systems/viperin.md b/content/3.defense-systems/viperin.md
similarity index 100%
rename from content/2.defense-systems/viperin.md
rename to content/3.defense-systems/viperin.md
diff --git a/content/2.defense-systems/wadjet.md b/content/3.defense-systems/wadjet.md
similarity index 100%
rename from content/2.defense-systems/wadjet.md
rename to content/3.defense-systems/wadjet.md
diff --git a/content/2.defense-systems/zorya.md b/content/3.defense-systems/zorya.md
similarity index 100%
rename from content/2.defense-systems/zorya.md
rename to content/3.defense-systems/zorya.md
diff --git a/content/4.refseq.md b/content/4.refseq.md
new file mode 100644
index 0000000000000000000000000000000000000000..ec34a0f081673e2f69e2ffc6eb7529649ddfc569
--- /dev/null
+++ b/content/4.refseq.md
@@ -0,0 +1,4 @@
+---
+layout: article-no-toc
+navigation: false
+---
\ No newline at end of file
diff --git a/content/_partial/articles.json b/content/_partials/_articles.json
similarity index 100%
rename from content/_partial/articles.json
rename to content/_partials/_articles.json
diff --git a/content/_partials/_dir.yml b/content/_partials/_dir.yml
new file mode 100644
index 0000000000000000000000000000000000000000..9a286def0874abc3f8edae1d953748fa397fd869
--- /dev/null
+++ b/content/_partials/_dir.yml
@@ -0,0 +1 @@
+navigation: false
diff --git a/content/_partial/pfam-a-hmm.csv b/content/_partials/_pfam-a-hmm.csv
similarity index 100%
rename from content/_partial/pfam-a-hmm.csv
rename to content/_partials/_pfam-a-hmm.csv
diff --git a/content/_partials/_refseq.csv b/content/_partials/_refseq.csv
new file mode 100644
index 0000000000000000000000000000000000000000..c17de6a02d31c52de8d7861c9a199960bab15a90
--- /dev/null
+++ b/content/_partials/_refseq.csv
@@ -0,0 +1,208 @@
+"sys_id","type","subtype","sys_beg","sys_end","protein_in_syst","genes_count","name_of_profiles_in_sys","genus","species"
+"defense-finder-genome1muq7_wr_Gao_RL_87","Gao_RL","Gao_RL","ESCO001.0722.01492.C001_00546","ESCO001.0722.01492.C001_00549","ESCO001.0722.01492.C001_00546,ESCO001.0722.01492.C001_00547,ESCO001.0722.01492.C001_00548,ESCO001.0722.01492.C001_00549",4,"Gao_RL__RL_D,Gao_RL__RL_C,Gao_RL__RL_B,Gao_RL__RL_A","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_AVAST_III_68","AVAST","AVAST_III","SASP008.0722.00001.C001_01732","SASP008.0722.00001.C001_01733","SASP008.0722.00001.C001_01732,SASP008.0722.00001.C001_01733",2,"AVAST_III__Avs3B,AVAST_III__Avs3A","Anabaena","Anabaena catenula"
+"defense-finder-genome1muq7_wr_AVAST_IV_69","AVAST","AVAST_IV","ESCO001.0722.00846.C001_00370","ESCO001.0722.00846.C001_00370","ESCO001.0722.00846.C001_00370",1,"AVAST_IV__Avs4A","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_AVAST_II_67","AVAST","AVAST_II","ESCO001.0722.01536.C001_03667","ESCO001.0722.01536.C001_03667","ESCO001.0722.01536.C001_03667",1,"AVAST_II__Avs2A","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_PD-Lambda-4_95","PD-Lambda-4","PD-Lambda-4","ESCO001.0722.01491.C001_01209","ESCO001.0722.01491.C001_01210","ESCO001.0722.01491.C001_01209,ESCO001.0722.01491.C001_01210",2,"PD-Lambda-4__PD-Lambda-4_B,PD-Lambda-4__PD-Lambda-4_A","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_Wadjet_II_106","Wadjet","Wadjet_II","THSP037.0722.00001.C001_02324","THSP037.0722.00001.C001_02327","THSP037.0722.00001.C001_02324,THSP037.0722.00001.C001_02325,THSP037.0722.00001.C001_02326,THSP037.0722.00001.C001_02327",4,"Wadjet__JetD_II,Wadjet__JetC_II,Wadjet__JetB_II,Wadjet__JetA_II","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_Dsr_I_85","Dsr","Dsr_I","ESCO001.0722.00190.C001_03773","ESCO001.0722.00190.C001_03773","ESCO001.0722.00190.C001_03773",1,"Dsr_I__Dsr1","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_AVAST_I_66","AVAST","AVAST_I","PAPU001.0722.00001.C001_00004","PAPU001.0722.00001.C001_00006","PAPU001.0722.00001.C001_00004,PAPU001.0722.00001.C001_00005,PAPU001.0722.00001.C001_00006",3,"AVAST_I__Avs1A,AVAST_I__Avs1B,AVAST_I__Avs1C","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_Wadjet_I_105","Wadjet","Wadjet_I","SYAC002.0722.00001.C001_01555","SYAC002.0722.00001.C001_01558","SYAC002.0722.00001.C001_01555,SYAC002.0722.00001.C001_01556,SYAC002.0722.00001.C001_01557,SYAC002.0722.00001.C001_01558",4,"Wadjet__JetD_I,Wadjet__JetC_I,Wadjet__JetB_I,Wadjet__JetA_I","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_DRT_1_79","DRT","DRT_1","KLPN001.0722.00865.C001_04446","KLPN001.0722.00865.C001_04447","KLPN001.0722.00865.C001_04446,KLPN001.0722.00865.C001_04447",2,"DRT_1__drt1a,DRT_1__drt1b","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_Wadjet_III_107","Wadjet","Wadjet_III","BLLI001.0722.00001.C001_00817","BLLI001.0722.00001.C001_00820","BLLI001.0722.00001.C001_00817,BLLI001.0722.00001.C001_00818,BLLI001.0722.00001.C001_00819,BLLI001.0722.00001.C001_00820",4,"Wadjet__JetD_III,Wadjet__JetA_III,Wadjet__JetB_III,Wadjet__JetC_III","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_DRT_3_81","DRT","DRT_3","KLQU001.0722.00047.C001_04085","KLQU001.0722.00047.C001_04086","KLQU001.0722.00047.C001_04085,KLQU001.0722.00047.C001_04086",2,"DRT_3__drt3a,DRT_3__drt3b","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_Dsr_II_86","Dsr","Dsr_II","ESCO001.0722.00455.C001_04350","ESCO001.0722.00455.C001_04350","ESCO001.0722.00455.C001_04350",1,"Dsr_II__Dsr2","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_PsyrTA_97","PsyrTA","PsyrTA","ESCO001.0722.01550.C001_02358","ESCO001.0722.01550.C001_02359","ESCO001.0722.01550.C001_02358,ESCO001.0722.01550.C001_02359",2,"PsyrTA__PsyrA,PsyrTA__PsyrT","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_PD-Lambda-2_93","PD-Lambda-2","PD-Lambda-2","KLMI001.0722.00005.C001_03694","KLMI001.0722.00005.C001_03696","KLMI001.0722.00005.C001_03694,KLMI001.0722.00005.C001_03695,KLMI001.0722.00005.C001_03696",3,"PD-Lambda-2__PD-Lambda-2_A,PD-Lambda-2__PD-Lambda-2_B,PD-Lambda-2__PD-Lambda-2_C","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_Old_exonuclease_91","Old_exonuclease","Old_exonuclease","ESCO001.0722.00399.C001_03687","ESCO001.0722.00399.C001_03687","ESCO001.0722.00399.C001_03687",1,"Old_exonuclease__Old_exonuclease","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_Rst_gop_beta_cll_99","Rst_gop_beta_cll","Rst_gop_beta_cll","KLGR001.0722.00013.C001_04750","KLGR001.0722.00013.C001_04752","KLGR001.0722.00013.C001_04750,KLGR001.0722.00013.C001_04751,KLGR001.0722.00013.C001_04752",3,"Rst_gop_beta_cll__gop,Rst_gop_beta_cll__beta,Rst_gop_beta_cll__cll","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_AVAST_V_70","AVAST","AVAST_V","LEAD002.0722.00003.C001_04722","LEAD002.0722.00003.C001_04722","LEAD002.0722.00003.C001_04722",1,"AVAST_V__Avs5A","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_DRT_4_82","DRT","DRT_4","CIFR004.0722.00102.C001_00071","CIFR004.0722.00102.C001_00071","CIFR004.0722.00102.C001_00071",1,"DRT_4__drt4","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_Septu_100","Septu","Septu","KLOX001.0722.00028.C001_04859","KLOX001.0722.00028.C001_04866","KLOX001.0722.00028.C001_04859,KLOX001.0722.00028.C001_04860,KLOX001.0722.00028.C001_04865,KLOX001.0722.00028.C001_04866",4,"Septu__PtuB_2,Septu__PtuA_2,Septu__PtuB,Septu__PtuA","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_AbiA_small_72","AbiA","AbiA_small","MEFO002.0722.00001.P002_00341","MEFO002.0722.00001.P002_00342","MEFO002.0722.00001.P002_00341,MEFO002.0722.00001.P002_00342",2,"AbiA_small__AbiA_small,AbiA_small__AbiA_SLATT","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_NLR_like_bNACHT09_90","NLR","NLR_like_bNACHT09","VICH002.0722.00049.C002_00519","VICH002.0722.00049.C002_00519","VICH002.0722.00049.C002_00519",1,"NLR_like_bNACHT09__NLR_like_bNACHT09","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_PD-Lambda-3_94","PD-Lambda-3","PD-Lambda-3","RAOR001.0722.00008.C001_00215","RAOR001.0722.00008.C001_00216","RAOR001.0722.00008.C001_00215,RAOR001.0722.00008.C001_00216",2,"PD-Lambda-3__PD-Lambda-3_A,PD-Lambda-3__PD-Lambda-3_B","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_DRT_5_83","DRT","DRT_5","ESCO001.0722.00760.C001_01979","ESCO001.0722.00760.C001_01979","ESCO001.0722.00760.C001_01979",1,"DRT_5__drt5","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_DRT8_77","DRT","DRT8","OXFO001.0722.00002.C001_00420","OXFO001.0722.00002.C001_00421","OXFO001.0722.00002.C001_00420,OXFO001.0722.00002.C001_00421",2,"DRT8__DRT8,DRT8__DRT8b","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_Rst_2TM_1TM_TIR_98","Rst_2TM_1TM_TIR","Rst_2TM_1TM_TIR","ESCO001.0722.00104.C001_02058","ESCO001.0722.00104.C001_02060","ESCO001.0722.00104.C001_02058,ESCO001.0722.00104.C001_02059,ESCO001.0722.00104.C001_02060",3,"Rst_2TM_1TM_TIR__Rst_TIR_tm,Rst_2TM_1TM_TIR__Rst_1TM_TIR,Rst_2TM_1TM_TIR__Rst_2TM_TIR","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_AbiK_73","AbiK","AbiK","FUNE001.0722.00002.C001_01412","FUNE001.0722.00002.C001_01412","FUNE001.0722.00002.C001_01412",1,"AbiK__AbiK","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_DRT_2_80","DRT","DRT_2","ENCL014.0722.00029.C001_03483","ENCL014.0722.00029.C001_03483","ENCL014.0722.00029.C001_03483",1,"DRT_2__drt2","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_DRT9_78","DRT","DRT9","PSAE004.0722.00302.C001_00010","PSAE004.0722.00302.C001_00010","PSAE004.0722.00302.C001_00010",1,"DRT9__DRT9","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_AbiA_large_71","AbiA","AbiA_large","TEGO001.0722.00001.C001_00038","TEGO001.0722.00001.C001_00038","TEGO001.0722.00001.C001_00038",1,"AbiA_large__AbiA_large","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_PD-Lambda-1_92","PD-Lambda-1","PD-Lambda-1","ESCO001.0722.00485.C001_00603","ESCO001.0722.00485.C001_00603","ESCO001.0722.00485.C001_00603",1,"PD-Lambda-1__PD-Lambda-1","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_DRT6_75","DRT","DRT6","CHMU001.0722.00001.C001_02937","CHMU001.0722.00001.C001_02937","CHMU001.0722.00001.C001_02937",1,"DRT6__DRT6","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_AbiP2_74","AbiP2","AbiP2","LELO001.0722.00001.C001_01622","LELO001.0722.00001.C001_01622","LELO001.0722.00001.C001_01622",1,"AbiP2__AbiP2","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_NLR_like_bNACHT01_89","NLR","NLR_like_bNACHT01","ESAL001.0722.00020.P005_00043","ESAL001.0722.00020.P005_00043","ESAL001.0722.00020.P005_00043",1,"NLR_like_bNACHT01__NLR_like_bNACHT01","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_ShosTA_101","ShosTA","ShosTA","ESCO001.0722.01172.C001_03616","ESCO001.0722.01172.C001_03617","ESCO001.0722.01172.C001_03616,ESCO001.0722.01172.C001_03617",2,"ShosTA__ShosT,ShosTA__ShosA","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_MqsRAC_88","MqsRAC","MqsRAC","ESCO001.0722.01696.C001_02972","ESCO001.0722.01696.C001_02974","ESCO001.0722.01696.C001_02972,ESCO001.0722.01696.C001_02974",2,"MqsRAC__mqsR,MqsRAC__mqsC","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_DarTG_84","DarTG","DarTG","MYTU002.0722.00037.C001_00064","MYTU002.0722.00037.C001_00065","MYTU002.0722.00037.C001_00064,MYTU002.0722.00037.C001_00065",2,"DarTG__DarT,DarTG__DarG","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_PD-Lambda-6_96","PD-Lambda-6","PD-Lambda-6","ESCO001.0722.00134.C001_04695","ESCO001.0722.00134.C001_04695","ESCO001.0722.00134.C001_04695",1,"PD-Lambda-6__PD-Lambda-6","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_DRT7_76","DRT","DRT7","VIVU001.0722.00013.C001_00184","VIVU001.0722.00013.C001_00184","VIVU001.0722.00013.C001_00184",1,"DRT7__DRT7","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_Dpd_138","Dpd","Dpd","THCR001.0722.00001.C001_01127","THCR001.0722.00001.C001_01142","THCR001.0722.00001.C001_01127,THCR001.0722.00001.C001_01128,THCR001.0722.00001.C001_01129,THCR001.0722.00001.C001_01130,THCR001.0722.00001.C001_01131,THCR001.0722.00001.C001_01132,THCR001.0722.00001.C001_01133,THCR001.0722.00001.C001_01134,THCR001.0722.00001.C001_01135,THCR001.0722.00001.C001_01136,THCR001.0722.00001.C001_01137,THCR001.0722.00001.C001_01138,THCR001.0722.00001.C001_01139,THCR001.0722.00001.C001_01140,THCR001.0722.00001.C001_01142",15,"Dpd__QueE,Dpd__DpdE,Dpd__DpdF,Dpd__DpdG,Dpd__DpdH,Dpd__DpdI,Dpd__DpdJ,Dpd__DpdK,Dpd__DpdD,Dpd__QueC,Dpd__DpdB,Dpd__DpdA,Dpd__DpdC,Dpd__QueD,Dpd__FolE","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_SspBCDE_157","SspBCDE","SspBCDE","BOHI001.0722.00008.C001_00581","BOHI001.0722.00008.C001_00587","BOHI001.0722.00008.C001_00581,BOHI001.0722.00008.C001_00582,BOHI001.0722.00008.C001_00583,BOHI001.0722.00008.C001_00584,BOHI001.0722.00008.C001_00585,BOHI001.0722.00008.C001_00586,BOHI001.0722.00008.C001_00587",7,"SspBCDE__SspF,SspBCDE__SspG,SspBCDE__SspH,SspBCDE__SspE,SspBCDE__SspD,SspBCDE__SspC,SspBCDE__SspB","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_Dnd_ABCDEFGH_136","Dnd","Dnd_ABCDEFGH","VISP026.0722.00001.C001_00835","VISP026.0722.00001.C001_00844","VISP026.0722.00001.C001_00835,VISP026.0722.00001.C001_00836,VISP026.0722.00001.C001_00837,VISP026.0722.00001.C001_00840,VISP026.0722.00001.C001_00841,VISP026.0722.00001.C001_00842,VISP026.0722.00001.C001_00843,VISP026.0722.00001.C001_00844",8,"Dnd_ABCDEFGH__DptF,Dnd_ABCDEFGH__DptG,Dnd_ABCDEFGH__DptH,Dnd__DndE,Dnd__DndD,Dnd__DndC,Dnd__DndB,Dnd__DndA","Escherichia","Escherichia coli"
+"defense-finder-genome1muq7_wr_Zorya_TypeI_158","Zorya","Zorya_TypeI","PSAE004.0722.00062.C001_04977","PSAE004.0722.00062.C001_04980","PSAE004.0722.00062.C001_04977,PSAE004.0722.00062.C001_04978,PSAE004.0722.00062.C001_04979,PSAE004.0722.00062.C001_04980",4,"Zorya_TypeI__ZorD,Zorya_TypeI__ZorC,Zorya__ZorB,Zorya__ZorA","Anabaena","Anabaena catenula"
+"defense-finder-genome1muq7_wr_Dnd_ABCDE_135","Dnd","Dnd_ABCDE","THCU001.0722.00001.C001_00170","THCU001.0722.00001.C001_00174","THCU001.0722.00001.C001_00170,THCU001.0722.00001.C001_00171,THCU001.0722.00001.C001_00172,THCU001.0722.00001.C001_00173,THCU001.0722.00001.C001_00174",5,"Dnd__DndA,Dnd__DndB,Dnd__DndC,Dnd__DndD,Dnd__DndE","Anabaena","Anabaena catenula"
+"defense-finder-genome1muq7_wr_Mokosh_TypeI_143","Mokosh","Mokosh_TypeI","VIAL003.0722.00025.C001_02349","VIAL003.0722.00025.C001_02350","VIAL003.0722.00025.C001_02349,VIAL003.0722.00025.C001_02350",2,"Mokosh_TypeI__MkoB2,Mokosh_TypeI__MkoA2","Anabaena","Anabaena catenula"
+"defense-finder-genome1muq7_wr_Mokosh_TypeI_144","Mokosh","Mokosh_TypeI","NOSP054.0722.00001.C001_01954","NOSP054.0722.00001.C001_01957","NOSP054.0722.00001.C001_01954,NOSP054.0722.00001.C001_01957",2,"Mokosh_TypeI__MkoA,Mokosh_TypeI__MkoB","Anabaena","Anabaena catenula"
+"defense-finder-genome1muq7_wr_Shango_156","Shango","Shango","PSSP124.0722.00001.C001_03189","PSSP124.0722.00001.C001_03191","PSSP124.0722.00001.C001_03189,PSSP124.0722.00001.C001_03190,PSSP124.0722.00001.C001_03191",3,"Shango__SngA,Shango__SngB,Shango__SngC","Anabaena","Anabaena catenula"
+"defense-finder-genome1muq7_wr_Mokosh_TypeI_145","Mokosh","Mokosh_TypeI","ALFR002.0722.00001.P002_00046","ALFR002.0722.00001.P002_00047","ALFR002.0722.00001.P002_00046,ALFR002.0722.00001.P002_00047",2,"Mokosh_TypeI__MkoB,Mokosh_TypeI__MkoA","Anabaena","Anabaena catenula"
+"defense-finder-genome1muq7_wr_Mokosh_TypeI_146","Mokosh","Mokosh_TypeI","PSAE004.0722.00242.C001_03385","PSAE004.0722.00242.C001_03386","PSAE004.0722.00242.C001_03385,PSAE004.0722.00242.C001_03386",2,"Mokosh_TypeI__MkoA,Mokosh_TypeI__MkoB","Anabaena","Anabaena catenula"
+"defense-finder-genome1muq7_wr_Mokosh_TypeII_149","Mokosh","Mokosh_TypeII","SAEN001.0722.00009.C001_04168","SAEN001.0722.00009.C001_04168","SAEN001.0722.00009.C001_04168",1,"Mokosh_TypeII__MkoC","Anabaena","Anabaena catenula"
+"defense-finder-genome1muq7_wr_Hachiman_139","Hachiman","Hachiman","ENSP011.0722.00001.C001_03190","ENSP011.0722.00001.C001_03191","ENSP011.0722.00001.C001_03190,ENSP011.0722.00001.C001_03191",2,"Hachiman__HamA_1,Hachiman__HamB","Anabaena","Anabaena catenula"
+"defense-finder-genome1muq7_wr_Menshen_141","Menshen","Menshen","KLPN001.0722.00213.C001_00798","KLPN001.0722.00213.C001_00800","KLPN001.0722.00213.C001_00798,KLPN001.0722.00213.C001_00799,KLPN001.0722.00213.C001_00800",3,"Menshen__NsnC_2660358384,Menshen__NsnB,Menshen__NsnA","Anabaena","Anabaena catenula"
+"defense-finder-genome1muq7_wr_Mokosh_TypeI_147","Mokosh","Mokosh_TypeI","PSAE004.0722.00020.C001_04344","PSAE004.0722.00020.C001_04345","PSAE004.0722.00020.C001_04344,PSAE004.0722.00020.C001_04345",2,"Mokosh_TypeI__MkoB,Mokosh_TypeI__MkoA","Anabaena","Anabaena catenula"
+"defense-finder-genome1muq7_wr_ISG15-like_140","ISG15-like","ISG15-like","RHPH002.0722.00008.P003_00009","RHPH002.0722.00008.P003_00012","RHPH002.0722.00008.P003_00009,RHPH002.0722.00008.P003_00010,RHPH002.0722.00008.P003_00011,RHPH002.0722.00008.P003_00012",4,"ISG15-like__BilA,ISG15-like__BilB,ISG15-like__BilC,ISG15-like__BilD","Anabaena","Anabaena catenula"
+"defense-finder-genome1muq7_wr_RosmerTA_155","RosmerTA","RosmerTA","ACIN004.0722.00001.C001_02755","ACIN004.0722.00001.C001_02756","ACIN004.0722.00001.C001_02755,ACIN004.0722.00001.C001_02756",2,"RosmerTA__RmrT_2641389401,RosmerTA__RmrA_2641389401","Anabaena","Anabaena catenula"
+"defense-finder-genome1muq7_wr_Zorya_TypeII_159","Zorya","Zorya_TypeII","LELO001.0722.00004.C001_00672","LELO001.0722.00004.C001_00674","LELO001.0722.00004.C001_00672,LELO001.0722.00004.C001_00673,LELO001.0722.00004.C001_00674",3,"Zorya__ZorA2,Zorya__ZorB,Zorya_TypeII__ZorE","Anabaena","Anabaena catenula"
+"defense-finder-genome1muq7_wr_Mokosh_TypeI_148","Mokosh","Mokosh_TypeI","CELY001.0722.00001.C001_02265","CELY001.0722.00001.C001_02266","CELY001.0722.00001.C001_02265,CELY001.0722.00001.C001_02266",2,"Mokosh_TypeI__MkoA,Mokosh_TypeI__MkoB","Anabaena","Anabaena catenula"
+"defense-finder-genome1muq7_wr_Dodola_137","Dodola","Dodola","STAU003.0722.00092.C001_02561","STAU003.0722.00092.C001_02562","STAU003.0722.00092.C001_02561,STAU003.0722.00092.C001_02562",2,"Dodola__DolA,Dodola__DolB","Anabaena","Anabaena catenula"
+"defense-finder-genome1muq7_wr_PD-T7-1_151","PD-T7-1","PD-T7-1","ESCO001.0722.00133.C001_00592","ESCO001.0722.00133.C001_00592","ESCO001.0722.00133.C001_00592",1,"PD-T7-1__PD-T7-1","Anabaena","Anabaena catenula"
+"defense-finder-genome1muq7_wr_PD-T4-6_150","PD-T4-6","PD-T4-6","ESCO001.0722.01509.C001_01014","ESCO001.0722.01509.C001_01014","ESCO001.0722.01509.C001_01014",1,"PD-T4-6__PD-T4-6","Anabaena","Anabaena catenula"
+"defense-finder-genome1muq7_wr_PD-T7-3_152","PD-T7-3","PD-T7-3","ESCO001.0722.00794.C001_02563","ESCO001.0722.00794.C001_02563","ESCO001.0722.00794.C001_02563",1,"PD-T7-3__PD-T7-3","Anabaena","Anabaena catenula"
+"defense-finder-genome1muq7_wr_PD-T7-5_154","PD-T7-5","PD-T7-5","ACBA002.0722.00182.C001_00941","ACBA002.0722.00182.C001_00941","ACBA002.0722.00182.C001_00941",1,"PD-T7-5__PD-T7-5","Anabaena","Anabaena catenula"
+"defense-finder-genome1muq7_wr_PD-T7-4_153","PD-T7-4","PD-T7-4","BATH001.0722.00030.C001_02864","BATH001.0722.00030.C001_02864","BATH001.0722.00030.C001_02864",1,"PD-T7-4__PD-T7-4","Anabaena","Anabaena catenula"
+"defense-finder-genome1muq7_wr_Mok_Hok_Sok_142","Mok_Hok_Sok","Mok_Hok_Sok","CIAM001.0722.00007.P003_00063","CIAM001.0722.00007.P003_00064","CIAM001.0722.00007.P003_00063,CIAM001.0722.00007.P003_00064",2,"Mok_Hok_Sok__Hok,Mok_Hok_Sok__Mok",,
+"defense-finder-genome1muq7_wr_Gao_Mza_26","Gao_Mza","Gao_Mza","ESCO001.0722.00905.C001_00698","ESCO001.0722.00905.C001_00702","ESCO001.0722.00905.C001_00698,ESCO001.0722.00905.C001_00699,ESCO001.0722.00905.C001_00700,ESCO001.0722.00905.C001_00701,ESCO001.0722.00905.C001_00702",5,"Gao_Mza__MzaA,Gao_Mza__MzaB,Gao_Mza__MzaC,Gao_Mza__MzaD,Gao_Mza__MzaE",,
+"defense-finder-genome1muq7_wr_DISARM_1_20","DISARM","DISARM_1","XACI001.0722.00030.C001_02113","XACI001.0722.00030.C001_02118","XACI001.0722.00030.C001_02113,XACI001.0722.00030.C001_02114,XACI001.0722.00030.C001_02115,XACI001.0722.00030.C001_02117,XACI001.0722.00030.C001_02118",5,"DISARM__drmC,DISARM__drmB,DISARM__drmA,DISARM_1__drmMI,DISARM_1__drmD",,
+"defense-finder-genome1muq7_wr_Gao_Hhe_24","Gao_Hhe","Gao_Hhe","ESCO001.0722.01405.C001_01788","ESCO001.0722.01405.C001_01788","ESCO001.0722.01405.C001_01788",1,"Gao_Hhe__HheA",,
+"defense-finder-genome1muq7_wr_DISARM_2_21","DISARM","DISARM_2","BAPA001.0722.00007.C001_00825","BAPA001.0722.00007.C001_00829","BAPA001.0722.00007.C001_00825,BAPA001.0722.00007.C001_00826,BAPA001.0722.00007.C001_00827,BAPA001.0722.00007.C001_00828,BAPA001.0722.00007.C001_00829",5,"DISARM_2__drmE,DISARM__drmA,DISARM__drmB,DISARM__drmC,DISARM_2__drmMII",,
+"defense-finder-genome1muq7_wr_radar_II_65","RADAR","radar_II","KLAE001.0722.00014.C001_01907","KLAE001.0722.00014.C001_01909","KLAE001.0722.00014.C001_01907,KLAE001.0722.00014.C001_01908,KLAE001.0722.00014.C001_01909",3,"radar_II__rdrD_II,radar_II__rdrB_II,radar_II__rdrA_II",,
+"defense-finder-genome1muq7_wr_Gao_Tmn_29","Gao_Tmn","Gao_Tmn","ESCO001.0722.00397.P002_00018","ESCO001.0722.00397.P002_00018","ESCO001.0722.00397.P002_00018",1,"Gao_Tmn__TmnA",,
+"defense-finder-genome1muq7_wr_AbiR_14","AbiR","AbiR","STEQ001.0722.00002.C001_00052","STEQ001.0722.00002.C001_00054","STEQ001.0722.00002.C001_00052,STEQ001.0722.00002.C001_00053,STEQ001.0722.00002.C001_00054",3,"AbiR__AbiRc,AbiR__AbiRb,AbiR__AbiRa",,
+"defense-finder-genome1muq7_wr_Rst_RT-Tm_57","Rst_RT-nitrilase-Tm","Rst_RT-Tm","ESCO001.0722.01741.C001_04231","ESCO001.0722.01741.C001_04232","ESCO001.0722.01741.C001_04231,ESCO001.0722.01741.C001_04232",2,"Rst_RT-Tm__RT,Rst_RT-Tm__RT-Tm",,
+"defense-finder-genome1muq7_wr_Lamassu-Fam_34","Lamassu-Fam","Lamassu-Fam","SIAM001.0722.00001.P003_00011","SIAM001.0722.00001.P003_00013","SIAM001.0722.00001.P003_00011,SIAM001.0722.00001.P003_00012,SIAM001.0722.00001.P003_00013",3,"Lamassu-Fam__LmuB_SMC_FMO,Lamassu-Fam__LmuC_acc_FMO,Lamassu-Fam__LmuA_effector_FMO",,
+"defense-finder-genome1muq7_wr_radar_I_64","RADAR","radar_I","PEAT002.0722.00001.C001_02031","PEAT002.0722.00001.C001_02032","PEAT002.0722.00001.C001_02031,PEAT002.0722.00001.C001_02032",2,"radar_I__rdrA_I,radar_I__rdrB_I",,
+"defense-finder-genome1muq7_wr_Gao_Iet_25","Gao_Iet","Gao_Iet","ESCO001.0722.00176.C001_04002","ESCO001.0722.00176.C001_04003","ESCO001.0722.00176.C001_04002,ESCO001.0722.00176.C001_04003",2,"Gao_Iet__IetA,Gao_Iet__IetS",,
+"defense-finder-genome1muq7_wr_Gao_Upx_30","Gao_Upx","Gao_Upx","SASP036.0722.00001.C001_01080","SASP036.0722.00001.C001_01080","SASP036.0722.00001.C001_01080",1,"Gao_Upx__UpxA",,
+"defense-finder-genome1muq7_wr_Pif_50","Pif","Pif","ESCO001.0722.00011.P003_00066","ESCO001.0722.00011.P003_00067","ESCO001.0722.00011.P003_00066,ESCO001.0722.00011.P003_00067",2,"Pif__PifC,Pif__PifA",,
+"defense-finder-genome1muq7_wr_Rst_3HP_53","Rst_3HP","Rst_3HP","ESCO001.0722.00247.C001_04329","ESCO001.0722.00247.C001_04331","ESCO001.0722.00247.C001_04329,ESCO001.0722.00247.C001_04330,ESCO001.0722.00247.C001_04331",3,"Rst_3HP__Hp1,Rst_3HP__Hp2,Rst_3HP__Hp3",,
+"defense-finder-genome1muq7_wr_Gao_TerY_28","Gao_TerY","Gao_TerY","ENCL014.0722.00002.C001_04051","ENCL014.0722.00002.C001_04053","ENCL014.0722.00002.C001_04051,ENCL014.0722.00002.C001_04052,ENCL014.0722.00002.C001_04053",3,"Gao_TerY__TerYA,Gao_TerY__TerYB,Gao_TerY__TerYC",,
+"defense-finder-genome1muq7_wr_Lamassu-Fam_35","Lamassu-Fam","Lamassu-Fam","ESFE001.0722.00025.C001_01962","ESFE001.0722.00025.C001_01965","ESFE001.0722.00025.C001_01962,ESFE001.0722.00025.C001_01963,ESFE001.0722.00025.C001_01964,ESFE001.0722.00025.C001_01965",4,"Lamassu-Fam__LmuB_SMC_Hydrolase_protease,Lamassu-Fam__LmuC_acc_hydrolase_protease,Lamassu-Fam__LmuA_effector_Protease,Lamassu-Fam__LmuA_effector_Hydrolase",,
+"defense-finder-genome1muq7_wr_Gao_Ppl_27","Gao_Ppl","Gao_Ppl","ESCO001.0722.01652.P002_00005","ESCO001.0722.01652.P002_00005","ESCO001.0722.01652.P002_00005",1,"Gao_Ppl__PplA",,
+"defense-finder-genome1muq7_wr_GasderMIN_31","GasderMIN","GasderMIN","LYEN001.0722.00002.C001_04720","LYEN001.0722.00002.C001_04720","LYEN001.0722.00002.C001_04720",1,"GasderMIN__bGSDM",,
+"defense-finder-genome1muq7_wr_Lamassu-Fam_36","Lamassu-Fam","Lamassu-Fam","BATH001.0722.00027.C001_02298","BATH001.0722.00027.C001_02300","BATH001.0722.00027.C001_02298,BATH001.0722.00027.C001_02299,BATH001.0722.00027.C001_02300",3,"Lamassu-Fam__LmuB_SMC_Sir2,Lamassu-Fam__LmuC_acc_Sir2,Lamassu-Fam__LmuA_effector_Sir2",,
+"defense-finder-genome1muq7_wr_Rst_TIR-NLR_58","Rst_TIR-NLR","Rst_TIR-NLR","ESCO001.0722.01747.C001_00475","ESCO001.0722.01747.C001_00475","ESCO001.0722.01747.C001_00475",1,"Rst_TIR-NLR__TIR",,
+"defense-finder-genome1muq7_wr_Lamassu-Fam_37","Lamassu-Fam","Lamassu-Fam","AZSP002.0722.00001.C001_01056","AZSP002.0722.00001.C001_01058","AZSP002.0722.00001.C001_01056,AZSP002.0722.00001.C001_01057,AZSP002.0722.00001.C001_01058",3,"Lamassu-Fam__LmuC_acc_PDDEXK,Lamassu-Fam__LmuB_SMC_PDDEXK,Lamassu-Fam__LmuA_effector_PDDEXK",,
+"defense-finder-genome1muq7_wr_Rst_HelicaseDUF2290_55","Rst_HelicaseDUF2290","Rst_HelicaseDUF2290","NOSP020.0722.00001.P002_00067","NOSP020.0722.00001.P002_00068","NOSP020.0722.00001.P002_00067,NOSP020.0722.00001.P002_00068",2,"Rst_HelicaseDUF2290__DUF2290_Pers,Rst_HelicaseDUF2290__Helicase",,
+"defense-finder-genome1muq7_wr_Lamassu-Fam_38","Lamassu-Fam","Lamassu-Fam","CLSA001.0722.00003.C001_00927","CLSA001.0722.00003.C001_00929","CLSA001.0722.00003.C001_00927,CLSA001.0722.00003.C001_00928,CLSA001.0722.00003.C001_00929",3,"Lamassu-Fam__LmuB_SMC_hypothetical,Lamassu-Fam__LmuC_acc_hypothetical,Lamassu-Fam__LmuA_effector_hypothetical",,
+"defense-finder-genome1muq7_wr_Lamassu-Fam_39","Lamassu-Fam","Lamassu-Fam","STPR003.0722.00001.C001_00759","STPR003.0722.00001.C001_00761","STPR003.0722.00001.C001_00759,STPR003.0722.00001.C001_00760,STPR003.0722.00001.C001_00761",3,"Lamassu-Fam__LmuA_effector_Lipase,Lamassu-Fam__LmuC_acc_Lipase,Lamassu-Fam__LmuB_SMC_Lipase",,
+"defense-finder-genome1muq7_wr_Lamassu-Fam_40","Lamassu-Fam","Lamassu-Fam","PSAE004.0722.00167.C001_03693","PSAE004.0722.00167.C001_03695","PSAE004.0722.00167.C001_03693,PSAE004.0722.00167.C001_03694,PSAE004.0722.00167.C001_03695",3,"Lamassu-Fam__LmuB_SMC_Mrr,Lamassu-Fam__LmuC_acc_Mrr,Lamassu-Fam__LmuA_effector_Mrr",,
+"defense-finder-genome1muq7_wr_Gao_Ape_23","Gao_Ape","Gao_Ape","ESCO001.0722.00227.C001_02792","ESCO001.0722.00227.C001_02792","ESCO001.0722.00227.C001_02792",1,"Gao_Ape__ApeA",,
+"defense-finder-genome1muq7_wr_AbiL_10","AbiL","AbiL","STCR001.0722.00001.C001_00308","STCR001.0722.00001.C001_00309","STCR001.0722.00001.C001_00308,STCR001.0722.00001.C001_00309",2,"AbiL__AbiLi,AbiL__AbiLii",,
+"defense-finder-genome1muq7_wr_Rst_Hydrolase-Tm_56","Rst_Hydrolase-3Tm","Rst_Hydrolase-Tm","ESCO001.0722.00569.C001_00057","ESCO001.0722.00569.C001_00058","ESCO001.0722.00569.C001_00057,ESCO001.0722.00569.C001_00058",2,"Rst_Hydrolase-Tm__Hydrolase-Tm,Rst_Hydrolase-Tm__Hydrolase",,
+"defense-finder-genome1muq7_wr_Gabija_22","Gabija","Gabija","VIAN002.0722.00005.C001_01865","VIAN002.0722.00005.C001_01868","VIAN002.0722.00005.C001_01865,VIAN002.0722.00005.C001_01866,VIAN002.0722.00005.C001_01867,VIAN002.0722.00005.C001_01868",4,"Gabija__GajA,Gabija__GajB_3,Gabija__GajB_2,Gabija__GajA",,
+"defense-finder-genome1muq7_wr_AbiG_6","AbiG","AbiG","STMU002.0722.00007.C001_01386","STMU002.0722.00007.C001_01387","STMU002.0722.00007.C001_01386,STMU002.0722.00007.C001_01387",2,"AbiG__AbiGi,AbiG__AbiGii",,
+"defense-finder-genome1muq7_wr_Stk2_60","Stk2","Stk2","STAU003.0722.00192.C001_00073","STAU003.0722.00192.C001_00073","STAU003.0722.00192.C001_00073",1,"Stk2__Stk2",,
+"defense-finder-genome1muq7_wr_Lamassu-Fam_41","Lamassu-Fam","Lamassu-Fam","ENHI001.0722.00008.C001_00589","ENHI001.0722.00008.C001_00591","ENHI001.0722.00008.C001_00589,ENHI001.0722.00008.C001_00590,ENHI001.0722.00008.C001_00591",3,"Lamassu-Fam__LmuA_effector_Protease,Lamassu-Fam__LmuC_acc_hydrolase_protease,Lamassu-Fam__LmuB_SMC_Hydrolase_protease",,
+"defense-finder-genome1muq7_wr_Lamassu-Fam_42","Lamassu-Fam","Lamassu-Fam","VIPA004.0722.00056.C001_00825","VIPA004.0722.00056.C001_00830","VIPA004.0722.00056.C001_00825,VIPA004.0722.00056.C001_00828,VIPA004.0722.00056.C001_00829,VIPA004.0722.00056.C001_00830",4,"Lamassu-Fam__LmuA_effector_Hydrolase,Lamassu-Fam__LmuC_acc_hydrolase_protease,Lamassu-Fam__LmuB_SMC_Cap4_nuclease_II,Lamassu-Fam__LmuB_SMC_Hydrolase_protease",,
+"defense-finder-genome1muq7_wr_AbiU_16","AbiU","AbiU","BAFR001.0722.00003.C001_00408","BAFR001.0722.00003.C001_00408","BAFR001.0722.00003.C001_00408",1,"AbiU__AbiU",,
+"defense-finder-genome1muq7_wr_Lamassu-Fam_43","Lamassu-Fam","Lamassu-Fam","PAYO001.0722.00001.C001_03951","PAYO001.0722.00001.C001_03953","PAYO001.0722.00001.C001_03951,PAYO001.0722.00001.C001_03952,PAYO001.0722.00001.C001_03953",3,"Lamassu-Fam__LmuA_effector_Cap4_nuclease_II,Lamassu-Fam__LmuC_acc_Cap4_nuclease,Lamassu-Fam__LmuB_SMC_Cap4_nuclease_II",,
+"defense-finder-genome1muq7_wr_dGTPase_63","dGTPase","dGTPase","ESCO001.0722.01222.P004_00025","ESCO001.0722.01222.P004_00025","ESCO001.0722.01222.P004_00025",1,"dGTPase__Sp_dGTPase",,
+"defense-finder-genome1muq7_wr_Rst_DUF4238_54","Rst_DUF4238","Rst_DUF4238","ESCO001.0722.01421.C001_04160","ESCO001.0722.01421.C001_04160","ESCO001.0722.01421.C001_04160",1,"Rst_DUF4238__DUF4238_Pers",,
+"defense-finder-genome1muq7_wr_AbiO_12","AbiO","AbiO","PSCH003.0722.00013.C001_05261","PSCH003.0722.00013.C001_05261","PSCH003.0722.00013.C001_05261",1,"AbiO__AbiO",,
+"defense-finder-genome1muq7_wr_Kiwa_33","Kiwa","Kiwa","ESCO001.0722.01046.C001_04125","ESCO001.0722.01046.C001_04135","ESCO001.0722.01046.C001_04125,ESCO001.0722.01046.C001_04126,ESCO001.0722.01046.C001_04134,ESCO001.0722.01046.C001_04135",4,"Kiwa__KwaA,Kiwa__KwaB,Kiwa__KwaB_2,Kiwa__KwaA",,
+"defense-finder-genome1muq7_wr_Nhi_47","Nhi","Nhi","BAAN002.0722.00070.P002_00158","BAAN002.0722.00070.P002_00158","BAAN002.0722.00070.P002_00158",1,"Nhi__Nhi",,
+"defense-finder-genome1muq7_wr_RloC_52","RloC","RloC","MANA001.0722.00001.C001_00575","MANA001.0722.00001.C001_00575","MANA001.0722.00001.C001_00575",1,"RloC__RloC",,
+"defense-finder-genome1muq7_wr_PD-T4-8_49","PD-T4-8","PD-T4-8","ESFE001.0722.00005.C001_03411","ESFE001.0722.00005.C001_03411","ESFE001.0722.00005.C001_03411",1,"PD-T4-8__PD-T4-8",,
+"defense-finder-genome1muq7_wr_dCTPdeaminase_62","dCTPdeaminase","dCTPdeaminase","BULA002.0722.00001.C001_03072","BULA002.0722.00001.C001_03072","BULA002.0722.00001.C001_03072",1,"dCTPdeaminase__dCTPdeaminase",,
+"defense-finder-genome1muq7_wr_RexAB_51","RexAB","RexAB","ESCO001.0722.00011.C001_03046","ESCO001.0722.00011.C001_03047","ESCO001.0722.00011.C001_03046,ESCO001.0722.00011.C001_03047",2,"RexAB__RexA,RexAB__RexB",,
+"defense-finder-genome1muq7_wr_AbiZ_18","AbiZ","AbiZ","STOR001.0722.00010.C001_01268","STOR001.0722.00010.C001_01268","STOR001.0722.00010.C001_01268",1,"AbiZ__AbiZ",,
+"defense-finder-genome1muq7_wr_AbiI_8","AbiI","AbiI","ENFA001.0722.00001.P003_00016","ENFA001.0722.00001.P003_00016","ENFA001.0722.00001.P003_00016",1,"AbiI__AbiI",,
+"defense-finder-genome1muq7_wr_AbiJ_9","AbiJ","AbiJ","LIMA001.0722.00001.P002_00015","LIMA001.0722.00001.P002_00015","LIMA001.0722.00001.P002_00015",1,"AbiJ__AbiJ",,
+"defense-finder-genome1muq7_wr_BstA_19","BstA","BstA","SAEN001.0722.00022.C001_01384","SAEN001.0722.00022.C001_01384","SAEN001.0722.00022.C001_01384",1,"BstA__BstA",,
+"defense-finder-genome1muq7_wr_AbiC_3","AbiC","AbiC","ENFA002.0722.00014.C001_01385","ENFA002.0722.00014.C001_01385","ENFA002.0722.00014.C001_01385",1,"AbiC__AbiC",,
+"defense-finder-genome1muq7_wr_AbiT_15","AbiT","AbiT","SISU002.0722.00001.C001_02670","SISU002.0722.00001.C001_02671","SISU002.0722.00001.C001_02670,SISU002.0722.00001.C001_02671",2,"AbiT__AbiTii,AbiT__AbiTi",,
+"defense-finder-genome1muq7_wr_NixI_48","NixI","NixI","VICH002.0722.00004.C002_00731","VICH002.0722.00004.C002_00732","VICH002.0722.00004.C002_00731,VICH002.0722.00004.C002_00732",2,"NixI__NixI,NixI__Stix",,
+"defense-finder-genome1muq7_wr_Lit_46","Lit","Lit","PSAE004.0722.00219.C001_03508","PSAE004.0722.00219.C001_03508","PSAE004.0722.00219.C001_03508",1,"Lit__Lit",,
+"defense-finder-genome1muq7_wr_AbiB_2","AbiB","AbiB","LACR001.0722.00008.P002_00073","LACR001.0722.00008.P002_00073","LACR001.0722.00008.P002_00073",1,"AbiB__AbiB",,
+"defense-finder-genome1muq7_wr_AbiE_5","AbiE","AbiE","MUAQ001.0722.00001.C001_01194","MUAQ001.0722.00001.C001_01198","MUAQ001.0722.00001.C001_01194,MUAQ001.0722.00001.C001_01195,MUAQ001.0722.00001.C001_01197,MUAQ001.0722.00001.C001_01198",4,"AbiEii__AbiEii,AbiEii__AbiEi_2,AbiEii__AbiEi_3,AbiEii__AbiEii",,
+"defense-finder-genome1muq7_wr_Viperin_61","Viperin","Viperin","LASP019.0722.00001.C001_02166","LASP019.0722.00001.C001_02166","LASP019.0722.00001.C001_02166",1,"Viperin__pVip",,
+"defense-finder-genome1muq7_wr_AbiD_4","AbiD","AbiD","PSPU001.0722.00011.C001_04014","PSPU001.0722.00011.C001_04014","PSPU001.0722.00011.C001_04014",1,"AbiD__AbiD",,
+"defense-finder-genome1muq7_wr_GasderMIN_32","GasderMIN","GasderMIN","ARVI001.0722.00001.C001_03109","ARVI001.0722.00001.C001_03109","ARVI001.0722.00001.C001_03109",1,"GasderMIN__bGSDM",,
+"defense-finder-genome1muq7_wr_AbiQ_13","AbiQ","AbiQ","ENSP014.0722.00001.C001_01423","ENSP014.0722.00001.C001_01423","ENSP014.0722.00001.C001_01423",1,"AbiQ__AbiQ",,
+"defense-finder-genome1muq7_wr_AbiV_17","AbiV","AbiV","ENFA001.0722.00048.P002_00017","ENFA001.0722.00048.P002_00017","ENFA001.0722.00048.P002_00017",1,"AbiV__AbiV",,
+"defense-finder-genome1muq7_wr_Shedu_59","Shedu","Shedu","CIFR004.0722.00037.P002_00225","CIFR004.0722.00037.P002_00225","CIFR004.0722.00037.P002_00225",1,"Shedu__SduA",,
+"defense-finder-genome1muq7_wr_AbiH_7","AbiH","AbiH","ENMU001.0722.00001.P004_00003","ENMU001.0722.00001.P004_00003","ENMU001.0722.00001.P004_00003",1,"AbiH__AbiH",,
+"defense-finder-genome1muq7_wr_AbiN_11","AbiN","AbiN","STPS003.0722.00004.C001_02116","STPS003.0722.00004.C001_02116","STPS003.0722.00004.C001_02116",1,"AbiN__AbiN",,
+"defense-finder-genome1muq7_wr_Abi2_1","Abi2","Abi2","MESP082.0722.00001.C001_04745","MESP082.0722.00001.C001_04745","MESP082.0722.00001.C001_04745",1,"Abi2__Abi_2",,
+"defense-finder-genome1muq7_wr_Lamassu-Fam_44","Lamassu-Fam","Lamassu-Fam","BOFL001.0722.00001.C001_04681","BOFL001.0722.00001.C001_04682","BOFL001.0722.00001.C001_04681,BOFL001.0722.00001.C001_04682",2,"Lamassu-Fam__LmuB_SMC_Amidase,Lamassu-Fam__LmuA_effector_Amidase",,
+"defense-finder-genome1muq7_wr_Lamassu-Fam_45","Lamassu-Fam","Lamassu-Fam","SHHA001.0722.00001.C001_00539","SHHA001.0722.00001.C001_00544","SHHA001.0722.00001.C001_00539,SHHA001.0722.00001.C001_00540,SHHA001.0722.00001.C001_00541,SHHA001.0722.00001.C001_00542,SHHA001.0722.00001.C001_00544",5,"Lamassu-Fam__LmuB_SMC_Hydrolase_protease,Lamassu-Fam__LmuC_acc_hydrolase_protease,Lamassu-Fam__LmuA_effector_Protease,Lamassu-Fam__LmuA_effector_Hydrolase,Lamassu-Fam__LmuA_effector_Lipase",,
+"defense-finder-genome1muq7_wr_Druantia_I_111","Druantia","Druantia_I","ESCO001.0722.00005.C001_00834","ESCO001.0722.00005.C001_00838","ESCO001.0722.00005.C001_00834,ESCO001.0722.00005.C001_00835,ESCO001.0722.00005.C001_00836,ESCO001.0722.00005.C001_00837,ESCO001.0722.00005.C001_00838",5,"Druantia__DruE_1,Druantia_I__DruD,Druantia_I__DruC,Druantia_I__DruB,Druantia_I__DruA",,
+"defense-finder-genome1muq7_wr_Druantia_II_112","Druantia","Druantia_II","KLPN001.0722.00099.C001_05297","KLPN001.0722.00099.C001_05300","KLPN001.0722.00099.C001_05297,KLPN001.0722.00099.C001_05298,KLPN001.0722.00099.C001_05299,KLPN001.0722.00099.C001_05300",4,"Druantia__DruE_2,Druantia_II__DruG,Druantia_II__DruF,Druantia_II__DruM",,
+"defense-finder-genome1muq7_wr_Druantia_III_113","Druantia","Druantia_III","ACBA002.0722.00172.C001_01790","ACBA002.0722.00172.C001_01791","ACBA002.0722.00172.C001_01790,ACBA002.0722.00172.C001_01791",2,"Druantia_III__DruH,Druantia__DruE_3",,
+"defense-finder-genome1muq7_wr_Gao_Qat_116","Gao_Qat","Gao_Qat","PSAE004.0722.00062.C001_02465","PSAE004.0722.00062.C001_02468","PSAE004.0722.00062.C001_02465,PSAE004.0722.00062.C001_02466,PSAE004.0722.00062.C001_02467,PSAE004.0722.00062.C001_02468",4,"Gao_Qat__QatA,Gao_Qat__QatB,Gao_Qat__QatC,Gao_Qat__QatD",,
+"defense-finder-genome1muq7_wr_Azaca_108","Azaca","Azaca","DEOL002.0722.00001.C001_00643","DEOL002.0722.00001.C001_00645","DEOL002.0722.00001.C001_00643,DEOL002.0722.00001.C001_00644,DEOL002.0722.00001.C001_00645",3,"Azaca__ZacA,Azaca__ZacB,Azaca__ZacC",,
+"defense-finder-genome1muq7_wr_DdmDE_110","DmdDE","DdmDE","VIPA004.0722.00050.C001_01741","VIPA004.0722.00050.C001_01742","VIPA004.0722.00050.C001_01741,VIPA004.0722.00050.C001_01742",2,"DdmDE__DdmE,DmdDE__DdmD",,
+"defense-finder-genome1muq7_wr_Gao_Her_SIR_115","Gao_Her","Gao_Her_SIR","ESCO001.0722.00231.C001_01896","ESCO001.0722.00231.C001_01897","ESCO001.0722.00231.C001_01896,ESCO001.0722.00231.C001_01897",2,"Gao_Her_SIR__SIR2,Gao_Her_SIR__HerA_SIR2",,
+"defense-finder-genome1muq7_wr_Gao_Her_DUF_114","Gao_Her","Gao_Her_DUF","ESCO001.0722.00123.C001_01297","ESCO001.0722.00123.C001_01298","ESCO001.0722.00123.C001_01297,ESCO001.0722.00123.C001_01298",2,"Gao_Her_DUF__DUF4297,Gao_Her_DUF__HerA_DUF",,
+"defense-finder-genome1muq7_wr_PD-T7-2_129","PD-T7-2","PD-T7-2","CIPO001.0722.00004.C001_00438","CIPO001.0722.00004.C001_00439","CIPO001.0722.00004.C001_00438,CIPO001.0722.00004.C001_00439",2,"PD-T7-2__PD-T7-2_B,PD-T7-2__PD-T7-2_A",,
+"defense-finder-genome1muq7_wr_PD-T4-4_125","PD-T4-4","PD-T4-4","ESCO001.0722.00877.C001_02599","ESCO001.0722.00877.C001_02600","ESCO001.0722.00877.C001_02599,ESCO001.0722.00877.C001_02600",2,"PD-T4-4__PD-T4-4_B,PD-T4-4__PD-T4-4_A",,
+"defense-finder-genome1muq7_wr_PD-T4-2_123","PD-T4-2","PD-T4-2","MISP011.0722.00001.C001_01706","MISP011.0722.00001.C001_01707","MISP011.0722.00001.C001_01706,MISP011.0722.00001.C001_01707",2,"PD-T4-2__PD-T4-2_B,PD-T4-2__PD-T4-2_A",,
+"defense-finder-genome1muq7_wr_PARIS_I_merge_120","Rst_PARIS","PARIS_I_merge","NOSP021.0722.00001.C001_00819","NOSP021.0722.00001.C001_00819","NOSP021.0722.00001.C001_00819",1,"PARIS_I_merge__AAA_15_DUF4435",,
+"defense-finder-genome1muq7_wr_Thoeris_I_131","Thoeris","Thoeris_I","AGAC001.0722.00004.C001_01371","AGAC001.0722.00004.C001_01373","AGAC001.0722.00004.C001_01371,AGAC001.0722.00004.C001_01372,AGAC001.0722.00004.C001_01373",3,"Thoeris__ThsB_Global,Thoeris__ThsB_Global,Thoeris_I__ThsA_new_grand",,
+"defense-finder-genome1muq7_wr_CapRel_109","CapRel","CapRel","ESCO001.0722.00901.P002_00013","ESCO001.0722.00901.P002_00013","ESCO001.0722.00901.P002_00013",1,"CapRel__CapRel",,
+"defense-finder-genome1muq7_wr_gp29_gp30_133","gp29_gp30","gp29_gp30","MYCA004.0722.00001.C001_01466","MYCA004.0722.00001.C001_01467","MYCA004.0722.00001.C001_01466,MYCA004.0722.00001.C001_01467",2,"gp29_gp30__gp29,gp29_gp30__gp30",,
+"defense-finder-genome1muq7_wr_PARIS_II_merge_119","Rst_PARIS","PARIS_II_merge","THCH002.0722.00001.C001_00268","THCH002.0722.00001.C001_00268","THCH002.0722.00001.C001_00268",1,"PARIS_II_merge__AAA_21_DUF4435",,
+"defense-finder-genome1muq7_wr_PD-T4-1_121","PD-T4-1","PD-T4-1","SAEN001.0722.00131.C001_03765","SAEN001.0722.00131.C001_03765","SAEN001.0722.00131.C001_03765",1,"PD-T4-1__PD-T4-1",,
+"defense-finder-genome1muq7_wr_PARIS_II_118","Rst_PARIS","PARIS_II","PRJE001.0722.00001.C001_01267","PRJE001.0722.00001.C001_01268","PRJE001.0722.00001.C001_01267,PRJE001.0722.00001.C001_01268",2,"PARIS_II__AAA_21,Rst_PARIS__DUF4435",,
+"defense-finder-genome1muq7_wr_PD-T4-10_122","PD-T4-10","PD-T4-10","VIAL003.0722.00017.C001_02055","VIAL003.0722.00017.C001_02056","VIAL003.0722.00017.C001_02055,VIAL003.0722.00017.C001_02056",2,"PD-T4-10__PD-T4-10_B,PD-T4-10__PD-T4-10_A",,
+"defense-finder-genome1muq7_wr_PD-T4-9_128","PD-T4-9","PD-T4-9","ESCO001.0722.01220.C001_04842","ESCO001.0722.01220.C001_04844","ESCO001.0722.01220.C001_04842,ESCO001.0722.01220.C001_04843,ESCO001.0722.01220.C001_04844",3,"PD-T4-9__PD-T4-9_A,PD-T4-9__PD-T4-9_B,PD-T4-9__PD-T4-9_C",,
+"defense-finder-genome1muq7_wr_PARIS_I_117","Rst_PARIS","PARIS_I","NOSP022.0722.00001.C001_05705","NOSP022.0722.00001.C001_05706","NOSP022.0722.00001.C001_05705,NOSP022.0722.00001.C001_05706",2,"Rst_PARIS__DUF4435,PARIS_I__AAA_15",,
+"defense-finder-genome1muq7_wr_PD-T4-7_127","PD-T4-7","PD-T4-7","ESCO001.0722.00951.C001_02873","ESCO001.0722.00951.C001_02873","ESCO001.0722.00951.C001_02873",1,"PD-T4-7__PD-T4-7",,
+"defense-finder-genome1muq7_wr_PD-T4-3_124","PD-T4-3","PD-T4-3","SAEN001.0722.00051.C001_00065","SAEN001.0722.00051.C001_00065","SAEN001.0722.00051.C001_00065",1,"PD-T4-3__PD-T4-3",,
+"defense-finder-genome1muq7_wr_PD-T4-5_126","PD-T4-5","PD-T4-5","PSSI002.0722.00001.C001_00563","PSSI002.0722.00001.C001_00563","PSSI002.0722.00001.C001_00563",1,"PD-T4-5__PD-T4-5",,
+"defense-finder-genome1muq7_wr_SpbK_130","SpbK","SpbK","CLBE001.0722.00006.C001_03165","CLBE001.0722.00006.C001_03165","CLBE001.0722.00006.C001_03165",1,"SpbK__SpbK",,
+"defense-finder-genome1muq7_wr_Thoeris_II_132","Thoeris","Thoeris_II","SAEN001.0722.00149.C001_01784","SAEN001.0722.00149.C001_01786","SAEN001.0722.00149.C001_01784,SAEN001.0722.00149.C001_01785,SAEN001.0722.00149.C001_01786",3,"Thoeris_II__ThsA_new_petit,Thoeris__ThsB_Global,Thoeris__ThsB_Global",,
+"defense-finder-genome1muq7_wr_PrrC_218","PrrC","PrrC","LEIN001.0722.00005.C001_01350","LEIN001.0722.00005.C001_01361","LEIN001.0722.00005.C001_01350,LEIN001.0722.00005.C001_01351,LEIN001.0722.00005.C001_01352,LEIN001.0722.00005.C001_01353,LEIN001.0722.00005.C001_01356,LEIN001.0722.00005.C001_01357,LEIN001.0722.00005.C001_01361",7,"RM__Type_I_REases,PrrC__PrrC,RM__Type_I_S,PrrC__EcoprrI,RM__Type_I_REases,RM__Type_I_MTases,RM__Type_I_S",,
+"defense-finder-genome1muq7_wr_RM_Type_I_220","RM","RM_Type_I","CLBO002.0722.00034.C001_02130","CLBO002.0722.00034.C001_02132","CLBO002.0722.00034.C001_02130,CLBO002.0722.00034.C001_02131,CLBO002.0722.00034.C001_02132",3,"RM__Type_I_REases,RM__Type_I_S,RM__Type_I_MTases",,
+"defense-finder-genome1muq7_wr_RM_Type_II_221","RM","RM_Type_II","MAHA002.0722.00003.C001_01945","MAHA002.0722.00003.C001_01946","MAHA002.0722.00003.C001_01945,MAHA002.0722.00003.C001_01946",2,"RM_Type_II__Type_II_REases,RM_Type_II__Type_II_MTases",,
+"defense-finder-genome1muq7_wr_RM_Type_III_223","RM","RM_Type_III","SAEN001.0722.00159.C001_03542","SAEN001.0722.00159.C001_03543","SAEN001.0722.00159.C001_03542,SAEN001.0722.00159.C001_03543",2,"RM_Type_III__Type_III_REases,RM_Type_III__Type_III_MTases",,
+"defense-finder-genome1muq7_wr_RM_Type_IIG_222","RM","RM_Type_IIG","SPAF001.0722.00001.C001_01360","SPAF001.0722.00001.C001_01360","SPAF001.0722.00001.C001_01360",1,"RM_Type_IIG__Type_IIG",,
+"defense-finder-genome1muq7_wr_PD-Lambda-5_217","PD-Lambda-5","PD-Lambda-5","SAEN001.0722.00053.C001_03261","SAEN001.0722.00053.C001_03262","SAEN001.0722.00053.C001_03261,SAEN001.0722.00053.C001_03262",2,"PD-Lambda-5__PD-Lambda-5_B,PD-Lambda-5__PD-Lambda-5_A",,
+"defense-finder-genome1muq7_wr_RM_Type_IV_224","RM","RM_Type_IV","STCO002.0722.00001.C001_04224","STCO002.0722.00001.C001_04224","STCO002.0722.00001.C001_04224",1,"RM_Type_IV__Type_IV_REases",,
+"defense-finder-genome1muq7_wr_CAS_Class1-Subtype-IV-A_226","CasFinder","CAS_Class1-Subtype-IV-A","RHFE001.0722.00001.P002_00104","RHFE001.0722.00001.P002_00110","RHFE001.0722.00001.P002_00104,RHFE001.0722.00001.P002_00105,RHFE001.0722.00001.P002_00106,RHFE001.0722.00001.P002_00107,RHFE001.0722.00001.P002_00108,RHFE001.0722.00001.P002_00109,RHFE001.0722.00001.P002_00110",7,"cas1_I-E_1,cas6e_I_II_III_IV_V_VI_3,csf3gr5_IV-A_2,csf2gr7_IV-A_1,csf5gr6_IV-A_1,csf1gr8_IV-A_2,csf4_IV-A1_2",,
+"defense-finder-genome1muq7_wr_BREX_II_169","BREX","BREX_II","STPL001.0722.00001.C001_00363","STPL001.0722.00001.C001_00375","STPL001.0722.00001.C001_00363,STPL001.0722.00001.C001_00366,STPL001.0722.00001.C001_00367,STPL001.0722.00001.C001_00374,STPL001.0722.00001.C001_00375",5,"BREX__brxD,BREX__pglZ2,BREX__pglY,BREX__pglX2,BREX__pglW",,
+"defense-finder-genome1muq7_wr_BREX_I_167","BREX","BREX_I","DEVU001.0722.00001.C001_01912","DEVU001.0722.00001.C001_01920","DEVU001.0722.00001.C001_01912,DEVU001.0722.00001.C001_01913,DEVU001.0722.00001.C001_01915,DEVU001.0722.00001.C001_01918,DEVU001.0722.00001.C001_01919,DEVU001.0722.00001.C001_01920",6,"BREX__brxL,BREX__pglZA,BREX__pglX1,BREX__brxC,BREX__brxB_DUF1788,BREX__brxA_DUF1819",,
+"defense-finder-genome1muq7_wr_BREX_V_172","BREX","BREX_V","BACE001.0722.00090.C001_00946","BACE001.0722.00090.C001_00953","BACE001.0722.00090.C001_00946,BACE001.0722.00090.C001_00947,BACE001.0722.00090.C001_00948,BACE001.0722.00090.C001_00949,BACE001.0722.00090.C001_00950,BACE001.0722.00090.C001_00952,BACE001.0722.00090.C001_00953",7,"BREX__brxA_DUF1819,BREX__brxB_DUF1788,BREX__brxC,BREX__pglX1,BREX__pglX1,BREX__pglZA,BREX__brxHII",,
+"defense-finder-genome1muq7_wr_BREX_IV_171","BREX","BREX_IV","DEMC001.0722.00005.C001_00226","DEMC001.0722.00005.C001_00229","DEMC001.0722.00005.C001_00226,DEMC001.0722.00005.C001_00229",2,"BREX__brxL,BREX__brxP",,
+"defense-finder-genome1muq7_wr_Retron_XIII_203","Retron","Retron_XIII","VASP003.0722.00001.C001_00493","VASP003.0722.00001.C001_00495","VASP003.0722.00001.C001_00493,VASP003.0722.00001.C001_00494,VASP003.0722.00001.C001_00495",3,"Retron__RT_Tot,Retron_XIII__WHSWIM,Retron_XIII__ARM",,
+"defense-finder-genome1muq7_wr_BREX_VI_173","BREX","BREX_VI","VIHA001.0722.00001.C001_01237","VIHA001.0722.00001.C001_01244","VIHA001.0722.00001.C001_01237,VIHA001.0722.00001.C001_01238,VIHA001.0722.00001.C001_01239,VIHA001.0722.00001.C001_01240,VIHA001.0722.00001.C001_01241,VIHA001.0722.00001.C001_01242,VIHA001.0722.00001.C001_01243,VIHA001.0722.00001.C001_01244",8,"BREX__brxE,BREX__brxA_DUF1819,BREX__brxB_DUF1788,BREX__brxC,BREX__pglX1,BREX__pglZA,BREX__brxD,BREX__brxHI",,
+"defense-finder-genome1muq7_wr_Tiamat_208","Tiamat","Tiamat","PSAE004.0722.00351.C001_02370","PSAE004.0722.00351.C001_02370","PSAE004.0722.00351.C001_02370",1,"Tiamat__TmtA_2731770353",,
+"defense-finder-genome1muq7_wr_pAgo_210","pAgo","pAgo","EMBR001.0722.00002.C001_03195","EMBR001.0722.00002.C001_03195","EMBR001.0722.00002.C001_03195",1,"pAgo__pAgo_Short",,
+"defense-finder-genome1muq7_wr_CBASS_III_185","CBASS","CBASS_III","MESP062.0722.00001.C001_06596","MESP062.0722.00001.C001_06600","MESP062.0722.00001.C001_06596,MESP062.0722.00001.C001_06597,MESP062.0722.00001.C001_06598,MESP062.0722.00001.C001_06599,MESP062.0722.00001.C001_06600",5,"CBASS__TRIP13,CBASS__HORMA,CBASS__bacHORMA_2,CBASS__Cyclase_II,CBASS__Endonuc_big",,
+"defense-finder-genome1muq7_wr_pAgo_211","pAgo","pAgo","SUVA001.0722.00001.C001_03275","SUVA001.0722.00001.C001_03275","SUVA001.0722.00001.C001_03275",1,"pAgo__pAgo_Short",,
+"defense-finder-genome1muq7_wr_pAgo_212","pAgo","pAgo","KLPN001.0722.00367.C001_04523","KLPN001.0722.00367.C001_04523","KLPN001.0722.00367.C001_04523",1,"pAgo__pAgo_LongB",,
+"defense-finder-genome1muq7_wr_Bunzi_175","Bunzi","Bunzi","VIPA004.0722.00031.C002_00019","VIPA004.0722.00031.C002_00020","VIPA004.0722.00031.C002_00019,VIPA004.0722.00031.C002_00020",2,"Bunzi__BnzA,Bunzi__BnzB",,
+"defense-finder-genome1muq7_wr_Retron_I_A_195","Retron","Retron_I_A","ENHO001.0722.00002.C001_01410","ENHO001.0722.00002.C001_01412","ENHO001.0722.00002.C001_01410,ENHO001.0722.00002.C001_01411,ENHO001.0722.00002.C001_01412",3,"Retron_I_A__HNH_TIGR02646,Retron_I_A__ATPase_TypeIA,Retron__RT_Tot",,
+"defense-finder-genome1muq7_wr_CBASS_II_184","CBASS","CBASS_II","BRSP012.0722.00001.P002_00340","BRSP012.0722.00001.P002_00351","BRSP012.0722.00001.P002_00340,BRSP012.0722.00001.P002_00341,BRSP012.0722.00001.P002_00342,BRSP012.0722.00001.P002_00343,BRSP012.0722.00001.P002_00345,BRSP012.0722.00001.P002_00347,BRSP012.0722.00001.P002_00351",7,"CBASS__Jab,CBASS__AG_E1_ThiF,CBASS__Cyclase_II,CBASS__Phospholipase,CBASS__Cyclase_new,CBASS__Effector_2TM_S_2TMBeta,CBASS__AG_E1_ThiF",,
+"defense-finder-genome1muq7_wr_pAgo_213","pAgo","pAgo","ALCO001.0722.00001.C001_00046","ALCO001.0722.00001.C001_00046","ALCO001.0722.00001.C001_00046",1,"pAgo__pAgo_Short",,
+"defense-finder-genome1muq7_wr_CBASS_IV_186","CBASS","CBASS_IV","DEME002.0722.00001.C001_00361","DEME002.0722.00001.C001_00365","DEME002.0722.00001.C001_00361,DEME002.0722.00001.C001_00362,DEME002.0722.00001.C001_00363,DEME002.0722.00001.C001_00364,DEME002.0722.00001.C001_00365",5,"CBASS__QueC,CBASS__TGT,CBASS__Cyclase_SMODS,CBASS__2TM_type_IV,CBASS__OGG",,
+"defense-finder-genome1muq7_wr_Aditi_160","Aditi","Aditi","STSU001.0722.00018.C001_01988","STSU001.0722.00018.C001_01989","STSU001.0722.00018.C001_01988,STSU001.0722.00018.C001_01989",2,"Aditi__DitB,Aditi__DitA",,
+"defense-finder-genome1muq7_wr_pAgo_214","pAgo","pAgo","STAQ001.0722.00001.C001_09178","STAQ001.0722.00001.C001_09178","STAQ001.0722.00001.C001_09178",1,"pAgo__pAgo_Short",,
+"defense-finder-genome1muq7_wr_Olokun_189","Olokun","Olokun","ALFI003.0722.00001.C001_01175","ALFI003.0722.00001.C001_01176","ALFI003.0722.00001.C001_01175,ALFI003.0722.00001.C001_01176",2,"Olokun__OloA,Olokun__OloB",,
+"defense-finder-genome1muq7_wr_Retron_II_192","Retron","Retron_II","VIPA001.0722.00001.C001_01314","VIPA001.0722.00001.C001_01315","VIPA001.0722.00001.C001_01314,VIPA001.0722.00001.C001_01315",2,"Retron_II__NDT2,Retron__RT_Tot",,
+"defense-finder-genome1muq7_wr_Retron_IV_194","Retron","Retron_IV","ALFI003.0722.00001.C001_01090","ALFI003.0722.00001.C001_01091","ALFI003.0722.00001.C001_01090,ALFI003.0722.00001.C001_01091",2,"Retron__RT_Tot,Retron_IV__2TM",,
+"defense-finder-genome1muq7_wr_Retron_VII_1_199","Retron","Retron_VII_1","PSME001.0722.00002.C001_02566","PSME001.0722.00002.C001_02566","PSME001.0722.00002.C001_02566",1,"Retron_VII_1__RT_7_A1",,
+"defense-finder-genome1muq7_wr_CBASS_I_183","CBASS","CBASS_I","VICH002.0722.00059.C001_02434","VICH002.0722.00059.C001_02439","VICH002.0722.00059.C001_02434,VICH002.0722.00059.C001_02435,VICH002.0722.00059.C001_02438,VICH002.0722.00059.C001_02439",4,"CBASS__Cyclase_new,CBASS__Effector_2TM_S_2TMBeta,CBASS__2TM_Gros,CBASS__Cyclase_SMODS",,
+"defense-finder-genome1muq7_wr_Retron_I_C_197","Retron","Retron_I_C","ENHI001.0722.00012.P002_00007","ENHI001.0722.00012.P002_00007","ENHI001.0722.00012.P002_00007",1,"Retron_I_C__RT_1_C2",,
+"defense-finder-genome1muq7_wr_Borvo_174","Borvo","Borvo","ESCO001.0722.01284.C001_02118","ESCO001.0722.01284.C001_02118","ESCO001.0722.01284.C001_02118",1,"Borvo__BovA",,
+"defense-finder-genome1muq7_wr_Pycsar_191","Pycsar","Pycsar","CRMA002.0722.00001.C001_00153","CRMA002.0722.00001.C001_00159","CRMA002.0722.00001.C001_00153,CRMA002.0722.00001.C001_00154,CRMA002.0722.00001.C001_00155,CRMA002.0722.00001.C001_00156,CRMA002.0722.00001.C001_00158,CRMA002.0722.00001.C001_00159",6,"CBASS__Effector_TIR,CBASS__Jab,CBASS__AG_E1_ThiF,Pycsar__AG_cyclase,Pycsar__AG_cyclase,CBASS__2TM_5",,
+"defense-finder-genome1muq7_wr_Dazbog_187","Dazbog","Dazbog","BACE001.0722.00008.C001_00318","BACE001.0722.00008.C001_00319","BACE001.0722.00008.C001_00318,BACE001.0722.00008.C001_00319",2,"Dazbog__DzbA,Dazbog__DzbB",,
+"defense-finder-genome1muq7_wr_RnlAB_204","RnlAB","RnlAB","ESCO001.0722.01564.C001_03490","ESCO001.0722.01564.C001_03491","ESCO001.0722.01564.C001_03490,ESCO001.0722.01564.C001_03491",2,"RnlAB__RnlA,RnlAB__RnlB",,
+"defense-finder-genome1muq7_wr_Retron_I_B_196","Retron","Retron_I_B","VIAL003.0722.00033.C002_00404","VIAL003.0722.00033.C002_00405","VIAL003.0722.00033.C002_00404,VIAL003.0722.00033.C002_00405",2,"Retron_I_B__ATPase_TOPRIM_COG3593,Retron__RT_Tot",,
+"defense-finder-genome1muq7_wr_Retron_XII_202","Retron","Retron_XII","PSAE004.0722.00147.C001_00565","PSAE004.0722.00147.C001_00565","PSAE004.0722.00147.C001_00565",1,"Retron_XII__RT_12",,
+"defense-finder-genome1muq7_wr_pAgo_215","pAgo","pAgo","NABR001.0722.00001.C001_00039","NABR001.0722.00001.C001_00039","NABR001.0722.00001.C001_00039",1,"pAgo__COG1431_pAgo",,
+"defense-finder-genome1muq7_wr_Retron_XI_201","Retron","Retron_XI","SHPU001.0722.00001.C001_00144","SHPU001.0722.00001.C001_00144","SHPU001.0722.00001.C001_00144",1,"Retron_XI__RT_11",,
+"defense-finder-genome1muq7_wr_SanaTA_206","SanaTA","SanaTA","VICA002.0722.00008.P005_00054","VICA002.0722.00008.P005_00055","VICA002.0722.00008.P005_00054,VICA002.0722.00008.P005_00055",2,"SanaTA__SanaT,SanaTA__SanaA",,
+"defense-finder-genome1muq7_wr_Retron_VII_2_200","Retron","Retron_VII_2","CHIN002.0722.00002.C001_01683","CHIN002.0722.00002.C001_01684","CHIN002.0722.00002.C001_01683,CHIN002.0722.00002.C001_01684",2,"Retron__RT_Tot,Retron_VII_2__DUF3800",,
+"defense-finder-genome1muq7_wr_Uzume_209","Uzume","Uzume","PAUR001.0722.00003.C001_01121","PAUR001.0722.00003.C001_01121","PAUR001.0722.00003.C001_01121",1,"Uzume__UzuA_2660320622",,
+"defense-finder-genome1muq7_wr_Retron_VI_198","Retron","Retron_VI","PHPR001.0722.00001.C002_00577","PHPR001.0722.00001.C002_00578","PHPR001.0722.00001.C002_00577,PHPR001.0722.00001.C002_00578",2,"Retron_VI__HTH,Retron__RT_Tot",,
+"defense-finder-genome1muq7_wr_SoFic_207","SoFIC","SoFic","GESU001.0722.00003.C001_01200","GESU001.0722.00003.C001_01200","GESU001.0722.00003.C001_01200",1,"SoFic__SoFic",,
+"defense-finder-genome1muq7_wr_SEFIR_205","SEFIR","SEFIR","HATI001.0722.00001.C001_02265","HATI001.0722.00001.C001_02265","HATI001.0722.00001.C001_02265",1,"SEFIR__bSEFIR",,
+"defense-finder-genome1muq7_wr_PfiAT_190","PfiAT","PfiAT","PSAE004.0722.00317.C001_04365","PSAE004.0722.00317.C001_04366","PSAE004.0722.00317.C001_04365,PSAE004.0722.00317.C001_04366",2,"PfiAT__PfiT,PfiAT__PfiA",,
+"defense-finder-genome1muq7_wr_Eleos_188","Eleos","Eleos","ESCO001.0722.01243.C001_00310","ESCO001.0722.01243.C001_00312","ESCO001.0722.01243.C001_00310,ESCO001.0722.01243.C001_00311,ESCO001.0722.01243.C001_00312",3,"Eleos__LeoC,Eleos__LeoB,Eleos__LeoA2",,
+"defense-finder-genome1muq7_wr_Retron_III_193","Retron","Retron_III","SHHA001.0722.00001.C001_00530","SHHA001.0722.00001.C001_00534","SHHA001.0722.00001.C001_00530,SHHA001.0722.00001.C001_00532,SHHA001.0722.00001.C001_00533,SHHA001.0722.00001.C001_00534",4,"Retron__RT_Tot,Retron_III__PRTase,Retron_III__PRTase_WH,Retron__RT_Tot",,
+"defense-finder-genome1muq7_wr_BREX_I_168","BREX","BREX_I","MESU001.0722.00002.C001_00689","MESU001.0722.00002.C001_00696","MESU001.0722.00002.C001_00689,MESU001.0722.00002.C001_00690,MESU001.0722.00002.C001_00691,MESU001.0722.00002.C001_00692,MESU001.0722.00002.C001_00695,MESU001.0722.00002.C001_00696",6,"BREX__brxA_DUF1819,BREX__brxB_DUF1788,BREX__brxC,BREX__pglX1,BREX__pglZA,BREX__brxL",,
+"defense-finder-genome1muq7_wr_BREX_III_170","BREX","BREX_III","RUBR001.0722.00001.C001_01109","RUBR001.0722.00001.C001_01114","RUBR001.0722.00001.C001_01109,RUBR001.0722.00001.C001_01110,RUBR001.0722.00001.C001_01111,RUBR001.0722.00001.C001_01113,RUBR001.0722.00001.C001_01114",5,"BREX__pglZ3,BREX__brxHII,BREX__pglXI,BREX__brxC,BREX__brxF",,
+"defense-finder-genome1muq7_wr_pAgo_216","pAgo","pAgo","PSSA001.0722.00001.C001_01672","PSSA001.0722.00001.C001_01672","PSSA001.0722.00001.C001_01672",1,"pAgo__pAgo_Short",,
diff --git a/docker-compose.yml b/docker-compose.yml
index db77b855f2ae404bc312e2c752c109f8291f9daa..972dd12abc1995c85d5b13a3c69ce004cd80d672 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,6 +4,8 @@ services:
build:
context: .
target: dev
+ args:
+ BASE_URL: /wiki/
container_name: nuxt
environment:
HOST: 0.0.0.0
diff --git a/layouts/article-no-toc.vue b/layouts/article-no-toc.vue
new file mode 100644
index 0000000000000000000000000000000000000000..a7a46c5f3424df7bc558c416c4f893d66f42d098
--- /dev/null
+++ b/layouts/article-no-toc.vue
@@ -0,0 +1,30 @@
+<script setup lang="ts">
+const { page } = useContent();
+// import { useCustomTheme } from '~/composables/useCustomTheme'
+import { useDisplay } from 'vuetify'
+
+// const { isDark } = useCustomTheme()
+const { mobile } = useDisplay()
+
+
+</script>
+<template>
+ <VApp>
+ <v-main style="min-height: 300px">
+ <v-container>
+ <slot />
+ <EditGitlab />
+ <NavPrevNext />
+ </v-container>
+ <Footer></Footer>
+ </v-main>
+ <NavNavbar />
+ <nav-back-to-top />
+ </VApp>
+</template>
+
+<style scoped>
+#app-footer {
+ border-top: 1px solid rgba(var(--v-border-color), var(--v-border-opacity));
+}
+</style>
diff --git a/layouts/article.vue b/layouts/article.vue
index 0a6d156570e1b541117eb13caa0578609573aa72..1480e3f290ac696aaf3d64fc10d901dc12c05900 100644
--- a/layouts/article.vue
+++ b/layouts/article.vue
@@ -1,17 +1,21 @@
<script setup lang="ts">
-const { page, surround } = useContent();
+const { page, surround, prev, next } = useContent();
// import { useCustomTheme } from '~/composables/useCustomTheme'
import { useDisplay } from 'vuetify'
// const { isDark } = useCustomTheme()
const { mobile } = useDisplay()
-
-
+console.log("================================")
+console.log(surround)
+console.log(prev)
+console.log(next)
</script>
<template>
<VApp>
+
<v-main style="min-height: 300px">
+
<!-- <v-container class="fill-height w-auto" > -->
<!-- <v-card flat max-width="1000" min-height="300" color="transparent">
<v-card-text> -->
@@ -20,18 +24,13 @@ const { mobile } = useDisplay()
<!-- </v-card-text>
</v-card> -->
<EditGitlab />
- <v-row justify="space-between">
- <v-col v-for="(surroundPage, i) in surround" :key="surroundPage?._id" :cols="mobile ? '12' : 'auto'">
- <v-btn v-if="surroundPage" :prepend-icon="i === 0 ? 'mdi-arrow-left' : undefined"
- :append-icon="i === 1 ? 'mdi-arrow-right' : undefined" :block="mobile ? true : false" variant="outlined"
- color="primary" :to="surroundPage?._path">{{ surroundPage?.title }}</v-btn>
- </v-col>
- </v-row>
+ <NavPrevNext />
</v-container>
<Footer></Footer>
</v-main>
<NavNavbar />
<NavTableOfContent :links="page.body.toc.links" />
+ <nav-back-to-top />
</VApp>
</template>
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 3f54bffc98378bd4b76b1daa803c35cb91da632e..c92e20d70dec7acfd9bd38a55b59fb106b706f24 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -1,3 +1,4 @@
+import { md3 } from 'vuetify/blueprints'
// https://v3.nuxtjs.org/api/configuration/nuxt.config
export default defineNuxtConfig({
modules: [
@@ -18,7 +19,10 @@ export default defineNuxtConfig({
icons: {
defaultSet: 'mdi',
sets: ['mdi', 'fa', 'md'],
- }
+ },
+ blueprint: md3
+
+
}
},
devtools: {
diff --git a/package-lock.json b/package-lock.json
index 1b1c271fb5ebcfe4f2dd53a5b592404d64b3e9c9..700902b1a0a8d4cfded5b93cb54b5cda8552764e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,15 +5,16 @@
"packages": {
"": {
"dependencies": {
+ "@observablehq/plot": "^0.6.11",
"@pinia/nuxt": "^0.4.11",
"pinia": "^2.1.6"
},
"devDependencies": {
- "@nuxt/content": "^2.7.2",
+ "@nuxt/content": "^2.8.5",
"@types/node": "^18.15.12",
"@vueuse/core": "^10.4.1",
"@vueuse/nuxt": "^10.4.1",
- "nuxt": "^3.7.0",
+ "nuxt": "^3.7.4",
"vuetify-nuxt-module": "^0.5.7"
}
},
@@ -47,56 +48,6 @@
"node": ">=6.9.0"
}
},
- "node_modules/@babel/code-frame/node_modules/ansi-styles": {
- "version": "3.2.1",
- "license": "MIT",
- "dependencies": {
- "color-convert": "^1.9.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/@babel/code-frame/node_modules/chalk": {
- "version": "2.4.2",
- "license": "MIT",
- "dependencies": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/@babel/code-frame/node_modules/color-convert": {
- "version": "1.9.3",
- "license": "MIT",
- "dependencies": {
- "color-name": "1.1.3"
- }
- },
- "node_modules/@babel/code-frame/node_modules/color-name": {
- "version": "1.1.3",
- "license": "MIT"
- },
- "node_modules/@babel/code-frame/node_modules/escape-string-regexp": {
- "version": "1.0.5",
- "license": "MIT",
- "engines": {
- "node": ">=0.8.0"
- }
- },
- "node_modules/@babel/code-frame/node_modules/supports-color": {
- "version": "5.5.0",
- "license": "MIT",
- "dependencies": {
- "has-flag": "^3.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/@babel/compat-data": {
"version": "7.22.20",
"license": "MIT",
@@ -391,56 +342,6 @@
"node": ">=6.9.0"
}
},
- "node_modules/@babel/highlight/node_modules/ansi-styles": {
- "version": "3.2.1",
- "license": "MIT",
- "dependencies": {
- "color-convert": "^1.9.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/@babel/highlight/node_modules/chalk": {
- "version": "2.4.2",
- "license": "MIT",
- "dependencies": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/@babel/highlight/node_modules/color-convert": {
- "version": "1.9.3",
- "license": "MIT",
- "dependencies": {
- "color-name": "1.1.3"
- }
- },
- "node_modules/@babel/highlight/node_modules/color-name": {
- "version": "1.1.3",
- "license": "MIT"
- },
- "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
- "version": "1.0.5",
- "license": "MIT",
- "engines": {
- "node": ">=0.8.0"
- }
- },
- "node_modules/@babel/highlight/node_modules/supports-color": {
- "version": "5.5.0",
- "license": "MIT",
- "dependencies": {
- "has-flag": "^3.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/@babel/parser": {
"version": "7.23.0",
"license": "MIT",
@@ -555,7 +456,7 @@
}
},
"node_modules/@esbuild/linux-x64": {
- "version": "0.19.3",
+ "version": "0.19.4",
"cpu": [
"x64"
],
@@ -569,6 +470,14 @@
"node": ">=12"
}
},
+ "node_modules/@fastify/busboy": {
+ "version": "2.0.0",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=14"
+ }
+ },
"node_modules/@ioredis/commands": {
"version": "1.2.0",
"dev": true,
@@ -640,6 +549,17 @@
"node-pre-gyp": "bin/node-pre-gyp"
}
},
+ "node_modules/@mapbox/node-pre-gyp/node_modules/agent-base": {
+ "version": "6.0.2",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "debug": "4"
+ },
+ "engines": {
+ "node": ">= 6.0.0"
+ }
+ },
"node_modules/@mapbox/node-pre-gyp/node_modules/detect-libc": {
"version": "2.0.2",
"dev": true,
@@ -648,31 +568,24 @@
"node": ">=8"
}
},
- "node_modules/@mapbox/node-pre-gyp/node_modules/node-fetch": {
- "version": "2.7.0",
+ "node_modules/@mapbox/node-pre-gyp/node_modules/https-proxy-agent": {
+ "version": "5.0.1",
"dev": true,
"license": "MIT",
"dependencies": {
- "whatwg-url": "^5.0.0"
+ "agent-base": "6",
+ "debug": "4"
},
"engines": {
- "node": "4.x || >=6.0.0"
- },
- "peerDependencies": {
- "encoding": "^0.1.0"
- },
- "peerDependenciesMeta": {
- "encoding": {
- "optional": true
- }
+ "node": ">= 6"
}
},
"node_modules/@netlify/functions": {
- "version": "2.0.2",
+ "version": "2.2.0",
"dev": true,
"license": "MIT",
"dependencies": {
- "@netlify/serverless-functions-api": "1.7.3",
+ "@netlify/serverless-functions-api": "1.8.0",
"is-promise": "^4.0.0"
},
"engines": {
@@ -688,7 +601,7 @@
}
},
"node_modules/@netlify/serverless-functions-api": {
- "version": "1.7.3",
+ "version": "1.8.0",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -729,31 +642,34 @@
}
},
"node_modules/@nuxt/content": {
- "version": "2.8.2",
+ "version": "2.8.5",
"dev": true,
"license": "MIT",
"dependencies": {
- "@nuxt/kit": "^3.7.0",
- "@nuxtjs/mdc": "^0.1.6",
- "@vueuse/head": "^1.3.1",
+ "@nuxt/kit": "^3.7.4",
+ "@nuxtjs/mdc": "^0.2.1",
+ "@vueuse/head": "^2.0.0",
"consola": "^3.2.3",
"defu": "^6.1.2",
"destr": "^2.0.1",
"json5": "^2.2.3",
"knitwork": "^1.0.0",
- "listhen": "^1.4.4",
+ "listhen": "^1.5.5",
+ "mdast-util-to-string": "^4.0.0",
"mdurl": "^1.0.1",
"micromark": "^4.0.0",
"micromark-util-sanitize-uri": "^2.0.0",
+ "micromark-util-types": "^2.0.0",
"ohash": "^1.1.3",
"pathe": "^1.1.1",
"scule": "^1.0.0",
"shiki-es": "^0.14.0",
"slugify": "^1.6.6",
"socket.io-client": "^4.7.2",
- "ufo": "^1.3.0",
+ "ufo": "^1.3.1",
+ "unist-util-stringify-position": "^4.0.0",
"unstorage": "^1.9.0",
- "ws": "^8.13.0"
+ "ws": "^8.14.2"
}
},
"node_modules/@nuxt/devalue": {
@@ -762,11 +678,11 @@
"license": "MIT"
},
"node_modules/@nuxt/kit": {
- "version": "3.7.3",
- "resolved": "https://registry.npmjs.org/@nuxt/kit/-/kit-3.7.3.tgz",
- "integrity": "sha512-bhP02i6CNti15Z4ix3LpR3fd1ANtTcpfS3CDSaCja24hDt3UxIasyp52mqD9LRC+OxrUVHJziB18EwUtS6RLDQ==",
+ "version": "3.7.4",
+ "resolved": "https://registry.npmjs.org/@nuxt/kit/-/kit-3.7.4.tgz",
+ "integrity": "sha512-/S5abZL62BITCvC/TY3KWA6N721U1Osln3cQdBb56XHIeafZCBVqTi92Xb0o7ovl72mMRhrKwRu7elzvz9oT/g==",
"dependencies": {
- "@nuxt/schema": "3.7.3",
+ "@nuxt/schema": "3.7.4",
"c12": "^1.4.2",
"consola": "^3.2.3",
"defu": "^6.1.2",
@@ -790,10 +706,11 @@
}
},
"node_modules/@nuxt/schema": {
- "version": "3.7.3",
+ "version": "3.7.4",
"license": "MIT",
"dependencies": {
"@nuxt/ui-templates": "^1.3.1",
+ "consola": "^3.2.3",
"defu": "^6.1.2",
"hookable": "^5.5.3",
"pathe": "^1.1.1",
@@ -809,25 +726,22 @@
}
},
"node_modules/@nuxt/telemetry": {
- "version": "2.5.0",
+ "version": "2.5.2",
"dev": true,
"license": "MIT",
"dependencies": {
- "@nuxt/kit": "^3.7.3",
- "chalk": "^5.3.0",
+ "@nuxt/kit": "^3.7.4",
"ci-info": "^3.8.0",
"consola": "^3.2.3",
"create-require": "^1.1.1",
"defu": "^6.1.2",
"destr": "^2.0.1",
"dotenv": "^16.3.1",
- "fs-extra": "^11.1.1",
"git-url-parse": "^13.1.0",
"is-docker": "^3.0.0",
"jiti": "^1.20.0",
"mri": "^1.2.0",
"nanoid": "^4.0.2",
- "node-fetch": "^3.3.2",
"ofetch": "^1.3.3",
"parse-git-config": "^3.0.0",
"pathe": "^1.1.1",
@@ -857,20 +771,20 @@
"license": "CC-BY-ND-4.0"
},
"node_modules/@nuxt/vite-builder": {
- "version": "3.7.3",
+ "version": "3.7.4",
"dev": true,
"license": "MIT",
"dependencies": {
- "@nuxt/kit": "3.7.3",
+ "@nuxt/kit": "3.7.4",
"@rollup/plugin-replace": "^5.0.2",
"@vitejs/plugin-vue": "^4.3.4",
"@vitejs/plugin-vue-jsx": "^3.0.2",
- "autoprefixer": "^10.4.15",
+ "autoprefixer": "^10.4.16",
"clear": "^0.1.0",
"consola": "^3.2.3",
"cssnano": "^6.0.1",
"defu": "^6.1.2",
- "esbuild": "^0.19.2",
+ "esbuild": "^0.19.3",
"escape-string-regexp": "^5.0.0",
"estree-walker": "^3.0.3",
"externality": "^1.0.2",
@@ -884,14 +798,14 @@
"pathe": "^1.1.1",
"perfect-debounce": "^1.0.0",
"pkg-types": "^1.0.3",
- "postcss": "^8.4.29",
+ "postcss": "^8.4.30",
"postcss-import": "^15.1.0",
"postcss-url": "^10.1.3",
"rollup-plugin-visualizer": "^5.9.2",
"std-env": "^3.4.3",
"strip-literal": "^1.3.0",
"ufo": "^1.3.0",
- "unplugin": "^1.4.0",
+ "unplugin": "^1.5.0",
"vite": "^4.4.9",
"vite-node": "^0.33.0",
"vite-plugin-checker": "^0.6.2",
@@ -913,13 +827,13 @@
}
},
"node_modules/@nuxtjs/mdc": {
- "version": "0.1.6",
+ "version": "0.2.1",
"dev": true,
"license": "MIT",
"dependencies": {
"@nuxt/kit": "latest",
- "@types/hast": "^3.0.0",
- "@types/mdast": "^4.0.0",
+ "@types/hast": "^3.0.1",
+ "@types/mdast": "^4.0.1",
"@vue/compiler-core": "^3.3.4",
"consola": "^3.2.3",
"defu": "^6.1.2",
@@ -930,10 +844,10 @@
"mdast-util-to-hast": "^13.0.2",
"micromark-util-sanitize-uri": "^2.0.0",
"ohash": "^1.1.3",
- "property-information": "^6.2.0",
- "rehype-external-links": "^2.1.0",
+ "property-information": "^6.3.0",
+ "rehype-external-links": "^3.0.0",
"rehype-raw": "^6.1.1",
- "rehype-slug": "^5.1.0",
+ "rehype-slug": "^6.0.0",
"rehype-sort-attribute-values": "^5.0.0",
"rehype-sort-attributes": "^5.0.0",
"remark-emoji": "^4.0.0",
@@ -942,13 +856,25 @@
"remark-parse": "^10.0.2",
"remark-rehype": "^10.1.0",
"scule": "^1.0.0",
- "shiki-es": "^0.14.0",
- "ufo": "^1.3.0",
- "unified": "^11.0.2",
+ "shikiji": "^0.6.8",
+ "ufo": "^1.3.1",
+ "unified": "^11.0.3",
"unist-builder": "^4.0.0",
"unist-util-visit": "^5.0.0"
}
},
+ "node_modules/@observablehq/plot": {
+ "version": "0.6.11",
+ "license": "ISC",
+ "dependencies": {
+ "d3": "^7.8.0",
+ "interval-tree-1d": "^1.0.0",
+ "isoformat": "^0.2.0"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
"node_modules/@parcel/watcher": {
"version": "2.3.0",
"dev": true,
@@ -1047,8 +973,7 @@
},
"node_modules/@pinia/nuxt": {
"version": "0.4.11",
- "resolved": "https://registry.npmjs.org/@pinia/nuxt/-/nuxt-0.4.11.tgz",
- "integrity": "sha512-bhuNFngJpmBCdAqWguezNJ/oJFR7wvKieqiZrmmdmPR07XjsidAw8RLXHMZE9kUm32M9E6T057OBbG/22jERTg==",
+ "license": "MIT",
"dependencies": {
"@nuxt/kit": "^3.5.0",
"pinia": ">=2.1.0"
@@ -1058,7 +983,7 @@
}
},
"node_modules/@rollup/plugin-alias": {
- "version": "5.0.0",
+ "version": "5.0.1",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -1068,7 +993,7 @@
"node": ">=14.0.0"
},
"peerDependencies": {
- "rollup": "^1.20.0||^2.0.0||^3.0.0"
+ "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
},
"peerDependenciesMeta": {
"rollup": {
@@ -1077,7 +1002,7 @@
}
},
"node_modules/@rollup/plugin-commonjs": {
- "version": "25.0.4",
+ "version": "25.0.5",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -1092,7 +1017,7 @@
"node": ">=14.0.0"
},
"peerDependencies": {
- "rollup": "^2.68.0||^3.0.0"
+ "rollup": "^2.68.0||^3.0.0||^4.0.0"
},
"peerDependenciesMeta": {
"rollup": {
@@ -1112,7 +1037,7 @@
}
},
"node_modules/@rollup/plugin-inject": {
- "version": "5.0.3",
+ "version": "5.0.4",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -1124,7 +1049,7 @@
"node": ">=14.0.0"
},
"peerDependencies": {
- "rollup": "^1.20.0||^2.0.0||^3.0.0"
+ "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
},
"peerDependenciesMeta": {
"rollup": {
@@ -1144,7 +1069,7 @@
}
},
"node_modules/@rollup/plugin-json": {
- "version": "6.0.0",
+ "version": "6.0.1",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -1154,7 +1079,7 @@
"node": ">=14.0.0"
},
"peerDependencies": {
- "rollup": "^1.20.0||^2.0.0||^3.0.0"
+ "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
},
"peerDependenciesMeta": {
"rollup": {
@@ -1163,7 +1088,7 @@
}
},
"node_modules/@rollup/plugin-node-resolve": {
- "version": "15.2.1",
+ "version": "15.2.2",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -1178,7 +1103,7 @@
"node": ">=14.0.0"
},
"peerDependencies": {
- "rollup": "^2.78.0||^3.0.0"
+ "rollup": "^2.78.0||^3.0.0||^4.0.0"
},
"peerDependenciesMeta": {
"rollup": {
@@ -1187,7 +1112,7 @@
}
},
"node_modules/@rollup/plugin-replace": {
- "version": "5.0.2",
+ "version": "5.0.3",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -1198,7 +1123,7 @@
"node": ">=14.0.0"
},
"peerDependencies": {
- "rollup": "^1.20.0||^2.0.0||^3.0.0"
+ "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
},
"peerDependenciesMeta": {
"rollup": {
@@ -1218,7 +1143,7 @@
}
},
"node_modules/@rollup/plugin-terser": {
- "version": "0.4.3",
+ "version": "0.4.4",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -1230,7 +1155,7 @@
"node": ">=14.0.0"
},
"peerDependencies": {
- "rollup": "^2.x || ^3.x"
+ "rollup": "^2.0.0||^3.0.0||^4.0.0"
},
"peerDependenciesMeta": {
"rollup": {
@@ -1239,14 +1164,17 @@
}
},
"node_modules/@rollup/plugin-wasm": {
- "version": "6.1.3",
+ "version": "6.2.2",
"dev": true,
"license": "MIT",
+ "dependencies": {
+ "@rollup/pluginutils": "^5.0.2"
+ },
"engines": {
"node": ">=14.0.0"
},
"peerDependencies": {
- "rollup": "^1.20.0||^2.0.0||^3.0.0"
+ "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
},
"peerDependenciesMeta": {
"rollup": {
@@ -1255,7 +1183,7 @@
}
},
"node_modules/@rollup/pluginutils": {
- "version": "5.0.4",
+ "version": "5.0.5",
"license": "MIT",
"dependencies": {
"@types/estree": "^1.0.0",
@@ -1266,7 +1194,7 @@
"node": ">=14.0.0"
},
"peerDependencies": {
- "rollup": "^1.20.0||^2.0.0||^3.0.0"
+ "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
},
"peerDependenciesMeta": {
"rollup": {
@@ -1327,7 +1255,7 @@
}
},
"node_modules/@types/mdast": {
- "version": "4.0.0",
+ "version": "4.0.1",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -1335,12 +1263,12 @@
}
},
"node_modules/@types/ms": {
- "version": "0.7.31",
+ "version": "0.7.32",
"dev": true,
"license": "MIT"
},
"node_modules/@types/node": {
- "version": "18.17.19",
+ "version": "18.18.3",
"dev": true,
"license": "MIT"
},
@@ -1381,7 +1309,7 @@
"url": "https://github.com/sponsors/harlan-zw"
}
},
- "node_modules/@unhead/schema": {
+ "node_modules/@unhead/dom/node_modules/@unhead/schema": {
"version": "1.7.4",
"dev": true,
"license": "MIT",
@@ -1393,6 +1321,18 @@
"url": "https://github.com/sponsors/harlan-zw"
}
},
+ "node_modules/@unhead/schema": {
+ "version": "1.7.5",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "hookable": "^5.5.3",
+ "zhead": "^2.1.2"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/harlan-zw"
+ }
+ },
"node_modules/@unhead/shared": {
"version": "1.7.4",
"dev": true,
@@ -1404,6 +1344,18 @@
"url": "https://github.com/sponsors/harlan-zw"
}
},
+ "node_modules/@unhead/shared/node_modules/@unhead/schema": {
+ "version": "1.7.4",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "hookable": "^5.5.3",
+ "zhead": "^2.1.1"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/harlan-zw"
+ }
+ },
"node_modules/@unhead/ssr": {
"version": "1.7.4",
"dev": true,
@@ -1416,6 +1368,18 @@
"url": "https://github.com/sponsors/harlan-zw"
}
},
+ "node_modules/@unhead/ssr/node_modules/@unhead/schema": {
+ "version": "1.7.4",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "hookable": "^5.5.3",
+ "zhead": "^2.1.1"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/harlan-zw"
+ }
+ },
"node_modules/@unhead/vue": {
"version": "1.7.4",
"dev": true,
@@ -1433,6 +1397,18 @@
"vue": ">=2.7 || >=3"
}
},
+ "node_modules/@unhead/vue/node_modules/@unhead/schema": {
+ "version": "1.7.4",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "hookable": "^5.5.3",
+ "zhead": "^2.1.1"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/harlan-zw"
+ }
+ },
"node_modules/@vercel/nft": {
"version": "0.23.1",
"dev": true,
@@ -1509,7 +1485,7 @@
}
},
"node_modules/@vitejs/plugin-vue": {
- "version": "4.3.4",
+ "version": "4.4.0",
"dev": true,
"license": "MIT",
"engines": {
@@ -1709,14 +1685,14 @@
}
},
"node_modules/@vueuse/head": {
- "version": "1.3.1",
+ "version": "2.0.0",
"dev": true,
"license": "MIT",
"dependencies": {
- "@unhead/dom": "^1.3.1",
- "@unhead/schema": "^1.3.1",
- "@unhead/ssr": "^1.3.1",
- "@unhead/vue": "^1.3.1"
+ "@unhead/dom": "^1.7.0",
+ "@unhead/schema": "^1.7.0",
+ "@unhead/ssr": "^1.7.0",
+ "@unhead/vue": "^1.7.0"
},
"peerDependencies": {
"vue": ">=2.7 || >=3"
@@ -1776,13 +1752,13 @@
}
},
"node_modules/agent-base": {
- "version": "6.0.2",
+ "version": "7.1.0",
"license": "MIT",
"dependencies": {
- "debug": "4"
+ "debug": "^4.3.4"
},
"engines": {
- "node": ">= 6.0.0"
+ "node": ">= 14"
}
},
"node_modules/ansi-colors": {
@@ -1827,17 +1803,13 @@
}
},
"node_modules/ansi-styles": {
- "version": "4.3.0",
- "dev": true,
+ "version": "3.2.1",
"license": "MIT",
"dependencies": {
- "color-convert": "^2.0.1"
+ "color-convert": "^1.9.0"
},
"engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+ "node": ">=4"
}
},
"node_modules/anymatch": {
@@ -1939,12 +1911,25 @@
}
},
"node_modules/ast-walker-scope": {
- "version": "0.4.2",
+ "version": "0.5.0",
"dev": true,
"license": "MIT",
"dependencies": {
- "@babel/parser": "^7.22.4",
- "@babel/types": "^7.22.4"
+ "@babel/parser": "^7.22.7",
+ "ast-kit": "^0.9.4"
+ },
+ "engines": {
+ "node": ">=16.14.0"
+ }
+ },
+ "node_modules/ast-walker-scope/node_modules/ast-kit": {
+ "version": "0.9.5",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@babel/parser": "^7.22.7",
+ "@rollup/pluginutils": "^5.0.2",
+ "pathe": "^1.1.1"
},
"engines": {
"node": ">=16.14.0"
@@ -2022,6 +2007,10 @@
"node": ">=8"
}
},
+ "node_modules/binary-search-bounds": {
+ "version": "2.0.5",
+ "license": "MIT"
+ },
"node_modules/bindings": {
"version": "1.5.0",
"dev": true,
@@ -2054,7 +2043,7 @@
}
},
"node_modules/browserslist": {
- "version": "4.21.11",
+ "version": "4.22.1",
"funding": [
{
"type": "opencollective",
@@ -2071,8 +2060,8 @@
],
"license": "MIT",
"dependencies": {
- "caniuse-lite": "^1.0.30001538",
- "electron-to-chromium": "^1.4.526",
+ "caniuse-lite": "^1.0.30001541",
+ "electron-to-chromium": "^1.4.535",
"node-releases": "^2.0.13",
"update-browserslist-db": "^1.0.13"
},
@@ -2107,16 +2096,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/busboy": {
- "version": "1.6.0",
- "dev": true,
- "dependencies": {
- "streamsearch": "^1.1.0"
- },
- "engines": {
- "node": ">=10.16.0"
- }
- },
"node_modules/c12": {
"version": "1.4.2",
"license": "MIT",
@@ -2165,7 +2144,7 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001539",
+ "version": "1.0.30001546",
"funding": [
{
"type": "opencollective",
@@ -2192,14 +2171,22 @@
}
},
"node_modules/chalk": {
- "version": "5.3.0",
- "dev": true,
+ "version": "2.4.2",
"license": "MIT",
- "engines": {
- "node": "^12.17.0 || ^14.13 || >=16.0.0"
+ "dependencies": {
+ "ansi-styles": "^3.2.1",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^5.3.0"
},
- "funding": {
- "url": "https://github.com/chalk/chalk?sponsor=1"
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/chalk/node_modules/escape-string-regexp": {
+ "version": "1.0.5",
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.8.0"
}
},
"node_modules/char-regex": {
@@ -2279,7 +2266,7 @@
}
},
"node_modules/ci-info": {
- "version": "3.8.0",
+ "version": "3.9.0",
"dev": true,
"funding": [
{
@@ -2345,19 +2332,14 @@
}
},
"node_modules/color-convert": {
- "version": "2.0.1",
- "dev": true,
+ "version": "1.9.3",
"license": "MIT",
"dependencies": {
- "color-name": "~1.1.4"
- },
- "engines": {
- "node": ">=7.0.0"
+ "color-name": "1.1.3"
}
},
"node_modules/color-name": {
- "version": "1.1.4",
- "dev": true,
+ "version": "1.1.3",
"license": "MIT"
},
"node_modules/color-support": {
@@ -2388,7 +2370,6 @@
},
"node_modules/commander": {
"version": "7.2.0",
- "dev": true,
"license": "MIT",
"engines": {
"node": ">= 10"
@@ -2655,12 +2636,343 @@
"dev": true,
"license": "MIT"
},
- "node_modules/data-uri-to-buffer": {
- "version": "4.0.1",
- "dev": true,
- "license": "MIT",
+ "node_modules/d3": {
+ "version": "7.8.5",
+ "license": "ISC",
+ "dependencies": {
+ "d3-array": "3",
+ "d3-axis": "3",
+ "d3-brush": "3",
+ "d3-chord": "3",
+ "d3-color": "3",
+ "d3-contour": "4",
+ "d3-delaunay": "6",
+ "d3-dispatch": "3",
+ "d3-drag": "3",
+ "d3-dsv": "3",
+ "d3-ease": "3",
+ "d3-fetch": "3",
+ "d3-force": "3",
+ "d3-format": "3",
+ "d3-geo": "3",
+ "d3-hierarchy": "3",
+ "d3-interpolate": "3",
+ "d3-path": "3",
+ "d3-polygon": "3",
+ "d3-quadtree": "3",
+ "d3-random": "3",
+ "d3-scale": "4",
+ "d3-scale-chromatic": "3",
+ "d3-selection": "3",
+ "d3-shape": "3",
+ "d3-time": "3",
+ "d3-time-format": "4",
+ "d3-timer": "3",
+ "d3-transition": "3",
+ "d3-zoom": "3"
+ },
"engines": {
- "node": ">= 12"
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-array": {
+ "version": "3.2.4",
+ "license": "ISC",
+ "dependencies": {
+ "internmap": "1 - 2"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-axis": {
+ "version": "3.0.0",
+ "license": "ISC",
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-brush": {
+ "version": "3.0.0",
+ "license": "ISC",
+ "dependencies": {
+ "d3-dispatch": "1 - 3",
+ "d3-drag": "2 - 3",
+ "d3-interpolate": "1 - 3",
+ "d3-selection": "3",
+ "d3-transition": "3"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-chord": {
+ "version": "3.0.1",
+ "license": "ISC",
+ "dependencies": {
+ "d3-path": "1 - 3"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-color": {
+ "version": "3.1.0",
+ "license": "ISC",
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-contour": {
+ "version": "4.0.2",
+ "license": "ISC",
+ "dependencies": {
+ "d3-array": "^3.2.0"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-delaunay": {
+ "version": "6.0.4",
+ "license": "ISC",
+ "dependencies": {
+ "delaunator": "5"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-dispatch": {
+ "version": "3.0.1",
+ "license": "ISC",
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-drag": {
+ "version": "3.0.0",
+ "license": "ISC",
+ "dependencies": {
+ "d3-dispatch": "1 - 3",
+ "d3-selection": "3"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-dsv": {
+ "version": "3.0.1",
+ "license": "ISC",
+ "dependencies": {
+ "commander": "7",
+ "iconv-lite": "0.6",
+ "rw": "1"
+ },
+ "bin": {
+ "csv2json": "bin/dsv2json.js",
+ "csv2tsv": "bin/dsv2dsv.js",
+ "dsv2dsv": "bin/dsv2dsv.js",
+ "dsv2json": "bin/dsv2json.js",
+ "json2csv": "bin/json2dsv.js",
+ "json2dsv": "bin/json2dsv.js",
+ "json2tsv": "bin/json2dsv.js",
+ "tsv2csv": "bin/dsv2dsv.js",
+ "tsv2json": "bin/dsv2json.js"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-ease": {
+ "version": "3.0.1",
+ "license": "BSD-3-Clause",
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-fetch": {
+ "version": "3.0.1",
+ "license": "ISC",
+ "dependencies": {
+ "d3-dsv": "1 - 3"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-force": {
+ "version": "3.0.0",
+ "license": "ISC",
+ "dependencies": {
+ "d3-dispatch": "1 - 3",
+ "d3-quadtree": "1 - 3",
+ "d3-timer": "1 - 3"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-format": {
+ "version": "3.1.0",
+ "license": "ISC",
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-geo": {
+ "version": "3.1.0",
+ "license": "ISC",
+ "dependencies": {
+ "d3-array": "2.5.0 - 3"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-hierarchy": {
+ "version": "3.1.2",
+ "license": "ISC",
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-interpolate": {
+ "version": "3.0.1",
+ "license": "ISC",
+ "dependencies": {
+ "d3-color": "1 - 3"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-path": {
+ "version": "3.1.0",
+ "license": "ISC",
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-polygon": {
+ "version": "3.0.1",
+ "license": "ISC",
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-quadtree": {
+ "version": "3.0.1",
+ "license": "ISC",
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-random": {
+ "version": "3.0.1",
+ "license": "ISC",
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-scale": {
+ "version": "4.0.2",
+ "license": "ISC",
+ "dependencies": {
+ "d3-array": "2.10.0 - 3",
+ "d3-format": "1 - 3",
+ "d3-interpolate": "1.2.0 - 3",
+ "d3-time": "2.1.1 - 3",
+ "d3-time-format": "2 - 4"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-scale-chromatic": {
+ "version": "3.0.0",
+ "license": "ISC",
+ "dependencies": {
+ "d3-color": "1 - 3",
+ "d3-interpolate": "1 - 3"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-selection": {
+ "version": "3.0.0",
+ "license": "ISC",
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-shape": {
+ "version": "3.2.0",
+ "license": "ISC",
+ "dependencies": {
+ "d3-path": "^3.1.0"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-time": {
+ "version": "3.1.0",
+ "license": "ISC",
+ "dependencies": {
+ "d3-array": "2 - 3"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-time-format": {
+ "version": "4.1.0",
+ "license": "ISC",
+ "dependencies": {
+ "d3-time": "1 - 3"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-timer": {
+ "version": "3.0.1",
+ "license": "ISC",
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/d3-transition": {
+ "version": "3.0.1",
+ "license": "ISC",
+ "dependencies": {
+ "d3-color": "1 - 3",
+ "d3-dispatch": "1 - 3",
+ "d3-ease": "1 - 3",
+ "d3-interpolate": "1 - 3",
+ "d3-timer": "1 - 3"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "peerDependencies": {
+ "d3-selection": "2 - 3"
+ }
+ },
+ "node_modules/d3-zoom": {
+ "version": "3.0.0",
+ "license": "ISC",
+ "dependencies": {
+ "d3-dispatch": "1 - 3",
+ "d3-drag": "2 - 3",
+ "d3-interpolate": "1 - 3",
+ "d3-selection": "2 - 3",
+ "d3-transition": "2 - 3"
+ },
+ "engines": {
+ "node": ">=12"
}
},
"node_modules/debug": {
@@ -2710,6 +3022,13 @@
"version": "6.1.2",
"license": "MIT"
},
+ "node_modules/delaunator": {
+ "version": "5.0.0",
+ "license": "ISC",
+ "dependencies": {
+ "robust-predicates": "^3.0.0"
+ }
+ },
"node_modules/delegates": {
"version": "1.0.0",
"dev": true,
@@ -2893,7 +3212,7 @@
"license": "MIT"
},
"node_modules/electron-to-chromium": {
- "version": "1.4.528",
+ "version": "1.4.543",
"license": "ISC"
},
"node_modules/emoji-regex": {
@@ -2923,31 +3242,6 @@
"node": ">= 0.8"
}
},
- "node_modules/encoding": {
- "version": "0.1.13",
- "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
- "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "iconv-lite": "^0.6.2"
- }
- },
- "node_modules/encoding/node_modules/iconv-lite": {
- "version": "0.6.3",
- "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
- "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
- "dev": true,
- "optional": true,
- "peer": true,
- "dependencies": {
- "safer-buffer": ">= 2.1.2 < 3.0.0"
- },
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/engine.io-client": {
"version": "6.5.2",
"dev": true,
@@ -3022,7 +3316,7 @@
}
},
"node_modules/esbuild": {
- "version": "0.19.3",
+ "version": "0.19.4",
"dev": true,
"hasInstallScript": true,
"license": "MIT",
@@ -3033,28 +3327,28 @@
"node": ">=12"
},
"optionalDependencies": {
- "@esbuild/android-arm": "0.19.3",
- "@esbuild/android-arm64": "0.19.3",
- "@esbuild/android-x64": "0.19.3",
- "@esbuild/darwin-arm64": "0.19.3",
- "@esbuild/darwin-x64": "0.19.3",
- "@esbuild/freebsd-arm64": "0.19.3",
- "@esbuild/freebsd-x64": "0.19.3",
- "@esbuild/linux-arm": "0.19.3",
- "@esbuild/linux-arm64": "0.19.3",
- "@esbuild/linux-ia32": "0.19.3",
- "@esbuild/linux-loong64": "0.19.3",
- "@esbuild/linux-mips64el": "0.19.3",
- "@esbuild/linux-ppc64": "0.19.3",
- "@esbuild/linux-riscv64": "0.19.3",
- "@esbuild/linux-s390x": "0.19.3",
- "@esbuild/linux-x64": "0.19.3",
- "@esbuild/netbsd-x64": "0.19.3",
- "@esbuild/openbsd-x64": "0.19.3",
- "@esbuild/sunos-x64": "0.19.3",
- "@esbuild/win32-arm64": "0.19.3",
- "@esbuild/win32-ia32": "0.19.3",
- "@esbuild/win32-x64": "0.19.3"
+ "@esbuild/android-arm": "0.19.4",
+ "@esbuild/android-arm64": "0.19.4",
+ "@esbuild/android-x64": "0.19.4",
+ "@esbuild/darwin-arm64": "0.19.4",
+ "@esbuild/darwin-x64": "0.19.4",
+ "@esbuild/freebsd-arm64": "0.19.4",
+ "@esbuild/freebsd-x64": "0.19.4",
+ "@esbuild/linux-arm": "0.19.4",
+ "@esbuild/linux-arm64": "0.19.4",
+ "@esbuild/linux-ia32": "0.19.4",
+ "@esbuild/linux-loong64": "0.19.4",
+ "@esbuild/linux-mips64el": "0.19.4",
+ "@esbuild/linux-ppc64": "0.19.4",
+ "@esbuild/linux-riscv64": "0.19.4",
+ "@esbuild/linux-s390x": "0.19.4",
+ "@esbuild/linux-x64": "0.19.4",
+ "@esbuild/netbsd-x64": "0.19.4",
+ "@esbuild/openbsd-x64": "0.19.4",
+ "@esbuild/sunos-x64": "0.19.4",
+ "@esbuild/win32-arm64": "0.19.4",
+ "@esbuild/win32-ia32": "0.19.4",
+ "@esbuild/win32-x64": "0.19.4"
}
},
"node_modules/escalade": {
@@ -3155,28 +3449,6 @@
"reusify": "^1.0.4"
}
},
- "node_modules/fetch-blob": {
- "version": "3.2.0",
- "dev": true,
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/jimmywarting"
- },
- {
- "type": "paypal",
- "url": "https://paypal.me/jimmywarting"
- }
- ],
- "license": "MIT",
- "dependencies": {
- "node-domexception": "^1.0.0",
- "web-streams-polyfill": "^3.0.3"
- },
- "engines": {
- "node": "^12.20 || >= 14.13"
- }
- },
"node_modules/file-uri-to-path": {
"version": "1.0.0",
"dev": true,
@@ -3227,17 +3499,6 @@
"flat": "cli.js"
}
},
- "node_modules/formdata-polyfill": {
- "version": "4.0.10",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "fetch-blob": "^3.1.2"
- },
- "engines": {
- "node": ">=12.20.0"
- }
- },
"node_modules/fraction.js": {
"version": "4.3.6",
"dev": true,
@@ -3300,11 +3561,6 @@
"dev": true,
"license": "ISC"
},
- "node_modules/function-bind": {
- "version": "1.1.1",
- "dev": true,
- "license": "MIT"
- },
"node_modules/gauge": {
"version": "3.0.2",
"dev": true,
@@ -3356,16 +3612,16 @@
}
},
"node_modules/giget": {
- "version": "1.1.2",
+ "version": "1.1.3",
"license": "MIT",
"dependencies": {
- "colorette": "^2.0.19",
+ "colorette": "^2.0.20",
"defu": "^6.1.2",
- "https-proxy-agent": "^5.0.1",
+ "https-proxy-agent": "^7.0.2",
"mri": "^1.2.0",
- "node-fetch-native": "^1.0.2",
- "pathe": "^1.1.0",
- "tar": "^6.1.13"
+ "node-fetch-native": "^1.4.0",
+ "pathe": "^1.1.1",
+ "tar": "^6.2.0"
},
"bin": {
"giget": "dist/cli.mjs"
@@ -3472,14 +3728,14 @@
}
},
"node_modules/h3": {
- "version": "1.8.1",
+ "version": "1.8.2",
"dev": true,
"license": "MIT",
"dependencies": {
"cookie-es": "^1.0.0",
"defu": "^6.1.2",
"destr": "^2.0.1",
- "iron-webcrypto": "^0.8.0",
+ "iron-webcrypto": "^0.10.1",
"radix3": "^1.1.0",
"ufo": "^1.3.0",
"uncrypto": "^0.1.3",
@@ -3487,12 +3743,9 @@
}
},
"node_modules/has": {
- "version": "1.0.3",
+ "version": "1.0.4",
"dev": true,
"license": "MIT",
- "dependencies": {
- "function-bind": "^1.1.1"
- },
"engines": {
"node": ">= 0.4.0"
}
@@ -3544,66 +3797,30 @@
"dev": true,
"license": "MIT"
},
- "node_modules/hast-util-has-property": {
- "version": "2.0.1",
- "dev": true,
- "license": "MIT",
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/unified"
- }
- },
"node_modules/hast-util-heading-rank": {
- "version": "2.1.1",
+ "version": "3.0.0",
"dev": true,
"license": "MIT",
"dependencies": {
- "@types/hast": "^2.0.0"
+ "@types/hast": "^3.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/unified"
}
},
- "node_modules/hast-util-heading-rank/node_modules/@types/hast": {
- "version": "2.3.6",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/unist": "^2"
- }
- },
- "node_modules/hast-util-heading-rank/node_modules/@types/unist": {
- "version": "2.0.8",
- "dev": true,
- "license": "MIT"
- },
"node_modules/hast-util-is-element": {
- "version": "2.1.3",
+ "version": "3.0.0",
"dev": true,
"license": "MIT",
"dependencies": {
- "@types/hast": "^2.0.0",
- "@types/unist": "^2.0.0"
+ "@types/hast": "^3.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/unified"
}
},
- "node_modules/hast-util-is-element/node_modules/@types/hast": {
- "version": "2.3.6",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/unist": "^2"
- }
- },
- "node_modules/hast-util-is-element/node_modules/@types/unist": {
- "version": "2.0.8",
- "dev": true,
- "license": "MIT"
- },
"node_modules/hast-util-parse-selector": {
"version": "3.1.1",
"dev": true,
@@ -3715,6 +3932,178 @@
"url": "https://opencollective.com/unified"
}
},
+ "node_modules/hast-util-to-html": {
+ "version": "9.0.0",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@types/hast": "^3.0.0",
+ "@types/unist": "^3.0.0",
+ "ccount": "^2.0.0",
+ "comma-separated-tokens": "^2.0.0",
+ "hast-util-raw": "^9.0.0",
+ "hast-util-whitespace": "^3.0.0",
+ "html-void-elements": "^3.0.0",
+ "mdast-util-to-hast": "^13.0.0",
+ "property-information": "^6.0.0",
+ "space-separated-tokens": "^2.0.0",
+ "stringify-entities": "^4.0.0",
+ "zwitch": "^2.0.4"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
+ "node_modules/hast-util-to-html/node_modules/hast-util-from-parse5": {
+ "version": "8.0.1",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@types/hast": "^3.0.0",
+ "@types/unist": "^3.0.0",
+ "devlop": "^1.0.0",
+ "hastscript": "^8.0.0",
+ "property-information": "^6.0.0",
+ "vfile": "^6.0.0",
+ "vfile-location": "^5.0.0",
+ "web-namespaces": "^2.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
+ "node_modules/hast-util-to-html/node_modules/hast-util-parse-selector": {
+ "version": "4.0.0",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@types/hast": "^3.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
+ "node_modules/hast-util-to-html/node_modules/hast-util-raw": {
+ "version": "9.0.1",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@types/hast": "^3.0.0",
+ "@types/unist": "^3.0.0",
+ "@ungap/structured-clone": "^1.0.0",
+ "hast-util-from-parse5": "^8.0.0",
+ "hast-util-to-parse5": "^8.0.0",
+ "html-void-elements": "^3.0.0",
+ "mdast-util-to-hast": "^13.0.0",
+ "parse5": "^7.0.0",
+ "unist-util-position": "^5.0.0",
+ "unist-util-visit": "^5.0.0",
+ "vfile": "^6.0.0",
+ "web-namespaces": "^2.0.0",
+ "zwitch": "^2.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
+ "node_modules/hast-util-to-html/node_modules/hast-util-to-parse5": {
+ "version": "8.0.0",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@types/hast": "^3.0.0",
+ "comma-separated-tokens": "^2.0.0",
+ "devlop": "^1.0.0",
+ "property-information": "^6.0.0",
+ "space-separated-tokens": "^2.0.0",
+ "web-namespaces": "^2.0.0",
+ "zwitch": "^2.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
+ "node_modules/hast-util-to-html/node_modules/hastscript": {
+ "version": "8.0.0",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@types/hast": "^3.0.0",
+ "comma-separated-tokens": "^2.0.0",
+ "hast-util-parse-selector": "^4.0.0",
+ "property-information": "^6.0.0",
+ "space-separated-tokens": "^2.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
+ "node_modules/hast-util-to-html/node_modules/html-void-elements": {
+ "version": "3.0.0",
+ "dev": true,
+ "license": "MIT",
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/wooorm"
+ }
+ },
+ "node_modules/hast-util-to-html/node_modules/parse5": {
+ "version": "7.1.2",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "entities": "^4.4.0"
+ },
+ "funding": {
+ "url": "https://github.com/inikulin/parse5?sponsor=1"
+ }
+ },
+ "node_modules/hast-util-to-html/node_modules/vfile": {
+ "version": "6.0.1",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@types/unist": "^3.0.0",
+ "unist-util-stringify-position": "^4.0.0",
+ "vfile-message": "^4.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
+ "node_modules/hast-util-to-html/node_modules/vfile-location": {
+ "version": "5.0.2",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@types/unist": "^3.0.0",
+ "vfile": "^6.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
+ "node_modules/hast-util-to-html/node_modules/vfile-message": {
+ "version": "4.0.2",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@types/unist": "^3.0.0",
+ "unist-util-stringify-position": "^4.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
"node_modules/hast-util-to-parse5": {
"version": "7.1.0",
"dev": true,
@@ -3745,7 +4134,19 @@
"dev": true,
"license": "MIT"
},
- "node_modules/hast-util-to-string": {
+ "node_modules/hast-util-to-string": {
+ "version": "3.0.0",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@types/hast": "^3.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
+ "node_modules/hast-util-whitespace": {
"version": "3.0.0",
"dev": true,
"license": "MIT",
@@ -3835,14 +4236,14 @@
}
},
"node_modules/https-proxy-agent": {
- "version": "5.0.1",
+ "version": "7.0.2",
"license": "MIT",
"dependencies": {
- "agent-base": "6",
+ "agent-base": "^7.0.2",
"debug": "4"
},
"engines": {
- "node": ">= 6"
+ "node": ">= 14"
}
},
"node_modules/httpxy": {
@@ -3858,6 +4259,16 @@
"node": ">=10.17.0"
}
},
+ "node_modules/iconv-lite": {
+ "version": "0.6.3",
+ "license": "MIT",
+ "dependencies": {
+ "safer-buffer": ">= 2.1.2 < 3.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/ignore": {
"version": "5.2.4",
"license": "MIT",
@@ -3883,6 +4294,20 @@
"dev": true,
"license": "ISC"
},
+ "node_modules/internmap": {
+ "version": "2.0.3",
+ "license": "ISC",
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/interval-tree-1d": {
+ "version": "1.0.4",
+ "license": "MIT",
+ "dependencies": {
+ "binary-search-bounds": "^2.0.0"
+ }
+ },
"node_modules/ioredis": {
"version": "5.3.2",
"dev": true,
@@ -3907,7 +4332,7 @@
}
},
"node_modules/iron-webcrypto": {
- "version": "0.8.2",
+ "version": "0.10.1",
"dev": true,
"license": "MIT",
"funding": {
@@ -4144,6 +4569,10 @@
"dev": true,
"license": "ISC"
},
+ "node_modules/isoformat": {
+ "version": "0.2.1",
+ "license": "ISC"
+ },
"node_modules/jiti": {
"version": "1.20.0",
"license": "MIT",
@@ -4202,7 +4631,7 @@
}
},
"node_modules/kleur": {
- "version": "3.0.3",
+ "version": "4.1.5",
"dev": true,
"license": "MIT",
"engines": {
@@ -4368,7 +4797,7 @@
}
},
"node_modules/magic-string": {
- "version": "0.30.3",
+ "version": "0.30.4",
"license": "MIT",
"dependencies": {
"@jridgewell/sourcemap-codec": "^1.4.15"
@@ -4434,7 +4863,7 @@
}
},
"node_modules/mdast-util-definitions/node_modules/@types/mdast": {
- "version": "3.0.12",
+ "version": "3.0.13",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -4524,7 +4953,7 @@
}
},
"node_modules/mdast-util-from-markdown/node_modules/@types/mdast": {
- "version": "3.0.12",
+ "version": "3.0.13",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -4536,6 +4965,18 @@
"dev": true,
"license": "MIT"
},
+ "node_modules/mdast-util-from-markdown/node_modules/mdast-util-to-string": {
+ "version": "3.2.0",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@types/mdast": "^3.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
"node_modules/mdast-util-from-markdown/node_modules/micromark": {
"version": "3.2.0",
"dev": true,
@@ -4936,6 +5377,18 @@
],
"license": "MIT"
},
+ "node_modules/mdast-util-from-markdown/node_modules/unist-util-stringify-position": {
+ "version": "3.0.3",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@types/unist": "^2.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
"node_modules/mdast-util-gfm": {
"version": "2.0.2",
"dev": true,
@@ -4970,7 +5423,7 @@
}
},
"node_modules/mdast-util-gfm-autolink-literal/node_modules/@types/mdast": {
- "version": "3.0.12",
+ "version": "3.0.13",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -5086,7 +5539,7 @@
}
},
"node_modules/mdast-util-gfm-footnote/node_modules/@types/mdast": {
- "version": "3.0.12",
+ "version": "3.0.13",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -5145,7 +5598,7 @@
}
},
"node_modules/mdast-util-gfm-strikethrough/node_modules/@types/mdast": {
- "version": "3.0.12",
+ "version": "3.0.13",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -5173,7 +5626,7 @@
}
},
"node_modules/mdast-util-gfm-table/node_modules/@types/mdast": {
- "version": "3.0.12",
+ "version": "3.0.13",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -5199,7 +5652,7 @@
}
},
"node_modules/mdast-util-gfm-task-list-item/node_modules/@types/mdast": {
- "version": "3.0.12",
+ "version": "3.0.13",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -5225,7 +5678,7 @@
}
},
"node_modules/mdast-util-phrasing/node_modules/@types/mdast": {
- "version": "3.0.12",
+ "version": "3.0.13",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -5288,7 +5741,7 @@
}
},
"node_modules/mdast-util-to-markdown/node_modules/@types/mdast": {
- "version": "3.0.12",
+ "version": "3.0.13",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -5300,6 +5753,18 @@
"dev": true,
"license": "MIT"
},
+ "node_modules/mdast-util-to-markdown/node_modules/mdast-util-to-string": {
+ "version": "3.2.0",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@types/mdast": "^3.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
"node_modules/mdast-util-to-markdown/node_modules/unist-util-is": {
"version": "5.2.1",
"dev": true,
@@ -5340,30 +5805,17 @@
}
},
"node_modules/mdast-util-to-string": {
- "version": "3.2.0",
+ "version": "4.0.0",
"dev": true,
"license": "MIT",
"dependencies": {
- "@types/mdast": "^3.0.0"
+ "@types/mdast": "^4.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/unified"
}
},
- "node_modules/mdast-util-to-string/node_modules/@types/mdast": {
- "version": "3.0.12",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/unist": "^2"
- }
- },
- "node_modules/mdast-util-to-string/node_modules/@types/unist": {
- "version": "2.0.8",
- "dev": true,
- "license": "MIT"
- },
"node_modules/mdn-data": {
"version": "2.0.30",
"dev": true,
@@ -6965,29 +7417,22 @@
}
}
},
- "node_modules/node-addon-api": {
- "version": "7.0.0",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/node-domexception": {
- "version": "1.0.0",
+ "node_modules/nitropack/node_modules/chalk": {
+ "version": "5.3.0",
"dev": true,
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/jimmywarting"
- },
- {
- "type": "github",
- "url": "https://paypal.me/jimmywarting"
- }
- ],
"license": "MIT",
"engines": {
- "node": ">=10.5.0"
+ "node": "^12.17.0 || ^14.13 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/chalk?sponsor=1"
}
},
+ "node_modules/node-addon-api": {
+ "version": "7.0.0",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/node-emoji": {
"version": "2.1.0",
"dev": true,
@@ -7000,20 +7445,22 @@
}
},
"node_modules/node-fetch": {
- "version": "3.3.2",
+ "version": "2.7.0",
"dev": true,
"license": "MIT",
"dependencies": {
- "data-uri-to-buffer": "^4.0.0",
- "fetch-blob": "^3.1.4",
- "formdata-polyfill": "^4.0.10"
+ "whatwg-url": "^5.0.0"
},
"engines": {
- "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+ "node": "4.x || >=6.0.0"
},
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/node-fetch"
+ "peerDependencies": {
+ "encoding": "^0.1.0"
+ },
+ "peerDependenciesMeta": {
+ "encoding": {
+ "optional": true
+ }
}
},
"node_modules/node-fetch-native": {
@@ -7122,19 +7569,19 @@
}
},
"node_modules/nuxt": {
- "version": "3.7.3",
+ "version": "3.7.4",
"dev": true,
"license": "MIT",
"dependencies": {
"@nuxt/devalue": "^2.0.2",
- "@nuxt/kit": "3.7.3",
- "@nuxt/schema": "3.7.3",
- "@nuxt/telemetry": "^2.4.1",
+ "@nuxt/kit": "3.7.4",
+ "@nuxt/schema": "3.7.4",
+ "@nuxt/telemetry": "^2.5.0",
"@nuxt/ui-templates": "^1.3.1",
- "@nuxt/vite-builder": "3.7.3",
- "@unhead/dom": "^1.7.2",
- "@unhead/ssr": "^1.7.2",
- "@unhead/vue": "^1.7.2",
+ "@nuxt/vite-builder": "3.7.4",
+ "@unhead/dom": "^1.7.4",
+ "@unhead/ssr": "^1.7.4",
+ "@unhead/vue": "^1.7.4",
"@vue/shared": "^3.3.4",
"acorn": "8.10.0",
"c12": "^1.4.2",
@@ -7143,7 +7590,7 @@
"defu": "^6.1.2",
"destr": "^2.0.1",
"devalue": "^4.3.2",
- "esbuild": "^0.19.2",
+ "esbuild": "^0.19.3",
"escape-string-regexp": "^5.0.0",
"estree-walker": "^3.0.3",
"fs-extra": "^11.1.1",
@@ -7156,14 +7603,14 @@
"magic-string": "^0.30.3",
"mlly": "^1.4.2",
"nitropack": "^2.6.3",
- "nuxi": "^3.8.3",
+ "nuxi": "^3.9.0",
"nypm": "^0.3.3",
"ofetch": "^1.3.3",
"ohash": "^1.1.3",
"pathe": "^1.1.1",
"perfect-debounce": "^1.0.0",
"pkg-types": "^1.0.3",
- "prompts": "^2.4.2",
+ "radix3": "^1.1.0",
"scule": "^1.0.0",
"std-env": "^3.4.3",
"strip-literal": "^1.3.0",
@@ -7173,13 +7620,13 @@
"unctx": "^2.3.1",
"unenv": "^1.7.4",
"unimport": "^3.3.0",
- "unplugin": "^1.4.0",
- "unplugin-vue-router": "^0.6.4",
+ "unplugin": "^1.5.0",
+ "unplugin-vue-router": "^0.7.0",
"untyped": "^1.4.0",
"vue": "^3.3.4",
"vue-bundle-renderer": "^2.0.0",
"vue-devtools-stub": "^0.1.0",
- "vue-router": "^4.2.4"
+ "vue-router": "^4.2.5"
},
"bin": {
"nuxi": "bin/nuxt.mjs",
@@ -7422,7 +7869,7 @@
}
},
"node_modules/openapi-typescript": {
- "version": "6.6.2",
+ "version": "6.7.0",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -7437,6 +7884,17 @@
"openapi-typescript": "bin/cli.js"
}
},
+ "node_modules/openapi-typescript/node_modules/supports-color": {
+ "version": "9.4.0",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/supports-color?sponsor=1"
+ }
+ },
"node_modules/p-limit": {
"version": "2.3.0",
"dev": true,
@@ -7603,8 +8061,7 @@
},
"node_modules/pinia": {
"version": "2.1.6",
- "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.1.6.tgz",
- "integrity": "sha512-bIU6QuE5qZviMmct5XwCesXelb5VavdOWKWaB17ggk++NUwQWWbP5YnsONTk3b752QkW9sACiR81rorpeOMSvQ==",
+ "license": "MIT",
"dependencies": {
"@vue/devtools-api": "^6.5.0",
"vue-demi": ">=0.14.5"
@@ -7647,7 +8104,7 @@
}
},
"node_modules/postcss": {
- "version": "8.4.30",
+ "version": "8.4.31",
"funding": [
{
"type": "opencollective",
@@ -8189,18 +8646,6 @@
"version": "2.0.1",
"license": "MIT"
},
- "node_modules/prompts": {
- "version": "2.4.2",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "kleur": "^3.0.3",
- "sisteransi": "^1.0.5"
- },
- "engines": {
- "node": ">= 6"
- }
- },
"node_modules/property-information": {
"version": "6.3.0",
"dev": true,
@@ -8331,157 +8776,37 @@
}
},
"node_modules/rehype-external-links": {
- "version": "2.1.0",
+ "version": "3.0.0",
"dev": true,
"license": "MIT",
"dependencies": {
- "@types/hast": "^2.0.0",
- "extend": "^3.0.0",
- "hast-util-is-element": "^2.0.0",
+ "@types/hast": "^3.0.0",
+ "@ungap/structured-clone": "^1.0.0",
+ "hast-util-is-element": "^3.0.0",
"is-absolute-url": "^4.0.0",
"space-separated-tokens": "^2.0.0",
- "unified": "^10.0.0",
- "unist-util-visit": "^4.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/unified"
- }
- },
- "node_modules/rehype-external-links/node_modules/@types/hast": {
- "version": "2.3.6",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/unist": "^2"
- }
- },
- "node_modules/rehype-external-links/node_modules/@types/unist": {
- "version": "2.0.8",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/rehype-external-links/node_modules/unified": {
- "version": "10.1.2",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/unist": "^2.0.0",
- "bail": "^2.0.0",
- "extend": "^3.0.0",
- "is-buffer": "^2.0.0",
- "is-plain-obj": "^4.0.0",
- "trough": "^2.0.0",
- "vfile": "^5.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/unified"
- }
- },
- "node_modules/rehype-external-links/node_modules/unist-util-is": {
- "version": "5.2.1",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/unist": "^2.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/unified"
- }
- },
- "node_modules/rehype-external-links/node_modules/unist-util-visit": {
- "version": "4.1.2",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/unist": "^2.0.0",
- "unist-util-is": "^5.0.0",
- "unist-util-visit-parents": "^5.1.1"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/unified"
- }
- },
- "node_modules/rehype-external-links/node_modules/unist-util-visit-parents": {
- "version": "5.1.3",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/unist": "^2.0.0",
- "unist-util-is": "^5.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/unified"
- }
- },
- "node_modules/rehype-raw": {
- "version": "6.1.1",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/hast": "^2.0.0",
- "hast-util-raw": "^7.2.0",
- "unified": "^10.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/unified"
- }
- },
- "node_modules/rehype-raw/node_modules/@types/hast": {
- "version": "2.3.6",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/unist": "^2"
- }
- },
- "node_modules/rehype-raw/node_modules/@types/unist": {
- "version": "2.0.8",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/rehype-raw/node_modules/unified": {
- "version": "10.1.2",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/unist": "^2.0.0",
- "bail": "^2.0.0",
- "extend": "^3.0.0",
- "is-buffer": "^2.0.0",
- "is-plain-obj": "^4.0.0",
- "trough": "^2.0.0",
- "vfile": "^5.0.0"
+ "unist-util-visit": "^5.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/unified"
}
},
- "node_modules/rehype-slug": {
- "version": "5.1.0",
+ "node_modules/rehype-raw": {
+ "version": "6.1.1",
"dev": true,
"license": "MIT",
"dependencies": {
"@types/hast": "^2.0.0",
- "github-slugger": "^2.0.0",
- "hast-util-has-property": "^2.0.0",
- "hast-util-heading-rank": "^2.0.0",
- "hast-util-to-string": "^2.0.0",
- "unified": "^10.0.0",
- "unist-util-visit": "^4.0.0"
+ "hast-util-raw": "^7.2.0",
+ "unified": "^10.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/unified"
}
},
- "node_modules/rehype-slug/node_modules/@types/hast": {
+ "node_modules/rehype-raw/node_modules/@types/hast": {
"version": "2.3.6",
"dev": true,
"license": "MIT",
@@ -8489,24 +8814,12 @@
"@types/unist": "^2"
}
},
- "node_modules/rehype-slug/node_modules/@types/unist": {
+ "node_modules/rehype-raw/node_modules/@types/unist": {
"version": "2.0.8",
"dev": true,
"license": "MIT"
},
- "node_modules/rehype-slug/node_modules/hast-util-to-string": {
- "version": "2.0.0",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/hast": "^2.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/unified"
- }
- },
- "node_modules/rehype-slug/node_modules/unified": {
+ "node_modules/rehype-raw/node_modules/unified": {
"version": "10.1.2",
"dev": true,
"license": "MIT",
@@ -8524,39 +8837,16 @@
"url": "https://opencollective.com/unified"
}
},
- "node_modules/rehype-slug/node_modules/unist-util-is": {
- "version": "5.2.1",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/unist": "^2.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/unified"
- }
- },
- "node_modules/rehype-slug/node_modules/unist-util-visit": {
- "version": "4.1.2",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/unist": "^2.0.0",
- "unist-util-is": "^5.0.0",
- "unist-util-visit-parents": "^5.1.1"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/unified"
- }
- },
- "node_modules/rehype-slug/node_modules/unist-util-visit-parents": {
- "version": "5.1.3",
+ "node_modules/rehype-slug": {
+ "version": "6.0.0",
"dev": true,
"license": "MIT",
"dependencies": {
- "@types/unist": "^2.0.0",
- "unist-util-is": "^5.0.0"
+ "@types/hast": "^3.0.0",
+ "github-slugger": "^2.0.0",
+ "hast-util-heading-rank": "^3.0.0",
+ "hast-util-to-string": "^3.0.0",
+ "unist-util-visit": "^5.0.0"
},
"funding": {
"type": "opencollective",
@@ -8577,18 +8867,6 @@
"url": "https://opencollective.com/unified"
}
},
- "node_modules/rehype-sort-attribute-values/node_modules/hast-util-is-element": {
- "version": "3.0.0",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/hast": "^3.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/unified"
- }
- },
"node_modules/rehype-sort-attributes": {
"version": "5.0.0",
"dev": true,
@@ -8631,7 +8909,7 @@
}
},
"node_modules/remark-gfm/node_modules/@types/mdast": {
- "version": "3.0.12",
+ "version": "3.0.13",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -8741,18 +9019,6 @@
"url": "https://opencollective.com/unified"
}
},
- "node_modules/remark-mdc/node_modules/mdast-util-to-string": {
- "version": "4.0.0",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/mdast": "^4.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/unified"
- }
- },
"node_modules/remark-mdc/node_modules/micromark-util-decode-string": {
"version": "2.0.0",
"dev": true,
@@ -8774,18 +9040,6 @@
"micromark-util-symbol": "^2.0.0"
}
},
- "node_modules/remark-mdc/node_modules/unist-util-stringify-position": {
- "version": "4.0.0",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/unist": "^3.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/unified"
- }
- },
"node_modules/remark-parse": {
"version": "10.0.2",
"dev": true,
@@ -8801,7 +9055,7 @@
}
},
"node_modules/remark-parse/node_modules/@types/mdast": {
- "version": "3.0.12",
+ "version": "3.0.13",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -8855,7 +9109,7 @@
}
},
"node_modules/remark-rehype/node_modules/@types/mdast": {
- "version": "3.0.12",
+ "version": "3.0.13",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -9132,8 +9386,12 @@
"node": "*"
}
},
+ "node_modules/robust-predicates": {
+ "version": "3.0.2",
+ "license": "Unlicense"
+ },
"node_modules/rollup": {
- "version": "3.29.3",
+ "version": "3.29.4",
"devOptional": true,
"license": "MIT",
"bin": {
@@ -9193,6 +9451,10 @@
"queue-microtask": "^1.2.2"
}
},
+ "node_modules/rw": {
+ "version": "1.3.3",
+ "license": "BSD-3-Clause"
+ },
"node_modules/sade": {
"version": "1.8.1",
"dev": true,
@@ -9225,11 +9487,7 @@
},
"node_modules/safer-buffer": {
"version": "2.1.2",
- "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
- "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
- "dev": true,
- "optional": true,
- "peer": true
+ "license": "MIT"
},
"node_modules/scule": {
"version": "1.0.0",
@@ -9378,16 +9636,19 @@
"dev": true,
"license": "MIT"
},
+ "node_modules/shikiji": {
+ "version": "0.6.8",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "hast-util-to-html": "^9.0.0"
+ }
+ },
"node_modules/signal-exit": {
"version": "3.0.7",
"dev": true,
"license": "ISC"
},
- "node_modules/sisteransi": {
- "version": "1.0.5",
- "dev": true,
- "license": "MIT"
- },
"node_modules/skin-tone": {
"version": "2.0.0",
"dev": true,
@@ -9506,13 +9767,6 @@
"version": "3.4.3",
"license": "MIT"
},
- "node_modules/streamsearch": {
- "version": "1.1.0",
- "dev": true,
- "engines": {
- "node": ">=10.0.0"
- }
- },
"node_modules/streamx": {
"version": "2.15.1",
"dev": true,
@@ -9601,14 +9855,13 @@
}
},
"node_modules/supports-color": {
- "version": "9.4.0",
- "dev": true,
+ "version": "5.5.0",
"license": "MIT",
- "engines": {
- "node": ">=12"
+ "dependencies": {
+ "has-flag": "^3.0.0"
},
- "funding": {
- "url": "https://github.com/chalk/supports-color?sponsor=1"
+ "engines": {
+ "node": ">=4"
}
},
"node_modules/supports-preserve-symlinks-flag": {
@@ -9687,7 +9940,7 @@
"license": "ISC"
},
"node_modules/terser": {
- "version": "5.20.0",
+ "version": "5.21.0",
"dev": true,
"license": "BSD-2-Clause",
"dependencies": {
@@ -9773,7 +10026,7 @@
}
},
"node_modules/ufo": {
- "version": "1.3.0",
+ "version": "1.3.1",
"license": "MIT"
},
"node_modules/ultrahtml": {
@@ -9782,14 +10035,14 @@
"license": "MIT"
},
"node_modules/unconfig": {
- "version": "0.3.10",
+ "version": "0.3.11",
"dev": true,
"license": "MIT",
"dependencies": {
- "@antfu/utils": "^0.7.5",
+ "@antfu/utils": "^0.7.6",
"defu": "^6.1.2",
- "jiti": "^1.19.1",
- "mlly": "^1.4.0"
+ "jiti": "^1.20.0",
+ "mlly": "^1.4.2"
},
"funding": {
"url": "https://github.com/sponsors/antfu"
@@ -9818,11 +10071,11 @@
}
},
"node_modules/undici": {
- "version": "5.25.2",
+ "version": "5.25.4",
"dev": true,
"license": "MIT",
"dependencies": {
- "busboy": "^1.6.0"
+ "@fastify/busboy": "^2.0.0"
},
"engines": {
"node": ">=14.0"
@@ -9854,6 +10107,18 @@
"url": "https://github.com/sponsors/harlan-zw"
}
},
+ "node_modules/unhead/node_modules/@unhead/schema": {
+ "version": "1.7.4",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "hookable": "^5.5.3",
+ "zhead": "^2.1.1"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/harlan-zw"
+ }
+ },
"node_modules/unicode-emoji-modifier-base": {
"version": "1.0.0",
"dev": true,
@@ -9880,18 +10145,6 @@
"url": "https://opencollective.com/unified"
}
},
- "node_modules/unified/node_modules/unist-util-stringify-position": {
- "version": "4.0.0",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/unist": "^3.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/unified"
- }
- },
"node_modules/unified/node_modules/vfile": {
"version": "6.0.1",
"dev": true,
@@ -9920,7 +10173,7 @@
}
},
"node_modules/unimport": {
- "version": "3.3.0",
+ "version": "3.4.0",
"license": "MIT",
"dependencies": {
"@rollup/pluginutils": "^5.0.4",
@@ -9928,12 +10181,12 @@
"fast-glob": "^3.3.1",
"local-pkg": "^0.4.3",
"magic-string": "^0.30.3",
- "mlly": "^1.4.1",
+ "mlly": "^1.4.2",
"pathe": "^1.1.1",
"pkg-types": "^1.0.3",
"scule": "^1.0.0",
"strip-literal": "^1.3.0",
- "unplugin": "^1.4.0"
+ "unplugin": "^1.5.0"
}
},
"node_modules/unist-builder": {
@@ -9982,22 +10235,17 @@
}
},
"node_modules/unist-util-stringify-position": {
- "version": "3.0.3",
+ "version": "4.0.0",
"dev": true,
"license": "MIT",
"dependencies": {
- "@types/unist": "^2.0.0"
+ "@types/unist": "^3.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/unified"
}
},
- "node_modules/unist-util-stringify-position/node_modules/@types/unist": {
- "version": "2.0.8",
- "dev": true,
- "license": "MIT"
- },
"node_modules/unist-util-visit": {
"version": "5.0.0",
"dev": true,
@@ -10044,23 +10292,23 @@
}
},
"node_modules/unplugin-vue-router": {
- "version": "0.6.4",
+ "version": "0.7.0",
"dev": true,
"license": "MIT",
"dependencies": {
- "@babel/types": "^7.21.5",
- "@rollup/pluginutils": "^5.0.2",
- "@vue-macros/common": "^1.3.1",
- "ast-walker-scope": "^0.4.1",
+ "@babel/types": "^7.22.19",
+ "@rollup/pluginutils": "^5.0.4",
+ "@vue-macros/common": "^1.8.0",
+ "ast-walker-scope": "^0.5.0",
"chokidar": "^3.5.3",
- "fast-glob": "^3.2.12",
+ "fast-glob": "^3.3.1",
"json5": "^2.2.3",
"local-pkg": "^0.4.3",
- "mlly": "^1.2.0",
- "pathe": "^1.1.0",
+ "mlly": "^1.4.2",
+ "pathe": "^1.1.1",
"scule": "^1.0.0",
- "unplugin": "^1.3.1",
- "yaml": "^2.2.2"
+ "unplugin": "^1.5.0",
+ "yaml": "^2.3.2"
},
"peerDependencies": {
"vue-router": "^4.1.0"
@@ -10242,14 +10490,6 @@
"node": ">=8"
}
},
- "node_modules/uvu/node_modules/kleur": {
- "version": "4.1.5",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=6"
- }
- },
"node_modules/vfile": {
"version": "5.3.7",
"dev": true,
@@ -10301,13 +10541,37 @@
"dev": true,
"license": "MIT"
},
+ "node_modules/vfile-message/node_modules/unist-util-stringify-position": {
+ "version": "3.0.3",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@types/unist": "^2.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
"node_modules/vfile/node_modules/@types/unist": {
"version": "2.0.8",
"dev": true,
"license": "MIT"
},
+ "node_modules/vfile/node_modules/unist-util-stringify-position": {
+ "version": "3.0.3",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@types/unist": "^2.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
"node_modules/vite": {
- "version": "4.4.9",
+ "version": "4.4.11",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -10446,6 +10710,20 @@
}
}
},
+ "node_modules/vite-plugin-checker/node_modules/ansi-styles": {
+ "version": "4.3.0",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "color-convert": "^2.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+ }
+ },
"node_modules/vite-plugin-checker/node_modules/chalk": {
"version": "4.1.2",
"dev": true,
@@ -10461,6 +10739,22 @@
"url": "https://github.com/chalk/chalk?sponsor=1"
}
},
+ "node_modules/vite-plugin-checker/node_modules/color-convert": {
+ "version": "2.0.1",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "color-name": "~1.1.4"
+ },
+ "engines": {
+ "node": ">=7.0.0"
+ }
+ },
+ "node_modules/vite-plugin-checker/node_modules/color-name": {
+ "version": "1.1.4",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/vite-plugin-checker/node_modules/commander": {
"version": "8.3.0",
"dev": true,
@@ -10618,7 +10912,7 @@
}
},
"node_modules/vscode-languageserver-textdocument": {
- "version": "1.0.8",
+ "version": "1.0.11",
"dev": true,
"license": "MIT"
},
@@ -10628,7 +10922,7 @@
"license": "MIT"
},
"node_modules/vscode-uri": {
- "version": "3.0.7",
+ "version": "3.0.8",
"dev": true,
"license": "MIT"
},
@@ -10696,7 +10990,7 @@
}
},
"node_modules/vuetify": {
- "version": "3.3.17",
+ "version": "3.3.20",
"dev": true,
"license": "MIT",
"engines": {
@@ -10729,7 +11023,7 @@
}
},
"node_modules/vuetify-nuxt-module": {
- "version": "0.5.12",
+ "version": "0.5.13",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -10750,14 +11044,6 @@
"url": "https://github.com/sponsors/wooorm"
}
},
- "node_modules/web-streams-polyfill": {
- "version": "3.2.1",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">= 8"
- }
- },
"node_modules/webidl-conversions": {
"version": "3.0.1",
"dev": true,
@@ -10821,6 +11107,36 @@
"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
}
},
+ "node_modules/wrap-ansi/node_modules/ansi-styles": {
+ "version": "4.3.0",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "color-convert": "^2.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+ }
+ },
+ "node_modules/wrap-ansi/node_modules/color-convert": {
+ "version": "2.0.1",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "color-name": "~1.1.4"
+ },
+ "engines": {
+ "node": ">=7.0.0"
+ }
+ },
+ "node_modules/wrap-ansi/node_modules/color-name": {
+ "version": "1.1.4",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/wrappy": {
"version": "1.0.2",
"dev": true,
@@ -10907,7 +11223,7 @@
}
},
"node_modules/zhead": {
- "version": "2.1.1",
+ "version": "2.1.3",
"dev": true,
"license": "MIT",
"funding": {
diff --git a/package.json b/package.json
index f86b928257d5a8deb57976cf39ac7a9279bec224..12756372ec3cd8d4e3e3d1ebd92eec882fafbf35 100644
--- a/package.json
+++ b/package.json
@@ -7,17 +7,18 @@
"preview": "nuxt preview"
},
"devDependencies": {
- "@nuxt/content": "^2.7.2",
+ "@nuxt/content": "^2.8.5",
"@types/node": "^18.15.12",
"@vueuse/core": "^10.4.1",
"@vueuse/nuxt": "^10.4.1",
- "nuxt": "^3.7.0",
+ "nuxt": "^3.7.4",
"vuetify-nuxt-module": "^0.5.7"
},
"overrides": {
"vue": "latest"
},
"dependencies": {
+ "@observablehq/plot": "^0.6.11",
"@pinia/nuxt": "^0.4.11",
"pinia": "^2.1.6"
}
diff --git a/pages/defense-systems.vue b/pages/defense-systems.vue
index 14f690ee46ac73b756dd205ff5fc4bb971fdc9ee..2ad4c2e6db1bbcab4ce340977a4ed2ddfc74792b 100644
--- a/pages/defense-systems.vue
+++ b/pages/defense-systems.vue
@@ -5,7 +5,7 @@ const { height } = useDisplay();
const { data, error, pending } = await useAsyncData(
"list-defense-systems",
- () => queryContent("/defense-systems").find()
+ () => queryContent("/defense-systems").where({ _partial: false }).find()
);
const defaultHeaders = ref([{ title: "System", key: "system" }]);
const tableKey = "tableColumns";
@@ -48,14 +48,11 @@ const systems = computed(() => {
};
});
});
+
+
</script>
<template>
<v-card flat color="transparent">
- <v-card-title>List systems</v-card-title>
- <ListSystems
- :headers="headers"
- :systems="systems"
- :height="height - 405"
- ></ListSystems>
+ <ListSystems :headers="headers" :systems="systems" :height="height - 405"></ListSystems>
</v-card>
</template>
\ No newline at end of file
diff --git a/pages/refseq.vue b/pages/refseq.vue
new file mode 100644
index 0000000000000000000000000000000000000000..e68426c6bcbe0da55384b702cd5e706c060dc1f0
--- /dev/null
+++ b/pages/refseq.vue
@@ -0,0 +1,192 @@
+<script setup lang="ts">
+import * as Plot from "@observablehq/plot";
+import PlotFigure from "~/components/PlotFigure";
+import { useDisplay } from "vuetify";
+
+const { width, lgAndDown } = useDisplay();
+
+const drawer = ref(true);
+// const { data } = await useAsyncData("refseq", () =>
+// queryContent("/refseq").find()
+// );
+const facet = ref(false);
+const facetDistriSystem = ref(false);
+// console.log(data.value);
+const {
+ data: refseqData,
+ error,
+ pending,
+} = await useAsyncData("refseq-data", () =>
+ queryContent("/_partials/_refseq").where({ _partial: true }).findOne()
+);
+
+const availableTaxo = ref(["species", "genus", "phylum"]);
+const selectedTaxoRank = ref("phylum");
+const sanitizedRefseq = computed(() => {
+ if (refseqData.value?.body) {
+ return refseqData.value.body;
+ } else {
+ return [];
+ }
+});
+
+const computedWidth = computed(() => {
+ return Math.max(width.value, 550);
+});
+
+const height = computed(() => {
+ return computedWidth.value / 3;
+});
+const search = ref("");
+
+const itemValue = ref("type");
+const selected = ref([]);
+const headers = ref([
+ {
+ title: "System",
+ key: "type",
+ },
+ { title: "Phylum", key: "phylum" },
+ { title: "Genus", key: "genus" },
+ { title: "Species", key: "species" },
+]);
+
+const selectedRefSeq = computed(() => {
+ if (selected.value.length === 0) {
+ return sanitizedRefseq;
+ } else {
+ return sanitizedRefseq.value.filter((item) => {
+ const selectedSet = new Set(selected.value);
+ return selectedSet.has(item[itemValue.value]);
+ });
+ }
+});
+function filterOnlyCapsText(value, query, item) {
+ if (value != null && query != null) {
+ if (typeof value === "string") {
+ return value.toString().toLowerCase().indexOf(query.toLowerCase()) !== -1;
+ }
+ if (typeof value == "object") {
+ if (value?.name) {
+ return (
+ value.name.toString().toLowerCase().indexOf(query.toLowerCase()) !==
+ -1
+ );
+ }
+ }
+ }
+ return false;
+}
+
+const computedDistriSystemOptions = computed(() => {
+ const groupYOption = facetDistriSystem.value
+ ? {
+ fx: "type",
+ x: selectedTaxoRank.value,
+ // fill: selectedTaxoRank.value,
+ tip: true,
+ sort: { y: "-x" },
+ }
+ : {
+ x: "type",
+ tip: true,
+ // fill: selectedTaxoRank.value,
+ sort: { x: "-y" },
+ };
+
+ return {
+ marginLeft: facetDistriSystem.value ? 120 : 30,
+ marginBottom: facetDistriSystem.value ? 120 : 120,
+ x: { label: null, tickRotate: 70 },
+ y: { grid: true },
+ color: { legend: true },
+ width: computedWidth.value,
+ height: facetDistriSystem.value ? height.value * 8 : height.value * 2,
+ marks: [
+ Plot.frame(),
+ Plot.barY(
+ unref(selectedRefSeq.value),
+ Plot.groupX(
+ { y: facetDistriSystem.value ? "proportion-facet" : "count" },
+ groupYOption
+ )
+ ),
+ ],
+ };
+});
+
+const computedDistriTaxoOptions = computed(() => {
+ const groupYOption = facet.value
+ ? {
+ y: "type",
+ fy: selectedTaxoRank.value,
+ fill: "type",
+ tip: true,
+ sort: { x: "-y" },
+ }
+ : {
+ y: selectedTaxoRank.value,
+ tip: true,
+ fill: "type",
+ // offset: "normalize",
+ sort: { y: "x", reverse: true },
+ };
+
+ return {
+ // style: {
+ // width: "100%",
+ // "max-width": "100%",
+ // },
+
+ marginLeft: 110,
+ marginRight: facet.value ? 110 : 20,
+ marginBottom: 100,
+ grid: true,
+ x: { percent: true },
+ // x: { label: facet.value ? "Count" : null, tickRotate: 90 },
+ // y: { nice: true },
+ color: { legend: true },
+ width: computedWidth.value,
+ height: facet.value ? height.value * 4.3 : height.value,
+ marks: [
+ Plot.frame(),
+ Plot.barX(
+ unref(selectedRefSeq.value),
+ Plot.groupY({ x: "count" }, groupYOption)
+ ),
+ ],
+ };
+});
+</script>
+
+<template>
+ <v-card>
+ <v-toolbar color="primary"><v-toolbar-title> REFSEQ</v-toolbar-title>
+ <v-text-field v-model="search" density="compact" variant="underlined" prepend-inner-icon="mdi-magnify"
+ label="Search for defense systems" single-line hide-details class="mx-2" clearable></v-text-field></v-toolbar>
+ <v-data-table-virtual v-model="selected" :headers="headers" :items="sanitizedRefseq" :item-value="itemValue"
+ density="compact" :search="search" :custom-filter="filterOnlyCapsText" height="800" show-select class="elevation-1">
+
+ <template #[`item.type`]="{ item }">
+ <v-chip variant="text" link :to="`/defense-systems/${item.type.toLowerCase()}`">{{
+ item.type
+ }}</v-chip>
+ </template>
+ </v-data-table-virtual>
+ </v-card>
+ <v-card class="my-3">
+ <v-toolbar color="primary"><v-toolbar-title> Distribution Systems</v-toolbar-title></v-toolbar>
+ <v-card-text>
+ <PlotFigure :options="unref(computedDistriSystemOptions)" defer></PlotFigure>
+ </v-card-text>
+ </v-card>
+ <v-card>
+ <v-toolbar color="primary"><v-toolbar-title> Distribution </v-toolbar-title></v-toolbar>
+ <v-card-text>
+ <v-select v-model="selectedTaxoRank" :items="availableTaxo" density="compact"
+ label="Select taxonomic rank"></v-select>
+ <!-- <v-switch v-model="facet" label="Facet" color="primary"></v-switch> -->
+ <PlotFigure defer :options="unref(computedDistriTaxoOptions)"></PlotFigure>
+ </v-card-text>
+ </v-card>
+</template>
\ No newline at end of file
diff --git a/stores/pfam.ts b/stores/pfam.ts
index f89011c6114522a96cc1ab75d4dec6bfaea77d46..dc2d082bec21e542fa27593bd9ef0be3a8678af6 100644
--- a/stores/pfam.ts
+++ b/stores/pfam.ts
@@ -25,7 +25,7 @@ export const usePfamStore = defineStore('pfam', () => {
async function initPfam() {
if (pfam.value.size < 1) {
- const pfamContent = await queryContent<PfamContent>("/_partial/pfam-a-hmm").where({ _partial: true }).findOne()
+ const pfamContent = await queryContent<PfamContent>("/_partials/_pfam-a-hmm").where({ _partial: true }).findOne()
if (pfamContent?.body) {
pfam.value = new Map(pfamContent.body.map(pfam => {
return [pfam.AC.split(".")[0], { ...unref(pfam) }];