utilitas 1995.2.4 → 1995.2.6

package/lib/manifest.mjs

@@ -1,7 +1,7 @@
 const manifest = {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1995.2.4",
+    "version": "1995.2.6",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",

package/lib/vision.mjs

@@ -1,17 +1,23 @@
 import { getApiKeyCredentials } from './encryption.mjs';
+import get from './shot.mjs';
 
 import {
     convert, deleteOnCloud, downloadFromCloud, getIdByGs, uploadToCloud,
 } from './storage.mjs';
 
 import {
-    ensureArray, ignoreErrFunc, log as _log, need, throwError, trim, timeout,
+    ensureArray, ignoreErrFunc, log as _log, need, throwError, trim,
 } from './utilitas.mjs';
 
 const _NEED = ['@google-cloud/vision', 'tesseract.js'];
 const [BASE64, BUFFER, FILE, DEFAULT_LANG] = ['BASE64', 'BUFFER', 'FILE', 'eng'];
 const ceil = num => num.toFixed(4);
 const errorMessage = 'Invalid image data.';
+const getTextFromBatch = bt => bt.responses.map(p => p.fullTextAnnotation.text);
+const DOCUMENT_TEXT_DETECTION = 'DOCUMENT_TEXT_DETECTION';
+const features = [{ type: DOCUMENT_TEXT_DETECTION }];
+const mimeType = 'application/pdf';
+const pages = [1, 2, 3, 4, 5]; // max 5 pages limit for batchAnnotateFiles API
 const log = content => _log(content, import.meta.url);
 
 let client;
@@ -125,16 +131,10 @@ const read = async (image, options) => {
     const content = await convert(image, {
         input: options?.input, expected: BASE64, errorMessage,
     });
-    const [response] = await client.batchAnnotateFiles({
-        requests: [{
-            inputConfig: { mimeType: 'application/pdf', content },
-            features: [{ type: 'DOCUMENT_TEXT_DETECTION' }],
-            pages: [1, 2, 3, 4, 5], // max 5 pages
-        }],
+    let result = await client.batchAnnotateFiles({
+        requests: [{ inputConfig: { mimeType, content }, features, pages }],
     });
-    let pages = response.responses[0].responses;
-    options?.raw || (pages = pages.map(x => x.fullTextAnnotation.text));
-    return pages;
+    return options?.raw ? result : getTextFromBatch(result[0].responses[0]);
 };
 
 const readAll = async (image, options) => {
@@ -149,9 +149,8 @@ const readAll = async (image, options) => {
     result.clear = await deleteOnCloud(resultId);
     result.submit = await client.asyncBatchAnnotateFiles({
         requests: [{
-            inputConfig: { mimeType: 'application/pdf', gcsSource: { uri } },
-            outputConfig: { gcsDestination: { uri: destination } },
-            features: [{ type: 'DOCUMENT_TEXT_DETECTION' }],
+            inputConfig: { mimeType, gcsSource: { uri } },
+            outputConfig: { gcsDestination: { uri: destination } }, features,
         }],
     });
     result.response = await result.submit[0].promise();
@@ -159,14 +158,9 @@ const readAll = async (image, options) => {
     options?.keep || (result.cleanup = await Promise.all(
         [getIdByGs(uri), resultId].map(deleteOnCloud)
     ));
-    if (options?.raw) { return result; }
-    const pages = [];
-    for (let file in result.result) {
-        result.result[file].responses.map(x => pages.push(
-            x.fullTextAnnotation.text
-        ));
-    }
-    return pages;
+    return options?.raw ? result : Object.keys(result.result).map(
+        f => getTextFromBatch(result.result[f])
+    ).flat();
 };
 
 export {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1995.2.4",
+    "version": "1995.2.6",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",