@brillout/test-e2e 0.5.30 → 0.5.32

package/bin.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('./dist/cli.js')
+import './dist/cli.js'

package/dist/editFile.js

@@ -5,6 +5,8 @@ import fs from 'fs';
 import path from 'path';
 import { assert } from './utils.js';
 import { getCurrentTest } from './getCurrentTest.js';
+import { createRequire } from 'module';
+const require_ = createRequire(import.meta.url);
 const filesContentOriginal = {};
 function editFile(filePathRelative, replacer) {
     const filePath = getFilePath(filePathRelative);
@@ -38,6 +40,6 @@ function editFileAssertReverted() {
 function getFilePath(filePathRelative) {
     const { testFile } = getCurrentTest();
     const cwd = path.dirname(testFile);
-    const filePath = require.resolve(filePathRelative, { paths: [cwd] });
+    const filePath = require_.resolve(filePathRelative, { paths: [cwd] });
     return filePath;
 }

package/dist/utils/runCommandLongRunning.js

@@ -1,7 +1,7 @@
 export { runCommandLongRunning };
-import { spawn as spawn_ } from 'child_process';
+import { spawn } from 'child_process';
 import stripAnsi from 'strip-ansi';
-import { assert, runCommandShortLived, humanizeTime, isWindows, isLinux, isCallable, hasProp } from '../utils.js';
+import { assert, runCommandShortLived, humanizeTime, isWindows, isLinux, isCallable } from '../utils.js';
 function runCommandLongRunning({ cmd, cwd, killPort, isReadyLog, isReadyTimeout, onStdout, onStderr, onExit, onTerminationError, terminationTimeout, }) {
     if (killPort)
         killByPort(killPort);
@@ -43,7 +43,7 @@ function runCommandLongRunning({ cmd, cwd, killPort, isReadyLog, isReadyTimeout,
             command = command + '.cmd';
         }
     }
-    const proc = spawn(command, args, { cwd, detached });
+    const proc = spawn(command, args, { cwd, detached, ...nodeWorkaround });
     let procExited = false;
     proc.stdin.on('data', async (chunk) => {
         const data = String(chunk);
@@ -191,6 +191,7 @@ function stopProcess({ proc, cwd, cmd, force, onTerminationError, }) {
                 // Ignoring stderr doesn't solve the problem that taskkill makes the process exit with code 1
                 'inherit', // stderr
             ],
+            ...nodeWorkaround(),
         });
     }
     else {
@@ -228,13 +229,14 @@ function isSuccessCode(code) {
 const spawn2: typeof spawn_ = (...args) => spawn_(...args)
 const spawn3: typeof spawn_ = function(...args) { return spawn_(...args) }
 //*/
-function spawn(command, args, options) {
-    // Workaround for Node.js regression:
-    //  - https://github.com/nodejs/node/issues/52475
-    //  - https://github.com/prebuild/prebuildify/issues/83#issuecomment-2056607495
-    if (isWindows())
-        options.shell = true;
-    // Needed for spawn_() to return ChildProcessWithoutNullStreams instead of ChildProcess
-    assert(hasProp(options, 'stdio', 'undefined'));
-    return spawn_(command, args, options);
+function nodeWorkaround() {
+    if (isWindows()) {
+        // Workaround for Node.js regression:
+        //  - https://github.com/nodejs/node/issues/52475
+        //  - https://github.com/prebuild/prebuildify/issues/83#issuecomment-2056607495
+        return { shell: true };
+    }
+    else {
+        return {};
+    }
 }

package/dist/utils.d.ts

@@ -13,4 +13,3 @@ export * from './utils/isObject.js';
 export * from './utils/isCallable.js';
 export * from './utils/platform.js';
 export * from './utils/isMinNodeVersion.js';
-export * from './utils/hasProp.js';

package/dist/utils.js

@@ -13,4 +13,3 @@ export * from './utils/isObject.js';
 export * from './utils/isCallable.js';
 export * from './utils/platform.js';
 export * from './utils/isMinNodeVersion.js';
-export * from './utils/hasProp.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brillout/test-e2e",
-  "version": "0.5.30",
+  "version": "0.5.32",
   "bin": "./bin.js",
   "main": "./dist/index.js",
   "type": "module",

package/dist/utils/hasProp.d.ts

@@ -1,15 +0,0 @@
-export { hasProp };
-declare function hasProp<ObjectType, PropName extends PropertyKey>(obj: ObjectType, prop: PropName, type: 'boolean'): obj is ObjectType & Record<PropName, boolean>;
-declare function hasProp<ObjectType, PropName extends PropertyKey>(obj: ObjectType, prop: PropName, type: 'number'): obj is ObjectType & Record<PropName, number>;
-declare function hasProp<ObjectType, PropName extends PropertyKey>(obj: ObjectType, prop: PropName, type: 'string'): obj is ObjectType & Record<PropName, string>;
-declare function hasProp<ObjectType, PropName extends PropertyKey>(obj: ObjectType, prop: PropName, type: 'object'): obj is ObjectType & Record<PropName, Record<string, unknown>>;
-declare function hasProp<ObjectType, PropName extends PropertyKey>(obj: ObjectType, prop: PropName, type: 'array'): obj is ObjectType & Record<PropName, unknown[]>;
-declare function hasProp<ObjectType, PropName extends PropertyKey>(obj: ObjectType, prop: PropName, type: 'string[]'): obj is ObjectType & Record<PropName, string[]>;
-declare function hasProp<ObjectType, PropName extends PropertyKey>(obj: ObjectType, prop: PropName, type: 'string{}'): obj is ObjectType & Record<PropName, Record<string, string>>;
-declare function hasProp<ObjectType, PropName extends PropertyKey>(obj: ObjectType, prop: PropName, type: 'function'): obj is ObjectType & Record<PropName, (...args: any[]) => unknown>;
-declare function hasProp<ObjectType, PropName extends PropertyKey>(obj: ObjectType, prop: PropName, type: 'undefined'): obj is ObjectType & Record<PropName, undefined>;
-declare function hasProp<ObjectType, PropName extends PropertyKey>(obj: ObjectType, prop: PropName, type: 'null'): obj is ObjectType & Record<PropName, null>;
-declare function hasProp<ObjectType, PropName extends PropertyKey>(obj: ObjectType, prop: PropName, type: 'true'): obj is ObjectType & Record<PropName, true>;
-declare function hasProp<ObjectType, PropName extends PropertyKey>(obj: ObjectType, prop: PropName, type: 'false'): obj is ObjectType & Record<PropName, false>;
-declare function hasProp<ObjectType, PropName extends PropertyKey, Enum>(obj: ObjectType, prop: PropName, type: Enum[]): obj is ObjectType & Record<PropName, Enum>;
-declare function hasProp<ObjectType, PropName extends PropertyKey>(obj: ObjectType, prop: PropName): obj is ObjectType & Record<PropName, unknown>;

package/dist/utils/hasProp.js

@@ -1,50 +0,0 @@
-export { hasProp };
-// - https://2ality.com/2020/06/type-guards-assertion-functions-typescript.html
-// - https://www.typescriptlang.org/play?#code/GYVwdgxgLglg9mABDAzgFQJ4AcCmdgAUAbgIYA2IOAXIiWBgDSJTbWIDkARnHGTnewCUNUhRzIUibr35gA3AFgAUKEiwEEzLnzFylGnUbNWNdmBABbTjgBOQkXvGpE5q7cUrw0eElRa8hKL6tPRMLLimKFA2MGAA5vaIQU6SUTHxHqreGn6sOskGocYRHOAA1mBwAO5gickSiOWVNZle6r7oeYGOhUbhbGmxcYgAvKVgFdW1wlI8fHSIAN7KiMiExeIjW+OTNeyIgksrq4g2OFAgNkjRlMcAvsdnF1cb+EmOo9v9Hg9KyhAIKK0GhNKajRAAFgATMplCQUChbFACLltIQSEwzJZrHZBIJ-oCZAA6MhwOIEEj4v6eNQ+WgIpEEAFgAAmMHaIImzTAM3hiJsUEkzLZ7SOShOa0QTIQIp8hyelzAx1WUAAFjZqi4cFVEABRGwamwEdgAQQZArpADESDAyEJlHcgA
-import { isCallable } from './isCallable.js';
-import { isObject } from './isObject.js';
-import { isArrayOfStrings } from './isArrayOfStrings.js';
-import { isObjectOfStrings } from './isObjectOfStrings.js';
-import { isArray } from './isArray.js';
-function hasProp(obj, prop, type = 'unknown') {
-    if (!isObject(obj))
-        return false;
-    if (!(prop in obj)) {
-        return type === 'undefined';
-    }
-    if (type === 'unknown') {
-        return true;
-    }
-    const propValue = obj[prop];
-    if (type === 'array') {
-        return isArray(propValue);
-    }
-    if (type === 'object') {
-        return isObject(propValue);
-    }
-    if (type === 'string[]') {
-        return isArrayOfStrings(propValue);
-    }
-    if (type === 'string{}') {
-        return isObjectOfStrings(propValue);
-    }
-    if (type === 'function') {
-        return isCallable(propValue);
-    }
-    if (isArray(type)) {
-        return typeof propValue === 'string' && type.includes(propValue);
-    }
-    if (type === 'null') {
-        return propValue === null;
-    }
-    if (type === 'undefined') {
-        return propValue === undefined;
-    }
-    if (type === 'true') {
-        return propValue === true;
-    }
-    if (type === 'false') {
-        return propValue === false;
-    }
-    return typeof propValue === type;
-}

package/dist/utils/isArray.d.ts

@@ -1 +0,0 @@
-export declare function isArray(value: unknown): value is unknown[];

package/dist/utils/isArray.js

@@ -1,4 +0,0 @@
-// Typesafe Array.isArray() — asserting unknown[] instead of any[]
-export function isArray(value) {
-    return Array.isArray(value);
-}

package/dist/utils/isArrayOfStrings.d.ts

@@ -1,2 +0,0 @@
-export { isArrayOfStrings };
-declare function isArrayOfStrings(val: unknown): val is string[];

package/dist/utils/isArrayOfStrings.js

@@ -1,5 +0,0 @@
-export { isArrayOfStrings };
-import { isArray } from './isArray.js';
-function isArrayOfStrings(val) {
-    return isArray(val) && val.every((v) => typeof v === 'string');
-}

package/dist/utils/isObjectOfStrings.d.ts

@@ -1,2 +0,0 @@
-export { isObjectOfStrings };
-declare function isObjectOfStrings(val: unknown): val is Record<string, string>;

package/dist/utils/isObjectOfStrings.js

@@ -1,5 +0,0 @@
-export { isObjectOfStrings };
-import { isObject } from './isObject.js';
-function isObjectOfStrings(val) {
-    return isObject(val) && Object.values(val).every((v) => typeof v === 'string');
-}