@uniformdev/cli 20.66.2-alpha.13 → 20.66.3-alpha.6

package/dist/index.mjs

@@ -5,23 +5,20 @@ import {
   applyDefaultSyncConfiguration,
   emitWithFormat,
   getDirectoryOrFilename,
-  getEntityBatchSize,
   getEntityOption,
-  isPaginatedSyncEntity,
   isPathAPackageFile,
   nodeFetchProxy,
   package_default,
   paginateAsync,
   readFileToObject,
   withApiOptions,
-  withBatchSizeOptions,
   withConfiguration,
   withDebugOptions,
   withDiffOptions,
   withFormatOptions,
   withProjectOptions,
   withTeamOptions
-} from "./chunk-ASGYUI3V.mjs";
+} from "./chunk-XOZ6UMXP.mjs";
 
 // src/index.ts
 import * as dotenv from "dotenv";
@@ -2246,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";
@@ -2279,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,
@@ -2313,7 +2317,7 @@ var uploadFile = async ({
           };
         }
         try {
-          return sizeOf(fileBuffer);
+          return await imageSizeFromFile(expectedFilePath);
         } catch {
           return {
             width: void 0,
@@ -2325,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;
@@ -2425,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,
@@ -2538,7 +2547,6 @@ var downloadFilesForCompositionOrEntry = async ({
   directory,
   fileClient
 }) => {
-  const fileDownloadQueue = new PQueue2({ concurrency: 10 });
   await walkFileUrlsForCompositionOrEntry({
     entity,
     callback: ({ fileUrl }) => {
@@ -2554,7 +2562,6 @@ var uploadFilesForCompositionOrEntry = async ({
   directory,
   fileClient
 }) => {
-  const fileUploadQueue2 = new PQueue2({ concurrency: 10 });
   const urlReplacementMap = /* @__PURE__ */ new Map();
   walkFileUrlsForCompositionOrEntry({
     entity: entity.object,
@@ -2587,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 }) => {
@@ -2627,7 +2633,6 @@ var replaceLocalUrlsWithRemoteReferences = async ({
   fileClient
 }) => {
   let entityAsString = JSON.stringify(entity);
-  const fileUrlReplacementQueue = new PQueue2({ concurrency: 10 });
   walkFileUrlsForCompositionOrEntry({
     entity: entity.object,
     callback: ({ fileUrl }) => {
@@ -2709,16 +2714,20 @@ function convertStateOption(state) {
 // src/commands/canvas/assetEngineDataSource.ts
 function createAssetEngineDataSource({
   client,
-  verbose,
-  batchSize
+  verbose
 }) {
   async function* getObjects() {
     const assets = paginateAsync(
-      async (offset, limit2) => (await client.get({
-        limit: limit2,
-        offset
-      })).assets,
-      { pageSize: batchSize ?? 50, verbose, entityName: "assets" }
+      async (offset, limit2) => {
+        if (verbose) {
+          console.log(`Fetching all assets from offset ${offset} with limit ${limit2}`);
+        }
+        return (await client.get({
+          limit: limit2,
+          offset
+        })).assets;
+      },
+      { pageSize: 50 }
     );
     for await (const e of assets) {
       const result = {
@@ -2768,25 +2777,22 @@ var AssetPullModule = {
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            withBatchSizeOptions(
-              yargs43.positional("directory", {
-                describe: "Directory to save the assets to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
-                type: "string"
-              }).option("format", {
-                alias: ["f"],
-                describe: "Output format",
-                default: "yaml",
-                choices: ["yaml", "json"],
-                type: "string"
-              }).option("mode", {
-                alias: ["m"],
-                describe: 'What kind of changes can be made. "create" = create new files, update nothing. "createOrUpdate" = create new files, update existing, delete nothing. "mirror" = create, update, and delete to mirror state',
-                choices: ["create", "createOrUpdate", "mirror"],
-                default: "mirror",
-                type: "string"
-              }),
-              "asset"
-            )
+            yargs43.positional("directory", {
+              describe: "Directory to save the assets to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
+              type: "string"
+            }).option("format", {
+              alias: ["f"],
+              describe: "Output format",
+              default: "yaml",
+              choices: ["yaml", "json"],
+              type: "string"
+            }).option("mode", {
+              alias: ["m"],
+              describe: 'What kind of changes can be made. "create" = create new files, update nothing. "createOrUpdate" = create new files, update existing, delete nothing. "mirror" = create, update, and delete to mirror state',
+              choices: ["create", "createOrUpdate", "mirror"],
+              default: "mirror",
+              type: "string"
+            })
           )
         )
       )
@@ -2803,8 +2809,7 @@ var AssetPullModule = {
     whatIf,
     project: projectId,
     diff: diffMode,
-    allowEmptySource,
-    resolvedBatchSize
+    allowEmptySource
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getAssetClient({
@@ -2814,11 +2819,7 @@ var AssetPullModule = {
       projectId
     });
     const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const source = createAssetEngineDataSource({
-      client,
-      verbose,
-      batchSize: resolvedBatchSize
-    });
+    const source = createAssetEngineDataSource({ client, verbose });
     let target;
     const isPackage = isPathAPackageFile(directory);
     const onBeforeDeleteObject = async (id, object4) => {
@@ -2893,19 +2894,16 @@ var AssetPushModule = {
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            withBatchSizeOptions(
-              yargs43.positional("directory", {
-                describe: "Directory to read the assets from. If a filename is used, a package will be read instead.",
-                type: "string"
-              }).option("mode", {
-                alias: ["m"],
-                describe: 'What kind of changes can be made. "create" = create new, update nothing. "createOrUpdate" = create new, update existing, delete nothing. "mirror" = create, update, and delete',
-                choices: ["create", "createOrUpdate", "mirror"],
-                default: "mirror",
-                type: "string"
-              }),
-              "asset"
-            )
+            yargs43.positional("directory", {
+              describe: "Directory to read the assets from. If a filename is used, a package will be read instead.",
+              type: "string"
+            }).option("mode", {
+              alias: ["m"],
+              describe: 'What kind of changes can be made. "create" = create new, update nothing. "createOrUpdate" = create new, update existing, delete nothing. "mirror" = create, update, and delete',
+              choices: ["create", "createOrUpdate", "mirror"],
+              default: "mirror",
+              type: "string"
+            })
           )
         )
       )
@@ -2921,8 +2919,7 @@ var AssetPushModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose,
-    resolvedBatchSize
+    verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getAssetClient({
@@ -2949,11 +2946,7 @@ var AssetPushModule = {
         verbose
       });
     }
-    const target = createAssetEngineDataSource({
-      client,
-      verbose,
-      batchSize: resolvedBatchSize
-    });
+    const target = createAssetEngineDataSource({ client, verbose });
     const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
     await syncEngine({
       source,
@@ -3146,8 +3139,10 @@ function createCategoriesEngineDataSource({
   client
 }) {
   async function* getObjects() {
-    const categories = (await client.getCategories()).categories;
-    for (const def of categories) {
+    const categories = paginateAsync(async () => (await client.getCategories()).categories, {
+      pageSize: 100
+    });
+    for await (const def of categories) {
       const result = {
         id: selectIdentifier(def),
         displayName: selectDisplayName(def),
@@ -3468,14 +3463,12 @@ var ComponentListModule = {
 
 // src/commands/canvas/componentDefinitionEngineDataSource.ts
 function createComponentDefinitionEngineDataSource({
-  client,
-  batchSize,
-  verbose
+  client
 }) {
   async function* getObjects() {
     const componentDefinitions = paginateAsync(
       async (offset, limit2) => (await client.getComponentDefinitions({ limit: limit2, offset })).componentDefinitions,
-      { pageSize: batchSize ?? 200, verbose, entityName: "components" }
+      { pageSize: 200 }
     );
     for await (const def of componentDefinitions) {
       const result = {
@@ -3515,25 +3508,22 @@ var ComponentPullModule = {
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            withBatchSizeOptions(
-              yargs43.positional("directory", {
-                describe: "Directory to save the component definitions to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
-                type: "string"
-              }).option("format", {
-                alias: ["f"],
-                describe: "Output format",
-                default: "yaml",
-                choices: ["yaml", "json"],
-                type: "string"
-              }).option("mode", {
-                alias: ["m"],
-                describe: 'What kind of changes can be made. "create" = create new files, update nothing. "createOrUpdate" = create new files, update existing, delete nothing. "mirror" = create, update, and delete to mirror state',
-                choices: ["create", "createOrUpdate", "mirror"],
-                default: "mirror",
-                type: "string"
-              }),
-              "component"
-            )
+            yargs43.positional("directory", {
+              describe: "Directory to save the component definitions to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
+              type: "string"
+            }).option("format", {
+              alias: ["f"],
+              describe: "Output format",
+              default: "yaml",
+              choices: ["yaml", "json"],
+              type: "string"
+            }).option("mode", {
+              alias: ["m"],
+              describe: 'What kind of changes can be made. "create" = create new files, update nothing. "createOrUpdate" = create new files, update existing, delete nothing. "mirror" = create, update, and delete to mirror state',
+              choices: ["create", "createOrUpdate", "mirror"],
+              default: "mirror",
+              type: "string"
+            })
           )
         )
       )
@@ -3550,16 +3540,11 @@ var ComponentPullModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose,
-    resolvedBatchSize
+    verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const source = createComponentDefinitionEngineDataSource({
-      client,
-      batchSize: resolvedBatchSize,
-      verbose
-    });
+    const source = createComponentDefinitionEngineDataSource({ client });
     let target;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -3604,19 +3589,16 @@ var ComponentPushModule = {
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            withBatchSizeOptions(
-              yargs43.positional("directory", {
-                describe: "Directory to read the component definitions from. If a filename is used, a package will be read instead.",
-                type: "string"
-              }).option("mode", {
-                alias: ["m"],
-                describe: 'What kind of changes can be made. "create" = create new, update nothing. "createOrUpdate" = create new, update existing, delete nothing. "mirror" = create, update, and delete',
-                choices: ["create", "createOrUpdate", "mirror"],
-                default: "mirror",
-                type: "string"
-              }),
-              "component"
-            )
+            yargs43.positional("directory", {
+              describe: "Directory to read the component definitions from. If a filename is used, a package will be read instead.",
+              type: "string"
+            }).option("mode", {
+              alias: ["m"],
+              describe: 'What kind of changes can be made. "create" = create new, update nothing. "createOrUpdate" = create new, update existing, delete nothing. "mirror" = create, update, and delete',
+              choices: ["create", "createOrUpdate", "mirror"],
+              default: "mirror",
+              type: "string"
+            })
           )
         )
       )
@@ -3632,8 +3614,7 @@ var ComponentPushModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose,
-    resolvedBatchSize
+    verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -3656,11 +3637,7 @@ var ComponentPushModule = {
         verbose
       });
     }
-    const target = createComponentDefinitionEngineDataSource({
-      client,
-      batchSize: resolvedBatchSize,
-      verbose
-    });
+    const target = createComponentDefinitionEngineDataSource({ client });
     await syncEngine({
       source,
       target,
@@ -4114,7 +4091,6 @@ function createComponentInstanceEngineDataSource({
   onlyPatterns,
   patternType,
   verbose,
-  batchSize,
   ...clientOptions
 }) {
   const stateId = convertStateOption(state);
@@ -4138,7 +4114,7 @@ function createComponentInstanceEngineDataSource({
         }
         return (await client.getCompositionList(parameters)).compositions;
       },
-      { pageSize: batchSize ?? 100, verbose, entityName: "compositions" }
+      { pageSize: 100 }
     );
     for await (const compositionListItem of componentInstances) {
       const result = {
@@ -4177,27 +4153,24 @@ var CompositionPublishModule = {
       withProjectOptions(
         withDebugOptions(
           withDiffOptions(
-            withBatchSizeOptions(
-              yargs43.positional("ids", {
-                describe: "Publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
-                type: "string"
-              }).option("all", {
-                alias: ["a"],
-                describe: "Publishes all compositions. Use compositionId to publish one instead.",
-                default: false,
-                type: "boolean"
-              }).option("onlyCompositions", {
-                describe: "Only publishing compositions and not patterns",
-                default: false,
-                type: "boolean"
-              }).option("onlyPatterns", {
-                describe: "Only pulling patterns and not compositions",
-                default: false,
-                type: "boolean",
-                hidden: true
-              }),
-              "composition"
-            )
+            yargs43.positional("ids", {
+              describe: "Publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
+              type: "string"
+            }).option("all", {
+              alias: ["a"],
+              describe: "Publishes all compositions. Use compositionId to publish one instead.",
+              default: false,
+              type: "boolean"
+            }).option("onlyCompositions", {
+              describe: "Only publishing compositions and not patterns",
+              default: false,
+              type: "boolean"
+            }).option("onlyPatterns", {
+              describe: "Only pulling patterns and not compositions",
+              default: false,
+              type: "boolean",
+              hidden: true
+            })
           )
         )
       )
@@ -4215,8 +4188,7 @@ var CompositionPublishModule = {
     onlyPatterns,
     patternType,
     verbose,
-    directory,
-    resolvedBatchSize
+    directory
   }) => {
     if (!all && !ids || all && ids) {
       console.error(`Specify --all or composition ID(s) to publish.`);
@@ -4232,8 +4204,7 @@ var CompositionPublishModule = {
       onlyCompositions,
       onlyPatterns,
       patternType,
-      verbose,
-      batchSize: resolvedBatchSize
+      verbose
     });
     const target = createComponentInstanceEngineDataSource({
       client,
@@ -4242,8 +4213,7 @@ var CompositionPublishModule = {
       onlyCompositions,
       onlyPatterns,
       patternType,
-      verbose,
-      batchSize: resolvedBatchSize
+      verbose
     });
     const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
     await syncEngine({
@@ -4281,36 +4251,33 @@ var ComponentPatternPublishModule = {
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            withBatchSizeOptions(
-              yargs43.positional("ids", {
-                describe: "Publishes component pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
-                type: "string"
-              }).option("all", {
-                alias: ["a"],
-                describe: "Publishes all component patterns. Use compositionId to publish one instead.",
-                default: false,
-                type: "boolean"
-              }).option("publishingState", {
-                describe: 'Publishing state to update to. Can be "published" or "preview".',
-                default: "published",
-                type: "string",
-                hidden: true
-              }).option("onlyCompositions", {
-                describe: "Only publishing compositions and not component patterns",
-                default: false,
-                type: "boolean"
-              }).option("onlyPatterns", {
-                describe: "Only pulling component patterns and not compositions",
-                default: true,
-                type: "boolean",
-                hidden: true
-              }).option("patternType", {
-                default: "component",
-                choices: ["all", "component", "composition"],
-                hidden: true
-              }),
-              "componentPattern"
-            )
+            yargs43.positional("ids", {
+              describe: "Publishes component pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
+              type: "string"
+            }).option("all", {
+              alias: ["a"],
+              describe: "Publishes all component patterns. Use compositionId to publish one instead.",
+              default: false,
+              type: "boolean"
+            }).option("publishingState", {
+              describe: 'Publishing state to update to. Can be "published" or "preview".',
+              default: "published",
+              type: "string",
+              hidden: true
+            }).option("onlyCompositions", {
+              describe: "Only publishing compositions and not component patterns",
+              default: false,
+              type: "boolean"
+            }).option("onlyPatterns", {
+              describe: "Only pulling component patterns and not compositions",
+              default: true,
+              type: "boolean",
+              hidden: true
+            }).option("patternType", {
+              default: "component",
+              choices: ["all", "component", "composition"],
+              hidden: true
+            })
           )
         )
       )
@@ -4319,8 +4286,8 @@ var ComponentPatternPublishModule = {
 };
 
 // src/commands/canvas/commands/composition/pull.ts
-var CompositionPullModule = componentInstancePullModuleFactory("compositions", "composition");
-function componentInstancePullModuleFactory(type, entityType) {
+var CompositionPullModule = componentInstancePullModuleFactory("compositions");
+function componentInstancePullModuleFactory(type) {
   return {
     command: "pull <directory>",
     describe: "Pulls all compositions to local files in a directory",
@@ -4330,34 +4297,31 @@ function componentInstancePullModuleFactory(type, entityType) {
           withStateOptions(
             withDebugOptions(
               withDiffOptions(
-                withBatchSizeOptions(
-                  yargs43.positional("directory", {
-                    describe: "Directory to save the component definitions to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
-                    type: "string"
-                  }).option("format", {
-                    alias: ["f"],
-                    describe: "Output format",
-                    default: "yaml",
-                    choices: ["yaml", "json"],
-                    type: "string"
-                  }).option("onlyCompositions", {
-                    describe: "Only pulling compositions and not patterns",
-                    default: false,
-                    type: "boolean"
-                  }).option("onlyPatterns", {
-                    describe: "Only pulling patterns and not compositions",
-                    default: false,
-                    type: "boolean",
-                    hidden: true
-                  }).option("mode", {
-                    alias: ["m"],
-                    describe: 'What kind of changes can be made. "create" = create new files, update nothing. "createOrUpdate" = create new files, update existing, delete nothing. "mirror" = create, update, and delete to mirror state',
-                    choices: ["create", "createOrUpdate", "mirror"],
-                    default: "mirror",
-                    type: "string"
-                  }),
-                  entityType
-                )
+                yargs43.positional("directory", {
+                  describe: "Directory to save the component definitions to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
+                  type: "string"
+                }).option("format", {
+                  alias: ["f"],
+                  describe: "Output format",
+                  default: "yaml",
+                  choices: ["yaml", "json"],
+                  type: "string"
+                }).option("onlyCompositions", {
+                  describe: "Only pulling compositions and not patterns",
+                  default: false,
+                  type: "boolean"
+                }).option("onlyPatterns", {
+                  describe: "Only pulling patterns and not compositions",
+                  default: false,
+                  type: "boolean",
+                  hidden: true
+                }).option("mode", {
+                  alias: ["m"],
+                  describe: 'What kind of changes can be made. "create" = create new files, update nothing. "createOrUpdate" = create new files, update existing, delete nothing. "mirror" = create, update, and delete to mirror state',
+                  choices: ["create", "createOrUpdate", "mirror"],
+                  default: "mirror",
+                  type: "string"
+                })
               )
             )
           )
@@ -4379,8 +4343,7 @@ function componentInstancePullModuleFactory(type, entityType) {
       project: projectId,
       diff: diffMode,
       allowEmptySource,
-      verbose,
-      resolvedBatchSize
+      verbose
     }) => {
       const fetch2 = nodeFetchProxy(proxy, verbose);
       const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -4391,8 +4354,7 @@ function componentInstancePullModuleFactory(type, entityType) {
         onlyCompositions,
         onlyPatterns,
         patternType,
-        verbose,
-        batchSize: resolvedBatchSize
+        verbose
       });
       const isPackage = isPathAPackageFile(directory);
       let target;
@@ -4448,7 +4410,7 @@ function componentInstancePullModuleFactory(type, entityType) {
 
 // src/commands/canvas/commands/componentPattern/pull.ts
 var ComponentPatternPullModule = {
-  ...componentInstancePullModuleFactory("componentPatterns", "componentPattern"),
+  ...componentInstancePullModuleFactory("componentPatterns"),
   describe: "Pulls all component patterns to local files in a directory",
   builder: (yargs43) => withConfiguration(
     withApiOptions(
@@ -4525,8 +4487,8 @@ function createLocaleValidationHook(uniformLocales) {
 }
 
 // src/commands/canvas/commands/composition/push.ts
-var CompositionPushModule = componentInstancePushModuleFactory("compositions", "composition");
-function componentInstancePushModuleFactory(type, entityType) {
+var CompositionPushModule = componentInstancePushModuleFactory("compositions");
+function componentInstancePushModuleFactory(type) {
   return {
     command: "push <directory>",
     describe: "Pushes all compositions from files in a directory to Uniform Canvas",
@@ -4536,28 +4498,25 @@ function componentInstancePushModuleFactory(type, entityType) {
           withStateOptions(
             withDebugOptions(
               withDiffOptions(
-                withBatchSizeOptions(
-                  yargs43.positional("directory", {
-                    describe: "Directory to read the compositions/patterns from. If a filename is used, a package will be read instead.",
-                    type: "string"
-                  }).option("mode", {
-                    alias: ["m"],
-                    describe: 'What kind of changes can be made. "create" = create new, update nothing. "createOrUpdate" = create new, update existing, delete nothing. "mirror" = create, update, and delete',
-                    choices: ["create", "createOrUpdate", "mirror"],
-                    default: "mirror",
-                    type: "string"
-                  }).option("onlyCompositions", {
-                    describe: "Only pulling compositions and not patterns",
-                    default: false,
-                    type: "boolean"
-                  }).option("onlyPatterns", {
-                    // backwards compatibility
-                    default: false,
-                    type: "boolean",
-                    hidden: true
-                  }),
-                  entityType
-                )
+                yargs43.positional("directory", {
+                  describe: "Directory to read the compositions/patterns from. If a filename is used, a package will be read instead.",
+                  type: "string"
+                }).option("mode", {
+                  alias: ["m"],
+                  describe: 'What kind of changes can be made. "create" = create new, update nothing. "createOrUpdate" = create new, update existing, delete nothing. "mirror" = create, update, and delete',
+                  choices: ["create", "createOrUpdate", "mirror"],
+                  default: "mirror",
+                  type: "string"
+                }).option("onlyCompositions", {
+                  describe: "Only pulling compositions and not patterns",
+                  default: false,
+                  type: "boolean"
+                }).option("onlyPatterns", {
+                  // backwards compatibility
+                  default: false,
+                  type: "boolean",
+                  hidden: true
+                })
               )
             )
           )
@@ -4578,8 +4537,7 @@ function componentInstancePushModuleFactory(type, entityType) {
       patternType,
       diff: diffMode,
       allowEmptySource,
-      verbose,
-      resolvedBatchSize
+      verbose
     }) => {
       const fetch2 = nodeFetchProxy(proxy, verbose);
       const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -4607,8 +4565,7 @@ function componentInstancePushModuleFactory(type, entityType) {
         onlyCompositions,
         onlyPatterns,
         patternType,
-        verbose,
-        batchSize: resolvedBatchSize
+        verbose
       });
       const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
       const uniformLocales = await fetchUniformLocales({
@@ -4653,7 +4610,7 @@ function componentInstancePushModuleFactory(type, entityType) {
 
 // src/commands/canvas/commands/componentPattern/push.ts
 var ComponentPatternPushModule = {
-  ...componentInstancePushModuleFactory("componentPatterns", "componentPattern"),
+  ...componentInstancePushModuleFactory("componentPatterns"),
   describe: "Pushes all component patterns from files in a directory to Uniform Canvas",
   builder: (yargs43) => withConfiguration(
     withApiOptions(
@@ -4761,27 +4718,24 @@ var CompositionUnpublishModule = {
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          withBatchSizeOptions(
-            yargs43.positional("ids", {
-              describe: "Un-publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
-              type: "string"
-            }).option("all", {
-              alias: ["a"],
-              describe: "Un-publishes all compositions. Use composition ID(s) to unpublish specific one(s) instead.",
-              default: false,
-              type: "boolean"
-            }).option("onlyCompositions", {
-              describe: "Only un-publishing compositions and not patterns",
-              default: false,
-              type: "boolean"
-            }).option("onlyPatterns", {
-              describe: "Only un-publishing patterns and not compositions",
-              default: false,
-              type: "boolean",
-              hidden: true
-            }),
-            "composition"
-          )
+          yargs43.positional("ids", {
+            describe: "Un-publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
+            type: "string"
+          }).option("all", {
+            alias: ["a"],
+            describe: "Un-publishes all compositions. Use composition ID(s) to unpublish specific one(s) instead.",
+            default: false,
+            type: "boolean"
+          }).option("onlyCompositions", {
+            describe: "Only un-publishing compositions and not patterns",
+            default: false,
+            type: "boolean"
+          }).option("onlyPatterns", {
+            describe: "Only un-publishing patterns and not compositions",
+            default: false,
+            type: "boolean",
+            hidden: true
+          })
         )
       )
     )
@@ -4797,8 +4751,7 @@ var CompositionUnpublishModule = {
     patternType,
     project: projectId,
     whatIf,
-    verbose,
-    resolvedBatchSize
+    verbose
   }) => {
     if (!all && !ids || all && ids) {
       console.error(`Specify --all or composition ID(s) to unpublish.`);
@@ -4815,8 +4768,7 @@ var CompositionUnpublishModule = {
       onlyCompositions,
       onlyPatterns,
       patternType,
-      verbose,
-      batchSize: resolvedBatchSize
+      verbose
     });
     const target = createComponentInstanceEngineDataSource({
       client,
@@ -4825,8 +4777,7 @@ var CompositionUnpublishModule = {
       onlyCompositions,
       onlyPatterns,
       patternType,
-      verbose,
-      batchSize: resolvedBatchSize
+      verbose
     });
     const log2 = createPublishStatusSyncEngineConsoleLogger({ status: "unpublish" });
     for await (const obj of target.objects) {
@@ -5065,37 +5016,34 @@ var CompositionPatternPublishModule = {
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            withBatchSizeOptions(
-              yargs43.positional("ids", {
-                describe: "Publishes composition pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
-                type: "string"
-              }).option("all", {
-                alias: ["a"],
-                describe: "Publishes all composition patterns. Use compositionId to publish one instead.",
-                default: false,
-                type: "boolean"
-              }).option("publishingState", {
-                describe: 'Publishing state to update to. Can be "published" or "preview".',
-                default: "published",
-                type: "string",
-                hidden: true
-              }).option("onlyCompositions", {
-                describe: "Only publishing compositions and not composition patterns",
-                default: false,
-                type: "boolean",
-                hidden: true
-              }).option("patternType", {
-                default: "composition",
-                choices: ["all", "component", "composition"],
-                hidden: true
-              }).option("onlyPatterns", {
-                describe: "Only pulling composition patterns and not compositions",
-                default: true,
-                type: "boolean",
-                hidden: true
-              }),
-              "compositionPattern"
-            )
+            yargs43.positional("ids", {
+              describe: "Publishes composition pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
+              type: "string"
+            }).option("all", {
+              alias: ["a"],
+              describe: "Publishes all composition patterns. Use compositionId to publish one instead.",
+              default: false,
+              type: "boolean"
+            }).option("publishingState", {
+              describe: 'Publishing state to update to. Can be "published" or "preview".',
+              default: "published",
+              type: "string",
+              hidden: true
+            }).option("onlyCompositions", {
+              describe: "Only publishing compositions and not composition patterns",
+              default: false,
+              type: "boolean",
+              hidden: true
+            }).option("patternType", {
+              default: "composition",
+              choices: ["all", "component", "composition"],
+              hidden: true
+            }).option("onlyPatterns", {
+              describe: "Only pulling composition patterns and not compositions",
+              default: true,
+              type: "boolean",
+              hidden: true
+            })
           )
         )
       )
@@ -5105,7 +5053,7 @@ var CompositionPatternPublishModule = {
 
 // src/commands/canvas/commands/compositionPattern/pull.ts
 var CompositionPatternPullModule = {
-  ...componentInstancePullModuleFactory("compositionPatterns", "compositionPattern"),
+  ...componentInstancePullModuleFactory("compositionPatterns"),
   describe: "Pulls all composition patterns to local files in a directory",
   builder: (yargs43) => withConfiguration(
     withApiOptions(
@@ -5149,7 +5097,7 @@ var CompositionPatternPullModule = {
 
 // src/commands/canvas/commands/compositionPattern/push.ts
 var CompositionPatternPushModule = {
-  ...componentInstancePushModuleFactory("compositionPatterns", "compositionPattern"),
+  ...componentInstancePushModuleFactory("compositionPatterns"),
   describe: "Pushes all composition patterns from files in a directory to Uniform Canvas",
   builder: (yargs43) => withConfiguration(
     withApiOptions(
@@ -5300,15 +5248,10 @@ var ContentTypeListModule = {
 
 // src/commands/canvas/contentTypeEngineDataSource.ts
 function createContentTypeEngineDataSource({
-  client,
-  batchSize,
-  verbose
+  client
 }) {
   async function* getObjects() {
-    const contentTypes = paginateAsync(
-      async (offset, limit2) => (await client.getContentTypes({ offset, limit: limit2 })).contentTypes,
-      { pageSize: batchSize ?? 100, verbose, entityName: "content types" }
-    );
+    const { contentTypes } = await client.getContentTypes({ offset: 0, limit: 1e3 });
     for await (const ct of contentTypes) {
       const result = {
         id: selectContentTypeIdentifier(ct),
@@ -5340,25 +5283,22 @@ var ContentTypePullModule = {
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            withBatchSizeOptions(
-              yargs43.positional("directory", {
-                describe: "Directory to save the content types to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
-                type: "string"
-              }).option("format", {
-                alias: ["f"],
-                describe: "Output format",
-                default: "yaml",
-                choices: ["yaml", "json"],
-                type: "string"
-              }).option("mode", {
-                alias: ["m"],
-                describe: 'What kind of changes can be made. "create" = create new files, update nothing. "createOrUpdate" = create new files, update existing, delete nothing. "mirror" = create, update, and delete to mirror state',
-                choices: ["create", "createOrUpdate", "mirror"],
-                default: "mirror",
-                type: "string"
-              }),
-              "contentType"
-            )
+            yargs43.positional("directory", {
+              describe: "Directory to save the content types to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
+              type: "string"
+            }).option("format", {
+              alias: ["f"],
+              describe: "Output format",
+              default: "yaml",
+              choices: ["yaml", "json"],
+              type: "string"
+            }).option("mode", {
+              alias: ["m"],
+              describe: 'What kind of changes can be made. "create" = create new files, update nothing. "createOrUpdate" = create new files, update existing, delete nothing. "mirror" = create, update, and delete to mirror state',
+              choices: ["create", "createOrUpdate", "mirror"],
+              default: "mirror",
+              type: "string"
+            })
           )
         )
       )
@@ -5375,8 +5315,7 @@ var ContentTypePullModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose,
-    resolvedBatchSize
+    verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getContentClient({
@@ -5385,11 +5324,7 @@ var ContentTypePullModule = {
       fetch: fetch2,
       projectId
     });
-    const source = createContentTypeEngineDataSource({
-      client,
-      verbose,
-      batchSize: resolvedBatchSize
-    });
+    const source = createContentTypeEngineDataSource({ client });
     let target;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -5433,24 +5368,21 @@ var ContentTypePushModule = {
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            withBatchSizeOptions(
-              yargs43.positional("directory", {
-                describe: "Directory to read the content types from. If a filename is used, a package will be read instead.",
-                type: "string"
-              }).option("what-if", {
-                alias: ["w"],
-                describe: "What-if mode reports what would be done but changes nothing",
-                default: false,
-                type: "boolean"
-              }).option("mode", {
-                alias: ["m"],
-                describe: 'What kind of changes can be made. "create" = create new, update nothing. "createOrUpdate" = create new, update existing, delete nothing. "mirror" = create, update, and delete',
-                choices: ["create", "createOrUpdate", "mirror"],
-                default: "mirror",
-                type: "string"
-              }),
-              "contentType"
-            )
+            yargs43.positional("directory", {
+              describe: "Directory to read the content types from. If a filename is used, a package will be read instead.",
+              type: "string"
+            }).option("what-if", {
+              alias: ["w"],
+              describe: "What-if mode reports what would be done but changes nothing",
+              default: false,
+              type: "boolean"
+            }).option("mode", {
+              alias: ["m"],
+              describe: 'What kind of changes can be made. "create" = create new, update nothing. "createOrUpdate" = create new, update existing, delete nothing. "mirror" = create, update, and delete',
+              choices: ["create", "createOrUpdate", "mirror"],
+              default: "mirror",
+              type: "string"
+            })
           )
         )
       )
@@ -5466,8 +5398,7 @@ var ContentTypePushModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose,
-    resolvedBatchSize
+    verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getContentClient({
@@ -5494,11 +5425,7 @@ var ContentTypePushModule = {
         verbose
       });
     }
-    const target = createContentTypeEngineDataSource({
-      client,
-      verbose,
-      batchSize: resolvedBatchSize
-    });
+    const target = createContentTypeEngineDataSource({ client });
     await syncEngine({
       source,
       target,
@@ -6166,9 +6093,7 @@ function createEntryEngineDataSource({
   state,
   onlyEntries,
   onlyPatterns,
-  entryIDs,
-  batchSize,
-  verbose
+  entryIDs
 }) {
   const stateId = convertStateOption(state);
   async function* getObjects() {
@@ -6194,7 +6119,7 @@ function createEntryEngineDataSource({
           throw error;
         }
       },
-      { pageSize: batchSize ?? 100, verbose, entityName: "entries" }
+      { pageSize: 100 }
     );
     for await (const e of entries) {
       const result = {
@@ -6227,18 +6152,15 @@ var EntryPublishModule = {
       withDiffOptions(
         withApiOptions(
           withProjectOptions(
-            withBatchSizeOptions(
-              yargs43.positional("ids", {
-                describe: "Publishes entry(ies) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
-                type: "string"
-              }).option("all", {
-                alias: ["a"],
-                describe: "Publishes all entries. Use --ids to publish selected entries instead.",
-                default: false,
-                type: "boolean"
-              }),
-              "entry"
-            )
+            yargs43.positional("ids", {
+              describe: "Publishes entry(ies) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
+              type: "string"
+            }).option("all", {
+              alias: ["a"],
+              describe: "Publishes all entries. Use --ids to publish selected entries instead.",
+              default: false,
+              type: "boolean"
+            })
           )
         )
       )
@@ -6254,8 +6176,7 @@ var EntryPublishModule = {
     project: projectId,
     whatIf,
     verbose,
-    directory,
-    resolvedBatchSize
+    directory
   }) => {
     if (!all && !ids || all && ids) {
       console.error(`Specify --all or entry ID(s) to publish.`);
@@ -6268,15 +6189,13 @@ var EntryPublishModule = {
       client,
       state: "preview",
       entryIDs: entryIDsArray,
-      onlyEntries: true,
-      batchSize: resolvedBatchSize
+      onlyEntries: true
     });
     const target = createEntryEngineDataSource({
       client,
       state: "published",
       entryIDs: entryIDsArray,
-      onlyEntries: true,
-      batchSize: resolvedBatchSize
+      onlyEntries: true
     });
     const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
     await syncEngine({
@@ -6314,25 +6233,22 @@ var EntryPullModule = {
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
-              withBatchSizeOptions(
-                yargs43.positional("directory", {
-                  describe: "Directory to save the entries to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
-                  type: "string"
-                }).option("format", {
-                  alias: ["f"],
-                  describe: "Output format",
-                  default: "yaml",
-                  choices: ["yaml", "json"],
-                  type: "string"
-                }).option("mode", {
-                  alias: ["m"],
-                  describe: 'What kind of changes can be made. "create" = create new files, update nothing. "createOrUpdate" = create new files, update existing, delete nothing. "mirror" = create, update, and delete to mirror state',
-                  choices: ["create", "createOrUpdate", "mirror"],
-                  default: "mirror",
-                  type: "string"
-                }),
-                "entry"
-              )
+              yargs43.positional("directory", {
+                describe: "Directory to save the entries to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
+                type: "string"
+              }).option("format", {
+                alias: ["f"],
+                describe: "Output format",
+                default: "yaml",
+                choices: ["yaml", "json"],
+                type: "string"
+              }).option("mode", {
+                alias: ["m"],
+                describe: 'What kind of changes can be made. "create" = create new files, update nothing. "createOrUpdate" = create new files, update existing, delete nothing. "mirror" = create, update, and delete to mirror state',
+                choices: ["create", "createOrUpdate", "mirror"],
+                default: "mirror",
+                type: "string"
+              })
             )
           )
         )
@@ -6351,8 +6267,7 @@ var EntryPullModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose,
-    resolvedBatchSize
+    verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getContentClient({
@@ -6362,13 +6277,7 @@ var EntryPullModule = {
       projectId
     });
     const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const source = createEntryEngineDataSource({
-      client,
-      state,
-      onlyEntries: true,
-      verbose,
-      batchSize: resolvedBatchSize
-    });
+    const source = createEntryEngineDataSource({ client, state, onlyEntries: true });
     let target;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -6430,19 +6339,16 @@ var EntryPushModule = {
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
-              withBatchSizeOptions(
-                yargs43.positional("directory", {
-                  describe: "Directory to read the entries from. If a filename is used, a package will be read instead.",
-                  type: "string"
-                }).option("mode", {
-                  alias: ["m"],
-                  describe: 'What kind of changes can be made. "create" = create new, update nothing. "createOrUpdate" = create new, update existing, delete nothing. "mirror" = create, update, and delete',
-                  choices: ["create", "createOrUpdate", "mirror"],
-                  default: "mirror",
-                  type: "string"
-                }),
-                "entry"
-              )
+              yargs43.positional("directory", {
+                describe: "Directory to read the entries from. If a filename is used, a package will be read instead.",
+                type: "string"
+              }).option("mode", {
+                alias: ["m"],
+                describe: 'What kind of changes can be made. "create" = create new, update nothing. "createOrUpdate" = create new, update existing, delete nothing. "mirror" = create, update, and delete',
+                choices: ["create", "createOrUpdate", "mirror"],
+                default: "mirror",
+                type: "string"
+              })
             )
           )
         )
@@ -6460,8 +6366,7 @@ var EntryPushModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose,
-    resolvedBatchSize
+    verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getContentClient({
@@ -6488,13 +6393,7 @@ var EntryPushModule = {
         verbose
       });
     }
-    const target = createEntryEngineDataSource({
-      client,
-      state,
-      onlyEntries: true,
-      verbose,
-      batchSize: resolvedBatchSize
-    });
+    const target = createEntryEngineDataSource({ client, state, onlyEntries: true });
     const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
     const uniformLocales = await fetchUniformLocales({
       apiKey,
@@ -6592,33 +6491,20 @@ var EntryUnpublishModule = {
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          withBatchSizeOptions(
-            yargs43.positional("ids", {
-              describe: "Un-publishes entry(ies) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
-              type: "string"
-            }).option("all", {
-              alias: ["a"],
-              describe: "Un-publishes all entries. Use --all to un-publish selected entries instead.",
-              default: false,
-              type: "boolean"
-            }),
-            "entry"
-          )
+          yargs43.positional("ids", {
+            describe: "Un-publishes entry(ies) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
+            type: "string"
+          }).option("all", {
+            alias: ["a"],
+            describe: "Un-publishes all entries. Use --all to un-publish selected entries instead.",
+            default: false,
+            type: "boolean"
+          })
         )
       )
     )
   ),
-  handler: async ({
-    apiHost,
-    apiKey,
-    proxy,
-    ids,
-    all,
-    project: projectId,
-    whatIf,
-    verbose,
-    resolvedBatchSize
-  }) => {
+  handler: async ({ apiHost, apiKey, proxy, ids, all, project: projectId, whatIf, verbose }) => {
     if (!all && !ids || all && ids) {
       console.error(`Specify --all or entry ID(s) to unpublish.`);
       process.exit(1);
@@ -6631,15 +6517,13 @@ var EntryUnpublishModule = {
       client,
       state: "published",
       entryIDs: entryIDsArray,
-      onlyEntries: true,
-      batchSize: resolvedBatchSize
+      onlyEntries: true
     });
     const target = createEntryEngineDataSource({
       client,
       state: "preview",
       entryIDs: entryIDsArray,
-      onlyEntries: true,
-      batchSize: resolvedBatchSize
+      onlyEntries: true
     });
     const log2 = createPublishStatusSyncEngineConsoleLogger({ status: "unpublish" });
     for await (const obj of target.objects) {
@@ -6857,18 +6741,15 @@ var EntryPatternPublishModule = {
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            withBatchSizeOptions(
-              yargs43.positional("ids", {
-                describe: "Publishes entry pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
-                type: "string"
-              }).option("all", {
-                alias: ["a"],
-                describe: "Publishes all entry patterns. Use --ids to publish selected entry patterns instead.",
-                default: false,
-                type: "boolean"
-              }),
-              "entryPattern"
-            )
+            yargs43.positional("ids", {
+              describe: "Publishes entry pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
+              type: "string"
+            }).option("all", {
+              alias: ["a"],
+              describe: "Publishes all entry patterns. Use --ids to publish selected entry patterns instead.",
+              default: false,
+              type: "boolean"
+            })
           )
         )
       )
@@ -6884,8 +6765,7 @@ var EntryPatternPublishModule = {
     whatIf,
     project: projectId,
     verbose,
-    directory,
-    resolvedBatchSize
+    directory
   }) => {
     if (!all && !ids || all && ids) {
       console.error(`Specify --all or entry pattern ID(s) to publish.`);
@@ -6898,15 +6778,13 @@ var EntryPatternPublishModule = {
       client,
       state: "preview",
       entryIDs: entryIDsArray,
-      onlyPatterns: true,
-      batchSize: resolvedBatchSize
+      onlyPatterns: true
     });
     const target = createEntryEngineDataSource({
       client,
       state: "published",
       entryIDs: entryIDsArray,
-      onlyPatterns: true,
-      batchSize: resolvedBatchSize
+      onlyPatterns: true
     });
     const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
     await syncEngine({
@@ -6944,25 +6822,22 @@ var EntryPatternPullModule = {
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
-              withBatchSizeOptions(
-                yargs43.positional("directory", {
-                  describe: "Directory to save the entries to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
-                  type: "string"
-                }).option("format", {
-                  alias: ["f"],
-                  describe: "Output format",
-                  default: "yaml",
-                  choices: ["yaml", "json"],
-                  type: "string"
-                }).option("mode", {
-                  alias: ["m"],
-                  describe: 'What kind of changes can be made. "create" = create new files, update nothing. "createOrUpdate" = create new files, update existing, delete nothing. "mirror" = create, update, and delete to mirror state',
-                  choices: ["create", "createOrUpdate", "mirror"],
-                  default: "mirror",
-                  type: "string"
-                }),
-                "entryPattern"
-              )
+              yargs43.positional("directory", {
+                describe: "Directory to save the entries to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
+                type: "string"
+              }).option("format", {
+                alias: ["f"],
+                describe: "Output format",
+                default: "yaml",
+                choices: ["yaml", "json"],
+                type: "string"
+              }).option("mode", {
+                alias: ["m"],
+                describe: 'What kind of changes can be made. "create" = create new files, update nothing. "createOrUpdate" = create new files, update existing, delete nothing. "mirror" = create, update, and delete to mirror state',
+                choices: ["create", "createOrUpdate", "mirror"],
+                default: "mirror",
+                type: "string"
+              })
             )
           )
         )
@@ -6981,8 +6856,7 @@ var EntryPatternPullModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose,
-    resolvedBatchSize
+    verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getContentClient({
@@ -6992,13 +6866,7 @@ var EntryPatternPullModule = {
       projectId
     });
     const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const source = createEntryEngineDataSource({
-      client,
-      state,
-      onlyPatterns: true,
-      verbose,
-      batchSize: resolvedBatchSize
-    });
+    const source = createEntryEngineDataSource({ client, state, onlyPatterns: true });
     let target;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -7060,24 +6928,21 @@ var EntryPatternPushModule = {
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
-              withBatchSizeOptions(
-                yargs43.positional("directory", {
-                  describe: "Directory to read the entry patterns from. If a filename is used, a package will be read instead.",
-                  type: "string"
-                }).option("what-if", {
-                  alias: ["w"],
-                  describe: "What-if mode reports what would be done but changes nothing",
-                  default: false,
-                  type: "boolean"
-                }).option("mode", {
-                  alias: ["m"],
-                  describe: 'What kind of changes can be made. "create" = create new, update nothing. "createOrUpdate" = create new, update existing, delete nothing. "mirror" = create, update, and delete',
-                  choices: ["create", "createOrUpdate", "mirror"],
-                  default: "mirror",
-                  type: "string"
-                }),
-                "entryPattern"
-              )
+              yargs43.positional("directory", {
+                describe: "Directory to read the entry patterns from. If a filename is used, a package will be read instead.",
+                type: "string"
+              }).option("what-if", {
+                alias: ["w"],
+                describe: "What-if mode reports what would be done but changes nothing",
+                default: false,
+                type: "boolean"
+              }).option("mode", {
+                alias: ["m"],
+                describe: 'What kind of changes can be made. "create" = create new, update nothing. "createOrUpdate" = create new, update existing, delete nothing. "mirror" = create, update, and delete',
+                choices: ["create", "createOrUpdate", "mirror"],
+                default: "mirror",
+                type: "string"
+              })
             )
           )
         )
@@ -7095,8 +6960,7 @@ var EntryPatternPushModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose,
-    resolvedBatchSize
+    verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getContentClient({
@@ -7123,13 +6987,7 @@ var EntryPatternPushModule = {
         verbose
       });
     }
-    const target = createEntryEngineDataSource({
-      client,
-      state,
-      onlyPatterns: true,
-      verbose,
-      batchSize: resolvedBatchSize
-    });
+    const target = createEntryEngineDataSource({ client, state, onlyPatterns: true });
     const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
     const uniformLocales = await fetchUniformLocales({
       apiKey,
@@ -7196,33 +7054,20 @@ var EntryPatternUnpublishModule = {
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          withBatchSizeOptions(
-            yargs43.positional("ids", {
-              describe: "Un-publishes entry patterns by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
-              type: "string"
-            }).option("all", {
-              alias: ["a"],
-              describe: "Un-publishes all entry patterns. Use --all to un-publish selected entry patterns instead.",
-              default: false,
-              type: "boolean"
-            }),
-            "entryPattern"
-          )
+          yargs43.positional("ids", {
+            describe: "Un-publishes entry patterns by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
+            type: "string"
+          }).option("all", {
+            alias: ["a"],
+            describe: "Un-publishes all entry patterns. Use --all to un-publish selected entry patterns instead.",
+            default: false,
+            type: "boolean"
+          })
         )
       )
     )
   ),
-  handler: async ({
-    apiHost,
-    apiKey,
-    proxy,
-    ids,
-    all,
-    project: projectId,
-    whatIf,
-    verbose,
-    resolvedBatchSize
-  }) => {
+  handler: async ({ apiHost, apiKey, proxy, ids, all, project: projectId, whatIf, verbose }) => {
     if (!all && !ids || all && ids) {
       console.error(`Specify --all or entry pattern ID(s) to unpublish.`);
       process.exit(1);
@@ -7235,15 +7080,13 @@ var EntryPatternUnpublishModule = {
       client,
       state: "published",
       entryIDs: entryIDsArray,
-      onlyPatterns: true,
-      batchSize: resolvedBatchSize
+      onlyPatterns: true
     });
     const target = createEntryEngineDataSource({
       client,
       state: "preview",
       entryIDs: entryIDsArray,
-      onlyPatterns: true,
-      batchSize: resolvedBatchSize
+      onlyPatterns: true
     });
     const log2 = createPublishStatusSyncEngineConsoleLogger({ status: "unpublish" });
     for await (const obj of target.objects) {
@@ -7329,14 +7172,12 @@ function normalizeLabelForSync(label) {
   return labelWithoutProjectId;
 }
 function createLabelsEngineDataSource({
-  client,
-  batchSize,
-  verbose
+  client
 }) {
   async function* getObjects() {
     const labels = paginateAsync(
       async (offset, limit2) => (await client.getLabels({ offset, limit: limit2 })).labels,
-      { pageSize: batchSize ?? 100, verbose, entityName: "labels" }
+      { pageSize: 100 }
     );
     for await (const label of labels) {
       const result = {
@@ -7377,25 +7218,22 @@ var LabelPullModule = {
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            withBatchSizeOptions(
-              yargs43.positional("directory", {
-                describe: "Directory to save the labels to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
-                type: "string"
-              }).option("format", {
-                alias: ["f"],
-                describe: "Output format",
-                default: "yaml",
-                choices: ["yaml", "json"],
-                type: "string"
-              }).option("mode", {
-                alias: ["m"],
-                describe: 'What kind of changes can be made. "create" = create new files, update nothing. "createOrUpdate" = create new files, update existing, delete nothing. "mirror" = create, update, and delete to mirror state',
-                choices: ["create", "createOrUpdate", "mirror"],
-                default: "mirror",
-                type: "string"
-              }),
-              "label"
-            )
+            yargs43.positional("directory", {
+              describe: "Directory to save the labels to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
+              type: "string"
+            }).option("format", {
+              alias: ["f"],
+              describe: "Output format",
+              default: "yaml",
+              choices: ["yaml", "json"],
+              type: "string"
+            }).option("mode", {
+              alias: ["m"],
+              describe: 'What kind of changes can be made. "create" = create new files, update nothing. "createOrUpdate" = create new files, update existing, delete nothing. "mirror" = create, update, and delete to mirror state',
+              choices: ["create", "createOrUpdate", "mirror"],
+              default: "mirror",
+              type: "string"
+            })
           )
         )
       )
@@ -7412,16 +7250,11 @@ var LabelPullModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose,
-    resolvedBatchSize
+    verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getLabelClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const source = createLabelsEngineDataSource({
-      client,
-      verbose,
-      batchSize: resolvedBatchSize
-    });
+    const source = createLabelsEngineDataSource({ client });
     let target;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -7472,19 +7305,16 @@ var LabelPushModule = {
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            withBatchSizeOptions(
-              yargs43.positional("directory", {
-                describe: "Directory to read the labels from. If a filename is used, a package will be read instead.",
-                type: "string"
-              }).option("mode", {
-                alias: ["m"],
-                describe: 'What kind of changes can be made. "create" = create new, update nothing. "createOrUpdate" = create new, update existing, delete nothing. "mirror" = create, update, and delete',
-                choices: ["create", "createOrUpdate", "mirror"],
-                default: "mirror",
-                type: "string"
-              }),
-              "label"
-            )
+            yargs43.positional("directory", {
+              describe: "Directory to read the labels from. If a filename is used, a package will be read instead.",
+              type: "string"
+            }).option("mode", {
+              alias: ["m"],
+              describe: 'What kind of changes can be made. "create" = create new, update nothing. "createOrUpdate" = create new, update existing, delete nothing. "mirror" = create, update, and delete',
+              choices: ["create", "createOrUpdate", "mirror"],
+              default: "mirror",
+              type: "string"
+            })
           )
         )
       )
@@ -7500,8 +7330,7 @@ var LabelPushModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose,
-    resolvedBatchSize
+    verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getLabelClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -7524,11 +7353,7 @@ var LabelPushModule = {
         verbose
       });
     }
-    const target = createLabelsEngineDataSource({
-      client,
-      verbose,
-      batchSize: resolvedBatchSize
-    });
+    const target = createLabelsEngineDataSource({ client });
     const labelsFailedDueToMissingParent = /* @__PURE__ */ new Set();
     const attemptSync = async () => {
       const lastFailedLabelsCount = labelsFailedDueToMissingParent.size;
@@ -8673,15 +8498,11 @@ var getWorkflowClient = (options) => new WorkflowClient({ ...options, bypassCach
 
 // src/commands/canvas/workflowEngineDataSource.ts
 function createWorkflowEngineDataSource({
-  client,
-  batchSize,
-  verbose
+  client
 }) {
   async function* getObjects() {
-    const workflows = paginateAsync(async (offset, limit2) => (await client.get({ offset, limit: limit2 })).results, {
-      pageSize: batchSize ?? 100,
-      verbose,
-      entityName: "workflows"
+    const workflows = paginateAsync(async () => (await client.get()).results, {
+      pageSize: 100
     });
     for await (const workflow of workflows) {
       const { modified, modifiedBy, created, createdBy, ...workflowWithoutStatistics } = workflow;
@@ -8715,25 +8536,22 @@ var WorkflowPullModule = {
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            withBatchSizeOptions(
-              yargs43.positional("directory", {
-                describe: "Directory to save to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
-                type: "string"
-              }).option("format", {
-                alias: ["f"],
-                describe: "Output format",
-                default: "yaml",
-                choices: ["yaml", "json"],
-                type: "string"
-              }).option("mode", {
-                alias: ["m"],
-                describe: 'What kind of changes can be made. "create" = create new files, update nothing. "createOrUpdate" = create new files, update existing, delete nothing. "mirror" = create, update, and delete to mirror state',
-                choices: ["create", "createOrUpdate", "mirror"],
-                default: "mirror",
-                type: "string"
-              }),
-              "workflow"
-            )
+            yargs43.positional("directory", {
+              describe: "Directory to save to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
+              type: "string"
+            }).option("format", {
+              alias: ["f"],
+              describe: "Output format",
+              default: "yaml",
+              choices: ["yaml", "json"],
+              type: "string"
+            }).option("mode", {
+              alias: ["m"],
+              describe: 'What kind of changes can be made. "create" = create new files, update nothing. "createOrUpdate" = create new files, update existing, delete nothing. "mirror" = create, update, and delete to mirror state',
+              choices: ["create", "createOrUpdate", "mirror"],
+              default: "mirror",
+              type: "string"
+            })
           )
         )
       )
@@ -8750,16 +8568,11 @@ var WorkflowPullModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose,
-    resolvedBatchSize
+    verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getWorkflowClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const source = createWorkflowEngineDataSource({
-      client,
-      verbose,
-      batchSize: resolvedBatchSize
-    });
+    const source = createWorkflowEngineDataSource({ client });
     let target;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -8803,19 +8616,16 @@ var WorkflowPushModule = {
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            withBatchSizeOptions(
-              yargs43.positional("directory", {
-                describe: "Directory to read from. If a filename is used, a package will be read instead.",
-                type: "string"
-              }).option("mode", {
-                alias: ["m"],
-                describe: 'What kind of changes can be made. "create" = create new, update nothing. "createOrUpdate" = create new, update existing, delete nothing. "mirror" = create, update, and delete',
-                choices: ["create", "createOrUpdate", "mirror"],
-                default: "mirror",
-                type: "string"
-              }),
-              "workflow"
-            )
+            yargs43.positional("directory", {
+              describe: "Directory to read from. If a filename is used, a package will be read instead.",
+              type: "string"
+            }).option("mode", {
+              alias: ["m"],
+              describe: 'What kind of changes can be made. "create" = create new, update nothing. "createOrUpdate" = create new, update existing, delete nothing. "mirror" = create, update, and delete',
+              choices: ["create", "createOrUpdate", "mirror"],
+              default: "mirror",
+              type: "string"
+            })
           )
         )
       )
@@ -8831,8 +8641,7 @@ var WorkflowPushModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose,
-    resolvedBatchSize
+    verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getWorkflowClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -8854,11 +8663,7 @@ var WorkflowPushModule = {
         verbose
       });
     }
-    const target = createWorkflowEngineDataSource({
-      client,
-      verbose,
-      batchSize: resolvedBatchSize
-    });
+    const target = createWorkflowEngineDataSource({ client });
     await syncEngine({
       source,
       target,
@@ -13214,8 +13019,7 @@ var SyncPullModule = {
             patternType: entityType === "compositionPattern" ? "composition" : entityType === "componentPattern" ? "component" : void 0,
             mode: getPullMode(entityType, config2),
             directory: getPullFilename(entityType, config2),
-            allowEmptySource: config2.allowEmptySource,
-            ...isPaginatedSyncEntity(entityType) ? { resolvedBatchSize: getEntityBatchSize(entityType, config2) } : {}
+            allowEmptySource: config2.allowEmptySource
           }),
           {
             text: `${entityType}\u2026`,
@@ -13380,8 +13184,7 @@ var SyncPushModule = {
             patternType: entityType === "compositionPattern" ? "composition" : entityType === "componentPattern" ? "component" : void 0,
             mode: getPushMode(entityType, config2),
             directory: getPushFilename(entityType, config2),
-            allowEmptySource: config2.allowEmptySource,
-            ...isPaginatedSyncEntity(entityType) ? { resolvedBatchSize: getEntityBatchSize(entityType, config2) } : {}
+            allowEmptySource: config2.allowEmptySource
           }),
           {
             text: `${entityType}...`,
@@ -13402,12 +13205,10 @@ var SyncPushModule = {
         await spinPromise(
           ComponentPatternPublishModule.handler({
             ...otherParams,
-            serialization: config2,
             patternType: "component",
             onlyPatterns: true,
             all: true,
-            directory: getPushFilename("componentPattern", config2),
-            resolvedBatchSize: getEntityBatchSize("componentPattern", config2)
+            directory: getPushFilename("componentPattern", config2)
           }),
           {
             text: "publishing component patterns...",
@@ -13428,12 +13229,10 @@ var SyncPushModule = {
         await spinPromise(
           CompositionPatternPublishModule.handler({
             ...otherParams,
-            serialization: config2,
             all: true,
             onlyPatterns: true,
             patternType: "composition",
-            directory: getPushFilename("compositionPattern", config2),
-            resolvedBatchSize: getEntityBatchSize("compositionPattern", config2)
+            directory: getPushFilename("compositionPattern", config2)
           }),
           {
             text: "publishing composition patterns...",
@@ -13454,11 +13253,9 @@ var SyncPushModule = {
         await spinPromise(
           CompositionPublishModule.handler({
             ...otherParams,
-            serialization: config2,
             all: true,
             onlyCompositions: true,
-            directory: getPushFilename("composition", config2),
-            resolvedBatchSize: getEntityBatchSize("composition", config2)
+            directory: getPushFilename("composition", config2)
           }),
           {
             text: "publishing compositions...",
@@ -13479,10 +13276,8 @@ var SyncPushModule = {
         await spinPromise(
           EntryPublishModule.handler({
             ...otherParams,
-            serialization: config2,
             all: true,
-            directory: getPushFilename("entry", config2),
-            resolvedBatchSize: getEntityBatchSize("entry", config2)
+            directory: getPushFilename("entry", config2)
           }),
           {
             text: "publishing entries...",
@@ -13503,10 +13298,8 @@ var SyncPushModule = {
         await spinPromise(
           EntryPatternPublishModule.handler({
             ...otherParams,
-            serialization: config2,
             all: true,
-            directory: getPushFilename("entryPattern", config2),
-            resolvedBatchSize: getEntityBatchSize("entryPattern", config2)
+            directory: getPushFilename("entryPattern", config2)
           }),
           {
             text: "publishing entry patterns...",