yavascript 0.0.13 → 0.14.1

package/dist/primordials-arm64.js

@@ -757,6 +757,9 @@ _export(exports, {
   ChildProcessOptions: function () {
     return _ChildProcess.ChildProcessOptions;
   },
+  ChildProcessState: function () {
+    return _ChildProcess.ChildProcessState;
+  },
   exec: function () {
     return _exec.exec;
   }
@@ -1933,9 +1936,18 @@ const _types = _kame_require_("src/api/types/index.ts");
 const _assert = _kame_require_("src/api/assert/index.ts");
 const _path = _kame_require_("src/api/path/index.ts");
 class ChildProcess {
-  /** returns pid */start() {
+  get state() {
+    this._updateState();
+    return this._state;
+  }
+  get pid() {
+    this._updateState();
+    return this._getPidRaw();
+  }
+  /** returns pid */
+  start() {
     this._logging.trace.call(null, "ChildProcess.start:", this.args);
-    this.pid = _quickjsos.exec(this.args, {
+    const pid = _quickjsos.exec(this.args, {
       block: false,
       cwd: this.cwd.toString(),
       env: this.env,
@@ -1943,33 +1955,123 @@ class ChildProcess {
       stdout: this.stdio.out.fileno(),
       stderr: this.stdio.err.fileno()
     });
-    return this.pid;
+    this._state = {
+      id: "STARTED",
+      pid
+    };
+    return pid;
   }
-  waitUntilComplete() {
-    const pid = this.pid;
-    if (pid == null) {
-      throw new Error("Cannot wait for a child process that hasn't yet been started");
+  _getPidRaw() {
+    const state = this._state;
+    switch (state.id) {
+      case "UNSTARTED":
+        return null;
+      case "STARTED":
+      case "STOPPED":
+      case "CONTINUED":
+        return state.pid;
+      case "EXITED":
+      case "SIGNALED":
+        return state.oldPid;
+      default:
+        {
+          const here = state;
+          throw new Error(`Unhandled ChildProcessStateKind: ${state.id}`);
+        }
     }
-    while (true) {
-      const [ret, status] = _quickjsos.waitpid(pid);
-      if (ret == pid) {
-        if (_quickjsos.WIFEXITED(status)) {
-          const ret = {
-            status: _quickjsos.WEXITSTATUS(status),
-            signal: undefined
-          };
-          this._logging.trace.call(null, "ChildProcess result:", this.args, "->", ret);
-          return ret;
-        } else if (_quickjsos.WIFSIGNALED(status)) {
-          const ret = {
-            status: undefined,
-            signal: _quickjsos.WTERMSIG(status)
-          };
-          this._logging.trace.call(null, "ChildProcess result:", this.args, "->");
-          return ret;
+  }
+  _updateState() {
+    switch (this._state.id) {
+      case "UNSTARTED":
+      case "EXITED":
+      case "SIGNALED":
+        return;
+      case "STARTED":
+      case "STOPPED":
+      case "CONTINUED":
+        this._waitpid(false);
+        break;
+      default:
+        {
+          const here = this._state;
+          throw new Error(`Unhandled ChildProcessStateKind: ${this._state.id}`);
         }
+    }
+  }
+  _waitpid(block) {
+    const pid = this._getPidRaw();
+    if (!pid) {
+      return;
+    }
+    const flags = block ? 0 : _quickjsos.WNOHANG;
+    const [ret, status] = _quickjsos.waitpid(pid, flags);
+    if (ret === pid) {
+      if (_quickjsos.WIFEXITED(status)) {
+        this._state = {
+          id: "EXITED",
+          oldPid: pid,
+          status: _quickjsos.WEXITSTATUS(status)
+        };
+        this._logging.trace.call(null, "ChildProcess result:", this.args, "->", this._state);
+      } else if (_quickjsos.WIFSIGNALED(status)) {
+        this._state = {
+          id: "SIGNALED",
+          oldPid: pid,
+          signal: _quickjsos.WTERMSIG(status)
+        };
+        this._logging.trace.call(null, "ChildProcess result:", this.args, "->", this._state);
+      } else if (_quickjsos.WIFSTOPPED(status)) {
+        this._state = {
+          id: "STOPPED",
+          pid
+        };
+        this._logging.trace.call(null, "ChildProcess stopped:", this.args);
+      } else if (_quickjsos.WIFCONTINUED(status)) {
+        this._state = {
+          id: "CONTINUED",
+          pid
+        };
+        this._logging.trace.call(null, "ChildProcess continued:", this.args);
       }
     }
+    return false;
+  }
+  waitUntilComplete() {
+    do {
+      const rawState = this._state;
+      idSwitch: switch (rawState.id) {
+        case "UNSTARTED":
+          {
+            throw new Error("The ChildProcess hasn't yet started. Call ChildProcess's start() method before calling waitUntilComplete().");
+          }
+        case "EXITED":
+          {
+            return {
+              status: rawState.status,
+              signal: undefined
+            };
+          }
+        case "SIGNALED":
+          {
+            return {
+              status: undefined,
+              signal: rawState.signal
+            };
+          }
+        case "STARTED":
+        case "CONTINUED":
+        case "STOPPED":
+          {
+            this._waitpid(true);
+            break idSwitch;
+          }
+        default:
+          {
+            const here = rawState;
+            throw new Error(`Unhandled ChildProcessStateKind: ${rawState.id}`);
+          }
+      }
+    } while (true);
   }
   constructor(args, options = {}) {
     _define_property._(this, "args", void 0);
@@ -1977,7 +2079,9 @@ class ChildProcess {
     _define_property._(this, "env", void 0);
     _define_property._(this, "stdio", void 0);
     _define_property._(this, "_logging", void 0);
-    _define_property._(this, "pid", null);
+    _define_property._(this, "_state", {
+      id: "UNSTARTED"
+    });
     // type of `args` gets checked in `toArgv`
     this.args = (0, _toargv.toArgv)(args);
     const cwd = options.cwd;
@@ -2821,17 +2925,23 @@ class Path {
     return this.replaceLast([]);
   }
   startsWith(value) {
-    value = new Path(value);
+    if (!(0, _is.is)(value, _types.types.Path)) {
+      value = new Path(value);
+    }
     return value.segments.every((segment, index) => this.segments[index] === segment);
   }
   endsWith(value) {
-    value = new Path(value);
+    if (!(0, _is.is)(value, _types.types.Path)) {
+      value = new Path(value);
+    }
     const valueSegmentsReversed = [...value.segments].reverse();
     const ownSegmentsReversed = [...this.segments].reverse();
     return valueSegmentsReversed.every((segment, index) => ownSegmentsReversed[index] === segment);
   }
   indexOf(value, fromIndex = 0) {
-    value = new Path(value);
+    if (!(0, _is.is)(value, _types.types.Path)) {
+      value = new Path(value);
+    }
     const ownSegmentsLength = this.segments.length;
     for (let i = fromIndex; i < ownSegmentsLength; i++) {
       if (value.segments.every((valueSegment, valueIndex) => {
@@ -2846,8 +2956,12 @@ class Path {
     return this.indexOf(value, fromIndex) !== -1;
   }
   replace(value, replacement) {
-    value = new Path(value);
-    replacement = new Path(replacement);
+    if (!(0, _is.is)(value, _types.types.Path)) {
+      value = new Path(value);
+    }
+    if (!(0, _is.is)(replacement, _types.types.Path)) {
+      replacement = new Path(replacement);
+    }
     const matchIndex = this.indexOf(value);
     if (matchIndex === -1) {
       return this.clone();
@@ -2857,7 +2971,9 @@ class Path {
     }
   }
   replaceAll(value, replacement) {
-    replacement = new Path(replacement);
+    if (!(0, _is.is)(replacement, _types.types.Path)) {
+      replacement = new Path(replacement);
+    }
     let searchIndex = 0;
     let currentPath = this;
     const ownLength = this.segments.length;
@@ -2873,12 +2989,28 @@ class Path {
     return currentPath;
   }
   replaceLast(replacement) {
-    replacement = new Path(replacement);
+    if (!(0, _is.is)(replacement, _types.types.Path)) {
+      replacement = new Path(replacement);
+    }
     const segments = [...this.segments];
     segments.pop();
     segments.push(...replacement.segments);
     return Path.fromRaw(segments, this.separator);
   }
+  equals(other) {
+    if (!(0, _is.is)(other, _types.types.Path)) {
+      other = new Path(other);
+    }
+    return other.separator === this.separator && this.hasEqualSegments(other);
+  }
+  hasEqualSegments(other) {
+    if (!(0, _is.is)(other, _types.types.Path)) {
+      other = new Path(other);
+    }
+    return this.segments.length === other.segments.length && this.segments.every((segment, index) => {
+      return segment === other.segments[index];
+    });
+  }
   [_inspect_custom](inputs) {
     if (typeof this.segments === "undefined" || typeof this.separator === "undefined") {
       // inspecting Path.prototype, or a Path someone messed up
@@ -4610,7 +4742,7 @@ function readModule(modulePath) {
 /* --- src/hardcoded/compile-time.js?evalAtBuildTime --- */
 "src/hardcoded/compile-time.js?evalAtBuildTime": (function (exports, _kame_require_, module, __filename, __dirname, _kame_dynamic_import_) {
 module.exports = {
-  "version": "v0.0.13",
+  "version": "v0.14.1",
   "arch": "arm64"
 };
 }),
@@ -10108,13 +10240,15 @@ function startRepl(handle_cmd, {
     history_add(cmd);
     return -1;
   }
+  let last_history_line = null;
   function history_add(str) {
-    if (str) {
+    if (str && str !== last_history_line) {
       history.push(str);
       if (history_file) {
         history_file.append(str);
       }
     }
+    last_history_line = str;
     history_index = history.length;
   }
   function previous_history() {
@@ -32543,7 +32677,7 @@ function expand(str, isTop) {
     var isOptions = m.body.indexOf(',') >= 0;
     if (!isSequence && !isOptions) {
       // {a},b}
-      if (m.post.match(/,.*\}/)) {
+      if (m.post.match(/,(?!,).*\}/)) {
         str = m.pre + '{' + m.body + escClose + m.post;
         return expand(str);
       }
@@ -36276,11 +36410,13 @@ function startRepl(lang) {
     history_add(cmd);
     return -1;
   }
+  let last_history_line = null;
   function history_add(str) {
-    if (str) {
+    if (str && str !== last_history_line) {
       history.push(str);
       historyFile.append(str);
     }
+    last_history_line = str;
     history_index = history.length;
   }
   function previous_history() {
@@ -92253,7 +92389,7 @@ var __kame__ = {
 	},
 	
 	chunkUrls: {
-  "external:node:fs": "9a6a54a4ea1d6a8292f46bf60bfc0005.js"
+  "external:node:fs": "3bb801181133a92adaa3fcceda50fa5a.js"
 },
 	loadChunk: function loadChunk(id) {
 		var resolve, reject;
@@ -92301,7 +92437,7 @@ var __kame__ = {
 	modules: modules,
 };
 
-global.__kame_instances__ = global.__kame_instances__ || {}; global.__kame_instances__["2bb27833f0d1749108048618"] = __kame__;
+global.__kame_instances__ = global.__kame_instances__ || {}; global.__kame_instances__["b1f20ef10f91754074773070"] = __kame__;
 
 return __kame__.runModule("src/primordials.ts", true);
 }

package/dist/primordials-x86_64.js

@@ -757,6 +757,9 @@ _export(exports, {
   ChildProcessOptions: function () {
     return _ChildProcess.ChildProcessOptions;
   },
+  ChildProcessState: function () {
+    return _ChildProcess.ChildProcessState;
+  },
   exec: function () {
     return _exec.exec;
   }
@@ -1933,9 +1936,18 @@ const _types = _kame_require_("src/api/types/index.ts");
 const _assert = _kame_require_("src/api/assert/index.ts");
 const _path = _kame_require_("src/api/path/index.ts");
 class ChildProcess {
-  /** returns pid */start() {
+  get state() {
+    this._updateState();
+    return this._state;
+  }
+  get pid() {
+    this._updateState();
+    return this._getPidRaw();
+  }
+  /** returns pid */
+  start() {
     this._logging.trace.call(null, "ChildProcess.start:", this.args);
-    this.pid = _quickjsos.exec(this.args, {
+    const pid = _quickjsos.exec(this.args, {
       block: false,
       cwd: this.cwd.toString(),
       env: this.env,
@@ -1943,33 +1955,123 @@ class ChildProcess {
       stdout: this.stdio.out.fileno(),
       stderr: this.stdio.err.fileno()
     });
-    return this.pid;
+    this._state = {
+      id: "STARTED",
+      pid
+    };
+    return pid;
   }
-  waitUntilComplete() {
-    const pid = this.pid;
-    if (pid == null) {
-      throw new Error("Cannot wait for a child process that hasn't yet been started");
+  _getPidRaw() {
+    const state = this._state;
+    switch (state.id) {
+      case "UNSTARTED":
+        return null;
+      case "STARTED":
+      case "STOPPED":
+      case "CONTINUED":
+        return state.pid;
+      case "EXITED":
+      case "SIGNALED":
+        return state.oldPid;
+      default:
+        {
+          const here = state;
+          throw new Error(`Unhandled ChildProcessStateKind: ${state.id}`);
+        }
     }
-    while (true) {
-      const [ret, status] = _quickjsos.waitpid(pid);
-      if (ret == pid) {
-        if (_quickjsos.WIFEXITED(status)) {
-          const ret = {
-            status: _quickjsos.WEXITSTATUS(status),
-            signal: undefined
-          };
-          this._logging.trace.call(null, "ChildProcess result:", this.args, "->", ret);
-          return ret;
-        } else if (_quickjsos.WIFSIGNALED(status)) {
-          const ret = {
-            status: undefined,
-            signal: _quickjsos.WTERMSIG(status)
-          };
-          this._logging.trace.call(null, "ChildProcess result:", this.args, "->");
-          return ret;
+  }
+  _updateState() {
+    switch (this._state.id) {
+      case "UNSTARTED":
+      case "EXITED":
+      case "SIGNALED":
+        return;
+      case "STARTED":
+      case "STOPPED":
+      case "CONTINUED":
+        this._waitpid(false);
+        break;
+      default:
+        {
+          const here = this._state;
+          throw new Error(`Unhandled ChildProcessStateKind: ${this._state.id}`);
         }
+    }
+  }
+  _waitpid(block) {
+    const pid = this._getPidRaw();
+    if (!pid) {
+      return;
+    }
+    const flags = block ? 0 : _quickjsos.WNOHANG;
+    const [ret, status] = _quickjsos.waitpid(pid, flags);
+    if (ret === pid) {
+      if (_quickjsos.WIFEXITED(status)) {
+        this._state = {
+          id: "EXITED",
+          oldPid: pid,
+          status: _quickjsos.WEXITSTATUS(status)
+        };
+        this._logging.trace.call(null, "ChildProcess result:", this.args, "->", this._state);
+      } else if (_quickjsos.WIFSIGNALED(status)) {
+        this._state = {
+          id: "SIGNALED",
+          oldPid: pid,
+          signal: _quickjsos.WTERMSIG(status)
+        };
+        this._logging.trace.call(null, "ChildProcess result:", this.args, "->", this._state);
+      } else if (_quickjsos.WIFSTOPPED(status)) {
+        this._state = {
+          id: "STOPPED",
+          pid
+        };
+        this._logging.trace.call(null, "ChildProcess stopped:", this.args);
+      } else if (_quickjsos.WIFCONTINUED(status)) {
+        this._state = {
+          id: "CONTINUED",
+          pid
+        };
+        this._logging.trace.call(null, "ChildProcess continued:", this.args);
       }
     }
+    return false;
+  }
+  waitUntilComplete() {
+    do {
+      const rawState = this._state;
+      idSwitch: switch (rawState.id) {
+        case "UNSTARTED":
+          {
+            throw new Error("The ChildProcess hasn't yet started. Call ChildProcess's start() method before calling waitUntilComplete().");
+          }
+        case "EXITED":
+          {
+            return {
+              status: rawState.status,
+              signal: undefined
+            };
+          }
+        case "SIGNALED":
+          {
+            return {
+              status: undefined,
+              signal: rawState.signal
+            };
+          }
+        case "STARTED":
+        case "CONTINUED":
+        case "STOPPED":
+          {
+            this._waitpid(true);
+            break idSwitch;
+          }
+        default:
+          {
+            const here = rawState;
+            throw new Error(`Unhandled ChildProcessStateKind: ${rawState.id}`);
+          }
+      }
+    } while (true);
   }
   constructor(args, options = {}) {
     _define_property._(this, "args", void 0);
@@ -1977,7 +2079,9 @@ class ChildProcess {
     _define_property._(this, "env", void 0);
     _define_property._(this, "stdio", void 0);
     _define_property._(this, "_logging", void 0);
-    _define_property._(this, "pid", null);
+    _define_property._(this, "_state", {
+      id: "UNSTARTED"
+    });
     // type of `args` gets checked in `toArgv`
     this.args = (0, _toargv.toArgv)(args);
     const cwd = options.cwd;
@@ -2821,17 +2925,23 @@ class Path {
     return this.replaceLast([]);
   }
   startsWith(value) {
-    value = new Path(value);
+    if (!(0, _is.is)(value, _types.types.Path)) {
+      value = new Path(value);
+    }
     return value.segments.every((segment, index) => this.segments[index] === segment);
   }
   endsWith(value) {
-    value = new Path(value);
+    if (!(0, _is.is)(value, _types.types.Path)) {
+      value = new Path(value);
+    }
     const valueSegmentsReversed = [...value.segments].reverse();
     const ownSegmentsReversed = [...this.segments].reverse();
     return valueSegmentsReversed.every((segment, index) => ownSegmentsReversed[index] === segment);
   }
   indexOf(value, fromIndex = 0) {
-    value = new Path(value);
+    if (!(0, _is.is)(value, _types.types.Path)) {
+      value = new Path(value);
+    }
     const ownSegmentsLength = this.segments.length;
     for (let i = fromIndex; i < ownSegmentsLength; i++) {
       if (value.segments.every((valueSegment, valueIndex) => {
@@ -2846,8 +2956,12 @@ class Path {
     return this.indexOf(value, fromIndex) !== -1;
   }
   replace(value, replacement) {
-    value = new Path(value);
-    replacement = new Path(replacement);
+    if (!(0, _is.is)(value, _types.types.Path)) {
+      value = new Path(value);
+    }
+    if (!(0, _is.is)(replacement, _types.types.Path)) {
+      replacement = new Path(replacement);
+    }
     const matchIndex = this.indexOf(value);
     if (matchIndex === -1) {
       return this.clone();
@@ -2857,7 +2971,9 @@ class Path {
     }
   }
   replaceAll(value, replacement) {
-    replacement = new Path(replacement);
+    if (!(0, _is.is)(replacement, _types.types.Path)) {
+      replacement = new Path(replacement);
+    }
     let searchIndex = 0;
     let currentPath = this;
     const ownLength = this.segments.length;
@@ -2873,12 +2989,28 @@ class Path {
     return currentPath;
   }
   replaceLast(replacement) {
-    replacement = new Path(replacement);
+    if (!(0, _is.is)(replacement, _types.types.Path)) {
+      replacement = new Path(replacement);
+    }
     const segments = [...this.segments];
     segments.pop();
     segments.push(...replacement.segments);
     return Path.fromRaw(segments, this.separator);
   }
+  equals(other) {
+    if (!(0, _is.is)(other, _types.types.Path)) {
+      other = new Path(other);
+    }
+    return other.separator === this.separator && this.hasEqualSegments(other);
+  }
+  hasEqualSegments(other) {
+    if (!(0, _is.is)(other, _types.types.Path)) {
+      other = new Path(other);
+    }
+    return this.segments.length === other.segments.length && this.segments.every((segment, index) => {
+      return segment === other.segments[index];
+    });
+  }
   [_inspect_custom](inputs) {
     if (typeof this.segments === "undefined" || typeof this.separator === "undefined") {
       // inspecting Path.prototype, or a Path someone messed up
@@ -4610,7 +4742,7 @@ function readModule(modulePath) {
 /* --- src/hardcoded/compile-time.js?evalAtBuildTime --- */
 "src/hardcoded/compile-time.js?evalAtBuildTime": (function (exports, _kame_require_, module, __filename, __dirname, _kame_dynamic_import_) {
 module.exports = {
-  "version": "v0.0.13",
+  "version": "v0.14.1",
   "arch": "x86_64"
 };
 }),
@@ -10108,13 +10240,15 @@ function startRepl(handle_cmd, {
     history_add(cmd);
     return -1;
   }
+  let last_history_line = null;
   function history_add(str) {
-    if (str) {
+    if (str && str !== last_history_line) {
       history.push(str);
       if (history_file) {
         history_file.append(str);
       }
     }
+    last_history_line = str;
     history_index = history.length;
   }
   function previous_history() {
@@ -32543,7 +32677,7 @@ function expand(str, isTop) {
     var isOptions = m.body.indexOf(',') >= 0;
     if (!isSequence && !isOptions) {
       // {a},b}
-      if (m.post.match(/,.*\}/)) {
+      if (m.post.match(/,(?!,).*\}/)) {
         str = m.pre + '{' + m.body + escClose + m.post;
         return expand(str);
       }
@@ -36276,11 +36410,13 @@ function startRepl(lang) {
     history_add(cmd);
     return -1;
   }
+  let last_history_line = null;
   function history_add(str) {
-    if (str) {
+    if (str && str !== last_history_line) {
       history.push(str);
       historyFile.append(str);
     }
+    last_history_line = str;
     history_index = history.length;
   }
   function previous_history() {
@@ -92253,7 +92389,7 @@ var __kame__ = {
 	},
 	
 	chunkUrls: {
-  "external:node:fs": "a415e82313f4069558924d5cf0df0a57.js"
+  "external:node:fs": "46567d986364f3f5dc3de6d742886e7c.js"
 },
 	loadChunk: function loadChunk(id) {
 		var resolve, reject;
@@ -92301,7 +92437,7 @@ var __kame__ = {
 	modules: modules,
 };
 
-global.__kame_instances__ = global.__kame_instances__ || {}; global.__kame_instances__["98a6cb5a4631749108049619"] = __kame__;
+global.__kame_instances__ = global.__kame_instances__ || {}; global.__kame_instances__["094c62d9fe61754074774557"] = __kame__;
 
 return __kame__.runModule("src/primordials.ts", true);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yavascript",
-  "version": "0.0.13",
+  "version": "0.14.1",
   "main": "lib/index.js",
   "bin": "lib/cli.js",
   "types": "yavascript.d.ts",