@j-o-r/sh 1.1.8 → 1.1.9

package/lib/SH.js

@@ -31,7 +31,7 @@ import SHDispatch from './SHDispatch.js';
 import Test from './Test.js'
 
 /**
-* @typedef {Object.<string, string | string[]>} ArgsObject
+* @typedef {Object.<string, string>} ArgsObject
 * @property {string} [key: string] - Any string key maps to a string value
 * @property {string[]} _ - Array of strings, unnamed parameters
 * @description Parsed parameters result.
@@ -111,8 +111,6 @@ const SH = new Proxy(function(pieces, ...args) {
 /**
 * Create a async/sync context in new execution callstack
 * @param {function} callback - async/sync function
-* @param {ResolveCallback} [resolve] - optional resolve/result callback
-* @param {RejectCallback} [reject] - optional reject/error callback
 * @example
 * const p = within(async () => {
 *		const res = await Promise.all([
@@ -124,24 +122,8 @@ const SH = new Proxy(function(pieces, ...args) {
 *   return 'res';
 * });
 */
-const within = (callback, resolve, reject) => {
-	// optional, custom resolve/reject functions from an outside promise/function
-	const RCB = jsType(resolve) === 'Function';
-	const ECB = jsType(reject) === 'Function';
-	(async () => {
-		try {
-			const res = await Promise.resolve(callback());
-			if (RCB) {
-				resolve(res);
-			}
-		} catch (e) {
-			if (ECB) {
-				reject(e)
-			} else {
-				throw (e);
-			}
-		}
-	})()
+const within = async (callback) => {
+	return await callback();
 }
 
 /**
@@ -297,6 +279,7 @@ const parseArgs = (args) => {
 			result._.push(args[i]);
 		}
 	}
+	// @ts-ignore
 	return result;
 };
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@j-o-r/sh",
   "author": "Jorrit Duin <j-o-r@duin.work>",
   "type": "module",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "description": "Execute shell commands on Linux-based systems from javascript",
   "main": "lib/SH.js",
   "types": "types/SH.d.ts",
@@ -50,4 +50,4 @@
     "process-promise",
     "process-output"
   ]
-}
+}

package/types/SH.d.ts

@@ -1,5 +1,5 @@
 export type ArgsObject = {
-    [x: string]: string | string[];
+    [x: string]: string;
 };
 export type RejectCallback = Function;
 export type ResolveCallback = Function;
@@ -54,8 +54,6 @@ export function readIn(): Promise<string>;
 /**
 * Create a async/sync context in new execution callstack
 * @param {function} callback - async/sync function
-* @param {ResolveCallback} [resolve] - optional resolve/result callback
-* @param {RejectCallback} [reject] - optional reject/error callback
 * @example
 * const p = within(async () => {
 *		const res = await Promise.all([
@@ -67,7 +65,7 @@ export function readIn(): Promise<string>;
 *   return 'res';
 * });
 */
-export function within(callback: Function, resolve?: ResolveCallback, reject?: RejectCallback): void;
+export function within(callback: Function): Promise<any>;
 /**
  * Generates an exponential backoff time with a random jitter.
  *
@@ -94,7 +92,7 @@ export function expBackoff(max?: string, rand?: string): Generator<number, void,
 */
 export function parseArgs(args?: string[]): ArgsObject;
 /**
-* @typedef {Object.<string, string | string[]>} ArgsObject
+* @typedef {Object.<string, string>} ArgsObject
 * @property {string} [key: string] - Any string key maps to a string value
 * @property {string[]} _ - Array of strings, unnamed parameters
 * @description Parsed parameters result.