Skip to content

Fix exporter #10583

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
BykhovDenis wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix exporter #10583

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions plugins/card-resources/src/exporter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import card from './plugin'

export async function importModule (json: string): Promise<void> {
try {
const data = JSON.parse(json) as Doc[]
const rawData = JSON.parse(json) as Doc[]
const data = Array.from(new Map(rawData.map(d => [d._id, d])).values())
const client = getClient()
const m = client.getModel()
const h = client.getHierarchy()
Expand Down Expand Up @@ -61,7 +62,8 @@ function stripData<T extends Doc> (doc: T): Data<T> {
export async function exportModule (_id: Ref<Class<Doc>>): Promise<string> {
const processed = new Set<Ref<Doc>>()
const res = await exportType(_id, processed)
const clear = res.map(strip)
const unique = Array.from(new Map(res.map(d => [d._id, d])).values())
const clear = unique.map(strip)
const str = JSON.stringify(clear)
return str
}
Expand Down Expand Up @@ -126,12 +128,14 @@ async function exportType (
withoutDesc: boolean = false
): Promise<Doc[]> {
if (processed.has(_id)) return []
processed.add(_id)
const res: Doc[] = []
const required: Array<Ref<Class<Doc>>> = []
const client = getClient()
const m = client.getModel()
const h = client.getHierarchy()
const type = m.findObject(_id)
if (type === undefined) return res

const parent = h.getClass(_id).extends
if (parent !== undefined && h.isDerived(parent, card.class.Card) && parent !== card.class.Card) {
Expand All @@ -140,8 +144,6 @@ async function exportType (
}
}

processed.add(_id)
if (type === undefined) return res
if (type.icon === view.ids.IconWithEmoji && typeof type.color === 'string') {
type.icon = card.icon.Card
}
Expand Down
Loading