@uniformdev/cli 20.66.2 → 20.66.3-alpha.6

package/dist/{chunk-XQNGKNLH.mjs → chunk-XOZ6UMXP.mjs}

@@ -68,7 +68,7 @@ var package_default = {
     "fs-jetpack": "5.1.0",
     graphql: "16.9.0",
     "graphql-request": "6.1.0",
-    "image-size": "^1.2.1",
+    "image-size": "^2.0.2",
     "isomorphic-git": "1.35.0",
     "js-yaml": "^4.1.0",
     jsonwebtoken: "9.0.3",

package/dist/defaultConfig.mjs

@@ -1,4 +1,4 @@
-import "./chunk-XQNGKNLH.mjs";
+import "./chunk-XOZ6UMXP.mjs";
 
 // src/sync/allSerializableEntitiesConfig.ts
 var allSerializableEntitiesConfig = {

package/dist/index.mjs

@@ -18,7 +18,7 @@ import {
   withFormatOptions,
   withProjectOptions,
   withTeamOptions
-} from "./chunk-XQNGKNLH.mjs";
+} from "./chunk-XOZ6UMXP.mjs";
 
 // src/index.ts
 import * as dotenv from "dotenv";
@@ -2243,9 +2243,10 @@ var downloadFile = async ({
 // src/files/uploadFile.ts
 import { preferredType } from "@thi.ng/mime";
 import { FILE_READY_STATE, getFileNameFromUrl } from "@uniformdev/files";
-import { fileTypeFromBuffer } from "file-type";
+import { fileTypeFromFile } from "file-type";
+import { createReadStream } from "fs";
 import fsj3 from "fs-jetpack";
-import sizeOf from "image-size";
+import { imageSizeFromFile } from "image-size/fromFile";
 import normalizeNewline from "normalize-newline";
 import PQueue from "p-queue";
 import { join as join9 } from "path";
@@ -2276,33 +2277,39 @@ var uploadFile = async ({
       }
       const localFileName = urlToFileName(fileUrl);
       const expectedFilePath = join9(writeDirectory, FILES_DIRECTORY_NAME, localFileName);
-      const fileExistsLocally = await fsj3.existsAsync(expectedFilePath);
-      if (!fileExistsLocally) {
+      const fileInspect = await fsj3.inspectAsync(expectedFilePath);
+      if (fileInspect?.type !== "file") {
         console.warn(
           `Skipping file ${fileUrl} as we couldn't find a local copy (looked at ${expectedFilePath})`
         );
         return null;
       }
-      let fileBuffer = await fsj3.readAsync(expectedFilePath, "buffer");
-      if (!fileBuffer) {
-        console.warn(`Skipping file ${fileUrl} (${expectedFilePath}) as we couldn't read it`);
-        return null;
-      }
       const fileName = getFileNameFromUrl(fileUrl);
-      let mimeType = expectedFilePath.endsWith(".svg") ? "image/svg+xml" : (await fileTypeFromBuffer(fileBuffer))?.mime;
+      let mimeType = expectedFilePath.endsWith(".svg") ? "image/svg+xml" : (await fileTypeFromFile(expectedFilePath))?.mime;
       if (!mimeType) {
         mimeType = preferredType(fileUrl.split(".").at(-1) ?? "");
       }
       if (mimeType === "audio/x-flac") {
         mimeType = "audio/flac";
       }
+      let uploadBody;
+      let uploadSize = fileInspect.size;
       if (mimeType === "image/svg+xml") {
+        const fileBuffer = await fsj3.readAsync(expectedFilePath, "buffer");
+        if (!fileBuffer) {
+          console.warn(`Skipping file ${fileUrl} (${expectedFilePath}) as we couldn't read it`);
+          return null;
+        }
+        uploadBody = fileBuffer;
         try {
-          fileBuffer = normalizeNewline(fileBuffer);
+          uploadBody = normalizeNewline(fileBuffer);
         } catch {
         }
+        uploadSize = uploadBody.length;
+      } else {
+        uploadBody = createReadStream(expectedFilePath);
       }
-      const { width, height } = (() => {
+      const { width, height } = await (async () => {
         if (!mimeType.startsWith("image/")) {
           return {
             width: void 0,
@@ -2310,7 +2317,7 @@ var uploadFile = async ({
           };
         }
         try {
-          return sizeOf(fileBuffer);
+          return await imageSizeFromFile(expectedFilePath);
         } catch {
           return {
             width: void 0,
@@ -2322,19 +2329,21 @@ var uploadFile = async ({
         id: fileId,
         name: fileName,
         mediaType: mimeType,
-        size: fileBuffer.length,
+        size: uploadSize,
         width,
         height,
         sourceId: hash
       });
-      const uploadResponse = await fetch(uploadUrl, {
+      const uploadRequest = {
         method,
-        body: fileBuffer,
+        body: uploadBody,
+        duplex: "half",
         headers: {
           "Content-Type": mimeType,
-          "Content-Length": fileBuffer.length.toString()
+          "Content-Length": uploadSize.toString()
         }
-      });
+      };
+      const uploadResponse = await fetch(uploadUrl, uploadRequest);
       if (!uploadResponse.ok) {
         console.warn(`Failed to upload file ${fileUrl} (${expectedFilePath})`);
         return null;
@@ -2422,6 +2431,9 @@ var walkFileUrlsForCompositionOrEntry = ({
 };
 
 // src/files/files.ts
+var fileDownloadQueue = new PQueue2({ concurrency: 10 });
+var fileUploadQueue2 = new PQueue2({ concurrency: 10 });
+var fileUrlReplacementQueue = new PQueue2({ concurrency: 10 });
 var downloadFileForAsset = async ({
   asset,
   directory,
@@ -2535,7 +2547,6 @@ var downloadFilesForCompositionOrEntry = async ({
   directory,
   fileClient
 }) => {
-  const fileDownloadQueue = new PQueue2({ concurrency: 10 });
   await walkFileUrlsForCompositionOrEntry({
     entity,
     callback: ({ fileUrl }) => {
@@ -2551,7 +2562,6 @@ var uploadFilesForCompositionOrEntry = async ({
   directory,
   fileClient
 }) => {
-  const fileUploadQueue2 = new PQueue2({ concurrency: 10 });
   const urlReplacementMap = /* @__PURE__ */ new Map();
   walkFileUrlsForCompositionOrEntry({
     entity: entity.object,
@@ -2584,7 +2594,6 @@ var replaceRemoteUrlsWithLocalReferences = async ({
   let sourceEntityAsString = JSON.stringify(sourceEntity);
   const targetEntityAsString = JSON.stringify(targetEntity);
   const writeDirectory = getFilesDirectory(directory);
-  const fileUrlReplacementQueue = new PQueue2({ concurrency: 10 });
   walkFileUrlsForCompositionOrEntry({
     entity: sourceEntity.object,
     callback: ({ fileUrl }) => {
@@ -2624,7 +2633,6 @@ var replaceLocalUrlsWithRemoteReferences = async ({
   fileClient
 }) => {
   let entityAsString = JSON.stringify(entity);
-  const fileUrlReplacementQueue = new PQueue2({ concurrency: 10 });
   walkFileUrlsForCompositionOrEntry({
     entity: entity.object,
     callback: ({ fileUrl }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "20.66.2",
+  "version": "20.66.3-alpha.6+99aaadfddb",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -27,13 +27,13 @@
   "dependencies": {
     "@inquirer/prompts": "^7.10.1",
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "20.66.2",
-    "@uniformdev/canvas": "20.66.2",
-    "@uniformdev/context": "20.66.2",
-    "@uniformdev/files": "20.66.2",
-    "@uniformdev/project-map": "20.66.2",
-    "@uniformdev/redirect": "20.66.2",
-    "@uniformdev/richtext": "20.66.2",
+    "@uniformdev/assets": "20.66.3-alpha.6+99aaadfddb",
+    "@uniformdev/canvas": "20.66.3-alpha.6+99aaadfddb",
+    "@uniformdev/context": "20.66.3-alpha.6+99aaadfddb",
+    "@uniformdev/files": "20.66.3-alpha.6+99aaadfddb",
+    "@uniformdev/project-map": "20.66.3-alpha.6+99aaadfddb",
+    "@uniformdev/redirect": "20.66.3-alpha.6+99aaadfddb",
+    "@uniformdev/richtext": "20.66.3-alpha.6+99aaadfddb",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -46,7 +46,7 @@
     "fs-jetpack": "5.1.0",
     "graphql": "16.9.0",
     "graphql-request": "6.1.0",
-    "image-size": "^1.2.1",
+    "image-size": "^2.0.2",
     "isomorphic-git": "1.35.0",
     "js-yaml": "^4.1.0",
     "jsonwebtoken": "9.0.3",
@@ -80,5 +80,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f6eff69d7dc3c184f3877abbb783c7177a78209d"
+  "gitHead": "99aaadfddbad0e7712ea51517666069915883931"
 }