New reordering algorithm

biome.json

@@ -29,5 +29,13 @@
     "formatter": {
       "quoteStyle": "single"
     }
-  }
+  },
+  "overrides": [
+    {
+      "include": ["package.json"],
+      "formatter": {
+        "lineWidth": 1
+      }
+    }
+  ]
 }

packages/cli-utils/package.json

@@ -18,7 +18,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@datocms/cma-client-node": ">=3.3.1",
+    "@datocms/cma-client-node": ">=3.3.9",
     "@oclif/core": "^1",
     "@whatwg-node/fetch": "^0.9.14",
     "chalk": "^4",

packages/cli/package.json

@@ -34,7 +34,7 @@
     "@oclif/plugin-warn-if-update-available": "^2.0.4",
     "lodash": "^4.17.21",
     "mkdirp": "^1.0.4",
-    "prettier": "^2.7.1",
+    "prettier": "^3.3.3",
     "ts-node": "^10.7.0",
     "typescript": "~4.5.0"
   },

packages/cli/src/utils/environments-diff/fetch-schema.ts

@@ -10,6 +10,7 @@ export async function fetchSchema(client: CmaClient.Client): Promise<Schema> {
     workflowsResponse,
     itemTypeFiltersResponse,
     uploadFiltersResponse,
+    uploadCollectionsResponse,
   ] = await Promise.all([
     client.site.rawFind({
       include: 'item_types,item_types.fields,item_types.fieldsets',
@@ -20,6 +21,7 @@ export async function fetchSchema(client: CmaClient.Client): Promise<Schema> {
     client.workflows.rawList(),
     client.itemTypeFilters.rawList(),
     client.uploadFilters.rawList(),
+    client.uploadCollections.rawList(),
   ]);
 
   const includedResources = siteResponse.included || [];
@@ -70,6 +72,12 @@ export async function fetchSchema(client: CmaClient.Client): Promise<Schema> {
         schemaMenuItem,
       ]),
     ),
+    uploadCollectionsById: Object.fromEntries(
+      uploadCollectionsResponse.data.map((uploadCollection) => [
+        uploadCollection.id,
+        uploadCollection,
+      ]),
+    ),
     pluginsById: Object.fromEntries(
       pluginsResponse.data.map((plugin) => [plugin.id, plugin]),
     ),

packages/cli/src/utils/environments-diff/index.ts

@@ -10,6 +10,7 @@ import { manageItemTypeFilters } from './resources/manage-item-type-filters';
 import { manageMenuItems } from './resources/manage-menu-items';
 import { managePlugins } from './resources/manage-plugins';
 import { manageSchemaMenuItems } from './resources/manage-schema-menu-items';
+import { manageUploadCollections } from './resources/manage-upload-collections';
 import { manageUploadFilters } from './resources/manage-upload-filters';
 import { manageWorkflows } from './resources/manage-workflows';
 import { updateFieldsAndFieldsets } from './resources/update-fields-and-fieldsets';
@@ -51,10 +52,15 @@ export async function diffEnvironments({
     ...manageItemTypeFilters(newSchema, oldSchema),
     ...manageMenuItems(newSchema, oldSchema),
     ...manageSchemaMenuItems(newSchema, oldSchema),
+    ...manageUploadCollections(newSchema, oldSchema),
     ...updateRoles(roles, newEnvironmentId, oldEnvironmentId),
   ];
 
   const options = await resolveConfig(migrationFilePath);
 
-  return write(commands, { ...options, format, filepath: migrationFilePath });
+  return write(commands, {
+    ...options,
+    format,
+    filepath: migrationFilePath,
+  });
 }