Remove redundant order test

Author: NathanPJF

packages/theme/src/cli/utilities/theme-uploader.test.ts

@@ -1,12 +1,10 @@
 import {renderTasksToStdErr} from './theme-ui.js'
 import {fakeThemeFileSystem} from './theme-fs/theme-fs-mock-factory.js'
 import {
-  ChecksumWithSize,
   MAX_BATCH_BYTESIZE,
   MAX_BATCH_FILE_COUNT,
   MAX_UPLOAD_RETRY_COUNT,
   MINIMUM_THEME_ASSETS,
-  orderFilesToBeUploaded,
   uploadTheme,
   updateUploadErrors,
 } from './theme-uploader.js'
@@ -416,47 +414,6 @@ describe('theme-uploader', () => {
     )
   })
 
-  test('orders settings_schema.json first and settings_data.json last in the dependent chain, surrounding every validator-consumer asset', () => {
-    // Regression for the fresh-theme bootstrap bug: blocks, sections, section-group
-    // JSONs and template JSONs run server-side validators that resolve dynamic-source
-    // defaults of the form `{{ settings.<theme_setting>.* }}` against the theme's
-    // currently-stored settings_schema.json. If the user's new schema lands AFTER
-    // those assets, validators see an empty schema and the first push errors out.
-    // settings_data.json must then go LAST because its values are validated against
-    // the freshly-uploaded schema and may reference earlier-uploaded sections/templates.
-    const file = (key: string): ChecksumWithSize => ({key, checksum: '_', size: 0})
-    const files: ChecksumWithSize[] = [
-      file('config/settings_schema.json'),
-      file('config/settings_data.json'),
-      file('layout/theme.liquid'),
-      file('blocks/quantity.liquid'),
-      file('sections/header.liquid'),
-      file('sections/header-group.json'),
-      file('templates/product.json'),
-      file('templates/product.context.uk.json'),
-    ]
-
-    const {dependentFiles} = orderFilesToBeUploaded(files)
-    const flat = dependentFiles.flat().map((f) => f.key)
-
-    expect(flat.at(0)).toBe('config/settings_schema.json')
-    expect(flat.at(-1)).toBe('config/settings_data.json')
-
-    const validatorConsumers = [
-      'blocks/quantity.liquid',
-      'sections/header.liquid',
-      'sections/header-group.json',
-      'templates/product.json',
-      'templates/product.context.uk.json',
-    ]
-    for (const key of validatorConsumers) {
-      const index = flat.indexOf(key)
-      expect(index, `${key} missing from dependent chain`).not.toBe(-1)
-      expect(index, `${key} should be after settings_schema.json`).toBeGreaterThan(0)
-      expect(index, `${key} should be before settings_data.json`).toBeLessThan(flat.length - 1)
-    }
-  })
-
   test('should create batches for files when bulk upload file count limit is reached', async () => {
     // Given
     const remoteChecksums: Checksum[] = []

packages/theme/src/cli/utilities/theme-uploader.ts

@@ -20,7 +20,7 @@ interface UploadOptions {
   multiEnvironment?: boolean
 }
 
-export type ChecksumWithSize = Checksum & {size: number}
+type ChecksumWithSize = Checksum & {size: number}
 type FileBatch = ChecksumWithSize[]
 
 /**
@@ -202,6 +202,7 @@ function getRemoteFilesToBeDeleted(remoteChecksums: Checksum[], themeFileSystem:
 }
 
 // Contextual Json Files -> Json Files -> Liquid Files -> Config Files -> Static Asset Files
+// Config file consideration: Inverse of the upload order: data first (consumes schema), then schema.
 function orderFilesToBeDeleted(files: Checksum[]): Checksum[] {
   const fileSets = partitionThemeFiles(files)
   return [
@@ -213,7 +214,6 @@ function orderFilesToBeDeleted(files: Checksum[]): Checksum[] {
     ...fileSets.blockLiquidFiles,
     ...fileSets.layoutFiles,
     ...fileSets.otherLiquidFiles,
-    // Inverse of the upload order: data first (consumes schema), then schema.
     ...fileSets.configDataFile,
     ...fileSets.configSchemaFile,
     ...fileSets.staticAssetFiles,
@@ -317,10 +317,7 @@ function selectUploadableFiles(themeFileSystem: ThemeFileSystem, remoteChecksums
  * 1. config/settings_schema.json must be uploaded FIRST. It declares the
  *    theme-level settings that block / section / section-group / template
  *    validators resolve dynamic-source defaults against (e.g. defaults of
- *    the form {{ settings.<theme_setting>.<property> }}). On a fresh
- *    theme the stored schema is empty, so any later asset whose schema
- *    references a not-yet-declared theme setting fails server-side
- *    validation. Uploading the schema first primes those references.
+ *    the form {{ settings.<theme_setting>.<property> }}).
  * 2. Layout files don't necessarily need to be the first, but they must be
  *    uploaded before templates.
  * 3. Liquid blocks need to be uploaded before sections
@@ -340,7 +337,7 @@ function selectUploadableFiles(themeFileSystem: ThemeFileSystem, remoteChecksums
  * - The static assets
  *
  */
-export function orderFilesToBeUploaded(files: ChecksumWithSize[]): {
+function orderFilesToBeUploaded(files: ChecksumWithSize[]): {
   independentFiles: ChecksumWithSize[][]
   dependentFiles: ChecksumWithSize[][]
 } {
@@ -351,17 +348,13 @@ export function orderFilesToBeUploaded(files: ChecksumWithSize[]): {
     independentFiles: [fileSets.otherLiquidFiles, fileSets.otherJsonFiles, fileSets.staticAssetFiles],
     // Follow order of dependencies:
     dependentFiles: [
-      // Theme setting declarations must land before any asset that may
-      // reference them via dynamic-source defaults. See header comment.
       fileSets.configSchemaFile,
       fileSets.layoutFiles,
       fileSets.blockLiquidFiles,
       fileSets.sectionLiquidFiles,
       fileSets.sectionJsonFiles,
       fileSets.templateJsonFiles,
       fileSets.contextualizedJsonFiles,
-      // Settings values reference the schema we just uploaded, plus any
-      // sections / templates referenced by presets.
       fileSets.configDataFile,
     ],
   }
@@ -399,7 +392,7 @@ function calculateLocalChecksums(localThemeFileSystem: ThemeFileSystem): Checksu
   localThemeFileSystem.files.forEach((file, key) => {
     // Text files: use UTF-8 byte count
     // Binary files: use base64 length
-    const size = file.value ? Buffer.byteLength(file.value, 'utf8') : (file.attachment?.length ?? 0)
+    const size = file.value ? Buffer.byteLength(file.value, 'utf8') : file.attachment?.length ?? 0
 
     checksums.push({
       key,