@expo/fingerprint 0.1.0 → 0.2.0

package/src/sourcer/__tests__/Expo-test.ts

@@ -5,7 +5,8 @@ import { vol, fs as volFS } from 'memfs';
 import path from 'path';
 import resolveFrom from 'resolve-from';
 
-import { normalizeOptions } from '../../Options';
+import { HashSourceContents } from '../../Fingerprint.types';
+import { normalizeOptionsAsync } from '../../Options';
 import {
   getEasBuildSourcesAsync,
   getExpoAutolinkingAndroidSourcesAsync,
@@ -55,7 +56,7 @@ describe(getEasBuildSourcesAsync, () => {
 }`
     );
 
-    const sources = await getEasBuildSourcesAsync('/app', normalizeOptions());
+    const sources = await getEasBuildSourcesAsync('/app', await normalizeOptionsAsync('/app'));
     expect(sources).toContainEqual(
       expect.objectContaining({
         type: 'file',
@@ -97,7 +98,10 @@ describe('getExpoAutolinkingSourcesAsync', () => {
   });
 
   it('should contain expo autolinking projects', async () => {
-    let sources = await getExpoAutolinkingAndroidSourcesAsync('/app', normalizeOptions());
+    let sources = await getExpoAutolinkingAndroidSourcesAsync(
+      '/app',
+      await normalizeOptionsAsync('/app')
+    );
     expect(sources).toContainEqual(
       expect.objectContaining({
         type: 'dir',
@@ -106,7 +110,7 @@ describe('getExpoAutolinkingSourcesAsync', () => {
     );
     expect(sources).toMatchSnapshot();
 
-    sources = await getExpoAutolinkingIosSourcesAsync('/app', normalizeOptions());
+    sources = await getExpoAutolinkingIosSourcesAsync('/app', await normalizeOptionsAsync('/app'));
     expect(sources).toContainEqual(
       expect.objectContaining({ type: 'dir', filePath: 'node_modules/expo-modules-core' })
     );
@@ -114,14 +118,17 @@ describe('getExpoAutolinkingSourcesAsync', () => {
   });
 
   it('should not containt absolute path in contents', async () => {
-    let sources = await getExpoAutolinkingAndroidSourcesAsync('/app', normalizeOptions());
+    let sources = await getExpoAutolinkingAndroidSourcesAsync(
+      '/app',
+      await normalizeOptionsAsync('/app')
+    );
     for (const source of sources) {
       if (source.type === 'contents') {
         expect(source.contents.indexOf('/app/')).toBe(-1);
       }
     }
 
-    sources = await getExpoAutolinkingIosSourcesAsync('/app', normalizeOptions());
+    sources = await getExpoAutolinkingIosSourcesAsync('/app', await normalizeOptionsAsync('/app'));
     for (const source of sources) {
       if (source.type === 'contents') {
         expect(source.contents.indexOf('/app/')).toBe(-1);
@@ -147,26 +154,67 @@ describe(getExpoConfigSourcesAsync, () => {
       // To fake the case as no expo installed, trying to resolve as **nonexist/expo/config** module
       return actualResolver(fromDirectory, 'nonexist/expo/config');
     });
-    const sources = await getExpoConfigSourcesAsync('/app', normalizeOptions());
+    const sources = await getExpoConfigSourcesAsync('/app', await normalizeOptionsAsync('/app'));
     expect(sources.length).toBe(0);
   });
 
-  it('should contain app.json', async () => {
+  it('should contain expo config', async () => {
     vol.fromJSON(require('./fixtures/ExpoManaged47Project.json'));
-    const sources = await getExpoConfigSourcesAsync('/app', normalizeOptions());
-    expect(sources).toContainEqual(
-      expect.objectContaining({
-        type: 'file',
-        filePath: 'app.json',
-      })
+    const appJson = JSON.parse(vol.readFileSync('/app/app.json', 'utf8').toString());
+    const sources = await getExpoConfigSourcesAsync('/app', await normalizeOptionsAsync('/app'));
+    const expoConfigSource = sources.find<HashSourceContents>(
+      (source): source is HashSourceContents =>
+        source.type === 'contents' && source.id === 'expoConfig'
+    );
+    const expoConfig = JSON.parse(expoConfigSource?.contents?.toString() ?? 'null');
+    expect(expoConfig).not.toBeNull();
+    expect(expoConfig.name).toEqual(appJson.expo.name);
+  });
+
+  it('should not contain runtimeVersion in expo config', async () => {
+    vol.fromJSON(require('./fixtures/ExpoManaged47Project.json'));
+    vol.writeFileSync(
+      '/app/app.config.js',
+      `\
+export default ({ config }) => {
+  config.runtimeVersion = '1.0.0';
+  return config;
+};`
+    );
+    const sources = await getExpoConfigSourcesAsync('/app', await normalizeOptionsAsync('/app'));
+    const expoConfigSource = sources.find<HashSourceContents>(
+      (source): source is HashSourceContents =>
+        source.type === 'contents' && source.id === 'expoConfig'
     );
+    const expoConfig = JSON.parse(expoConfigSource?.contents?.toString() ?? 'null');
+    expect(expoConfig).not.toBeNull();
+    expect(expoConfig.runtimeVersion).toBeUndefined();
+  });
+
+  it('should keep expo config contents in deterministic order', async () => {
+    vol.fromJSON(require('./fixtures/ExpoManaged47Project.json'));
+    const sources = await getExpoConfigSourcesAsync('/app', await normalizeOptionsAsync('/app'));
+
+    const appJsonContents = vol.readFileSync('/app/app.json', 'utf8').toString();
+    const appJson = JSON.parse(appJsonContents);
+    const { name } = appJson.expo;
+    // Re-insert name to change the object order
+    delete appJson.expo.name;
+    appJson.expo.name = name;
+    const newAppJsonContents = JSON.stringify(appJson);
+    expect(newAppJsonContents).not.toEqual(appJsonContents);
+    vol.writeFileSync('/app/app.json', newAppJsonContents);
+
+    // Even new app.json contents changed its order, the source contents should be the same.
+    const sources2 = await getExpoConfigSourcesAsync('/app', await normalizeOptionsAsync('/app'));
+    expect(sources).toEqual(sources2);
   });
 
   it('should contain external icon file in app.json', async () => {
     vol.fromJSON(require('./fixtures/ExpoManaged47Project.json'));
     vol.mkdirSync('/app/assets');
     vol.writeFileSync('/app/assets/icon.png', 'PNG data');
-    const sources = await getExpoConfigSourcesAsync('/app', normalizeOptions());
+    const sources = await getExpoConfigSourcesAsync('/app', await normalizeOptionsAsync('/app'));
     expect(sources).toContainEqual(
       expect.objectContaining({
         type: 'file',
@@ -221,7 +269,7 @@ describe(`getExpoConfigSourcesAsync - config-plugins`, () => {
         },
       })
     );
-    const sources = await getExpoConfigSourcesAsync('/app', normalizeOptions());
+    const sources = await getExpoConfigSourcesAsync('/app', await normalizeOptionsAsync('/app'));
     expect(sources).toContainEqual(
       expect.objectContaining({
         type: 'dir',
@@ -243,7 +291,7 @@ describe(`getExpoConfigSourcesAsync - config-plugins`, () => {
         },
       })
     );
-    const sources = await getExpoConfigSourcesAsync('/app', normalizeOptions());
+    const sources = await getExpoConfigSourcesAsync('/app', await normalizeOptionsAsync('/app'));
     expect(sources).toContainEqual(
       expect.objectContaining({
         type: 'dir',
@@ -260,7 +308,7 @@ export default ({ config }) => {
   return config;
 };`
     );
-    const sources = await getExpoConfigSourcesAsync('/app', normalizeOptions());
+    const sources = await getExpoConfigSourcesAsync('/app', await normalizeOptionsAsync('/app'));
 
     vol.writeFileSync(
       '/app/app.config.js',
@@ -272,9 +320,16 @@ export default ({ config }) => {
   return config;
 };`
     );
-    const sources2 = await getExpoConfigSourcesAsync('/app', normalizeOptions());
+    const sources2 = await getExpoConfigSourcesAsync('/app', await normalizeOptionsAsync('/app'));
 
-    expect(sources).toEqual(sources2);
+    // sources2 will contain the plugins from expo config, but sources will not.
+    const sourcesWithoutExpoConfig = sources.filter(
+      (item) => item.type !== 'contents' || item.id !== 'expoConfig'
+    );
+    const sources2WithoutExpoConfig = sources2.filter(
+      (item) => item.type !== 'contents' || item.id !== 'expoConfig'
+    );
+    expect(sourcesWithoutExpoConfig).toEqual(sources2WithoutExpoConfig);
   });
 });
 

package/src/sourcer/__tests__/PatchPackage-test.ts

@@ -1,6 +1,6 @@
 import { vol } from 'memfs';
 
-import { normalizeOptions } from '../../Options';
+import { normalizeOptionsAsync } from '../../Options';
 import { getPatchPackageSourcesAsync } from '../PatchPackage';
 import { getHashSourcesAsync } from '../Sourcer';
 
@@ -16,7 +16,7 @@ describe(getPatchPackageSourcesAsync, () => {
     vol.fromJSON(require('./fixtures/ExpoManaged47Project.json'));
     vol.fromJSON(require('./fixtures/PatchPackage.json'));
 
-    const sources = await getPatchPackageSourcesAsync('/app', normalizeOptions());
+    const sources = await getPatchPackageSourcesAsync('/app', await normalizeOptionsAsync('/app'));
     expect(sources).toContainEqual(
       expect.objectContaining({
         type: 'dir',
@@ -41,7 +41,7 @@ describe('patch-package postinstall', () => {
       { virtual: true }
     );
 
-    const sources = await getHashSourcesAsync('/app', normalizeOptions());
+    const sources = await getHashSourcesAsync('/app', await normalizeOptionsAsync('/app'));
     expect(sources).toContainEqual(
       expect.objectContaining({
         type: 'contents',

package/src/sourcer/__tests__/Sourcer-test.ts

@@ -1,11 +1,11 @@
-import { normalizeOptions } from '../../Options';
+import { normalizeOptionsAsync } from '../../Options';
 import { getHashSourcesAsync } from '../Sourcer';
 
 describe(getHashSourcesAsync, () => {
   it('should include `extraSources` from input parameter', async () => {
     const sources = await getHashSourcesAsync(
       '/app',
-      normalizeOptions({
+      await normalizeOptionsAsync('/app', {
         extraSources: [{ type: 'dir', filePath: '/app/scripts', reasons: ['extra'] }],
       })
     );

package/src/sourcer/__tests__/Utils-test.ts

@@ -0,0 +1,41 @@
+import { stringifyJsonSorted } from '../Utils';
+
+describe(stringifyJsonSorted, () => {
+  it('should support primitive types', () => {
+    expect(stringifyJsonSorted(1)).toEqual('1');
+    expect(stringifyJsonSorted('s')).toEqual('"s"');
+    expect(stringifyJsonSorted(true)).toEqual('true');
+    expect(stringifyJsonSorted(false)).toEqual('false');
+    expect(stringifyJsonSorted(null)).toEqual('null');
+  });
+
+  it('should sort array', () => {
+    expect(stringifyJsonSorted([])).toEqual('[]');
+    expect(stringifyJsonSorted([2, 'a', 1, false, 6, 4, 5, 's', 3, 0, true, 1, 1])).toEqual(
+      '["a","s",0,1,1,1,2,3,4,5,6,false,true]'
+    );
+  });
+
+  it('should sort object by keys', () => {
+    expect(stringifyJsonSorted({})).toEqual('{}');
+    expect(stringifyJsonSorted({ c: '1', a: '3', b: '2' })).toEqual('{"a":"3","b":"2","c":"1"}');
+    expect(
+      stringifyJsonSorted({ c: '1', a: '3', b: '2', nested: { c: '1', a: '3', b: '2' } })
+    ).toEqual('{"a":"3","b":"2","c":"1","nested":{"a":"3","b":"2","c":"1"}}');
+  });
+
+  it('should support mixed array/object', () => {
+    expect(stringifyJsonSorted([{ b: '2' }, { c: '1' }, { a: '3' }])).toEqual(
+      '[{"a":"3"},{"b":"2"},{"c":"1"}]'
+    );
+    expect(stringifyJsonSorted([{ b: '2' }, {}, { a: '3' }, null])).toEqual(
+      '[null,{"a":"3"},{"b":"2"},{}]'
+    );
+    expect(
+      stringifyJsonSorted({
+        array: [3, 2, 1],
+        nestedData: { nestedArray: [{ b: '2' }, { c: '1' }, { a: '3' }] },
+      })
+    ).toEqual('{"array":[1,2,3],"nestedData":{"nestedArray":[{"a":"3"},{"b":"2"},{"c":"1"}]}}');
+  });
+});