@uniformdev/cli 20.66.3-alpha.6 → 20.66.5-alpha.2

package/dist/index.mjs

@@ -5,20 +5,23 @@ import {
   applyDefaultSyncConfiguration,
   emitWithFormat,
   getDirectoryOrFilename,
+  getEntityBatchSize,
   getEntityOption,
+  isPaginatedSyncEntity,
   isPathAPackageFile,
   nodeFetchProxy,
   package_default,
   paginateAsync,
   readFileToObject,
   withApiOptions,
+  withBatchSizeOptions,
   withConfiguration,
   withDebugOptions,
   withDiffOptions,
   withFormatOptions,
   withProjectOptions,
   withTeamOptions
-} from "./chunk-XOZ6UMXP.mjs";
+} from "./chunk-JWPMHLJX.mjs";
 
 // src/index.ts
 import * as dotenv from "dotenv";
@@ -2639,16 +2642,11 @@ var replaceLocalUrlsWithRemoteReferences = async ({
       fileUrlReplacementQueue.add(async () => {
         try {
           const hash = urlToHash(fileUrl);
-          fileUrlReplacementQueue.add(async () => {
-            try {
-              const file = await fileClient.get({ sourceId: hash }).catch(() => null);
-              if (!file) {
-                return;
-              }
-              entityAsString = entityAsString.replaceAll(`"${fileUrl}"`, `"${file.url}"`);
-            } catch {
-            }
-          });
+          const file = await fileClient.get({ sourceId: hash }).catch(() => null);
+          if (!file) {
+            return;
+          }
+          entityAsString = entityAsString.replaceAll(`"${fileUrl}"`, `"${file.url}"`);
         } catch {
         }
       });
@@ -2714,20 +2712,16 @@ function convertStateOption(state) {
 // src/commands/canvas/assetEngineDataSource.ts
 function createAssetEngineDataSource({
   client,
-  verbose
+  verbose,
+  batchSize
 }) {
   async function* getObjects() {
     const assets = paginateAsync(
-      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 }
+      async (offset, limit2) => (await client.get({
+        limit: limit2,
+        offset
+      })).assets,
+      { pageSize: batchSize ?? 50, verbose, entityName: "assets" }
     );
     for await (const e of assets) {
       const result = {
@@ -2777,22 +2771,25 @@ var AssetPullModule = {
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            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"
-            })
+            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"
+            )
           )
         )
       )
@@ -2809,7 +2806,8 @@ var AssetPullModule = {
     whatIf,
     project: projectId,
     diff: diffMode,
-    allowEmptySource
+    allowEmptySource,
+    resolvedBatchSize
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getAssetClient({
@@ -2819,7 +2817,11 @@ var AssetPullModule = {
       projectId
     });
     const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const source = createAssetEngineDataSource({ client, verbose });
+    const source = createAssetEngineDataSource({
+      client,
+      verbose,
+      batchSize: resolvedBatchSize
+    });
     let target;
     const isPackage = isPathAPackageFile(directory);
     const onBeforeDeleteObject = async (id, object4) => {
@@ -2894,16 +2896,19 @@ var AssetPushModule = {
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            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"
-            })
+            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"
+            )
           )
         )
       )
@@ -2919,7 +2924,8 @@ var AssetPushModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose
+    verbose,
+    resolvedBatchSize
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getAssetClient({
@@ -2946,7 +2952,11 @@ var AssetPushModule = {
         verbose
       });
     }
-    const target = createAssetEngineDataSource({ client, verbose });
+    const target = createAssetEngineDataSource({
+      client,
+      verbose,
+      batchSize: resolvedBatchSize
+    });
     const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
     await syncEngine({
       source,
@@ -3139,10 +3149,8 @@ function createCategoriesEngineDataSource({
   client
 }) {
   async function* getObjects() {
-    const categories = paginateAsync(async () => (await client.getCategories()).categories, {
-      pageSize: 100
-    });
-    for await (const def of categories) {
+    const categories = (await client.getCategories()).categories;
+    for (const def of categories) {
       const result = {
         id: selectIdentifier(def),
         displayName: selectDisplayName(def),
@@ -3463,12 +3471,14 @@ var ComponentListModule = {
 
 // src/commands/canvas/componentDefinitionEngineDataSource.ts
 function createComponentDefinitionEngineDataSource({
-  client
+  client,
+  batchSize,
+  verbose
 }) {
   async function* getObjects() {
     const componentDefinitions = paginateAsync(
       async (offset, limit2) => (await client.getComponentDefinitions({ limit: limit2, offset })).componentDefinitions,
-      { pageSize: 200 }
+      { pageSize: batchSize ?? 200, verbose, entityName: "components" }
     );
     for await (const def of componentDefinitions) {
       const result = {
@@ -3508,22 +3518,25 @@ var ComponentPullModule = {
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            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"
-            })
+            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"
+            )
           )
         )
       )
@@ -3540,11 +3553,16 @@ var ComponentPullModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose
+    verbose,
+    resolvedBatchSize
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const source = createComponentDefinitionEngineDataSource({ client });
+    const source = createComponentDefinitionEngineDataSource({
+      client,
+      batchSize: resolvedBatchSize,
+      verbose
+    });
     let target;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -3589,16 +3607,19 @@ var ComponentPushModule = {
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            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"
-            })
+            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"
+            )
           )
         )
       )
@@ -3614,7 +3635,8 @@ var ComponentPushModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose
+    verbose,
+    resolvedBatchSize
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -3637,7 +3659,11 @@ var ComponentPushModule = {
         verbose
       });
     }
-    const target = createComponentDefinitionEngineDataSource({ client });
+    const target = createComponentDefinitionEngineDataSource({
+      client,
+      batchSize: resolvedBatchSize,
+      verbose
+    });
     await syncEngine({
       source,
       target,
@@ -4091,6 +4117,7 @@ function createComponentInstanceEngineDataSource({
   onlyPatterns,
   patternType,
   verbose,
+  batchSize,
   ...clientOptions
 }) {
   const stateId = convertStateOption(state);
@@ -4114,7 +4141,7 @@ function createComponentInstanceEngineDataSource({
         }
         return (await client.getCompositionList(parameters)).compositions;
       },
-      { pageSize: 100 }
+      { pageSize: batchSize ?? 100, verbose, entityName: "compositions" }
     );
     for await (const compositionListItem of componentInstances) {
       const result = {
@@ -4153,24 +4180,27 @@ var CompositionPublishModule = {
       withProjectOptions(
         withDebugOptions(
           withDiffOptions(
-            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
-            })
+            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"
+            )
           )
         )
       )
@@ -4188,7 +4218,8 @@ var CompositionPublishModule = {
     onlyPatterns,
     patternType,
     verbose,
-    directory
+    directory,
+    resolvedBatchSize
   }) => {
     if (!all && !ids || all && ids) {
       console.error(`Specify --all or composition ID(s) to publish.`);
@@ -4204,7 +4235,8 @@ var CompositionPublishModule = {
       onlyCompositions,
       onlyPatterns,
       patternType,
-      verbose
+      verbose,
+      batchSize: resolvedBatchSize
     });
     const target = createComponentInstanceEngineDataSource({
       client,
@@ -4213,7 +4245,8 @@ var CompositionPublishModule = {
       onlyCompositions,
       onlyPatterns,
       patternType,
-      verbose
+      verbose,
+      batchSize: resolvedBatchSize
     });
     const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
     await syncEngine({
@@ -4251,33 +4284,36 @@ var ComponentPatternPublishModule = {
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            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
-            })
+            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"
+            )
           )
         )
       )
@@ -4286,8 +4322,8 @@ var ComponentPatternPublishModule = {
 };
 
 // src/commands/canvas/commands/composition/pull.ts
-var CompositionPullModule = componentInstancePullModuleFactory("compositions");
-function componentInstancePullModuleFactory(type) {
+var CompositionPullModule = componentInstancePullModuleFactory("compositions", "composition");
+function componentInstancePullModuleFactory(type, entityType) {
   return {
     command: "pull <directory>",
     describe: "Pulls all compositions to local files in a directory",
@@ -4297,31 +4333,34 @@ function componentInstancePullModuleFactory(type) {
           withStateOptions(
             withDebugOptions(
               withDiffOptions(
-                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"
-                })
+                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
+                )
               )
             )
           )
@@ -4343,7 +4382,8 @@ function componentInstancePullModuleFactory(type) {
       project: projectId,
       diff: diffMode,
       allowEmptySource,
-      verbose
+      verbose,
+      resolvedBatchSize
     }) => {
       const fetch2 = nodeFetchProxy(proxy, verbose);
       const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -4354,7 +4394,8 @@ function componentInstancePullModuleFactory(type) {
         onlyCompositions,
         onlyPatterns,
         patternType,
-        verbose
+        verbose,
+        batchSize: resolvedBatchSize
       });
       const isPackage = isPathAPackageFile(directory);
       let target;
@@ -4410,7 +4451,7 @@ function componentInstancePullModuleFactory(type) {
 
 // src/commands/canvas/commands/componentPattern/pull.ts
 var ComponentPatternPullModule = {
-  ...componentInstancePullModuleFactory("componentPatterns"),
+  ...componentInstancePullModuleFactory("componentPatterns", "componentPattern"),
   describe: "Pulls all component patterns to local files in a directory",
   builder: (yargs43) => withConfiguration(
     withApiOptions(
@@ -4487,8 +4528,8 @@ function createLocaleValidationHook(uniformLocales) {
 }
 
 // src/commands/canvas/commands/composition/push.ts
-var CompositionPushModule = componentInstancePushModuleFactory("compositions");
-function componentInstancePushModuleFactory(type) {
+var CompositionPushModule = componentInstancePushModuleFactory("compositions", "composition");
+function componentInstancePushModuleFactory(type, entityType) {
   return {
     command: "push <directory>",
     describe: "Pushes all compositions from files in a directory to Uniform Canvas",
@@ -4498,25 +4539,28 @@ function componentInstancePushModuleFactory(type) {
           withStateOptions(
             withDebugOptions(
               withDiffOptions(
-                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
-                })
+                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
+                )
               )
             )
           )
@@ -4537,7 +4581,8 @@ function componentInstancePushModuleFactory(type) {
       patternType,
       diff: diffMode,
       allowEmptySource,
-      verbose
+      verbose,
+      resolvedBatchSize
     }) => {
       const fetch2 = nodeFetchProxy(proxy, verbose);
       const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -4565,7 +4610,8 @@ function componentInstancePushModuleFactory(type) {
         onlyCompositions,
         onlyPatterns,
         patternType,
-        verbose
+        verbose,
+        batchSize: resolvedBatchSize
       });
       const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
       const uniformLocales = await fetchUniformLocales({
@@ -4610,7 +4656,7 @@ function componentInstancePushModuleFactory(type) {
 
 // src/commands/canvas/commands/componentPattern/push.ts
 var ComponentPatternPushModule = {
-  ...componentInstancePushModuleFactory("componentPatterns"),
+  ...componentInstancePushModuleFactory("componentPatterns", "componentPattern"),
   describe: "Pushes all component patterns from files in a directory to Uniform Canvas",
   builder: (yargs43) => withConfiguration(
     withApiOptions(
@@ -4718,24 +4764,27 @@ var CompositionUnpublishModule = {
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          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
-          })
+          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"
+          )
         )
       )
     )
@@ -4751,7 +4800,8 @@ var CompositionUnpublishModule = {
     patternType,
     project: projectId,
     whatIf,
-    verbose
+    verbose,
+    resolvedBatchSize
   }) => {
     if (!all && !ids || all && ids) {
       console.error(`Specify --all or composition ID(s) to unpublish.`);
@@ -4768,7 +4818,8 @@ var CompositionUnpublishModule = {
       onlyCompositions,
       onlyPatterns,
       patternType,
-      verbose
+      verbose,
+      batchSize: resolvedBatchSize
     });
     const target = createComponentInstanceEngineDataSource({
       client,
@@ -4777,7 +4828,8 @@ var CompositionUnpublishModule = {
       onlyCompositions,
       onlyPatterns,
       patternType,
-      verbose
+      verbose,
+      batchSize: resolvedBatchSize
     });
     const log2 = createPublishStatusSyncEngineConsoleLogger({ status: "unpublish" });
     for await (const obj of target.objects) {
@@ -5016,34 +5068,37 @@ var CompositionPatternPublishModule = {
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            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
-            })
+            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"
+            )
           )
         )
       )
@@ -5053,7 +5108,7 @@ var CompositionPatternPublishModule = {
 
 // src/commands/canvas/commands/compositionPattern/pull.ts
 var CompositionPatternPullModule = {
-  ...componentInstancePullModuleFactory("compositionPatterns"),
+  ...componentInstancePullModuleFactory("compositionPatterns", "compositionPattern"),
   describe: "Pulls all composition patterns to local files in a directory",
   builder: (yargs43) => withConfiguration(
     withApiOptions(
@@ -5097,7 +5152,7 @@ var CompositionPatternPullModule = {
 
 // src/commands/canvas/commands/compositionPattern/push.ts
 var CompositionPatternPushModule = {
-  ...componentInstancePushModuleFactory("compositionPatterns"),
+  ...componentInstancePushModuleFactory("compositionPatterns", "compositionPattern"),
   describe: "Pushes all composition patterns from files in a directory to Uniform Canvas",
   builder: (yargs43) => withConfiguration(
     withApiOptions(
@@ -5248,10 +5303,15 @@ var ContentTypeListModule = {
 
 // src/commands/canvas/contentTypeEngineDataSource.ts
 function createContentTypeEngineDataSource({
-  client
+  client,
+  batchSize,
+  verbose
 }) {
   async function* getObjects() {
-    const { contentTypes } = await client.getContentTypes({ offset: 0, limit: 1e3 });
+    const contentTypes = paginateAsync(
+      async (offset, limit2) => (await client.getContentTypes({ offset, limit: limit2 })).contentTypes,
+      { pageSize: batchSize ?? 100, verbose, entityName: "content types" }
+    );
     for await (const ct of contentTypes) {
       const result = {
         id: selectContentTypeIdentifier(ct),
@@ -5283,22 +5343,25 @@ var ContentTypePullModule = {
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            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"
-            })
+            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"
+            )
           )
         )
       )
@@ -5315,7 +5378,8 @@ var ContentTypePullModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose
+    verbose,
+    resolvedBatchSize
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getContentClient({
@@ -5324,7 +5388,11 @@ var ContentTypePullModule = {
       fetch: fetch2,
       projectId
     });
-    const source = createContentTypeEngineDataSource({ client });
+    const source = createContentTypeEngineDataSource({
+      client,
+      verbose,
+      batchSize: resolvedBatchSize
+    });
     let target;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -5368,21 +5436,24 @@ var ContentTypePushModule = {
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            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"
-            })
+            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"
+            )
           )
         )
       )
@@ -5398,7 +5469,8 @@ var ContentTypePushModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose
+    verbose,
+    resolvedBatchSize
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getContentClient({
@@ -5425,7 +5497,11 @@ var ContentTypePushModule = {
         verbose
       });
     }
-    const target = createContentTypeEngineDataSource({ client });
+    const target = createContentTypeEngineDataSource({
+      client,
+      verbose,
+      batchSize: resolvedBatchSize
+    });
     await syncEngine({
       source,
       target,
@@ -6093,7 +6169,9 @@ function createEntryEngineDataSource({
   state,
   onlyEntries,
   onlyPatterns,
-  entryIDs
+  entryIDs,
+  batchSize,
+  verbose
 }) {
   const stateId = convertStateOption(state);
   async function* getObjects() {
@@ -6119,7 +6197,7 @@ function createEntryEngineDataSource({
           throw error;
         }
       },
-      { pageSize: 100 }
+      { pageSize: batchSize ?? 100, verbose, entityName: "entries" }
     );
     for await (const e of entries) {
       const result = {
@@ -6152,15 +6230,18 @@ var EntryPublishModule = {
       withDiffOptions(
         withApiOptions(
           withProjectOptions(
-            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"
-            })
+            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"
+            )
           )
         )
       )
@@ -6176,7 +6257,8 @@ var EntryPublishModule = {
     project: projectId,
     whatIf,
     verbose,
-    directory
+    directory,
+    resolvedBatchSize
   }) => {
     if (!all && !ids || all && ids) {
       console.error(`Specify --all or entry ID(s) to publish.`);
@@ -6189,13 +6271,15 @@ var EntryPublishModule = {
       client,
       state: "preview",
       entryIDs: entryIDsArray,
-      onlyEntries: true
+      onlyEntries: true,
+      batchSize: resolvedBatchSize
     });
     const target = createEntryEngineDataSource({
       client,
       state: "published",
       entryIDs: entryIDsArray,
-      onlyEntries: true
+      onlyEntries: true,
+      batchSize: resolvedBatchSize
     });
     const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
     await syncEngine({
@@ -6233,22 +6317,25 @@ var EntryPullModule = {
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
-              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"
-              })
+              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"
+              )
             )
           )
         )
@@ -6267,7 +6354,8 @@ var EntryPullModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose
+    verbose,
+    resolvedBatchSize
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getContentClient({
@@ -6277,7 +6365,13 @@ var EntryPullModule = {
       projectId
     });
     const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const source = createEntryEngineDataSource({ client, state, onlyEntries: true });
+    const source = createEntryEngineDataSource({
+      client,
+      state,
+      onlyEntries: true,
+      verbose,
+      batchSize: resolvedBatchSize
+    });
     let target;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -6339,16 +6433,19 @@ var EntryPushModule = {
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
-              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"
-              })
+              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"
+              )
             )
           )
         )
@@ -6366,7 +6463,8 @@ var EntryPushModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose
+    verbose,
+    resolvedBatchSize
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getContentClient({
@@ -6393,7 +6491,13 @@ var EntryPushModule = {
         verbose
       });
     }
-    const target = createEntryEngineDataSource({ client, state, onlyEntries: true });
+    const target = createEntryEngineDataSource({
+      client,
+      state,
+      onlyEntries: true,
+      verbose,
+      batchSize: resolvedBatchSize
+    });
     const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
     const uniformLocales = await fetchUniformLocales({
       apiKey,
@@ -6487,24 +6591,37 @@ import { diffJson as diffJson3 } from "diff";
 var EntryUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish an entry(ies)",
-  builder: (yargs43) => withConfiguration(
-    withDebugOptions(
-      withApiOptions(
-        withProjectOptions(
-          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"
-          })
+  builder: (yargs43) => withConfiguration(
+    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"
+          )
         )
       )
     )
   ),
-  handler: async ({ apiHost, apiKey, proxy, ids, all, project: projectId, whatIf, verbose }) => {
+  handler: async ({
+    apiHost,
+    apiKey,
+    proxy,
+    ids,
+    all,
+    project: projectId,
+    whatIf,
+    verbose,
+    resolvedBatchSize
+  }) => {
     if (!all && !ids || all && ids) {
       console.error(`Specify --all or entry ID(s) to unpublish.`);
       process.exit(1);
@@ -6517,13 +6634,15 @@ var EntryUnpublishModule = {
       client,
       state: "published",
       entryIDs: entryIDsArray,
-      onlyEntries: true
+      onlyEntries: true,
+      batchSize: resolvedBatchSize
     });
     const target = createEntryEngineDataSource({
       client,
       state: "preview",
       entryIDs: entryIDsArray,
-      onlyEntries: true
+      onlyEntries: true,
+      batchSize: resolvedBatchSize
     });
     const log2 = createPublishStatusSyncEngineConsoleLogger({ status: "unpublish" });
     for await (const obj of target.objects) {
@@ -6741,15 +6860,18 @@ var EntryPatternPublishModule = {
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            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"
-            })
+            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"
+            )
           )
         )
       )
@@ -6765,7 +6887,8 @@ var EntryPatternPublishModule = {
     whatIf,
     project: projectId,
     verbose,
-    directory
+    directory,
+    resolvedBatchSize
   }) => {
     if (!all && !ids || all && ids) {
       console.error(`Specify --all or entry pattern ID(s) to publish.`);
@@ -6778,13 +6901,15 @@ var EntryPatternPublishModule = {
       client,
       state: "preview",
       entryIDs: entryIDsArray,
-      onlyPatterns: true
+      onlyPatterns: true,
+      batchSize: resolvedBatchSize
     });
     const target = createEntryEngineDataSource({
       client,
       state: "published",
       entryIDs: entryIDsArray,
-      onlyPatterns: true
+      onlyPatterns: true,
+      batchSize: resolvedBatchSize
     });
     const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
     await syncEngine({
@@ -6822,22 +6947,25 @@ var EntryPatternPullModule = {
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
-              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"
-              })
+              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"
+              )
             )
           )
         )
@@ -6856,7 +6984,8 @@ var EntryPatternPullModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose
+    verbose,
+    resolvedBatchSize
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getContentClient({
@@ -6866,7 +6995,13 @@ var EntryPatternPullModule = {
       projectId
     });
     const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const source = createEntryEngineDataSource({ client, state, onlyPatterns: true });
+    const source = createEntryEngineDataSource({
+      client,
+      state,
+      onlyPatterns: true,
+      verbose,
+      batchSize: resolvedBatchSize
+    });
     let target;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -6928,21 +7063,24 @@ var EntryPatternPushModule = {
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
-              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"
-              })
+              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"
+              )
             )
           )
         )
@@ -6960,7 +7098,8 @@ var EntryPatternPushModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose
+    verbose,
+    resolvedBatchSize
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getContentClient({
@@ -6987,7 +7126,13 @@ var EntryPatternPushModule = {
         verbose
       });
     }
-    const target = createEntryEngineDataSource({ client, state, onlyPatterns: true });
+    const target = createEntryEngineDataSource({
+      client,
+      state,
+      onlyPatterns: true,
+      verbose,
+      batchSize: resolvedBatchSize
+    });
     const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
     const uniformLocales = await fetchUniformLocales({
       apiKey,
@@ -7054,20 +7199,33 @@ var EntryPatternUnpublishModule = {
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          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"
-          })
+          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"
+          )
         )
       )
     )
   ),
-  handler: async ({ apiHost, apiKey, proxy, ids, all, project: projectId, whatIf, verbose }) => {
+  handler: async ({
+    apiHost,
+    apiKey,
+    proxy,
+    ids,
+    all,
+    project: projectId,
+    whatIf,
+    verbose,
+    resolvedBatchSize
+  }) => {
     if (!all && !ids || all && ids) {
       console.error(`Specify --all or entry pattern ID(s) to unpublish.`);
       process.exit(1);
@@ -7080,13 +7238,15 @@ var EntryPatternUnpublishModule = {
       client,
       state: "published",
       entryIDs: entryIDsArray,
-      onlyPatterns: true
+      onlyPatterns: true,
+      batchSize: resolvedBatchSize
     });
     const target = createEntryEngineDataSource({
       client,
       state: "preview",
       entryIDs: entryIDsArray,
-      onlyPatterns: true
+      onlyPatterns: true,
+      batchSize: resolvedBatchSize
     });
     const log2 = createPublishStatusSyncEngineConsoleLogger({ status: "unpublish" });
     for await (const obj of target.objects) {
@@ -7172,12 +7332,14 @@ function normalizeLabelForSync(label) {
   return labelWithoutProjectId;
 }
 function createLabelsEngineDataSource({
-  client
+  client,
+  batchSize,
+  verbose
 }) {
   async function* getObjects() {
     const labels = paginateAsync(
       async (offset, limit2) => (await client.getLabels({ offset, limit: limit2 })).labels,
-      { pageSize: 100 }
+      { pageSize: batchSize ?? 100, verbose, entityName: "labels" }
     );
     for await (const label of labels) {
       const result = {
@@ -7218,22 +7380,25 @@ var LabelPullModule = {
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            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"
-            })
+            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"
+            )
           )
         )
       )
@@ -7250,11 +7415,16 @@ var LabelPullModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose
+    verbose,
+    resolvedBatchSize
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getLabelClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const source = createLabelsEngineDataSource({ client });
+    const source = createLabelsEngineDataSource({
+      client,
+      verbose,
+      batchSize: resolvedBatchSize
+    });
     let target;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -7305,16 +7475,19 @@ var LabelPushModule = {
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            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"
-            })
+            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"
+            )
           )
         )
       )
@@ -7330,7 +7503,8 @@ var LabelPushModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose
+    verbose,
+    resolvedBatchSize
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getLabelClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -7353,7 +7527,11 @@ var LabelPushModule = {
         verbose
       });
     }
-    const target = createLabelsEngineDataSource({ client });
+    const target = createLabelsEngineDataSource({
+      client,
+      verbose,
+      batchSize: resolvedBatchSize
+    });
     const labelsFailedDueToMissingParent = /* @__PURE__ */ new Set();
     const attemptSync = async () => {
       const lastFailedLabelsCount = labelsFailedDueToMissingParent.size;
@@ -8498,11 +8676,15 @@ var getWorkflowClient = (options) => new WorkflowClient({ ...options, bypassCach
 
 // src/commands/canvas/workflowEngineDataSource.ts
 function createWorkflowEngineDataSource({
-  client
+  client,
+  batchSize,
+  verbose
 }) {
   async function* getObjects() {
-    const workflows = paginateAsync(async () => (await client.get()).results, {
-      pageSize: 100
+    const workflows = paginateAsync(async (offset, limit2) => (await client.get({ offset, limit: limit2 })).results, {
+      pageSize: batchSize ?? 100,
+      verbose,
+      entityName: "workflows"
     });
     for await (const workflow of workflows) {
       const { modified, modifiedBy, created, createdBy, ...workflowWithoutStatistics } = workflow;
@@ -8536,22 +8718,25 @@ var WorkflowPullModule = {
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            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"
-            })
+            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"
+            )
           )
         )
       )
@@ -8568,11 +8753,16 @@ var WorkflowPullModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose
+    verbose,
+    resolvedBatchSize
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getWorkflowClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const source = createWorkflowEngineDataSource({ client });
+    const source = createWorkflowEngineDataSource({
+      client,
+      verbose,
+      batchSize: resolvedBatchSize
+    });
     let target;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -8616,16 +8806,19 @@ var WorkflowPushModule = {
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            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"
-            })
+            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"
+            )
           )
         )
       )
@@ -8641,7 +8834,8 @@ var WorkflowPushModule = {
     project: projectId,
     diff: diffMode,
     allowEmptySource,
-    verbose
+    verbose,
+    resolvedBatchSize
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getWorkflowClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -8663,7 +8857,11 @@ var WorkflowPushModule = {
         verbose
       });
     }
-    const target = createWorkflowEngineDataSource({ client });
+    const target = createWorkflowEngineDataSource({
+      client,
+      verbose,
+      batchSize: resolvedBatchSize
+    });
     await syncEngine({
       source,
       target,
@@ -13019,7 +13217,8 @@ var SyncPullModule = {
             patternType: entityType === "compositionPattern" ? "composition" : entityType === "componentPattern" ? "component" : void 0,
             mode: getPullMode(entityType, config2),
             directory: getPullFilename(entityType, config2),
-            allowEmptySource: config2.allowEmptySource
+            allowEmptySource: config2.allowEmptySource,
+            ...isPaginatedSyncEntity(entityType) ? { resolvedBatchSize: getEntityBatchSize(entityType, config2) } : {}
           }),
           {
             text: `${entityType}\u2026`,
@@ -13184,7 +13383,8 @@ var SyncPushModule = {
             patternType: entityType === "compositionPattern" ? "composition" : entityType === "componentPattern" ? "component" : void 0,
             mode: getPushMode(entityType, config2),
             directory: getPushFilename(entityType, config2),
-            allowEmptySource: config2.allowEmptySource
+            allowEmptySource: config2.allowEmptySource,
+            ...isPaginatedSyncEntity(entityType) ? { resolvedBatchSize: getEntityBatchSize(entityType, config2) } : {}
           }),
           {
             text: `${entityType}...`,
@@ -13205,10 +13405,12 @@ var SyncPushModule = {
         await spinPromise(
           ComponentPatternPublishModule.handler({
             ...otherParams,
+            serialization: config2,
             patternType: "component",
             onlyPatterns: true,
             all: true,
-            directory: getPushFilename("componentPattern", config2)
+            directory: getPushFilename("componentPattern", config2),
+            resolvedBatchSize: getEntityBatchSize("componentPattern", config2)
           }),
           {
             text: "publishing component patterns...",
@@ -13229,10 +13431,12 @@ var SyncPushModule = {
         await spinPromise(
           CompositionPatternPublishModule.handler({
             ...otherParams,
+            serialization: config2,
             all: true,
             onlyPatterns: true,
             patternType: "composition",
-            directory: getPushFilename("compositionPattern", config2)
+            directory: getPushFilename("compositionPattern", config2),
+            resolvedBatchSize: getEntityBatchSize("compositionPattern", config2)
           }),
           {
             text: "publishing composition patterns...",
@@ -13253,9 +13457,11 @@ var SyncPushModule = {
         await spinPromise(
           CompositionPublishModule.handler({
             ...otherParams,
+            serialization: config2,
             all: true,
             onlyCompositions: true,
-            directory: getPushFilename("composition", config2)
+            directory: getPushFilename("composition", config2),
+            resolvedBatchSize: getEntityBatchSize("composition", config2)
           }),
           {
             text: "publishing compositions...",
@@ -13276,8 +13482,10 @@ var SyncPushModule = {
         await spinPromise(
           EntryPublishModule.handler({
             ...otherParams,
+            serialization: config2,
             all: true,
-            directory: getPushFilename("entry", config2)
+            directory: getPushFilename("entry", config2),
+            resolvedBatchSize: getEntityBatchSize("entry", config2)
           }),
           {
             text: "publishing entries...",
@@ -13298,8 +13506,10 @@ var SyncPushModule = {
         await spinPromise(
           EntryPatternPublishModule.handler({
             ...otherParams,
+            serialization: config2,
             all: true,
-            directory: getPushFilename("entryPattern", config2)
+            directory: getPushFilename("entryPattern", config2),
+            resolvedBatchSize: getEntityBatchSize("entryPattern", config2)
           }),
           {
             text: "publishing entry patterns...",