Skip to content

feat: simplify code that writes output files and add EOL at EOF #15

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

feat: simplify code that writes output files and add EOL at EOF #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3397dcc
feat: simplify code that writes output files and add EOL at EOF
marcusrbrown Jan 28, 2022
0ad37e7
chore: convert tabs to spaces
marcusrbrown Jan 28, 2022
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
15 changes: 10 additions & 5 deletions lib/publish.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/publish.js.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 15 additions & 9 deletions src/publish.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { to } from "await-to-js";
import { createHash } from "crypto";
import fs from "fs/promises";
import * as path from "path";
import * as os from "os";
import { parseStringPromise } from "xml2js";

export interface Library {
Expand Down Expand Up @@ -30,6 +31,13 @@ enum PublishStep {
Registry,
}

//* Write a string to a file, creating the directory if it doesn't exist
const writeFile = async (file: string, data: string|object) => {
const output = typeof data === "string" ? data : JSON.stringify(data, null, 2);
await fs.mkdir(path.dirname(file), { recursive: true });
await fs.writeFile(file, output + os.EOL, "utf8");
}

export default async function publish(src: string, dest: string) {
let step = PublishStep.Init;
try {
Expand All @@ -41,7 +49,7 @@ export default async function publish(src: string, dest: string) {
for await (const d of await fs.opendir(src)) {
if (d.isDirectory()) packages.push( path.join(src, d.name) );
}

//* Collect library metadata
step = PublishStep.Libraries;
//* ------------------------------------------------------------
Expand All @@ -51,7 +59,7 @@ export default async function publish(src: string, dest: string) {
//* Parse and verify library.json
const [err, libFile] = await to(fs.readFile(path.join(m, "library.json")));
if (err || !libFile) throw new Error('Missing library.json');

const lib = JSON.parse(libFile.toString()) as Library;
if (!lib.name) throw new Error('Missing library name');
if (!lib.url) throw new Error('Missing library url');
Expand Down Expand Up @@ -82,7 +90,7 @@ export default async function publish(src: string, dest: string) {
if (library.$ && library.$["version"] && library.$["src"]) {
var shasum = createHash('sha1');
shasum.update(library.$["src"])

modules[key].versions.push({
version: library.$["version"],
url: library.$["src"],
Expand Down Expand Up @@ -140,8 +148,7 @@ export default async function publish(src: string, dest: string) {

// Write typing file to out directory
const output = path.join(dest, path.basename(key));
await fs.mkdir(output, { recursive: true });
await fs.writeFile(path.join(output, version.path), data);
await writeFile(path.join(output, version.path), data);
}
}

Expand All @@ -150,8 +157,7 @@ export default async function publish(src: string, dest: string) {
//* ------------------------------------------------------------
for (const key of Object.keys(modules)) {
const lib = modules[key];
await fs.mkdir(path.join(dest, path.basename(key)), { recursive: true });
await fs.writeFile(path.join(dest, path.basename(key), "index.json"), JSON.stringify(lib, null, 2));
await writeFile(path.join(dest, path.basename(key), "index.json"), lib);
}

//* Generate a package registry index.json for each module
Expand All @@ -165,10 +171,10 @@ export default async function publish(src: string, dest: string) {
url: lib.url!,
}
}
await fs.writeFile(path.join(dest, "index.json"), JSON.stringify(registry, null, 2));
await writeFile(path.join(dest, "index.json"), registry);

} catch (e) {
console.error(`${PublishStep[step]}:`, (e as Error).message);
process.exit(1);
}
}
}