shell-dsl 0.0.15 → 0.0.16

package/dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "shell-dsl",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "type": "commonjs"
 }

package/dist/cjs/src/commands/cd/cd.cjs

@@ -0,0 +1,66 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __moduleCache = /* @__PURE__ */ new WeakMap;
+var __toCommonJS = (from) => {
+  var entry = __moduleCache.get(from), desc;
+  if (entry)
+    return entry;
+  entry = __defProp({}, "__esModule", { value: true });
+  if (from && typeof from === "object" || typeof from === "function")
+    __getOwnPropNames(from).map((key) => !__hasOwnProp.call(entry, key) && __defProp(entry, key, {
+      get: () => from[key],
+      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+    }));
+  __moduleCache.set(from, entry);
+  return entry;
+};
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, {
+      get: all[name],
+      enumerable: true,
+      configurable: true,
+      set: (newValue) => all[name] = () => newValue
+    });
+};
+
+// src/commands/cd/cd.ts
+var exports_cd = {};
+__export(exports_cd, {
+  cd: () => cd
+});
+module.exports = __toCommonJS(exports_cd);
+var cd = async (ctx) => {
+  if (ctx.args.length === 0) {
+    return 0;
+  }
+  let target = ctx.args[0];
+  if (target === "-") {
+    const oldpwd = ctx.env.OLDPWD;
+    if (!oldpwd) {
+      await ctx.stderr.writeText(`cd: OLDPWD not set
+`);
+      return 1;
+    }
+    target = oldpwd;
+  }
+  const resolved = ctx.fs.resolve(ctx.cwd, target);
+  try {
+    const stat = await ctx.fs.stat(resolved);
+    if (!stat.isDirectory()) {
+      await ctx.stderr.writeText(`cd: not a directory: ${target}
+`);
+      return 1;
+    }
+  } catch {
+    await ctx.stderr.writeText(`cd: not a directory: ${target}
+`);
+    return 1;
+  }
+  ctx.setCwd(resolved);
+  return 0;
+};
+
+//# debugId=F71D097361CBA61564756E2164756E21

package/dist/cjs/src/commands/cd/cd.cjs.map

@@ -0,0 +1,10 @@
+{
+  "version": 3,
+  "sources": ["../../../../../src/commands/cd/cd.ts"],
+  "sourcesContent": [
+    "import type { Command } from \"../../types.cjs\";\n\nexport const cd: Command = async (ctx) => {\n  if (ctx.args.length === 0) {\n    return 0;\n  }\n\n  let target = ctx.args[0]!;\n\n  if (target === \"-\") {\n    const oldpwd = ctx.env.OLDPWD;\n    if (!oldpwd) {\n      await ctx.stderr.writeText(\"cd: OLDPWD not set\\n\");\n      return 1;\n    }\n    target = oldpwd;\n  }\n\n  const resolved = ctx.fs.resolve(ctx.cwd, target);\n\n  try {\n    const stat = await ctx.fs.stat(resolved);\n    if (!stat.isDirectory()) {\n      await ctx.stderr.writeText(`cd: not a directory: ${target}\\n`);\n      return 1;\n    }\n  } catch {\n    await ctx.stderr.writeText(`cd: not a directory: ${target}\\n`);\n    return 1;\n  }\n\n  ctx.setCwd(resolved);\n\n  return 0;\n};\n"
+  ],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEO,IAAM,KAAc,OAAO,QAAQ;AAAA,EACxC,IAAI,IAAI,KAAK,WAAW,GAAG;AAAA,IACzB,OAAO;AAAA,EACT;AAAA,EAEA,IAAI,SAAS,IAAI,KAAK;AAAA,EAEtB,IAAI,WAAW,KAAK;AAAA,IAClB,MAAM,SAAS,IAAI,IAAI;AAAA,IACvB,IAAI,CAAC,QAAQ;AAAA,MACX,MAAM,IAAI,OAAO,UAAU;AAAA,CAAsB;AAAA,MACjD,OAAO;AAAA,IACT;AAAA,IACA,SAAS;AAAA,EACX;AAAA,EAEA,MAAM,WAAW,IAAI,GAAG,QAAQ,IAAI,KAAK,MAAM;AAAA,EAE/C,IAAI;AAAA,IACF,MAAM,OAAO,MAAM,IAAI,GAAG,KAAK,QAAQ;AAAA,IACvC,IAAI,CAAC,KAAK,YAAY,GAAG;AAAA,MACvB,MAAM,IAAI,OAAO,UAAU,wBAAwB;AAAA,CAAU;AAAA,MAC7D,OAAO;AAAA,IACT;AAAA,IACA,MAAM;AAAA,IACN,MAAM,IAAI,OAAO,UAAU,wBAAwB;AAAA,CAAU;AAAA,IAC7D,OAAO;AAAA;AAAA,EAGT,IAAI,OAAO,QAAQ;AAAA,EAEnB,OAAO;AAAA;",
+  "debugId": "F71D097361CBA61564756E2164756E21",
+  "names": []
+}

package/dist/cjs/src/commands/index.cjs

@@ -33,6 +33,7 @@ __export(exports_commands, {
   uniq: () => import_uniq.uniq,
   trueCmd: () => import_true_false.trueCmd,
   tree: () => import_tree.tree,
+  tr: () => import_tr.tr,
   touch: () => import_touch.touch,
   test: () => import_test.test,
   tee: () => import_tee.tee,
@@ -52,6 +53,7 @@ __export(exports_commands, {
   cp: () => import_cp.cp,
   continueCmd: () => import_break_continue.continueCmd,
   colon: () => import_colon.colon,
+  cd: () => import_cd.cd,
   cat: () => import_cat.cat,
   builtinCommands: () => builtinCommands,
   breakCmd: () => import_break_continue.breakCmd,
@@ -83,6 +85,8 @@ var import_sed = require("./sed/sed.cjs");
 var import_awk = require("./awk/awk.cjs");
 var import_break_continue = require("./break-continue/break-continue.cjs");
 var import_colon = require("./colon/colon.cjs");
+var import_cd = require("./cd/cd.cjs");
+var import_tr = require("./tr/tr.cjs");
 var import_echo2 = require("./echo/echo.cjs");
 var import_cat2 = require("./cat/cat.cjs");
 var import_grep2 = require("./grep/grep.cjs");
@@ -107,6 +111,8 @@ var import_sed2 = require("./sed/sed.cjs");
 var import_awk2 = require("./awk/awk.cjs");
 var import_break_continue2 = require("./break-continue/break-continue.cjs");
 var import_colon2 = require("./colon/colon.cjs");
+var import_cd2 = require("./cd/cd.cjs");
+var import_tr2 = require("./tr/tr.cjs");
 var builtinCommands = {
   echo: import_echo2.echo,
   cat: import_cat2.cat,
@@ -134,7 +140,9 @@ var builtinCommands = {
   awk: import_awk2.awk,
   break: import_break_continue2.breakCmd,
   continue: import_break_continue2.continueCmd,
-  ":": import_colon2.colon
+  ":": import_colon2.colon,
+  cd: import_cd2.cd,
+  tr: import_tr2.tr
 };
 
-//# debugId=A797E42D013860AF64756E2164756E21
+//# debugId=17598CDDC0006B1664756E2164756E21

package/dist/cjs/src/commands/index.cjs.map

@@ -2,9 +2,9 @@
   "version": 3,
   "sources": ["../../../../src/commands/index.ts"],
   "sourcesContent": [
-    "import type { Command } from \"../types.cjs\";\n\nexport { echo } from \"./echo/echo.cjs\";\nexport { cat } from \"./cat/cat.cjs\";\nexport { grep } from \"./grep/grep.cjs\";\nexport { wc } from \"./wc/wc.cjs\";\nexport { head } from \"./head/head.cjs\";\nexport { tail } from \"./tail/tail.cjs\";\nexport { sort } from \"./sort/sort.cjs\";\nexport { uniq } from \"./uniq/uniq.cjs\";\nexport { pwd } from \"./pwd/pwd.cjs\";\nexport { ls } from \"./ls/ls.cjs\";\nexport { mkdir } from \"./mkdir/mkdir.cjs\";\nexport { rm } from \"./rm/rm.cjs\";\nexport { test, bracket } from \"./test/test.cjs\";\nexport { trueCmd, falseCmd } from \"./true-false/true-false.cjs\";\nexport { touch } from \"./touch/touch.cjs\";\nexport { cp } from \"./cp/cp.cjs\";\nexport { mv } from \"./mv/mv.cjs\";\nexport { tee } from \"./tee/tee.cjs\";\nexport { tree } from \"./tree/tree.cjs\";\nexport { find } from \"./find/find.cjs\";\nexport { sed } from \"./sed/sed.cjs\";\nexport { awk } from \"./awk/awk.cjs\";\nexport { breakCmd, continueCmd } from \"./break-continue/break-continue.cjs\";\nexport { colon } from \"./colon/colon.cjs\";\n\n// Re-export all commands as a bundle\nimport { echo } from \"./echo/echo.cjs\";\nimport { cat } from \"./cat/cat.cjs\";\nimport { grep } from \"./grep/grep.cjs\";\nimport { wc } from \"./wc/wc.cjs\";\nimport { head } from \"./head/head.cjs\";\nimport { tail } from \"./tail/tail.cjs\";\nimport { sort } from \"./sort/sort.cjs\";\nimport { uniq } from \"./uniq/uniq.cjs\";\nimport { pwd } from \"./pwd/pwd.cjs\";\nimport { ls } from \"./ls/ls.cjs\";\nimport { mkdir } from \"./mkdir/mkdir.cjs\";\nimport { rm } from \"./rm/rm.cjs\";\nimport { test, bracket } from \"./test/test.cjs\";\nimport { trueCmd, falseCmd } from \"./true-false/true-false.cjs\";\nimport { touch } from \"./touch/touch.cjs\";\nimport { cp } from \"./cp/cp.cjs\";\nimport { mv } from \"./mv/mv.cjs\";\nimport { tee } from \"./tee/tee.cjs\";\nimport { tree } from \"./tree/tree.cjs\";\nimport { find } from \"./find/find.cjs\";\nimport { sed } from \"./sed/sed.cjs\";\nimport { awk } from \"./awk/awk.cjs\";\nimport { breakCmd, continueCmd } from \"./break-continue/break-continue.cjs\";\nimport { colon } from \"./colon/colon.cjs\";\n\nexport const builtinCommands: Record<string, Command> = {\n  echo,\n  cat,\n  grep,\n  wc,\n  head,\n  tail,\n  sort,\n  uniq,\n  pwd,\n  ls,\n  mkdir,\n  rm,\n  test,\n  \"[\": bracket,\n  true: trueCmd,\n  false: falseCmd,\n  touch,\n  cp,\n  mv,\n  tee,\n  tree,\n  find,\n  sed,\n  awk,\n  break: breakCmd,\n  continue: continueCmd,\n  \":\": colon,\n};\n"
+    "import type { Command } from \"../types.cjs\";\n\nexport { echo } from \"./echo/echo.cjs\";\nexport { cat } from \"./cat/cat.cjs\";\nexport { grep } from \"./grep/grep.cjs\";\nexport { wc } from \"./wc/wc.cjs\";\nexport { head } from \"./head/head.cjs\";\nexport { tail } from \"./tail/tail.cjs\";\nexport { sort } from \"./sort/sort.cjs\";\nexport { uniq } from \"./uniq/uniq.cjs\";\nexport { pwd } from \"./pwd/pwd.cjs\";\nexport { ls } from \"./ls/ls.cjs\";\nexport { mkdir } from \"./mkdir/mkdir.cjs\";\nexport { rm } from \"./rm/rm.cjs\";\nexport { test, bracket } from \"./test/test.cjs\";\nexport { trueCmd, falseCmd } from \"./true-false/true-false.cjs\";\nexport { touch } from \"./touch/touch.cjs\";\nexport { cp } from \"./cp/cp.cjs\";\nexport { mv } from \"./mv/mv.cjs\";\nexport { tee } from \"./tee/tee.cjs\";\nexport { tree } from \"./tree/tree.cjs\";\nexport { find } from \"./find/find.cjs\";\nexport { sed } from \"./sed/sed.cjs\";\nexport { awk } from \"./awk/awk.cjs\";\nexport { breakCmd, continueCmd } from \"./break-continue/break-continue.cjs\";\nexport { colon } from \"./colon/colon.cjs\";\nexport { cd } from \"./cd/cd.cjs\";\nexport { tr } from \"./tr/tr.cjs\";\n\n// Re-export all commands as a bundle\nimport { echo } from \"./echo/echo.cjs\";\nimport { cat } from \"./cat/cat.cjs\";\nimport { grep } from \"./grep/grep.cjs\";\nimport { wc } from \"./wc/wc.cjs\";\nimport { head } from \"./head/head.cjs\";\nimport { tail } from \"./tail/tail.cjs\";\nimport { sort } from \"./sort/sort.cjs\";\nimport { uniq } from \"./uniq/uniq.cjs\";\nimport { pwd } from \"./pwd/pwd.cjs\";\nimport { ls } from \"./ls/ls.cjs\";\nimport { mkdir } from \"./mkdir/mkdir.cjs\";\nimport { rm } from \"./rm/rm.cjs\";\nimport { test, bracket } from \"./test/test.cjs\";\nimport { trueCmd, falseCmd } from \"./true-false/true-false.cjs\";\nimport { touch } from \"./touch/touch.cjs\";\nimport { cp } from \"./cp/cp.cjs\";\nimport { mv } from \"./mv/mv.cjs\";\nimport { tee } from \"./tee/tee.cjs\";\nimport { tree } from \"./tree/tree.cjs\";\nimport { find } from \"./find/find.cjs\";\nimport { sed } from \"./sed/sed.cjs\";\nimport { awk } from \"./awk/awk.cjs\";\nimport { breakCmd, continueCmd } from \"./break-continue/break-continue.cjs\";\nimport { colon } from \"./colon/colon.cjs\";\nimport { cd } from \"./cd/cd.cjs\";\nimport { tr } from \"./tr/tr.cjs\";\n\nexport const builtinCommands: Record<string, Command> = {\n  echo,\n  cat,\n  grep,\n  wc,\n  head,\n  tail,\n  sort,\n  uniq,\n  pwd,\n  ls,\n  mkdir,\n  rm,\n  test,\n  \"[\": bracket,\n  true: trueCmd,\n  false: falseCmd,\n  touch,\n  cp,\n  mv,\n  tee,\n  tree,\n  find,\n  sed,\n  awk,\n  break: breakCmd,\n  continue: continueCmd,\n  \":\": colon,\n  cd,\n  tr,\n};\n"
   ],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEqB,IAArB;AACoB,IAApB;AACqB,IAArB;AACmB,IAAnB;AACqB,IAArB;AACqB,IAArB;AACqB,IAArB;AACqB,IAArB;AACoB,IAApB;AACmB,IAAnB;AACsB,IAAtB;AACmB,IAAnB;AAC8B,IAA9B;AACkC,IAAlC;AACsB,IAAtB;AACmB,IAAnB;AACmB,IAAnB;AACoB,IAApB;AACqB,IAArB;AACqB,IAArB;AACoB,IAApB;AACoB,IAApB;AACsC,IAAtC;AACsB,IAAtB;AAGqB,IAArB;AACoB,IAApB;AACqB,IAArB;AACmB,IAAnB;AACqB,IAArB;AACqB,IAArB;AACqB,IAArB;AACqB,IAArB;AACoB,IAApB;AACmB,IAAnB;AACsB,IAAtB;AACmB,IAAnB;AAC8B,IAA9B;AACkC,IAAlC;AACsB,IAAtB;AACmB,IAAnB;AACmB,IAAnB;AACoB,IAApB;AACqB,IAArB;AACqB,IAArB;AACoB,IAApB;AACoB,IAApB;AACsC,IAAtC;AACsB,IAAtB;AAEO,IAAM,kBAA2C;AAAA,EACtD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,KAAK;AAAA,EACL,MAAM;AAAA,EACN,OAAO;AAAA,EACP;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,OAAO;AAAA,EACP,UAAU;AAAA,EACV,KAAK;AACP;",
-  "debugId": "A797E42D013860AF64756E2164756E21",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEqB,IAArB;AACoB,IAApB;AACqB,IAArB;AACmB,IAAnB;AACqB,IAArB;AACqB,IAArB;AACqB,IAArB;AACqB,IAArB;AACoB,IAApB;AACmB,IAAnB;AACsB,IAAtB;AACmB,IAAnB;AAC8B,IAA9B;AACkC,IAAlC;AACsB,IAAtB;AACmB,IAAnB;AACmB,IAAnB;AACoB,IAApB;AACqB,IAArB;AACqB,IAArB;AACoB,IAApB;AACoB,IAApB;AACsC,IAAtC;AACsB,IAAtB;AACmB,IAAnB;AACmB,IAAnB;AAGqB,IAArB;AACoB,IAApB;AACqB,IAArB;AACmB,IAAnB;AACqB,IAArB;AACqB,IAArB;AACqB,IAArB;AACqB,IAArB;AACoB,IAApB;AACmB,IAAnB;AACsB,IAAtB;AACmB,IAAnB;AAC8B,IAA9B;AACkC,IAAlC;AACsB,IAAtB;AACmB,IAAnB;AACmB,IAAnB;AACoB,IAApB;AACqB,IAArB;AACqB,IAArB;AACoB,IAApB;AACoB,IAApB;AACsC,IAAtC;AACsB,IAAtB;AACmB,IAAnB;AACmB,IAAnB;AAEO,IAAM,kBAA2C;AAAA,EACtD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,KAAK;AAAA,EACL,MAAM;AAAA,EACN,OAAO;AAAA,EACP;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,OAAO;AAAA,EACP,UAAU;AAAA,EACV,KAAK;AAAA,EACL;AAAA,EACA;AACF;",
+  "debugId": "17598CDDC0006B1664756E2164756E21",
   "names": []
 }

package/dist/cjs/src/commands/sed/sed.cjs

@@ -56,40 +56,110 @@ function parseSubstitution(script) {
 }
 function parseCommand(script) {
   const trimmed = script.trim();
-  const addressMatch = trimmed.match(/^\/(.+?)\/([dp])$/);
-  if (addressMatch) {
-    const [, addressPatternStr, cmd] = addressMatch;
-    try {
-      return {
-        type: cmd,
-        addressPattern: new RegExp(addressPatternStr),
-        globalFlag: false,
-        printFlag: false
-      };
-    } catch {
-      return null;
-    }
+  if (trimmed.startsWith(":")) {
+    return {
+      type: "label",
+      label: trimmed.slice(1).trim(),
+      globalFlag: false,
+      printFlag: false
+    };
   }
-  if (trimmed === "d") {
-    return { type: "d", globalFlag: false, printFlag: false };
+  if (trimmed === "b" || trimmed.startsWith("b ") || trimmed.startsWith("b\t")) {
+    return {
+      type: "b",
+      label: trimmed.length > 1 ? trimmed.slice(1).trim() : undefined,
+      globalFlag: false,
+      printFlag: false
+    };
   }
-  if (trimmed === "p") {
-    return { type: "p", globalFlag: false, printFlag: false };
+  if (trimmed.startsWith("{") && trimmed.endsWith("}")) {
+    const inner = trimmed.slice(1, -1).trim();
+    const parts = splitScriptParts(inner);
+    const children = [];
+    for (const part of parts) {
+      const cmd = parseCommand(part);
+      if (cmd)
+        children.push(cmd);
+    }
+    return {
+      type: "group",
+      children,
+      globalFlag: false,
+      printFlag: false
+    };
   }
-  const addressSubMatch = trimmed.match(/^\/(.+?)\/s(.)(.+?)\2(.*?)\2([gi]*)$/);
-  if (addressSubMatch) {
-    const [, addressPatternStr, , patternStr, replacement, flags] = addressSubMatch;
-    const globalFlag = flags.includes("g");
-    const caseInsensitive = flags.includes("i");
+  const simpleCommands = {
+    h: "h",
+    H: "H",
+    g: "g_hold",
+    G: "G",
+    x: "x",
+    n: "n",
+    N: "N",
+    P: "P",
+    D: "D",
+    d: "d",
+    p: "p"
+  };
+  if (simpleCommands[trimmed]) {
+    return {
+      type: simpleCommands[trimmed],
+      globalFlag: false,
+      printFlag: false
+    };
+  }
+  const addressWithCmd = trimmed.match(/^\/(.+?)\/(!)?\s*(.*)$/);
+  if (addressWithCmd) {
+    const [, addressPatternStr, negation, rest] = addressWithCmd;
+    const negated = negation === "!";
+    const restTrimmed = rest.trim();
     try {
-      return {
-        type: "s",
-        addressPattern: new RegExp(addressPatternStr),
-        pattern: new RegExp(patternStr, caseInsensitive ? "i" : ""),
-        replacement,
-        globalFlag,
-        printFlag: false
-      };
+      const addressPattern = new RegExp(addressPatternStr);
+      if (!restTrimmed)
+        return null;
+      if (simpleCommands[restTrimmed]) {
+        return {
+          type: simpleCommands[restTrimmed],
+          addressPattern,
+          negated,
+          globalFlag: false,
+          printFlag: false
+        };
+      }
+      if (restTrimmed === "b" || restTrimmed.startsWith("b ")) {
+        return {
+          type: "b",
+          addressPattern,
+          negated,
+          label: restTrimmed.length > 1 ? restTrimmed.slice(1).trim() : undefined,
+          globalFlag: false,
+          printFlag: false
+        };
+      }
+      if (restTrimmed.startsWith("{") && restTrimmed.endsWith("}")) {
+        const inner = restTrimmed.slice(1, -1).trim();
+        const parts = splitScriptParts(inner);
+        const children = [];
+        for (const part of parts) {
+          const cmd = parseCommand(part);
+          if (cmd)
+            children.push(cmd);
+        }
+        return {
+          type: "group",
+          addressPattern,
+          negated,
+          children,
+          globalFlag: false,
+          printFlag: false
+        };
+      }
+      const subCmd2 = parseSubstitution(restTrimmed);
+      if (subCmd2) {
+        subCmd2.addressPattern = addressPattern;
+        subCmd2.negated = negated;
+        return subCmd2;
+      }
     } catch {
       return null;
     }
@@ -103,8 +173,17 @@ function splitScriptParts(script) {
   const parts = [];
   let i = 0;
   let current = "";
+  let braceDepth = 0;
   while (i < script.length) {
-    if (script[i] === "s" && i + 1 < script.length) {
+    if (script[i] === "{") {
+      braceDepth++;
+      current += script[i];
+      i++;
+    } else if (script[i] === "}") {
+      braceDepth--;
+      current += script[i];
+      i++;
+    } else if (script[i] === "s" && braceDepth === 0 && i + 1 < script.length && !/[a-zA-Z0-9]/.test(script[i + 1])) {
       const delim = script[i + 1];
       let j = i + 2;
       let delimCount = 0;
@@ -121,7 +200,7 @@ function splitScriptParts(script) {
         j++;
       current += script.slice(i, j);
       i = j;
-    } else if (script[i] === ";") {
+    } else if (script[i] === ";" && braceDepth === 0) {
       const trimmed2 = current.trim();
       if (trimmed2)
         parts.push(trimmed2);
@@ -194,9 +273,12 @@ function parseArgs(args) {
               error: { type: "missing_value", option: "-e" }
             };
           }
-          const cmd = parseCommand(script);
-          if (cmd)
-            options.commands.push(cmd);
+          const parts = splitScriptParts(script);
+          for (const part of parts) {
+            const cmd = parseCommand(part);
+            if (cmd)
+              options.commands.push(cmd);
+          }
           break;
         } else {
           return {
@@ -249,37 +331,141 @@ function applySubstitution(line, cmd) {
     return line.replace(cmd.pattern, cmd.replacement);
   }
 }
-function processLine(line, commands, suppressOutput) {
-  let currentLine = line;
-  let deleted = false;
-  let printed = false;
-  for (const cmd of commands) {
-    if (cmd.addressPattern && !cmd.addressPattern.test(currentLine)) {
+function addressMatches(cmd, state) {
+  if (!cmd.addressPattern) {
+    return cmd.negated ? false : true;
+  }
+  const matches = cmd.addressPattern.test(state.patternSpace);
+  return cmd.negated ? !matches : matches;
+}
+function findLabel(commands, label) {
+  for (let i = 0;i < commands.length; i++) {
+    if (commands[i].type === "label" && commands[i].label === label) {
+      return i;
+    }
+  }
+  return -1;
+}
+function executeCommands(commands, state, topLevel) {
+  let pc = 0;
+  while (pc < commands.length) {
+    const cmd = commands[pc];
+    if (cmd.type === "label") {
+      pc++;
+      continue;
+    }
+    if (!addressMatches(cmd, state)) {
+      pc++;
       continue;
     }
     switch (cmd.type) {
       case "s":
-        currentLine = applySubstitution(currentLine, cmd);
+        state.patternSpace = applySubstitution(state.patternSpace, cmd);
         break;
       case "d":
-        deleted = true;
-        return { output: null, deleted: true };
+        state.deleted = true;
+        return { branchToEnd: false, deleted: true, nextLine: false, restart: false };
       case "p":
-        printed = true;
+        state.output.push(state.patternSpace);
+        break;
+      case "h":
+        state.holdSpace = state.patternSpace;
+        break;
+      case "H":
+        state.holdSpace = state.holdSpace + `
+` + state.patternSpace;
+        break;
+      case "g_hold":
+        state.patternSpace = state.holdSpace;
+        break;
+      case "G":
+        state.patternSpace = state.patternSpace + `
+` + state.holdSpace;
+        break;
+      case "x": {
+        const tmp = state.patternSpace;
+        state.patternSpace = state.holdSpace;
+        state.holdSpace = tmp;
+        break;
+      }
+      case "n":
+        if (!state.suppressOutput) {
+          state.output.push(state.patternSpace);
+        }
+        state.lineIndex++;
+        if (state.lineIndex < state.lines.length) {
+          state.patternSpace = state.lines[state.lineIndex];
+        } else {
+          state.deleted = true;
+          return { branchToEnd: false, deleted: true, nextLine: false, restart: false };
+        }
+        break;
+      case "N":
+        state.lineIndex++;
+        if (state.lineIndex < state.lines.length) {
+          state.patternSpace = state.patternSpace + `
+` + state.lines[state.lineIndex];
+        } else {
+          if (!state.suppressOutput) {
+            state.output.push(state.patternSpace);
+          }
+          state.deleted = true;
+          return { branchToEnd: false, deleted: true, nextLine: false, restart: false };
+        }
+        break;
+      case "P": {
+        const nlIdx = state.patternSpace.indexOf(`
+`);
+        if (nlIdx >= 0) {
+          state.output.push(state.patternSpace.slice(0, nlIdx));
+        } else {
+          state.output.push(state.patternSpace);
+        }
+        break;
+      }
+      case "D": {
+        const nlIdx2 = state.patternSpace.indexOf(`
+`);
+        if (nlIdx2 >= 0) {
+          state.patternSpace = state.patternSpace.slice(nlIdx2 + 1);
+          state.restart = true;
+          return { branchToEnd: false, deleted: false, nextLine: false, restart: true };
+        } else {
+          state.deleted = true;
+          return { branchToEnd: false, deleted: true, nextLine: false, restart: false };
+        }
+      }
+      case "b":
+        if (cmd.label) {
+          if (topLevel) {
+            const idx = findLabel(commands, cmd.label);
+            if (idx >= 0) {
+              pc = idx;
+              continue;
+            }
+          }
+          return { branchToEnd: true, branchLabel: cmd.label, deleted: false, nextLine: false, restart: false };
+        }
+        return { branchToEnd: true, deleted: false, nextLine: false, restart: false };
+      case "group":
+        if (cmd.children) {
+          const result = executeCommands(cmd.children, state, false);
+          if (result.deleted || result.branchToEnd || result.restart) {
+            if (result.branchLabel && topLevel) {
+              const idx = findLabel(commands, result.branchLabel);
+              if (idx >= 0) {
+                pc = idx;
+                continue;
+              }
+            }
+            return result;
+          }
+        }
         break;
     }
+    pc++;
   }
-  if (deleted) {
-    return { output: null, deleted: true };
-  }
-  if (suppressOutput) {
-    return { output: printed ? currentLine : null, deleted: false };
-  }
-  if (printed) {
-    return { output: currentLine + `
-` + currentLine, deleted: false };
-  }
-  return { output: currentLine, deleted: false };
+  return { branchToEnd: false, deleted: false, nextLine: false, restart: false };
 }
 var sed = async (ctx) => {
   const { options, files, error } = parseArgs(ctx.args);
@@ -298,34 +484,59 @@ var sed = async (ctx) => {
     if (lines.length > 0 && lines[lines.length - 1] === "") {
       lines.pop();
     }
-    for (const line of lines) {
-      const { output } = processLine(line, options.commands, options.suppressOutput);
-      if (output !== null) {
-        await ctx.stdout.writeText(output + `
-`);
+    const allOutput = [];
+    const state = {
+      patternSpace: "",
+      holdSpace: "",
+      lineIndex: 0,
+      lines,
+      suppressOutput: options.suppressOutput,
+      output: [],
+      deleted: false,
+      restart: false
+    };
+    while (state.lineIndex < lines.length) {
+      state.patternSpace = lines[state.lineIndex];
+      state.deleted = false;
+      state.output = [];
+      let restarting = true;
+      while (restarting) {
+        restarting = false;
+        state.restart = false;
+        const result = executeCommands(options.commands, state, true);
+        if (result.restart) {
+          restarting = true;
+          allOutput.push(...state.output);
+          state.output = [];
+          continue;
+        }
+        if (result.deleted) {
+          allOutput.push(...state.output);
+          state.lineIndex++;
+          break;
+        }
+        allOutput.push(...state.output);
+        if (!options.suppressOutput) {
+          allOutput.push(state.patternSpace);
+        }
+        state.lineIndex++;
       }
     }
+    return allOutput;
   };
   if (files.length === 0) {
     const content = await ctx.stdin.text();
-    await processContent(content);
+    const outputLines = await processContent(content);
+    for (const line of outputLines) {
+      await ctx.stdout.writeText(line + `
+`);
+    }
   } else if (options.inPlace) {
     for (const file of files) {
       try {
         const path = ctx.fs.resolve(ctx.cwd, file);
         const content = await ctx.fs.readFile(path);
-        const lines = content.toString().split(`
-`);
-        if (lines.length > 0 && lines[lines.length - 1] === "") {
-          lines.pop();
-        }
-        const outputLines = [];
-        for (const line of lines) {
-          const { output } = processLine(line, options.commands, options.suppressOutput);
-          if (output !== null) {
-            outputLines.push(output);
-          }
-        }
+        const outputLines = await processContent(content.toString());
         const result = outputLines.length > 0 ? outputLines.join(`
 `) + `
 ` : "";
@@ -342,7 +553,11 @@ var sed = async (ctx) => {
       try {
         const path = ctx.fs.resolve(ctx.cwd, file);
         const content = await ctx.fs.readFile(path);
-        await processContent(content.toString());
+        const outputLines = await processContent(content.toString());
+        for (const line of outputLines) {
+          await ctx.stdout.writeText(line + `
+`);
+        }
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         await ctx.stderr.writeText(`sed: ${file}: ${message}
@@ -354,4 +569,4 @@ var sed = async (ctx) => {
   return 0;
 };
 
-//# debugId=9484A386918DB8C764756E2164756E21
+//# debugId=54C2879933482FB364756E2164756E21