@comapeo/core 5.1.2 → 5.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import-categories.d.ts","sourceRoot":"","sources":["../src/import-categories.js"],"names":[],"mappings":"AAqBA,uDAAuD;AACvD,0DAA0D;AAC1D;;;;;;GAMG;AACH,0CANW,YAAY,wBAEpB;IAAwB,QAAQ,EAAxB,MAAM;IACgC,MAAM,EAA5C,OAAO,aAAa,EAAE,MAAM;CACpC,GAAU,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"import-categories.d.ts","sourceRoot":"","sources":["../src/import-categories.js"],"names":[],"mappings":"AAqBA,uDAAuD;AACvD,0DAA0D;AAC1D;;;;;;GAMG;AACH,0CANW,YAAY,wBAEpB;IAAwB,QAAQ,EAAxB,MAAM;IACgC,MAAM,EAA5C,OAAO,aAAa,EAAE,MAAM;CACpC,GAAU,OAAO,CAAC,IAAI,CAAC,CA6RzB;kBAnSa;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE;kCADlB,oBAAoB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapeo-manager.d.ts","sourceRoot":"","sources":["../src/mapeo-manager.js"],"names":[],"mappings":"AAuFA,oDAEC;AAED,mFAC6C;AAE7C,6CAA6C;AAE7C;;GAEG;AAEH;;;GAGG;AAEH;;GAEG;AACH;IAwBE;;;;;;;;;;;;;;OAcG;IACH,4NAbG;QAAqB,OAAO,EAApB,MAAM;QACO,QAAQ,EAArB,MAAM;QACO,uBAAuB,EAApC,MAAM;QACO,sBAAsB,EAAnC,MAAM;QACqB,WAAW,EAAtC,MAAM,GAAG,WAAW;QACoB,OAAO,EAA/C,OAAO,SAAS,EAAE,eAAe;QACnB,iBAAiB;QACjB,aAAa;QACb,eAAe;QACf,qBAAqB;QACpB,sBAAsB;QACH,aAAa,UAAzC,MAAM,KAAK,SAAS;KAAsB,EAyG1D;IAED,uBAEC;IAoKD;;;;;OAKG;IACH;eAHoB,MAAM;qBAAe,MAAM;uBAAiB,MAAM;6BAAuB,MAAM;oBACtF,OAAO,CAAC,MAAM,CAAC,CAoF3B;IAED;;;OAGG;IACH,4BAHW,MAAM,GACJ,OAAO,CAAC,YAAY,CAAC,CA+CjC;IA8BD;;;OAGG;IACH;sBAH2B,OAAO;oBACrB,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAoEzC;IAED;;;;;;;;OAQG;IACH,wGAJW,mBAAmB;sBACH,OAAO;sBACrB,OAAO,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"mapeo-manager.d.ts","sourceRoot":"","sources":["../src/mapeo-manager.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/import-categories.js
CHANGED
|
@@ -188,6 +188,9 @@ export async function importCategories(project, { filePath, logger }) {
|
|
|
188
188
|
const { buildDateValue, ...readerMetadata } = await reader.metadata()
|
|
189
189
|
const fileVersion = await reader.fileVersion()
|
|
190
190
|
|
|
191
|
+
// Need to wait for all presets to be created so that we can read the refs for the translations
|
|
192
|
+
await queue.onIdle()
|
|
193
|
+
|
|
191
194
|
for await (const {
|
|
192
195
|
lang,
|
|
193
196
|
translations: translationsByDocType,
|
package/src/mapeo-manager.js
CHANGED
|
@@ -679,14 +679,7 @@ export class MapeoManager extends TypedEmitter {
|
|
|
679
679
|
) => {
|
|
680
680
|
const projectPublicId = projectKeyToPublicId(projectKey)
|
|
681
681
|
|
|
682
|
-
// 1. Check
|
|
683
|
-
const activeProject = this.#activeProjects.get(projectPublicId)
|
|
684
|
-
|
|
685
|
-
if (activeProject) {
|
|
686
|
-
throw new Error(`Project with ID ${projectPublicId} already exists`)
|
|
687
|
-
}
|
|
688
|
-
|
|
689
|
-
// 2. Check if the project exists in the project keys table
|
|
682
|
+
// 1. Check if the project exists in the project keys table
|
|
690
683
|
// If it does, that means the project has already been either created or added before
|
|
691
684
|
const projectId = projectKeyToId(projectKey)
|
|
692
685
|
const projectInviteId = projectKeyToProjectInviteId(projectKey)
|
|
@@ -706,6 +699,16 @@ export class MapeoManager extends TypedEmitter {
|
|
|
706
699
|
throw new Error(`Project with ID ${projectPublicId} already exists`)
|
|
707
700
|
}
|
|
708
701
|
|
|
702
|
+
// 2. Check for an active project
|
|
703
|
+
const activeProject = this.#activeProjects.get(projectPublicId)
|
|
704
|
+
|
|
705
|
+
// If the project keys don't exist or have left and we have an active project
|
|
706
|
+
// It means we must have left the project and it's still loaded in memory but cleared
|
|
707
|
+
// We should close it so we can open a fresh copy
|
|
708
|
+
if (activeProject) {
|
|
709
|
+
await activeProject.close()
|
|
710
|
+
}
|
|
711
|
+
|
|
709
712
|
// No awaits here - need to update table in same tick as the projectExists check
|
|
710
713
|
|
|
711
714
|
// 3. Update the project keys table
|