@foxtware/mineral 1.0.4 → 1.0.7

package/api/utils.js

@@ -185,7 +185,13 @@ const xmlResponseParser = (parserOptions = {}) => {
 };
 
 const getResponseParser = (contentType) => {
-  if (contentType?.includes('jsonl') || contentType?.includes('ndjson')) return (res) => res.text();
+  if (!contentType) {
+    return async (res) => {
+      const text = await res.text();
+      return text || null;
+    };
+  }
+  if (contentType.includes('jsonl') || contentType.includes('ndjson')) return (res) => res.text();
   if (contentType.includes('application/json')) return (res) => res.json();
   if (contentType.includes('text/xml')) return xmlResponseParser();
   if (contentType.includes('application/soap+xml')) return (res) => res.text();
@@ -851,7 +857,7 @@ class OperationQueue {
 
   async run({
     interval = false,
-    verbose = true,
+    verbose = !HOSTED,
     inspect = false,
   } = {}) {
 
@@ -1182,6 +1188,7 @@ class Processor extends EventEmitter {
   }
 }
 
+// TODO: verbose as option
 class Getter extends EventEmitter {
   constructor(
     startingParams,
@@ -1277,7 +1284,7 @@ class Getter extends EventEmitter {
       [done, paginatedParams] = await paginator(paginatedParams, response);
     }
 
-    console.log(`${ ifTextThenSpace(this.logFlavourText) }resultsCount`, resultsCount);
+    !HOSTED && console.log(`${ ifTextThenSpace(this.logFlavourText) }resultsCount`, resultsCount);
     this.emit('done');
     
     if (returnAll) {
@@ -1392,10 +1399,11 @@ const objectMatchesPartial = (object, partial) => {
   ));
 };
 
-const oneFromManyInResponse = (
+const oneFromManyResponse = (
   response, 
-  idProp, 
-  idValue,
+  {
+    validator,
+  } = {},
 ) => {
   const {
     ok,
@@ -1405,15 +1413,19 @@ const oneFromManyInResponse = (
   if (!ok || !data) {
     return response;
   }
+  
+  let candidates = data;
 
-  const candidates = data.filter(item => item[idProp] === idValue);
+  if (validator) {
+    candidates = candidates.filter(validator);
+  }
 
   if (candidates.length === 0) {
     return {
       ok: true,
       data: null,
       meta: {
-        message: `No item found with ${ idProp } ${ idValue }`,
+        message: `No ${ validator ? 'matching ' : '' }item found`,
       },
     };
   }
@@ -1424,7 +1436,7 @@ const oneFromManyInResponse = (
       ok: true,
       data: null,
       meta: {
-        message: `Multiple items found with ${ idProp } ${ idValue }`,
+        message: `Multiple ${ validator ? 'matching ' : '' }items found`,
       },
     };
   }
@@ -1571,6 +1583,30 @@ const arrayPartition = (array, partitioner) => {
   return { passed, rejected };
 };
 
+const truncateMiddle = (
+  value,
+  maxLength,
+  {
+    marker = '...',
+    includeMarkerInLength = false,
+  } = {},
+) => {
+  const string = String(value ?? '');
+  if (string.length <= maxLength) {
+    return string;
+  }
+
+  if (includeMarkerInLength && maxLength <= marker.length) {
+    return marker.slice(0, maxLength);
+  }
+
+  const available = includeMarkerInLength ? maxLength - marker.length : maxLength;
+  const frontLength = Math.ceil(available / 2);
+  const backLength = Math.floor(available / 2);
+
+  return `${ string.slice(0, frontLength) }${ marker }${ string.slice(string.length - backLength) }`;
+};
+
 module.exports = {
   wait,
   timeMs,
@@ -1612,7 +1648,7 @@ module.exports = {
   valueProvided,
   objectToArray,
   objectMatchesPartial,
-  oneFromManyInResponse,
+  oneFromManyResponse,
   surveyObject,
   diffObjects,
   objectPropsTranslate,
@@ -1620,4 +1656,5 @@ module.exports = {
   deterministicArrayItem,
   oneTrickProcessor,
   arrayPartition,
+  truncateMiddle,
 };

package/hosting/deployFromHostingYml.js

@@ -1,5 +1,5 @@
-const readline = require('readline');
 const { toAbsolutePath, setWorkspace, loadWorkspaceEnv } = require('../api/workspace');
+const choicy = require('choicy');
 const { getApiDirs, readCliFlag } = require('../cli');
 const { loadHandlers } = require('../server');
 const {
@@ -31,24 +31,6 @@ const getHostConfig = (options = {}) => ({
   api_dirs: getApiDirs(options),
 });
 
-const chooseOption = async (prompt, options) => new Promise((resolve) => {
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout,
-  });
-
-  console.log(prompt);
-  options.forEach((option, index) => {
-    console.log(`  ${ index + 1 }. ${ option }`);
-  });
-
-  rl.question('> ', (answer) => {
-    rl.close();
-    const choice = Number(answer) - 1;
-    resolve(options[choice] ?? options[0]);
-  });
-});
-
 const getDeployArgs = () => {
   const args = process.argv.slice(2);
   const deployArgs = [];
@@ -257,7 +239,10 @@ const deployFromHostingYml = async (options = {}) => {
       return;
     }
 
-    const selectedGroup = await chooseOption('Which group would you like to deploy?', groupNames);
+    const selectedGroup = await choicy(groupNames, {
+      question: 'Which group would you like to deploy?',
+      oneChoice: true,
+    });
     for (const functionName of groups[selectedGroup] || []) {
       await deployOne(functionName);
     }
@@ -271,7 +256,10 @@ const deployFromHostingYml = async (options = {}) => {
       return;
     }
 
-    const selectedFunction = await chooseOption('Which function would you like to deploy?', functionNames);
+    const selectedFunction = await choicy(functionNames, {
+      question: 'Which function would you like to deploy?',
+      oneChoice: true,
+    });
     await deployOne(selectedFunction);
     return;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@foxtware/mineral",
-  "version": "1.0.4",
+  "version": "1.0.7",
   "bin": {
     "mineral": "bin/mineral.js"
   },
@@ -23,10 +23,12 @@
   "dependencies": {
     "@supabase/supabase-js": "^2.55.0",
     "@upstash/redis": "^1.28.4",
+    "choicy": "^1.1.1",
     "csvtojson": "^2.0.14",
     "dotenv": "^17.2.0",
     "googleapis": "^165.0.0",
     "json-2-csv": "^5.5.9",
+    "libsodium-wrappers": "^0.8.4",
     "xml2js": "^0.6.2",
     "yaml": "^2.9.0"
   },

package/server.utils.js

@@ -1,5 +1,6 @@
 const { execFileSync } = require('child_process');
-const { logDeep, askQuestion } = require('./api/utils');
+const { logDeep } = require('./api/utils');
+const choicy = require('choicy');
 const { HOSTED } = require('./api/constants');
 const { StringDecoder } = require('string_decoder');
 
@@ -368,17 +369,21 @@ const listenOrOfferKillPort = (server, port, onListening) => {
   };
 
   const askRecoveryQuestions = async () => {
-    const shouldFind = await askQuestion('Look up the process using it? ');
+    const shouldFind = await choicy(
+      [
+        { title: 'Yes', value: true },
+        { title: 'No', value: false },
+      ],
+      {
+        question: 'Look up the process using it?',
+        oneChoice: true,
+      },
+    );
 
-    if (shouldFind === 'n') {
+    if (!shouldFind) {
       return false;
     }
 
-    if (shouldFind !== '') {
-      console.error('not a valid input');
-      exitServer(1);
-    }
-
     const listeners = findPortListeners(port);
 
     if (!listeners.length) {
@@ -388,17 +393,21 @@ const listenOrOfferKillPort = (server, port, onListening) => {
 
     console.log('Port in use by:', formatPortListeners(listeners));
 
-    const shouldKill = await askQuestion('Kill it and retry? ');
+    const shouldKill = await choicy(
+      [
+        { title: 'Yes', value: true },
+        { title: 'No', value: false },
+      ],
+      {
+        question: 'Kill it and retry?',
+        oneChoice: true,
+      },
+    );
 
-    if (shouldKill === 'n') {
+    if (!shouldKill) {
       return false;
     }
 
-    if (shouldKill !== '') {
-      console.error('not a valid input');
-      exitServer(1);
-    }
-
     await killPortListeners(listeners);
     return true;
   };