fauxnix-cli 0.2.1 → 0.4.0

package/dist/commands/files.js

@@ -1,6 +1,6 @@
 import { wordToString } from '../ast.js';
 import { parseWords, psStr } from '../registry.js';
-import { exprOfWord, operandExpr } from '../translator.js';
+import { argListExpr, exprOfWord, operandExpr } from '../translator.js';
 /* ------------------------------------------------------------------ */
 /* Shared PS snippets                                                  */
 /* ------------------------------------------------------------------ */
@@ -45,9 +45,7 @@ const PS_HSIZE_FN = [
 ].join('\n');
 /** Operand Words → PS array expression of string exprs. */
 function psArray(words, fn = operandExpr) {
-    if (words.length === 0)
-        return '@()';
-    return '@(' + words.map(fn).join(', ') + ')';
+    return argListExpr(words, fn);
 }
 /* ------------------------------------------------------------------ */
 /* ls                                                                  */
@@ -63,7 +61,7 @@ const ls = (args) => {
     const sortByTime = flags.has('t');
     const sortBySize = flags.has('S');
     const reverse = flags.has('r');
-    const targets = operandWords.length ? operandWords.map((w) => operandExpr(w)) : ["'.'"];
+    const targets = operandWords.length ? argListExpr(operandWords) : "@('.')";
     return [
         PS_GLOB_FN,
         PS_FTIME_FN,
@@ -84,7 +82,7 @@ const ls = (args) => {
         '  }',
         '  return $n',
         '}',
-        '$fx_targets = @(' + targets.join(', ') + ')',
+        '$fx_targets = ' + targets,
         '$fx_all = @()',
         'foreach ($fx_t in $fx_targets) {',
         '  foreach ($fx_g in (fx-glob $fx_t)) {',
@@ -126,12 +124,10 @@ const cp = (args) => {
     const { flags, longs, operandWords } = parseWords(args);
     const recurse = flags.has('r') || flags.has('R') || longs.has('--recursive');
     const verbose = flags.has('v') || longs.has('--verbose');
-    const srcs = psArray(operandWords.slice(0, -1));
-    const dst = operandWords.length >= 2 ? operandExpr(operandWords[operandWords.length - 1]) : "''";
     return [
         PS_GLOB_FN,
-        '$fx_srcs = ' + srcs,
-        '$fx_dst = ' + dst,
+        '$fx_all = ' + argListExpr(operandWords),
+        "if ($fx_all.Count -lt 2) { $fx_srcs = @(); $fx_dst = '' } else { $fx_dst = [string]$fx_all[$fx_all.Count - 1]; $fx_srcs = @($fx_all[0..($fx_all.Count - 2)]) }",
         "if ($fx_srcs.Count -eq 0) { [Console]::Error.WriteLine('cp: missing file operand'); $script:fx_exit = 1 }",
         "elseif ($fx_dst -eq '') { [Console]::Error.WriteLine('cp: missing destination file operand'); $script:fx_exit = 1 }",
         'else {',
@@ -154,12 +150,10 @@ const cp = (args) => {
 const mv = (args) => {
     const { flags, longs, operandWords } = parseWords(args);
     const verbose = flags.has('v') || longs.has('--verbose');
-    const srcs = psArray(operandWords.slice(0, -1));
-    const dst = operandWords.length >= 2 ? operandExpr(operandWords[operandWords.length - 1]) : "''";
     return [
         PS_GLOB_FN,
-        '$fx_srcs = ' + srcs,
-        '$fx_dst = ' + dst,
+        '$fx_all = ' + argListExpr(operandWords),
+        "if ($fx_all.Count -lt 2) { $fx_srcs = @(); $fx_dst = '' } else { $fx_dst = [string]$fx_all[$fx_all.Count - 1]; $fx_srcs = @($fx_all[0..($fx_all.Count - 2)]) }",
         "if ($fx_srcs.Count -eq 0) { [Console]::Error.WriteLine('mv: missing file operand'); $script:fx_exit = 1 }",
         "elseif ($fx_dst -eq '') { [Console]::Error.WriteLine('mv: missing destination file operand'); $script:fx_exit = 1 }",
         'elseif ($fx_srcs.Count -gt 1 -and -not (Test-Path -LiteralPath $fx_dst -PathType Container)) { [Console]::Error.WriteLine("mv: target \'" + $fx_dst + "\' is not a directory"); $script:fx_exit = 1 }',
@@ -274,13 +268,11 @@ const mktemp = (args) => {
 const ln = (args) => {
     const { flags, operandWords } = parseWords(args);
     const sym = flags.has('s');
-    const src = operandWords.length >= 2 ? operandExpr(operandWords[0]) : "''";
-    const dst = operandWords.length >= 2 ? operandExpr(operandWords[1]) : "''";
     const kind = sym ? 'SymbolicLink' : 'HardLink';
     const label = sym ? 'symbolic link' : 'hard link';
     return [
-        '$fx_src = ' + src,
-        '$fx_dst = ' + dst,
+        '$fx_ops = ' + argListExpr(operandWords),
+        "if ($fx_ops.Count -lt 2) { $fx_src = ''; $fx_dst = '' } else { $fx_src = [string]$fx_ops[0]; $fx_dst = [string]$fx_ops[1] }",
         "if ($fx_src -eq '' -or $fx_dst -eq '') { [Console]::Error.WriteLine('ln: missing file operand'); $script:fx_exit = 1 }",
         'else {',
         '  if (Test-Path -LiteralPath $fx_dst -PathType Container) { $fx_dst = Join-Path $fx_dst (Split-Path $fx_src -Leaf) }',
@@ -321,29 +313,28 @@ const realpath = (args) => {
 /* basename / dirname                                                  */
 /* ------------------------------------------------------------------ */
 const basename = (args) => {
-    if (args.length === 2) {
-        return [
-            '$fx_p = ' + exprOfWord(args[0]),
-            '$fx_sfx = ' + exprOfWord(args[1]),
-            "$fx_n = [IO.Path]::GetFileName(($fx_p.TrimEnd('/')).TrimEnd('\\'))",
-            "if ($fx_n -eq '') { $fx_n = '/' }",
-            "if ($fx_sfx -ne '' -and $fx_n.EndsWith($fx_sfx) -and ($fx_n.Length -gt $fx_sfx.Length)) { $fx_n = $fx_n.Substring(0, $fx_n.Length - $fx_sfx.Length) }",
-            '$fx_n',
-        ].join('\n');
-    }
     return [
-        '$fx_ps = @(' + args.map(exprOfWord).join(', ') + ')',
+        '$fx_ps = ' + argListExpr(args, exprOfWord),
         "if ($fx_ps.Count -eq 0) { [Console]::Error.WriteLine('basename: missing operand'); $script:fx_exit = 1 }",
-        'foreach ($fx_p in $fx_ps) {',
+        'elseif ($fx_ps.Count -eq 2) {',
+        '  $fx_p = [string]$fx_ps[0]',
+        '  $fx_sfx = [string]$fx_ps[1]',
         "  $fx_n = [IO.Path]::GetFileName(($fx_p.TrimEnd('/')).TrimEnd('\\'))",
         "  if ($fx_n -eq '') { $fx_n = '/' }",
+        "  if ($fx_sfx -ne '' -and $fx_n.EndsWith($fx_sfx) -and ($fx_n.Length -gt $fx_sfx.Length)) { $fx_n = $fx_n.Substring(0, $fx_n.Length - $fx_sfx.Length) }",
         '  $fx_n',
+        '} else {',
+        '  foreach ($fx_p in $fx_ps) {',
+        "    $fx_n = [IO.Path]::GetFileName(($fx_p.TrimEnd('/')).TrimEnd('\\'))",
+        "    if ($fx_n -eq '') { $fx_n = '/' }",
+        '    $fx_n',
+        '  }',
         '}',
     ].join('\n');
 };
 const dirname = (args) => {
     return [
-        '$fx_ps = @(' + args.map(exprOfWord).join(', ') + ')',
+        '$fx_ps = ' + argListExpr(args, exprOfWord),
         "if ($fx_ps.Count -eq 0) { [Console]::Error.WriteLine('dirname: missing operand'); $script:fx_exit = 1 }",
         'foreach ($fx_p in $fx_ps) {',
         "  $fx_n = ($fx_p.TrimEnd('/')).TrimEnd('\\')",
@@ -428,7 +419,7 @@ const du = (args) => {
     const { flags, longs, operandWords } = parseWords(args, [], ['--max-depth']);
     const sum = flags.has('s') || longs.has('--summarize');
     const human = flags.has('h') || longs.has('--human-readable');
-    const targets = operandWords.length ? operandWords.map((w) => operandExpr(w)) : ["'.'"];
+    const targets = operandWords.length ? argListExpr(operandWords) : "@('.')";
     return [
         PS_HSIZE_FN,
         'function fx-size($p) {',
@@ -436,7 +427,7 @@ const du = (args) => {
         '  Get-ChildItem -LiteralPath $p -Recurse -Force -File -ErrorAction SilentlyContinue | ForEach-Object { $t += $_.Length }',
         '  return [math]::Ceiling($t / 1KB)',
         '}',
-        '$fx_ts = @(' + targets.join(', ') + ')',
+        '$fx_ts = ' + targets,
         'foreach ($fx_t in $fx_ts) {',
         '  if (-not (Test-Path -LiteralPath $fx_t)) { [Console]::Error.WriteLine("du: cannot access \'" + $fx_t + "\': No such file or directory"); $script:fx_exit = 1; continue }',
         '  if (' + (sum ? '$true' : '$false') + ') {',
@@ -500,7 +491,7 @@ const find = (args) => {
     const sizeExpr = extractValue(preds, ['-size']);
     const mtimeExpr = extractValue(preds, ['-mtime']);
     const wantDelete = preds.includes('-delete');
-    const paths = pathWords.length ? pathWords.map((w) => operandExpr(w)) : ["'.'"];
+    const paths = pathWords.length ? argListExpr(pathWords) : "@('.')";
     const conditions = [];
     if (namePat !== null)
         conditions.push("($fx_i.Name -like '" + likeOf(namePat) + "')");
@@ -516,7 +507,7 @@ const find = (args) => {
     const sizeCond = sizeOf(sizeExpr);
     const mtimeCond = mtimeOf(mtimeExpr);
     return [
-        '$fx_paths = @(' + paths.join(', ') + ')',
+        '$fx_paths = ' + paths,
         'foreach ($fx_p in $fx_paths) {',
         '  if (-not (Test-Path -LiteralPath $fx_p)) { [Console]::Error.WriteLine("find: \'" + $fx_p + "\': No such file or directory"); $script:fx_exit = 1; continue }',
         '  $fx_root = (Get-Item -LiteralPath $fx_p -Force).FullName',
@@ -632,13 +623,11 @@ const diff = (args) => {
     const unified = flags.has('u') || flags.has('U');
     const brief = flags.has('q') || flags.has('brief');
     void unified;
-    const a = operandWords.length > 0 ? operandExpr(operandWords[0]) : "''";
-    const b = operandWords.length > 1 ? operandExpr(operandWords[1]) : "''";
     return [
         PS_READTEXT_FN,
         'function fx-dr($x, $y) { if ($x -eq $y) { return [string]$x } else { return ([string]$x) + \',\' + ([string]$y) } }',
-        '$fx_a = ' + a,
-        '$fx_b = ' + b,
+        '$fx_ops = ' + argListExpr(operandWords),
+        "if ($fx_ops.Count -lt 2) { $fx_a = ''; $fx_b = '' } else { $fx_a = [string]$fx_ops[0]; $fx_b = [string]$fx_ops[1] }",
         "if ($fx_a -eq '' -or $fx_b -eq '') { [Console]::Error.WriteLine('diff: missing operand'); $script:fx_exit = 2 }",
         'elseif (-not (Test-Path -LiteralPath $fx_a)) { [Console]::Error.WriteLine("diff: " + $fx_a + ": No such file or directory"); $script:fx_exit = 2 }',
         'elseif (-not (Test-Path -LiteralPath $fx_b)) { [Console]::Error.WriteLine("diff: " + $fx_b + ": No such file or directory"); $script:fx_exit = 2 }',

package/dist/commands/net.js

@@ -1,6 +1,6 @@
 import { wordToString } from '../ast.js';
 import { parseWords, psErr, psStr } from '../registry.js';
-import { exprOfWord, literalOfWord, operandExpr } from '../translator.js';
+import { argListExpr, exprOfWord, literalOfWord, operandExpr } from '../translator.js';
 /* ------------------------------------------------------------------ */
 /* Shared PS snippets                                                  */
 /* ------------------------------------------------------------------ */
@@ -94,7 +94,7 @@ const curl = (args) => {
     // refuses private/loopback URLs before the process is even started.
     return [
         PS_NETGUARD_FNS,
-        "$fx_args = @(" + args.map(exprOfWord).join(', ') + ')',
+        '$fx_args = ' + argListExpr(args, exprOfWord),
         '$fx_bad = $false',
         "foreach ($fx_a in $fx_args) { if (fx-netguard 'curl' $fx_a) { $fx_bad = $true } }",
         'if ($fx_bad) { $script:fx_exit = 1 }',
@@ -212,11 +212,11 @@ function mapWgetArgs(args) {
     return { margs, sawOutput, urls };
 }
 const wget = (args) => {
-    const orig = args.map(exprOfWord);
+    const orig = args.map((w) => exprOfWord(w));
     const mapped = mapWgetArgs(args);
     return [
         PS_NETGUARD_FNS,
-        '$fx_args = @(' + orig.join(', ') + ')',
+        '$fx_args = ' + argListExpr(args, exprOfWord),
         '$fx_margs = @(' + mapped.margs.join(', ') + ')',
         '$fx_bad = $false',
         "foreach ($fx_a in $fx_args) { if (fx-netguard 'wget' $fx_a) { $fx_bad = $true } }",
@@ -456,7 +456,10 @@ const ifconfig = (args) => {
 /* ------------------------------------------------------------------ */
 /* nslookup / dig / host                                               */
 /* ------------------------------------------------------------------ */
-const nslookup = (args) => nativeCall('nslookup.exe', args.map(exprOfWord).join(', '));
+const nslookup = (args) => [
+    '$fx_args = ' + argListExpr(args, exprOfWord),
+    nativeCall('nslookup.exe', '$fx_args'),
+].join('\n');
 const dig = (args) => {
     const raw = args.map(wordToString);
     let short = false;