utilitas 1995.2.21 → 1995.2.22

package/lib/manifest.mjs

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

package/lib/uoid.mjs

@@ -1,6 +1,6 @@
 import { assertUrl, basename, ensureString, rotate } from './utilitas.mjs';
 import { hexToBigInt, md5, randomString, uniqueString } from './encryption.mjs';
-import { v1 as uuidv1, v5 as uuidv5 } from 'uuid';
+import { v4 as uuidv4, v5 as uuidv5 } from 'uuid';
 import manifest from './manifest.mjs';
 
 // https://stackoverflow.com/questions/7905929/how-to-test-valid-uuid-guid
@@ -19,7 +19,7 @@ const getTimestampFromUuid = (uuid) => uuid ? Number((BigInt(
 ) - 122192928000000000n) / 10000n) : 0;
 
 const create = (options) => {
-    options = Object.assign({ file: import.meta.url, id: uuidv1() }, options || {});
+    options = Object.assign({ file: import.meta.url, id: uuidv4() }, options || {});
     options.type = options.type || basename(options.file);
     if ((options.security = ~~options.security) === 1) {
         options.security = 128;

package/lib/vision.mjs

@@ -7,8 +7,10 @@ import {
     trim,
 } from './utilitas.mjs';
 
+import { v4 as uuidv4 } from 'uuid';
 import { getApiKeyCredentials } from './encryption.mjs';
 import fs from 'node:fs';
+import path from 'node:path';
 
 const _NEED = [
     '@google-cloud/vision', 'office-text-extractor', 'pdfjs-dist',
@@ -18,7 +20,7 @@ const _NEED = [
 const [BASE64, BUFFER, FILE, DEFAULT_LANG] = ['BASE64', 'BUFFER', 'FILE', 'eng'];
 const ceil = num => num.toFixed(4);
 const errorMessage = 'Invalid input data.';
-const getTextFromBatch = bt => bt.responses.map(p => p.fullTextAnnotation.text);
+const getTextFromBatch = b => b.responses.map(p => p?.fullTextAnnotation?.text || '');
 const DOCUMENT_TEXT_DETECTION = 'DOCUMENT_TEXT_DETECTION';
 const features = [{ type: DOCUMENT_TEXT_DETECTION }];
 const mimeType = 'application/pdf';
@@ -181,7 +183,7 @@ const read = async (image, options) => {
     const content = await convert(image, {
         input: options?.input, expected: BASE64, errorMessage,
     });
-    let result = await client.batchAnnotateFiles({
+    const result = await client.batchAnnotateFiles({
         requests: [{ inputConfig: { mimeType, content }, features, pages }],
     });
     return options?.raw ? result : getTextFromBatch(result[0].responses[0]);
@@ -191,7 +193,8 @@ const readAll = async (image, options) => {
     assert(client, 'Vision API has not been initialized.', 500);
     const result = {};
     result.upload = await uploadToCloud(image, {
-        gzip: false, prefix: options?.prefix || '_vision', ...options || {},
+        destination: path.join(options?.prefix || '_vision', `${uuidv4()}.pdf`),
+        ...options || {},
     });
     const uri = result.upload?.gs;
     const destination = `${uri}_result/`;
@@ -240,7 +243,7 @@ const getPdfInfo = async (file, options) => {
     const result = {
         numPages: doc.numPages,
         info: data.info,
-        metadata: { ...data.metadata.getAll() },
+        metadata: { ...data.metadata?.getAll() },
         pages: options?.withPages ? await getPdfPages(doc) : null,
     };
     return result;

package/package.json

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