@vertexvis/api-client-node 0.15.4 → 0.16.0

package/dist/esm/base.d.ts

@@ -10,7 +10,7 @@
  * Do not edit the class manually.
  */
 import { Configuration } from './configuration';
-import { AxiosInstance } from 'axios';
+import { AxiosInstance, AxiosRequestConfig } from 'axios';
 export declare const BASE_PATH: string;
 /**
  *
@@ -29,7 +29,7 @@ export declare const COLLECTION_FORMATS: {
  */
 export interface RequestArgs {
     url: string;
-    options: any;
+    options: AxiosRequestConfig;
 }
 /**
  *

package/dist/esm/client/helpers/files.d.ts

@@ -1,17 +1,12 @@
 /// <reference types="node" />
-import { RequestOptions } from 'https';
 import { BaseReq, DeleteReq } from '../../client/index';
 import { CreateFileRequest, FileMetadataData } from '../../index';
 /** Upload file arguments. */
 export interface UploadFileReq extends BaseReq {
     /** A {@link CreateFileRequest}. */
     readonly createFileReq: CreateFileRequest;
-    /** File data.
-     * @deprecated Use {@link filePath} instead.
-     */
-    readonly fileData?: unknown;
-    readonly filePath?: string;
-    readonly bypassAxiosEXPERIMENTAL?: boolean;
+    /** File data. */
+    readonly fileData: Buffer;
 }
 /**
  * Delete all files.
@@ -30,9 +25,4 @@ export declare function uploadFileIfNotExists({ client, createFileReq, onMsg, ve
  *
  * @param args - The {@link UploadFileReq}.
  */
-export declare function uploadFile({ client, createFileReq, fileData, filePath, onMsg, verbose, bypassAxiosEXPERIMENTAL, }: UploadFileReq): Promise<FileMetadataData>;
-interface UploadRes {
-    readonly status: number;
-}
-export declare const upload: (body: Buffer, opts: RequestOptions) => Promise<UploadRes>;
-export {};
+export declare function uploadFile({ client, createFileReq, fileData, onMsg, verbose, }: UploadFileReq): Promise<FileMetadataData>;

package/dist/esm/client/helpers/files.js

@@ -18,12 +18,7 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import fs from 'fs';
-import { request } from 'https';
-import { promisify } from 'util';
-import { delay, encodeIfNotEncoded, getBySuppliedId, getPage, } from '../../client/index';
-const readFile = promisify(fs.readFile);
-const stat = promisify(fs.stat);
+import { encodeIfNotEncoded, getBySuppliedId, getPage, } from '../../client/index';
 /**
  * Delete all files.
  *
@@ -85,8 +80,7 @@ export function uploadFileIfNotExists(_a) {
  *
  * @param args - The {@link UploadFileReq}.
  */
-export function uploadFile({ client, createFileReq, fileData, filePath, onMsg = console.log, verbose, bypassAxiosEXPERIMENTAL = false, }) {
-    var _a;
+export function uploadFile({ client, createFileReq, fileData, onMsg = console.log, verbose, }) {
     return __awaiter(this, void 0, void 0, function* () {
         const fileName = createFileReq.data.attributes.name;
         const createRes = yield client.files.createFile({
@@ -95,50 +89,20 @@ export function uploadFile({ client, createFileReq, fileData, filePath, onMsg =
         const fileId = createRes.data.data.id;
         if (verbose)
             onMsg(`Created file '${fileName}', ${fileId}`);
-        const [body, { size }] = filePath
-            ? yield Promise.all([readFile(filePath), stat(filePath)])
-            : [fileData, { size: -1 }];
-        const uploadRes = yield (bypassAxiosEXPERIMENTAL
-            ? upload(body, {
-                headers: {
-                    Authorization: `Bearer ${client.token.access_token}`,
-                    'Content-Type': 'application/octet-stream',
-                    'Content-Length': size,
-                },
-                hostname: new URL((_a = client.config.basePath) !== null && _a !== void 0 ? _a : '').hostname,
-                method: 'POST',
-                port: 443,
-                path: `/files/${fileId}`,
-            })
-            : client.files.uploadFile({ id: fileId, body }, { headers: size >= 0 ? { 'Content-Length': size } : undefined }));
+        const uploadRes = yield client.files.uploadFile({
+            id: fileId,
+            body: fileData,
+        });
         if (uploadRes.status !== 204) {
             throw new Error(`Uploading file ${fileId} failed with status code ${uploadRes.status}`);
         }
-        if (verbose)
-            onMsg(`Uploaded file ${fileId}`);
         const getRes = (yield client.files.getFile({ id: fileId })).data.data;
-        if (size >= 0 && getRes.attributes.size !== size) {
-            onMsg(`File ${fileId} size mismatch, expected ${size} got ${getRes.attributes.size}`);
-        }
         const status = getRes.attributes.status;
         if (status === 'error') {
             throw new Error(`Uploading file ${fileId} failed with status ${status}`);
         }
-        // Sanity check
-        if (status !== 'complete') {
-            if (verbose)
-                onMsg(`File ${fileId} in status ${status}, waiting...`);
-            yield delay(1000);
-        }
+        if (verbose)
+            onMsg(`Uploaded file ${fileId}, status ${status}`);
         return getRes;
     });
 }
-export const upload = (body, opts) => new Promise((resolve, reject) => {
-    const req = request(opts, (r) => {
-        var _a;
-        r.resume();
-        resolve({ status: (_a = r.statusCode) !== null && _a !== void 0 ? _a : -1 });
-    });
-    req.on('error', (error) => (req.aborted ? null : reject(error)));
-    req.end(body);
-});

package/dist/esm/client/helpers/parts.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { AxiosResponse } from 'axios';
 import { CreateFileRequest, CreateGeometrySetRequest, CreatePartRequest, Failure, PartData, PartRevisionData, QueuedJob } from '../../index';
 import { BaseReq, DeleteReq, Polling, RenderImageReq } from '../index';
@@ -7,11 +8,8 @@ export interface CreatePartFromFileReq extends BaseReq {
     readonly createFileReq: CreateFileRequest;
     /** Function returning a {@link CreatePartRequest}. */
     readonly createPartReq: (fileId: string) => CreatePartRequest;
-    /** File data.
-     * @deprecated Use {@link filePath} instead.
-     */
-    readonly fileData?: unknown;
-    readonly filePath?: string;
+    /** File data. */
+    readonly fileData: Buffer;
     /** {@link Polling} */
     readonly polling?: Polling;
     /** Whether or not to return queued translation. */

package/dist/esm/client/helpers/queued-jobs.js

@@ -89,7 +89,7 @@ export function isPollError(r) {
 }
 export function isBatch(obj) {
     const b = obj;
-    return defined(b) && defined(b.vertexvis_batchresults);
+    return defined(b) && defined(b['vertexvis/batch:results']);
 }
 export function throwOnError(r) {
     throw new Error(isQueuedJobError(r.res) || isFailure(r.res)

package/dist/esm/client/helpers/scenes.d.ts

@@ -52,7 +52,7 @@ export interface QueuedBatchOps {
     readonly ops: BatchOperation[];
     readonly res?: Failure | QueuedJob;
 }
-interface SceneItemError {
+export interface SceneItemError {
     readonly req: CreateSceneItemRequestData;
     readonly res?: ApiError;
 }

package/dist/esm/client/helpers/scenes.js

@@ -174,7 +174,7 @@ export function createSceneAndSceneItemsEXPERIMENTAL({ client, createSceneItemRe
             })).scene,
             sceneItemErrors: batchRes
                 .flatMap((b, i) => isBatch(b.res)
-                ? b.res.vertexvis_batchresults.map((r, j) => isApiError(r)
+                ? b.res['vertexvis/batch:results'].map((r, j) => isApiError(r)
                     ? { req: queuedOps[i].ops[j].data, res: r }
                     : undefined)
                 : [])
@@ -203,16 +203,7 @@ export function createSceneItemsEXPERIMENTAL({ client, createSceneItemReqs, fail
             let res;
             try {
                 res = (yield client.batches.createBatch({
-                    createBatchRequest: {
-                        vertexvis_batchoperations: ops,
-                        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                        // @ts-ignore
-                        toJSON() {
-                            return {
-                                'vertexvis/batch:operations': this.vertexvis_batchoperations,
-                            };
-                        },
-                    },
+                    createBatchRequest: { 'vertexvis/batch:operations': ops },
                 })).data;
             }
             catch (error) {

package/dist/esm/client/utils.js

@@ -358,6 +358,7 @@ export function tryStream(fn) {
             return yield fn();
         }
         catch (error) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const ae = error;
             // eslint-disable-next-line promise/param-names
             return new Promise((_resolve, reject) => {

package/dist/esm/client/version.d.ts

@@ -1 +1 @@
-export declare const version = "0.15.4";
+export declare const version = "0.15.6";

package/dist/esm/client/version.js

@@ -1 +1 @@
-export const version = '0.15.4';
+export const version = '0.15.6';

package/dist/esm/common.d.ts

@@ -11,7 +11,7 @@
  */
 import { Configuration } from './configuration';
 import { RequestArgs } from './base';
-import { AxiosInstance } from 'axios';
+import { AxiosInstance, AxiosResponse } from 'axios';
 /**
  *
  * @export
@@ -62,4 +62,4 @@ export declare const toPathString: (url: URL) => string;
  *
  * @export
  */
-export declare const createRequestFunction: (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration | undefined) => (axios?: AxiosInstance, basePath?: string) => Promise<import("axios").AxiosResponse<any>>;
+export declare const createRequestFunction: (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration | undefined) => <T = unknown, R = AxiosResponse<T, any>>(axios?: AxiosInstance, basePath?: string) => Promise<R>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vertexvis/api-client-node",
-  "version": "0.15.4",
+  "version": "0.16.0",
   "description": "The Vertex REST API client for Node.js.",
   "license": "MIT",
   "author": "Vertex Developers <support@vertexvis.com> (https://developer.vertexvis.com)",
@@ -32,6 +32,25 @@
     "api-client",
     "typescript"
   ],
+  "dependencies": {
+    "axios": "^0.24",
+    "p-limit": "^3"
+  },
+  "devDependencies": {
+    "@types/jest": "^27.0",
+    "@types/node": "^16",
+    "@vertexvis/eslint-config-vertexvis-typescript": "^0.4",
+    "eslint": "^7",
+    "eslint-plugin-promise": "^5.2",
+    "eslint-plugin-simple-import-sort": "^7.0",
+    "eslint-plugin-tsdoc": "^0.2",
+    "jest": "^27.4",
+    "pinst": "^2.1",
+    "prettier": "^2.5",
+    "ts-jest": "^27.1",
+    "typedoc": "^0.22",
+    "typescript": "4.5.x"
+  },
   "scripts": {
     "build": "tsc --project tsconfig.json && tsc --project tsconfig-esm.json",
     "clean": "rm -rf dist/",
@@ -49,24 +68,5 @@
     "test:func": "yarn clean-build && node dist/functional-test.js",
     "verify": "yarn clean-build && yarn test --coverage && node dist/cjs/verify.js",
     "watch": "jest --watch"
-  },
-  "dependencies": {
-    "axios": "^0.21",
-    "p-limit": "^3.1"
-  },
-  "devDependencies": {
-    "@types/jest": "^27.0",
-    "@types/node": "^16",
-    "@vertexvis/eslint-config-vertexvis-typescript": "^0.4",
-    "eslint": "^7.32",
-    "eslint-plugin-promise": "^5.1",
-    "eslint-plugin-simple-import-sort": "^7.0",
-    "eslint-plugin-tsdoc": "^0.2",
-    "jest": "^27.2",
-    "pinst": "^2.1",
-    "prettier": "^2.4",
-    "ts-jest": "^27.0",
-    "typedoc": "^0.22",
-    "typescript": "4.4.x"
   }
 }