Skip to content

Commit 8c97553

Browse files
committed
Release version 1.0.0-rc.4
- Fixed issues with packing/unpacking as YAML.
1 parent 01804ba commit 8c97553

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 1.0.0-rc.4
2+
3+
### Fixes
4+
- Fixed issues with packing/unpacking as YAML.
5+
16
## 1.0.0-rc.3
27

38
### Improvements

commands/package.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ async function handlePack(argv) {
403403
return;
404404
}
405405

406-
const { nedb } = argv;
406+
const { nedb, yaml } = argv;
407407
if ( !nedb && isFileLocked(path.join(pack, "LOCK")) ) {
408408
console.error(chalk.red(`The pack "${chalk.blue(pack)}" is currently in use by Foundry VTT. `
409409
+ "Please close Foundry VTT and try again."));
@@ -415,7 +415,7 @@ async function handlePack(argv) {
415415
console.log(`[${dbMode}] Packing "${chalk.blue(source)}" into "${chalk.blue(pack)}"`);
416416

417417
try {
418-
await compilePack(source, pack, { nedb, log: true });
418+
await compilePack(source, pack, { nedb, yaml, log: true });
419419
} catch ( err ) {
420420
console.error(err);
421421
process.exitCode = 1;

lib/package.mjs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ export async function extractPack(src, dest, {
327327
* @param {Partial<ExtractOptions>} [options]
328328
* @returns {Promise<void>}
329329
*/
330-
async function extractNedb(pack, dest, { yaml, log, collection, transformEntry, transformName }={}) {
330+
async function extractNedb(pack, dest, { yaml: asYaml, log, collection, transformEntry, transformName }={}) {
331331
// Load the NeDB file.
332332
const db = new Datastore({ filename: pack, autoload: true });
333333

@@ -345,11 +345,11 @@ async function extractNedb(pack, dest, { yaml, log, collection, transformEntry,
345345
if ( await transformEntry?.(doc) === false ) continue;
346346
let name = await transformName?.(doc);
347347
if ( !name ) {
348-
name = `${doc.name ? `${getSafeFilename(doc.name)}_${doc._id}` : doc._id}.${yaml ? "yml" : "json"}`;
348+
name = `${doc.name ? `${getSafeFilename(doc.name)}_${doc._id}` : doc._id}.${asYaml ? "yml" : "json"}`;
349349
}
350350
const filename = path.join(dest, name);
351351
fs.mkdirSync(path.dirname(filename), { recursive: true });
352-
fs.writeFileSync(filename, yaml ? yaml.dump(doc) : JSON.stringify(doc, null, 2) + "\n");
352+
fs.writeFileSync(filename, asYaml ? yaml.dump(doc) : JSON.stringify(doc, null, 2) + "\n");
353353
if ( log ) console.log(`Wrote ${chalk.blue(name)}`);
354354
}
355355
}
@@ -363,7 +363,7 @@ async function extractNedb(pack, dest, { yaml, log, collection, transformEntry,
363363
* @param {Partial<ExtractOptions>} [options]
364364
* @returns {Promise<void>}
365365
*/
366-
async function extractClassicLevel(pack, dest, { yaml, log, transformEntry, transformName }) {
366+
async function extractClassicLevel(pack, dest, { yaml: asYaml, log, transformEntry, transformName }) {
367367
// Load the directory as a ClassicLevel DB.
368368
const db = new ClassicLevel(pack, { keyEncoding: "utf8", valueEncoding: "json" });
369369

@@ -385,11 +385,11 @@ async function extractClassicLevel(pack, dest, { yaml, log, transformEntry, tran
385385
if ( await transformEntry?.(doc) === false ) continue;
386386
let name = await transformName?.(doc);
387387
if ( !name ) {
388-
name = `${doc.name ? `${getSafeFilename(doc.name)}_${id}` : key}.${yaml ? "yml" : "json"}`;
388+
name = `${doc.name ? `${getSafeFilename(doc.name)}_${id}` : key}.${asYaml ? "yml" : "json"}`;
389389
}
390390
const filename = path.join(dest, name);
391391
fs.mkdirSync(path.dirname(filename), { recursive: true });
392-
fs.writeFileSync(filename, yaml ? yaml.dump(doc) : JSON.stringify(doc, null, 2) + "\n");
392+
fs.writeFileSync(filename, asYaml ? yaml.dump(doc) : JSON.stringify(doc, null, 2) + "\n");
393393
if ( log ) console.log(`Wrote ${chalk.blue(name)}`);
394394
}
395395

0 commit comments

Comments
 (0)