markdown-patch 0.1.0 → 0.1.1

package/package.json

@@ -15,13 +15,13 @@
     "typescript": "^5.5.4"
   },
   "name": "markdown-patch",
-  "version": "0.1.0",
-  "main": "index.js",
+  "version": "0.1.1",
+  "main": "./dist/index.js",
   "scripts": {
     "test": "node node_modules/.bin/jest"
   },
   "bin": {
-    "mdpatch": "./dist/index.js"
+    "mdpatch": "./dist/cli.js"
   },
   "keywords": [],
   "author": "",

package/src/cli.ts

@@ -0,0 +1,88 @@
+#!/usr/bin/env node
+import { Command } from "commander";
+import fs from "fs/promises";
+import { getDocumentMap } from "./map.js";
+import { printMap } from "./debug.js";
+import { PatchInstruction } from "./types.js";
+import { applyPatch } from "./patch.js";
+import packageJson from "../package.json" assert { type: "json" };
+
+async function readStdin(): Promise<string> {
+  return new Promise((resolve, reject) => {
+    let data = "";
+    process.stdin.on("data", (chunk) => (data += chunk));
+    process.stdin.on("end", () => resolve(data));
+    process.stdin.on("error", reject);
+  });
+}
+
+const program = new Command();
+
+// Configure the CLI
+program
+  .name(Object.keys(packageJson.bin)[0])
+  .description(packageJson.description)
+  .version(packageJson.version);
+
+program
+  .command("print-map")
+  .argument("<path>", "filepath to show identified patchable paths for")
+  .argument(
+    "[regex]",
+    "limit displayed matches to those matching the supplied regular expression"
+  )
+  .action(async (path: string, regex: string | undefined) => {
+    const document = await fs.readFile(path, "utf-8");
+    const documentMap = getDocumentMap(document);
+
+    printMap(document, documentMap, regex ? new RegExp(regex) : undefined);
+  });
+
+program
+  .command("apply")
+  .argument("<path>", "file to patch")
+  .argument("<patch>", "patch file to apply")
+  .option(
+    "-o, --output <output>",
+    "write output to the specified path instead of applying in-place; use '-' for stdout"
+  )
+  .action(async (path: string, patch: string, options) => {
+    let patchParsed: PatchInstruction[];
+    let patchData: string;
+    try {
+      if (patch === "-") {
+        patchData = await readStdin();
+      } else {
+        patchData = await fs.readFile(patch, "utf-8");
+      }
+    } catch (e) {
+      console.error("Failed to read patch: ", e);
+      process.exit(1);
+    }
+
+    try {
+      const parsedData = JSON.parse(patchData);
+      if (!Array.isArray(parsedData)) {
+        patchParsed = [parsedData];
+      } else {
+        patchParsed = parsedData;
+      }
+    } catch (e) {
+      console.error("Could not parse patch file as JSON");
+      process.exit(1);
+    }
+
+    let document = await fs.readFile(path, "utf-8");
+    console.log("Document", document);
+    for (const instruction of patchParsed) {
+      document = applyPatch(document, instruction);
+    }
+
+    if (options.output === "-") {
+      process.stdout.write(document);
+    } else {
+      await fs.writeFile(options.output ? options.output : path, document);
+    }
+  });
+
+program.parse(process.argv);

package/src/index.ts

@@ -1,88 +1,9 @@
-#!/usr/bin/env node
-import { Command } from "commander";
-import fs from "fs/promises";
-import { getDocumentMap } from "./map.js";
-import { printMap } from "./debug.js";
-import { PatchInstruction } from "./types.js";
-import { applyPatch } from "./patch.js";
-import packageJson from "../package.json" assert { type: "json" };
-
-async function readStdin(): Promise<string> {
-  return new Promise((resolve, reject) => {
-    let data = "";
-    process.stdin.on("data", (chunk) => (data += chunk));
-    process.stdin.on("end", () => resolve(data));
-    process.stdin.on("error", reject);
-  });
-}
-
-const program = new Command();
-
-// Configure the CLI
-program
-  .name(Object.keys(packageJson.bin)[0])
-  .description(packageJson.description)
-  .version(packageJson.version);
-
-program
-  .command("print-map")
-  .argument("<path>", "filepath to show identified patchable paths for")
-  .argument(
-    "[regex]",
-    "limit displayed matches to those matching the supplied regular expression"
-  )
-  .action(async (path: string, regex: string | undefined) => {
-    const document = await fs.readFile(path, "utf-8");
-    const documentMap = getDocumentMap(document);
-
-    printMap(document, documentMap, regex ? new RegExp(regex) : undefined);
-  });
-
-program
-  .command("apply")
-  .argument("<path>", "file to patch")
-  .argument("<patch>", "patch file to apply")
-  .option(
-    "-o, --output <output>",
-    "write output to the specified path instead of applying in-place; use '-' for stdout"
-  )
-  .action(async (path: string, patch: string, options) => {
-    let patchParsed: PatchInstruction[];
-    let patchData: string;
-    try {
-      if (patch === "-") {
-        patchData = await readStdin();
-      } else {
-        patchData = await fs.readFile(patch, "utf-8");
-      }
-    } catch (e) {
-      console.error("Failed to read patch: ", e);
-      process.exit(1);
-    }
-
-    try {
-      const parsedData = JSON.parse(patchData);
-      if (!Array.isArray(parsedData)) {
-        patchParsed = [parsedData];
-      } else {
-        patchParsed = parsedData;
-      }
-    } catch (e) {
-      console.error("Could not parse patch file as JSON");
-      process.exit(1);
-    }
-
-    let document = await fs.readFile(path, "utf-8");
-    console.log("Document", document);
-    for (const instruction of patchParsed) {
-      document = applyPatch(document, instruction);
-    }
-
-    if (options.output === "-") {
-      process.stdout.write(document);
-    } else {
-      await fs.writeFile(options.output ? options.output : path, document);
-    }
-  });
-
-program.parse(process.argv);
+import {
+  PatchFailureReason,
+  PatchFailed,
+  PatchError,
+  TablePartsNotFound,
+  applyPatch,
+} from "./patch.js";
+
+export * from "./types.js";

package/src/patch.ts

@@ -10,7 +10,7 @@ import {
   ReplaceTableRowsBlockPatchInstruction,
 } from "./types.js";
 
-enum PatchFailureReason {
+export enum PatchFailureReason {
   InvalidTarget = "invalid-target",
   ContentAlreadyPreexistsInTarget = "content-already-preexists-in-target",
   TableContentIncorrectColumnCount = "table-content-incorrect-column-count",

package/dist/index.js

@@ -1,75 +0,0 @@
-#!/usr/bin/env node
-import { Command } from "commander";
-import fs from "fs/promises";
-import { getDocumentMap } from "./map.js";
-import { printMap } from "./debug.js";
-import { applyPatch } from "./patch.js";
-async function readStdin() {
-    return new Promise((resolve, reject) => {
-        let data = "";
-        process.stdin.on("data", (chunk) => (data += chunk));
-        process.stdin.on("end", () => resolve(data));
-        process.stdin.on("error", reject);
-    });
-}
-const program = new Command();
-// Configure the CLI
-program
-    .name("mdpatch")
-    .description("Change markdown documents by inserting or changing content relative to headings or other parst of a document's structure.")
-    .version("0.1.0");
-program
-    .command("print-map")
-    .argument("<path>", "filepath to show identified patchable paths for")
-    .argument("[regex]", "limit displayed matches to those matching the supplied regular expression")
-    .action(async (path, regex) => {
-    const document = await fs.readFile(path, "utf-8");
-    const documentMap = getDocumentMap(document);
-    printMap(document, documentMap, regex ? new RegExp(regex) : undefined);
-});
-program
-    .command("apply")
-    .argument("<path>", "file to patch")
-    .argument("<patch>", "patch file to apply")
-    .option("-o, --output <output>", "write output to the specified path instead of applying in-place; use '-' for stdout")
-    .action(async (path, patch, options) => {
-    let patchParsed;
-    let patchData;
-    try {
-        if (patch === "-") {
-            patchData = await readStdin();
-        }
-        else {
-            patchData = await fs.readFile(patch, "utf-8");
-        }
-    }
-    catch (e) {
-        console.error("Failed to read patch: ", e);
-        process.exit(1);
-    }
-    try {
-        const parsedData = JSON.parse(patchData);
-        if (!Array.isArray(parsedData)) {
-            patchParsed = [parsedData];
-        }
-        else {
-            patchParsed = parsedData;
-        }
-    }
-    catch (e) {
-        console.error("Could not parse patch file as JSON");
-        process.exit(1);
-    }
-    let document = await fs.readFile(path, "utf-8");
-    console.log("Document", document);
-    for (const instruction of patchParsed) {
-        document = applyPatch(document, instruction);
-    }
-    if (options.output === "-") {
-        process.stdout.write(document);
-    }
-    else {
-        await fs.writeFile(options.output ? options.output : path, document);
-    }
-});
-program.parse(process.argv);