xshell 1.0.184 → 1.0.185

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.184",
+    "version": "1.0.185",
     "type": "module",
     "main": "./index.js",
     "bin": {

package/path.d.ts

@@ -55,7 +55,7 @@ export declare function extname(path: string): string;
 /** `/` */
 export declare const sep = "/";
 /** The platform-specific file delimiter. ';' or ':'. */
-export declare const delimiter: ";" | ":";
+export declare const delimiter: ":" | ";";
 /** Returns an object from a path string - the opposite of format().
     @param path path to evaluate.
     @throws {TypeError} if `path` is not a string. */
@@ -83,7 +83,7 @@ export declare let path: {
     basename: typeof basename;
     extname: typeof extname;
     sep: string;
-    delimiter: ";" | ":";
+    delimiter: ":" | ";";
     parse: typeof parse;
     format: typeof format;
     toNamespacedPath: typeof toNamespacedPath;

package/prototype.browser.d.ts

@@ -88,11 +88,15 @@ declare global {
         /** 返回去掉 suffix 结尾的字符串，如果没有以 suffix 结尾则返回原字符串 */
         strip_if_end(this: string, suffix: string): string;
         /** 从 search 字符串出现的位置开始截取到最后
-            - include?: `false` 传 true 时包括 search 部分 */
-        slice_from(this: string, search: string, include?: boolean): string;
-        /** 从 search 字符串出现的位置开始截断，去掉尾部
-            - include?: `false` 传 true 时包括 search 部分 */
-        slice_to(this: string, search: string, include?: boolean): string;
+            - options?:
+                - include?: `false` 传 true 时包括 search 部分
+                - last?: `false` true 时从最后一次出现的地方开始截取，否则默认从第一次出现的地方开始截取 */
+        slice_from(this: string, search: string, options?: SliceOptions): string;
+        /** 从 search 字符串最后出现的位置开始截断，去掉尾部
+            - options?:
+                - include?: `false` 传 true 时包括 search 部分
+                - last?: `false` true 时截取到最后一次出现的地方，否则默认截取到第一次出现的地方 */
+        slice_to(this: string, search: string, options?: SliceOptions): string;
         /** 等价于 .endsWith('/') */
         isdir: boolean;
         /** 以 `/` 分割的路径，可能以 / 结尾 */
@@ -161,6 +165,10 @@ declare global {
         map<TResult>(mapfn: (value: T, index: number) => TResult): TResult[];
     }
 }
+interface SliceOptions {
+    include?: boolean;
+    last?: boolean;
+}
 export declare const emoji_regex: RegExp;
 export declare function to_method_property_descriptors(methods: {
     [name: string]: Function;
@@ -185,3 +193,4 @@ export declare const brackets: {
 };
 export declare function to_json(obj: any, replacer?: any): string;
 export declare function is_codepoint_fullwidth(codepoint: number): boolean;
+export {};

package/prototype.browser.js

@@ -275,15 +275,15 @@ Object.defineProperties(String.prototype, {
         strip_if_end(suffix) {
             return this.endsWith(suffix) ? this.slice(0, -suffix.length) : this;
         },
-        slice_from(search, include = false) {
-            const i = this.indexOf(search);
+        slice_from(search, { include = false, last = false } = {}) {
+            const i = last ? this.lastIndexOf(search) : this.indexOf(search);
             if (i === -1)
                 throw new Error(`slice_from 在字符串 ${this} 中找不到 search: ${search}`);
             else
                 return this.slice(include ? i : i + search.length);
         },
-        slice_to(search, include) {
-            const i = this.lastIndexOf(search);
+        slice_to(search, { include = false, last = false } = {}) {
+            const i = last ? this.lastIndexOf(search) : this.indexOf(search);
             if (i === -1)
                 throw new Error(`slice_to 在字符串 ${this} 中找不到 search: ${search}`);
             else

package/prototype.d.ts

@@ -110,11 +110,15 @@ declare global {
         /** 返回去掉 suffix 结尾的字符串，如果没有以 suffix 结尾则返回原字符串 */
         strip_if_end(this: string, suffix: string): string;
         /** 从 search 字符串出现的位置开始截取到最后
-            - include?: `false` 传 true 时包括 search 部分 */
-        slice_from(this: string, search: string, include?: boolean): string;
-        /** 从 search 字符串出现的位置开始截断，去掉尾部
-            - include?: `false` 传 true 时包括 search 部分 */
-        slice_to(this: string, search: string, include?: boolean): string;
+            - options?:
+                - include?: `false` 传 true 时包括 search 部分
+                - last?: `false` true 时从最后一次出现的地方开始截取，否则默认从第一次出现的地方开始截取 */
+        slice_from(this: string, search: string, options?: SliceOptions): string;
+        /** 从 search 字符串最后出现的位置开始截断，去掉尾部
+            - options?:
+                - include?: `false` 传 true 时包括 search 部分
+                - last?: `false` true 时截取到最后一次出现的地方，否则默认截取到第一次出现的地方 */
+        slice_to(this: string, search: string, options?: SliceOptions): string;
         /** 等价于 .endsWith('/') */
         isdir: boolean;
         /** 以 `/` 分割的路径，可能以 / 结尾 */
@@ -191,6 +195,10 @@ declare global {
         map<TResult>(mapfn: (value: T, index: number) => TResult): TResult[];
     }
 }
+interface SliceOptions {
+    include?: boolean;
+    last?: boolean;
+}
 import chalk from 'chalk';
 export declare const emoji_regex: RegExp;
 export { chalk };

package/prototype.js

@@ -294,15 +294,15 @@ if (!globalThis.my_prototype_defined) {
             strip_if_end(suffix) {
                 return this.endsWith(suffix) ? this.slice(0, -suffix.length) : this;
             },
-            slice_from(search, include = false) {
-                const i = this.indexOf(search);
+            slice_from(search, { include = false, last = false } = {}) {
+                const i = last ? this.lastIndexOf(search) : this.indexOf(search);
                 if (i === -1)
                     throw new Error(`slice_from 在字符串 ${this} 中找不到 search: ${search}`);
                 else
                     return this.slice(include ? i : i + search.length);
             },
-            slice_to(search, include) {
-                const i = this.lastIndexOf(search);
+            slice_to(search, { include = false, last = false } = {}) {
+                const i = last ? this.lastIndexOf(search) : this.indexOf(search);
                 if (i === -1)
                     throw new Error(`slice_to 在字符串 ${this} 中找不到 search: ${search}`);
                 else