@thinkwise/testwise 0.1.63 → 0.1.65

package/dist/package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "@thinkwise/testwise",
-    "version": "0.1.63",
+    "version": "0.1.64-beta.0",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@thinkwise/testwise",
-            "version": "0.1.63",
+            "version": "0.1.64-beta.0",
             "license": "ISC",
             "dependencies": {
                 "@types/node": "^22.15.29",

package/dist/package.json

@@ -1,16 +1,17 @@
 {
     "name": "@thinkwise/testwise",
-    "version": "0.1.63",
+    "version": "0.1.64-beta.0",
     "main": "dist/index.js",
     "type": "module",
     "bin": {
-        "testwise": "./scripts/add-config.js",
+        "testwise": "./scripts/main.js",
         "testwise-credentials": "./promptCredentials.js"
     },
     "scripts": {
         "lint": "eslint ./ --cache --ignore-pattern .gitignore",
         "format:fix": "run-s \"lint --fix\" && biome check --fix --unsafe",
-        "format:check": "run-s \"lint \" && biome check"
+        "format:check": "run-s \"lint \" && biome check",
+        "postinstall": "node scripts/main.js install"
     },
     "keywords": [],
     "author": "",
@@ -22,7 +23,8 @@
         "chalk": "^5.4.1",
         "csv-parse": "^5.6.0",
         "dotenv": "^17.2.2",
-        "prompts": "^2.4.2"
+        "prompts": "^2.4.2",
+        "ts-node": "^10.9.2"
     },
     "peerDependencies": {
         "@playwright/test": "^1.52.0"

package/dist/scripts/tsconfig.template.json

@@ -0,0 +1,12 @@
+{
+    "compilerOptions": {
+        "target": "ES2016",
+        "module": "ESNext",
+        "moduleResolution": "node",
+        "typeRoots": ["./node_modules/@types", "./types"],
+        "resolveJsonModule": true,
+        "esModuleInterop": true,
+        "strict": true,
+        "skipLibCheck": true
+    }
+}

package/dist/services/ConfigBuilder.js

@@ -3,11 +3,12 @@ import path from 'node:path';
 import dotenv from 'dotenv';
 class ConfigBuilder {
     constructor() {
-        const configFilePath = path.resolve(process.cwd(), 'Testwise.json');
+        const baseDir = process.env.INIT_CWD || process.cwd();
+        const configFilePath = path.resolve(baseDir, 'Testwise.json');
         // Find all env files in the consuming project and apply them to process.env
-        const envFiles = fs.readdirSync(process.cwd()).filter((file) => file.endsWith('.env'));
+        const envFiles = fs.readdirSync(baseDir).filter((file) => file.endsWith('.env'));
         for (const envFile of envFiles) {
-            const envConfig = dotenv.parse(fs.readFileSync(path.resolve(process.cwd(), envFile)));
+            const envConfig = dotenv.parse(fs.readFileSync(path.resolve(baseDir, envFile)));
             Object.assign(process.env, envConfig);
         }
         if (!fs.existsSync(configFilePath)) {

package/dist/services/ConfigBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConfigBuilder.js","sourceRoot":"","sources":["../../services/ConfigBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,MAAM,aAAa;IAGjB;QACE,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,eAAe,CAAC,CAAC;QAEpE,4EAA4E;QAC5E,MAAM,QAAQ,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QAEvF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;YACtF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACxC,CAAC;QAED,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,kCAAkC,cAAc,EAAE,CAAC,CAAC;QACtE,CAAC;QAED,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAC7D,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IACxC,CAAC;IAED;;;;OAIG;IACI,GAAG,CAAI,GAAW;QACvB,MAAM,MAAM,GAAG,GAAG;aACf,KAAK,CAAC,GAAG,CAAC;aACV,MAAM,CACL,CAAC,GAAwC,EAAE,OAAO,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAA4B,EAChG,IAAI,CAAC,MAAM,CACP,CAAC;QAET,+GAA+G;QAC/G,IAAI,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACrC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;QACvD,MAAM,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;QAE9B,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,SAAS,EAAE,CAAC;YACtC,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAY,CAAC;YAChD,oEAAoE;YACpE,IAAI,CAAC;gBACH,OAAO,IAAI,CAAC,KAAK,CAAC,QAAkB,CAAM,CAAC;YAC7C,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,QAAa,CAAC;YACvB,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAED,IAAI,QAAQ,GAAyB,IAAI,CAAC;AAE1C,MAAM,UAAU,cAAc;IAC5B,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,QAAQ,GAAG,IAAI,aAAa,EAAE,CAAC;IACjC,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
+{"version":3,"file":"ConfigBuilder.js","sourceRoot":"","sources":["../../services/ConfigBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,MAAM,aAAa;IAGjB;QACE,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QACtD,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAE9D,4EAA4E;QAC5E,MAAM,QAAQ,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QAEjF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;YAChF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACxC,CAAC;QAED,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,kCAAkC,cAAc,EAAE,CAAC,CAAC;QACtE,CAAC;QAED,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAC7D,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IACxC,CAAC;IAED;;;;OAIG;IACI,GAAG,CAAI,GAAW;QACvB,MAAM,MAAM,GAAG,GAAG;aACf,KAAK,CAAC,GAAG,CAAC;aACV,MAAM,CACL,CAAC,GAAwC,EAAE,OAAO,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAA4B,EAChG,IAAI,CAAC,MAAM,CACP,CAAC;QAET,+GAA+G;QAC/G,IAAI,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACrC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;QACvD,MAAM,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;QAE9B,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,SAAS,EAAE,CAAC;YACtC,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAY,CAAC;YAChD,oEAAoE;YACpE,IAAI,CAAC;gBACH,OAAO,IAAI,CAAC,KAAK,CAAC,QAAkB,CAAM,CAAC;YAC7C,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,QAAa,CAAC;YACvB,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAED,IAAI,QAAQ,GAAyB,IAAI,CAAC;AAE1C,MAAM,UAAU,cAAc;IAC5B,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,QAAQ,GAAG,IAAI,aAAa,EAAE,CAAC;IACjC,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@thinkwise/testwise",
-  "version": "0.1.63",
+  "version": "0.1.65",
   "main": "dist/index.js",
   "type": "module",
   "bin": {
-    "testwise": "./scripts/add-config.js",
+    "testwise": "./scripts/main.js",
     "testwise-credentials": "./promptCredentials.js"
   },
   "scripts": {
@@ -25,7 +25,8 @@
     "prompts": "^2.4.2"
   },
   "peerDependencies": {
-    "@playwright/test": "^1.52.0"
+    "@playwright/test": "^1.52.0",
+    "typescript": "^5.8.3"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.1.2",

package/promptCredentials.js

@@ -1,124 +1,124 @@
-#!/usr/bin/env node
-import { spawnSync } from 'node:child_process';
-import { readFileSync } from 'node:fs';
-import process from 'node:process';
-import chalk from 'chalk';
-import prompts from 'prompts';
-
-const packageScripts = JSON.parse(readFileSync('./package.json')).scripts;
-
-function exitWithError(error) {
-  console.log(chalk.red(error));
-  process.exit(1);
-}
-
-function startTestSolution() {
-  console.log('Now starting test solution...');
-  spawnSync(`yarn --cwd ../ ${args.join(' ')}`, {
-    shell: true,
-    stdio: 'inherit'
-  });
-  process.exit();
-}
-
-const args = process.argv.slice(2);
-
-if (!args.length) {
-  exitWithError('Error: Got too few parameters. Usage: yarn test:credentials test');
-}
-
-const yarnScriptToExec = args[0];
-
-if (!packageScripts[yarnScriptToExec]) {
-  exitWithError(`Error: Given script "${yarnScriptToExec}" doesn't exist in package.json.`);
-}
-
-// INCOMING HACK!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-// temp fix to be reworked when converting this file to TS
-import fs from 'node:fs';
-import path from 'node:path';
-
-const indiciumURL = (() => {
-  try {
-    const configPath = path.resolve(process.cwd(), './Testwise.json');
-    const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
-    return config.environmentSettings?.serviceUrl || '';
-  } catch (error) {
-    console.error('Error reading Testwise.json:', error);
-    return '';
-  }
-})();
-
-// END OF HACK!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-if (process.env.SF_TEST_USERNAME && process.env.SF_TEST_PASSWORD) {
-  console.log('Using SF_TEST_USERNAME and SF_TEST_PASSWORD environment variables.');
-  startTestSolution();
-}
-
-const questions = [
-  {
-    type: 'text',
-    name: 'username',
-    message: 'Username:',
-    validate: (value) => {
-      if (!value?.length) {
-        return 'Username is required';
-      }
-
-      if (value.toLowerCase() === 'demo') {
-        return 'Running tests locally with demo is forbidden as it results in dataset concurrency problems';
-      }
-
-      return true;
-    }
-  },
-  {
-    type: 'invisible',
-    name: 'password',
-    message: 'Password:',
-    validate: (value) => (!value?.length ? 'Password is required' : true)
-  }
-];
-
-(async () => {
-  const credentialsResponse = await prompts(questions);
-
-  if (!credentialsResponse || !credentialsResponse.username || !credentialsResponse.password) {
-    exitWithError('Username or password was not given');
-  }
-
-  const { password, username } = credentialsResponse;
-  const params = new URLSearchParams();
-
-  params.append('UserName', username);
-  params.append('Password', password);
-
-  const fetch = (await import('node-fetch')).default;
-  const authResponse = await fetch(`${indiciumURL}/account/api/login`, {
-    method: 'POST',
-    body: params
-  });
-
-  if (authResponse.status === 204) {
-    console.log('Confirmed credentials work @', indiciumURL);
-  } else {
-    const confirmResponse = await prompts([
-      {
-        type: 'confirm',
-        name: 'value',
-        message: `Can't login to ${indiciumURL} with the given credentials. Continue anyways?`,
-        initial: true
-      }
-    ]);
-
-    if (!confirmResponse.value) {
-      return;
-    }
-  }
-
-  process.env.SF_TEST_USERNAME = username;
-  process.env.SF_TEST_PASSWORD = password;
-
-  startTestSolution();
-})();
+#!/usr/bin/env node
+import { spawnSync } from 'node:child_process';
+import { readFileSync } from 'node:fs';
+import process from 'node:process';
+import chalk from 'chalk';
+import prompts from 'prompts';
+
+const packageScripts = JSON.parse(readFileSync('./package.json')).scripts;
+
+function exitWithError(error) {
+  console.log(chalk.red(error));
+  process.exit(1);
+}
+
+function startTestSolution() {
+  console.log('Now starting test solution...');
+  spawnSync(`yarn --cwd ../ ${args.join(' ')}`, {
+    shell: true,
+    stdio: 'inherit'
+  });
+  process.exit();
+}
+
+const args = process.argv.slice(2);
+
+if (!args.length) {
+  exitWithError('Error: Got too few parameters. Usage: yarn test:credentials test');
+}
+
+const yarnScriptToExec = args[0];
+
+if (!packageScripts[yarnScriptToExec]) {
+  exitWithError(`Error: Given script "${yarnScriptToExec}" doesn't exist in package.json.`);
+}
+
+// INCOMING HACK!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+// temp fix to be reworked when converting this file to TS
+import fs from 'node:fs';
+import path from 'node:path';
+
+const indiciumURL = (() => {
+  try {
+    const configPath = path.resolve(process.cwd(), './Testwise.json');
+    const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+    return config.environmentSettings?.serviceUrl || '';
+  } catch (error) {
+    console.error('Error reading Testwise.json:', error);
+    return '';
+  }
+})();
+
+// END OF HACK!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+if (process.env.SF_TEST_USERNAME && process.env.SF_TEST_PASSWORD) {
+  console.log('Using SF_TEST_USERNAME and SF_TEST_PASSWORD environment variables.');
+  startTestSolution();
+}
+
+const questions = [
+  {
+    type: 'text',
+    name: 'username',
+    message: 'Username:',
+    validate: (value) => {
+      if (!value?.length) {
+        return 'Username is required';
+      }
+
+      if (value.toLowerCase() === 'demo') {
+        return 'Running tests locally with demo is forbidden as it results in dataset concurrency problems';
+      }
+
+      return true;
+    }
+  },
+  {
+    type: 'invisible',
+    name: 'password',
+    message: 'Password:',
+    validate: (value) => (!value?.length ? 'Password is required' : true)
+  }
+];
+
+(async () => {
+  const credentialsResponse = await prompts(questions);
+
+  if (!credentialsResponse || !credentialsResponse.username || !credentialsResponse.password) {
+    exitWithError('Username or password was not given');
+  }
+
+  const { password, username } = credentialsResponse;
+  const params = new URLSearchParams();
+
+  params.append('UserName', username);
+  params.append('Password', password);
+
+  const fetch = (await import('node-fetch')).default;
+  const authResponse = await fetch(`${indiciumURL}/account/api/login`, {
+    method: 'POST',
+    body: params
+  });
+
+  if (authResponse.status === 204) {
+    console.log('Confirmed credentials work @', indiciumURL);
+  } else {
+    const confirmResponse = await prompts([
+      {
+        type: 'confirm',
+        name: 'value',
+        message: `Can't login to ${indiciumURL} with the given credentials. Continue anyways?`,
+        initial: true
+      }
+    ]);
+
+    if (!confirmResponse.value) {
+      return;
+    }
+  }
+
+  process.env.SF_TEST_USERNAME = username;
+  process.env.SF_TEST_PASSWORD = password;
+
+  startTestSolution();
+})();

package/scripts/main.js

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+import process from 'node:process';
+import { setup } from './setup.js';
+
+if (process.argv[2] === 'install') {
+  setup();
+} else if (process.argv[2] === 'sync') {
+  console.log('This feature is coming soon!');
+} else {
+  console.warn('Command unknown. Use "install" or "sync".');
+}

package/scripts/setup.js

@@ -0,0 +1,34 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import fs from 'node:fs';
+import path from 'node:path';
+import process from 'node:process';
+import { fileURLToPath } from 'node:url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export function setup() {
+  try {
+    const testwiseConfigFile = path.resolve(process.cwd(), 'Testwise.json');
+    const testwiseConfigTemplateFile = path.join(__dirname, 'Testwise.template.json');
+    const tsConfigFile = path.resolve(process.cwd(), 'tsconfig.json');
+    const tsConfigTemplateFile = path.join(__dirname, 'tsconfig.template.json');
+
+    if (!fs.existsSync(testwiseConfigFile)) {
+      fs.copyFileSync(testwiseConfigTemplateFile, testwiseConfigFile);
+      console.info('Testwise.json config file created.');
+    } else {
+      console.info('Testwise.json already exists, skipping creation.');
+    }
+
+    if (!fs.existsSync(tsConfigFile)) {
+      fs.copyFileSync(tsConfigTemplateFile, tsConfigFile);
+      console.info('tsconfig.json config file created.');
+    } else {
+      console.info('tsconfig.json already exists, skipping creation.');
+    }
+  } catch (error) {
+    console.error('Error during installation:', error.message);
+    process.exit(1); // Exit with an error code if something goes wrong
+  }
+}

package/scripts/tsconfig.template.json

@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "target": "ES2016",
+    "module": "ESNext",
+    "moduleResolution": "node",
+    "typeRoots": ["./node_modules/@types", "./types"],
+    "resolveJsonModule": true,
+    "esModuleInterop": true,
+    "strict": true,
+    "skipLibCheck": true
+  }
+}

package/services/ConfigBuilder.ts

@@ -6,13 +6,14 @@ class ConfigBuilder {
   private config: Record<string, unknown>;
 
   constructor() {
-    const configFilePath = path.resolve(process.cwd(), 'Testwise.json');
+    const baseDir = process.env.INIT_CWD || process.cwd();
+    const configFilePath = path.resolve(baseDir, 'Testwise.json');
 
     // Find all env files in the consuming project and apply them to process.env
-    const envFiles = fs.readdirSync(process.cwd()).filter((file) => file.endsWith('.env'));
+    const envFiles = fs.readdirSync(baseDir).filter((file) => file.endsWith('.env'));
 
     for (const envFile of envFiles) {
-      const envConfig = dotenv.parse(fs.readFileSync(path.resolve(process.cwd(), envFile)));
+      const envConfig = dotenv.parse(fs.readFileSync(path.resolve(baseDir, envFile)));
       Object.assign(process.env, envConfig);
     }
 

package/scripts/add-config.js

@@ -1,23 +0,0 @@
-#!/usr/bin/env node
-/* eslint-disable no-undef */
-/* eslint-disable @typescript-eslint/naming-convention */
-
-import fs from 'node:fs';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-if (process.argv[2] === 'install') {
-  const __filename = fileURLToPath(import.meta.url);
-  const __dirname = path.dirname(__filename);
-  const configFile = path.resolve(process.cwd(), 'Testwise.json');
-  const templateFile = path.join(__dirname, 'Testwise.template.json');
-
-  if (!fs.existsSync(configFile)) {
-    fs.copyFileSync(templateFile, configFile);
-    console.log('Testwise.json config file created.');
-  } else {
-    console.log('Testwise.json already exists, skipping creation.');
-  }
-} else {
-  console.log('Unknown or missing command. Usage: npx testwise install');
-}