@assethub/cli 0.1.5 → 0.1.6

package/dist/index.js

@@ -437,6 +437,61 @@ const extensionFromMimeType = (mimeType, mediaType) => {
         return 'gltf';
     return mediaType === 'image' ? 'png' : 'glb';
 };
+const contentTypeFromExtension = (extension) => {
+    switch (extension.toLowerCase()) {
+        case 'png':
+            return 'image/png';
+        case 'jpg':
+        case 'jpeg':
+            return 'image/jpeg';
+        case 'webp':
+            return 'image/webp';
+        case 'gif':
+            return 'image/gif';
+        case 'bmp':
+            return 'image/bmp';
+        case 'tif':
+        case 'tiff':
+            return 'image/tiff';
+        case 'glb':
+            return 'model/gltf-binary';
+        case 'gltf':
+            return 'model/gltf+json';
+        case 'obj':
+            return 'model/obj';
+        case 'fbx':
+            return 'application/fbx';
+        case 'stl':
+            return 'model/stl';
+        case 'ply':
+            return 'text/plain';
+        case 'usdz':
+            return 'model/vnd.usdz+zip';
+        case 'usd':
+        case 'usdc':
+            return 'model/vnd.usd';
+        default:
+            return undefined;
+    }
+};
+const isNonspecificContentType = (contentType) => {
+    const clean = contentType?.split(';')[0]?.trim().toLowerCase() ?? '';
+    return (clean === '' ||
+        clean === 'application/octet-stream' ||
+        clean === 'binary/octet-stream');
+};
+const inferContentTypeFromFileName = (fileName) => {
+    const extension = extname(fileName).replace(/^\./, '');
+    if (extension === '')
+        return undefined;
+    return contentTypeFromExtension(extension);
+};
+const resolveUploadContentType = (fileName, explicitContentType) => {
+    if (!isNonspecificContentType(explicitContentType)) {
+        return explicitContentType;
+    }
+    return inferContentTypeFromFileName(fileName);
+};
 const ensureFileNameExtension = (fileName, mediaType, mimeType) => {
     if (extname(fileName) !== '') {
         return fileName;
@@ -699,15 +754,19 @@ const uploadSourceDescriptor = async ({ descriptor, client, mediaType, }) => {
     if (descriptor.kind === 'source') {
         return descriptor.source;
     }
-    const file = descriptor.kind === 'file'
-        ? await readBlob(descriptor.path, descriptor.contentType)
-        : descriptor.blob;
     const fileName = descriptor.kind === 'file'
         ? basename(descriptor.path)
         : descriptor.fileName;
+    const fileNameWithExtension = ensureFileNameExtension(fileName, mediaType, descriptor.contentType);
+    const contentType = resolveUploadContentType(fileNameWithExtension, descriptor.contentType);
+    const file = descriptor.kind === 'file'
+        ? await readBlob(descriptor.path, contentType)
+        : isNonspecificContentType(descriptor.blob.type) && contentType != null
+            ? new Blob([descriptor.blob], { type: contentType })
+            : descriptor.blob;
     const upload = await client.v2.uploadFile({
         file,
-        fileName: ensureFileNameExtension(fileName, mediaType, descriptor.contentType),
+        fileName: fileNameWithExtension,
         mediaType,
     });
     return { fileRef: upload.fileRef };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assethub/cli",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Command line interface for AssetHub.",
   "type": "module",
   "bin": {