Some cleanup

Author: isaacroldan

packages/app/src/cli/models/app/app.test.ts

@@ -616,7 +616,12 @@ describe('manifest', () => {
     })
 
     // When
-    const manifest = await app.manifest()
+    const manifest = await app.manifest({
+      app: 'API_KEY',
+      extensions: {app_access: 'UUID_A'},
+      extensionIds: {},
+      extensionsNonUuidManaged: {},
+    })
 
     // Then
     expect(manifest).toEqual({
@@ -627,6 +632,7 @@ describe('manifest', () => {
           type: 'app_access_external',
           handle: 'app_access',
           uid: appAccessModule.uid,
+          uuid: 'UUID_A',
           assets: appAccessModule.uid,
           target: appAccessModule.contextValue,
           config: expect.objectContaining({
@@ -664,7 +670,7 @@ describe('manifest', () => {
     })
 
     // When
-    const manifest = await app.manifest()
+    const manifest = await app.manifest(undefined)
 
     // Then
     expect(manifest).toEqual({
@@ -722,7 +728,7 @@ describe('manifest', () => {
     })
 
     // When
-    const manifest = await app.manifest()
+    const manifest = await app.manifest(undefined)
 
     // Then
     expect(manifest).toEqual({

packages/app/src/cli/models/app/identifiers.test.ts

@@ -208,12 +208,9 @@ describe('getAppIdentifiers', () => {
       })
 
       // When
-      const got = getAppIdentifiers(
-        {
-          app,
-        },
-        testDeveloperPlatformClient(),
-      )
+      const got = getAppIdentifiers({
+        app,
+      })
 
       // Then
       expect(got.app).toEqual('FOO')
@@ -238,7 +235,6 @@ describe('getAppIdentifiers', () => {
         {
           app,
         },
-        testDeveloperPlatformClient(),
         {SHOPIFY_API_KEY: 'FOO', SHOPIFY_TEST_UI_EXTENSION_ID: 'BAR'},
       )
 
@@ -247,34 +243,4 @@ describe('getAppIdentifiers', () => {
       expect((got.extensions ?? {})['test-ui-extension']).toEqual('BAR')
     })
   })
-
-  test('returns the UIDs when Atomic Deployments is enabled', async () => {
-    await inTemporaryDirectory(async (tmpDir: string) => {
-      // Given
-      const uiExtension = await testUIExtension({
-        directory: '/tmp/project/extensions/my-extension',
-        idEnvironmentVariableName: 'SHOPIFY_MY_EXTENSION_ID',
-      })
-      const app = testApp({
-        directory: tmpDir,
-        dotenv: {
-          path: joinPath(tmpDir, '.env'),
-          variables: {SHOPIFY_API_KEY: 'FOO', SHOPIFY_TEST_UI_EXTENSION_ID: 'BAR'},
-        },
-        allExtensions: [uiExtension],
-      })
-
-      // When
-      const got = getAppIdentifiers(
-        {
-          app,
-        },
-        testDeveloperPlatformClient({supportsAtomicDeployments: true}),
-      )
-
-      // Then
-      expect(got.app).toEqual('FOO')
-      expect((got.extensions ?? {})['test-ui-extension']).toEqual(uiExtension.uid)
-    })
-  })
 })

packages/app/src/cli/models/app/identifiers.ts

@@ -98,7 +98,6 @@ interface GetAppIdentifiersOptions {
  */
 export function getAppIdentifiers(
   {app}: GetAppIdentifiersOptions,
-  developerPlatformClient: DeveloperPlatformClient,
   systemEnvironment = process.env,
 ): Partial<UuidOnlyIdentifiers> {
   const envVariables = {
@@ -111,9 +110,6 @@ export function getAppIdentifiers(
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       extensionsIdentifiers[extension.localIdentifier] = envVariables[extension.idEnvironmentVariableName]!
     }
-    // if (developerPlatformClient.supportsAtomicDeployments) {
-    //   extensionsIdentifiers[extension.localIdentifier] = extension.uid
-    // }
   }
   app.allExtensions.forEach(processExtension)
 

packages/app/src/cli/services/bundle.test.ts

@@ -25,7 +25,7 @@ describe('writeManifestToBundle', () => {
       } as unknown as AppInterface
 
       // When
-      await writeManifestToBundle(mockApp, tmpDir)
+      await writeManifestToBundle(mockApp, tmpDir, undefined)
 
       // Then
       const manifestPath = joinPath(tmpDir, 'manifest.json')

packages/app/src/cli/services/context.ts

@@ -153,7 +153,7 @@ export async function ensureDeployContext(options: DeployOptions): Promise<Ident
     force,
     release: !noRelease,
     developerPlatformClient,
-    envIdentifiers: getAppIdentifiers({app}, developerPlatformClient),
+    envIdentifiers: getAppIdentifiers({app}),
     remoteApp,
     activeAppVersion,
   })

packages/app/src/cli/services/context/id-matching.test.ts

@@ -781,7 +781,7 @@ describe('automaticMatchmaking: with Atomic Deployments enabled', () => {
     const got = await automaticMatchmaking(
       [EXTENSION_A, EXTENSION_A_2],
       [REGISTRATION_A],
-      {},
+      {'extension-a': 'UUID_A'},
       testDeveloperPlatformClient({supportsAtomicDeployments: true}),
     )
 
@@ -792,6 +792,7 @@ describe('automaticMatchmaking: with Atomic Deployments enabled', () => {
       toCreate: [EXTENSION_A_2],
       toManualMatch: {local: [], remote: []},
     }
+
     expect(got).toEqual(expected)
   })
 })

packages/app/src/cli/services/context/id-matching.ts

@@ -69,7 +69,7 @@ function matchByNameAndType(
 /**
  * Automatically match local and remote sources if they have the same UID
  */
-function matchByUUID(
+function matchByUIDandUUID(
   local: LocalSource[],
   remote: RemoteSource[],
   ids: IdentifiersExtensions,
@@ -82,27 +82,29 @@ function matchByUUID(
   const matched: IdentifiersExtensions = {}
   const pendingLocal: LocalSource[] = []
 
-  // First, match by UID
+  // First, try to match by UID, then by UUID.
   local.forEach((localSource) => {
-    const possibleMatch = remote.find((remoteSource) => remoteSource.id === localSource.uid)
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    if (possibleMatch) matched[localSource.localIdentifier] = possibleMatch.id!
-    else pendingLocal.push(localSource)
-  })
+    const matchByUID = remote.find((remoteSource) => remoteSource.id === localSource.uid)
+    const matchByUUID = remote.find((remoteSource) => remoteSource.uuid === ids[localSource.localIdentifier])
 
-  // Then, match by UUID
-  pendingLocal.forEach((localSource) => {
-    const possibleMatch = remote.find((remoteSource) => remoteSource.uuid === ids[localSource.localIdentifier])
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    if (possibleMatch) matched[localSource.localIdentifier] = possibleMatch.uuid!
+    if (matchByUID) {
+      matched[localSource.localIdentifier] = matchByUID.id
+    } else if (matchByUUID) {
+      matched[localSource.localIdentifier] = matchByUUID.uuid
+    } else {
+      pendingLocal.push(localSource)
+    }
   })
 
-  // The rest, are either to be created or deleted.
-  // const {matched, toCreate, toConfirm, toManualMatch} = matchByNameAndType(local, notMigratedRemoteExtensions)
+  const pendingRemote = remote.filter(
+    (remoteSource) =>
+      !Object.values(matched).includes(remoteSource.uuid) && !Object.values(matched).includes(remoteSource.id),
+  )
 
-  const toCreate = local.filter((elem) => !matched[elem.localIdentifier])
+  // Then, try to match by name and type as a last resort.
+  const {matched: matchedByName, toCreate, toConfirm, toManualMatch} = matchByNameAndType(pendingLocal, pendingRemote)
 
-  return {matched, toCreate, toConfirm: [], toManualMatch: {local: [], remote: []}}
+  return {matched: {...matched, ...matchedByName}, toCreate, toConfirm, toManualMatch}
 }
 
 function migrateLegacyFunctions(
@@ -241,7 +243,7 @@ export async function automaticMatchmaking(
   const {local, remote} = pendingAfterMigratingFunctions
 
   const {matched, toCreate, toConfirm, toManualMatch} = useUuidMatching
-    ? matchByUUID(localSources, remoteSources, ids)
+    ? matchByUIDandUUID(localSources, remoteSources, ids)
     : matchByNameAndType(local, remote)
 
   return {

packages/app/src/cli/services/deploy/bundle.test.ts

@@ -68,7 +68,7 @@ describe('bundleAndBuildExtensions', () => {
 
       // Then
       expect(extensionBundleMock).toHaveBeenCalledTimes(2)
-      expect(bundle.writeManifestToBundle).toHaveBeenCalledWith(app, bundleDirectory)
+      expect(bundle.writeManifestToBundle).toHaveBeenCalledWith(app, bundleDirectory, identifiers)
 
       await expect(file.fileExists(bundlePath)).resolves.toBeTruthy()
     })

packages/app/src/cli/services/dev/processes/draftable-extension.ts

@@ -77,7 +77,7 @@ export async function setupDraftableExtensionsProcess({
     return
   }
 
-  const prodEnvIdentifiers = getAppIdentifiers({app: localApp}, developerPlatformClient)
+  const prodEnvIdentifiers = getAppIdentifiers({app: localApp})
 
   const {extensionIds: remoteExtensionIds, extensions: extensionsUuids} = await ensureDeploymentIdsPresence({
     app: localApp,