@planningcenter/chat-react-native 4.3.0-rc.11 → 4.3.0-rc.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -27,7 +27,7 @@ export const makeRequest = ({
27
27
  uri = uri.query(combinedQuery);
28
28
  }
29
29
  const body = ['POST', 'PATCH'].includes(action) ? JSON.stringify(data) : undefined;
30
- return instrumentedFetch(decodeURIComponent(uri.toString()), {
30
+ return instrumentedFetch(uri.toString(), {
31
31
  method: action,
32
32
  headers,
33
33
  body
@@ -1 +1 @@
1
- {"version":3,"file":"request_helpers.js","names":["_","URI","instrumentedFetch","transformRequestData","transformResponse","makeRequest","action","url","data","headers","uri","query","urlQuery","combinedQuery","Object","entries","sort","reduce","obj","key","value","body","includes","JSON","stringify","undefined","decodeURIComponent","toString","method","then","response","ok","text","t","parse","Promise","reject","STANDARD_META_ATTRIBUTES","concatRecords","records","moreRecords","included","meta","pick","throwErrorIfFieldsMissing","walk","args","fields","Error","fieldTypes","keys","dataTypes","castArray","map","includedTypes","responseTypes","uniq","concat","missingFields","difference","filter","length","friendlyErrors","throwErrorIfQueryParams","noQueryParamsFriendlyErrors","request","passthrough","resolve","ensureFieldsInDev","__DEV__","ensureNoQueryParamsInDev","search","transformGetToPost","rest","include","fieldsArray","Array","isArray","join","fromEntries"],"sources":["../../../src/utils/client/request_helpers.ts"],"sourcesContent":["import _ from 'lodash'\nimport URI from 'urijs'\nimport { instrumentedFetch } from './instrumented_fetch'\nimport { transformRequestData } from './transform_request_data'\nimport transformResponse from './transform_response'\nimport { Accumulator, GetRequest, PostRequest, RequestData, WalkRequest } from './types'\n\nexport type MakeRequestArgs = {\n action: 'GET' | 'POST' | 'PATCH' | 'DELETE'\n url: string\n data?: Partial<RequestData>\n headers: Record<string, string>\n}\n\nexport const makeRequest = ({ action = 'GET', url, data = {}, headers = {} }: MakeRequestArgs) => {\n // break apart url so we can reconstruct the url with the query params\n let uri = new URI(url)\n const query = transformRequestData(data)\n const urlQuery = uri.query(true)\n\n // This likely doesn't matter but will enforce consistent ordering of query params\n const combinedQuery = Object.entries({ ...query, ...urlQuery })\n .sort()\n .reduce((obj, [key, value]) => {\n // @ts-ignore\n obj[key] = value\n return obj\n }, {})\n\n if (action === 'GET') {\n uri = uri.query(combinedQuery)\n }\n\n const body = ['POST', 'PATCH'].includes(action) ? JSON.stringify(data) : undefined\n\n return instrumentedFetch(decodeURIComponent(uri.toString()), {\n method: action,\n headers,\n body,\n }).then(response => {\n if (response.ok) {\n return response.text().then(t => (t === '' ? '' : JSON.parse(t)))\n } else {\n return Promise.reject(response)\n }\n })\n}\n\nconst STANDARD_META_ATTRIBUTES = [\n 'total_count',\n 'count',\n 'prev',\n 'next',\n 'can_order_by',\n 'can_query_by',\n 'can_include',\n 'can_filter',\n 'parent',\n]\n\nexport const concatRecords = (records: Accumulator, moreRecords: Accumulator) => ({\n data: [...records.data, ...moreRecords.data],\n included: [...records.included, ...moreRecords.included],\n // Because custom meta can be computed on a per-page bases,\n // it is safer to remove all custom meta when concatenating multiple pages of data\n meta: _.pick(moreRecords.meta, STANDARD_META_ATTRIBUTES),\n})\n\ntype Walk = (args: MakeRequestArgs | WalkRequest) => Promise<any>\ntype WalkArgs = MakeRequestArgs & {\n data?: {\n fields?: Record<string, any>\n }\n}\n\nexport const throwErrorIfFieldsMissing = async (walk: Walk, args: WalkArgs) => {\n const fields = args?.data?.fields\n\n if (!fields) {\n throw new Error(`Must pass fields for request: ${args.url}`)\n }\n\n const fieldTypes = Object.keys(fields)\n\n const response = await walk(args)\n\n const dataTypes = _(response.data).castArray().map('type').value()\n const includedTypes = _.map(response.included, 'type')\n const responseTypes = _.uniq(dataTypes.concat(includedTypes))\n const missingFields = _.difference(responseTypes, fieldTypes).filter(t => t)\n\n if (missingFields.length > 0) {\n throw new Error(\n `Must include fields for types: ${JSON.stringify(missingFields)} for request ${args.url}`\n )\n }\n\n return transformResponse(response)\n}\n\nexport const friendlyErrors = (walk: Walk, args: WalkArgs) =>\n throwErrorIfQueryParams(args.url)\n .then(() => throwErrorIfFieldsMissing(walk, args))\n .then(transformResponse)\n\nexport const noQueryParamsFriendlyErrors = (request: typeof makeRequest, args: WalkArgs) =>\n throwErrorIfQueryParams(args.url)\n .then(() => request(args))\n .then(transformResponse)\n\nconst passthrough = async <T, R>(walk: (args: T) => Promise<R>, args: T) =>\n Promise.resolve(transformResponse(await walk(args)))\n\nexport const ensureFieldsInDev = __DEV__ ? friendlyErrors : passthrough\n\nexport const ensureNoQueryParamsInDev = __DEV__ ? noQueryParamsFriendlyErrors : passthrough\n\nexport const throwErrorIfQueryParams = (url: string) => {\n if (new URI(url).search().length) {\n throw new Error('Must pass query params as data arg')\n }\n\n return Promise.resolve()\n}\n\nexport const transformGetToPost = (args: GetRequest): PostRequest => {\n const { data, ...rest } = args\n const { fields, include } = data\n const fieldsArray = Object.entries(fields).map(([key, value]) => {\n if (Array.isArray(value)) {\n return [key, value.join(',')]\n }\n\n return [key, value]\n })\n\n return {\n ...rest,\n data: {\n fields: Object.fromEntries(fieldsArray),\n include,\n },\n }\n}\n"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"request_helpers.js","names":["_","URI","instrumentedFetch","transformRequestData","transformResponse","makeRequest","action","url","data","headers","uri","query","urlQuery","combinedQuery","Object","entries","sort","reduce","obj","key","value","body","includes","JSON","stringify","undefined","toString","method","then","response","ok","text","t","parse","Promise","reject","STANDARD_META_ATTRIBUTES","concatRecords","records","moreRecords","included","meta","pick","throwErrorIfFieldsMissing","walk","args","fields","Error","fieldTypes","keys","dataTypes","castArray","map","includedTypes","responseTypes","uniq","concat","missingFields","difference","filter","length","friendlyErrors","throwErrorIfQueryParams","noQueryParamsFriendlyErrors","request","passthrough","resolve","ensureFieldsInDev","__DEV__","ensureNoQueryParamsInDev","search","transformGetToPost","rest","include","fieldsArray","Array","isArray","join","fromEntries"],"sources":["../../../src/utils/client/request_helpers.ts"],"sourcesContent":["import _ from 'lodash'\nimport URI from 'urijs'\nimport { instrumentedFetch } from './instrumented_fetch'\nimport { transformRequestData } from './transform_request_data'\nimport transformResponse from './transform_response'\nimport { Accumulator, GetRequest, PostRequest, RequestData, WalkRequest } from './types'\n\nexport type MakeRequestArgs = {\n action: 'GET' | 'POST' | 'PATCH' | 'DELETE'\n url: string\n data?: Partial<RequestData>\n headers: Record<string, string>\n}\n\nexport const makeRequest = ({ action = 'GET', url, data = {}, headers = {} }: MakeRequestArgs) => {\n // break apart url so we can reconstruct the url with the query params\n let uri = new URI(url)\n const query = transformRequestData(data)\n const urlQuery = uri.query(true)\n\n // This likely doesn't matter but will enforce consistent ordering of query params\n const combinedQuery = Object.entries({ ...query, ...urlQuery })\n .sort()\n .reduce((obj, [key, value]) => {\n // @ts-ignore\n obj[key] = value\n return obj\n }, {})\n\n if (action === 'GET') {\n uri = uri.query(combinedQuery)\n }\n\n const body = ['POST', 'PATCH'].includes(action) ? JSON.stringify(data) : undefined\n\n return instrumentedFetch(uri.toString(), {\n method: action,\n headers,\n body,\n }).then(response => {\n if (response.ok) {\n return response.text().then(t => (t === '' ? '' : JSON.parse(t)))\n } else {\n return Promise.reject(response)\n }\n })\n}\n\nconst STANDARD_META_ATTRIBUTES = [\n 'total_count',\n 'count',\n 'prev',\n 'next',\n 'can_order_by',\n 'can_query_by',\n 'can_include',\n 'can_filter',\n 'parent',\n]\n\nexport const concatRecords = (records: Accumulator, moreRecords: Accumulator) => ({\n data: [...records.data, ...moreRecords.data],\n included: [...records.included, ...moreRecords.included],\n // Because custom meta can be computed on a per-page bases,\n // it is safer to remove all custom meta when concatenating multiple pages of data\n meta: _.pick(moreRecords.meta, STANDARD_META_ATTRIBUTES),\n})\n\ntype Walk = (args: MakeRequestArgs | WalkRequest) => Promise<any>\ntype WalkArgs = MakeRequestArgs & {\n data?: {\n fields?: Record<string, any>\n }\n}\n\nexport const throwErrorIfFieldsMissing = async (walk: Walk, args: WalkArgs) => {\n const fields = args?.data?.fields\n\n if (!fields) {\n throw new Error(`Must pass fields for request: ${args.url}`)\n }\n\n const fieldTypes = Object.keys(fields)\n\n const response = await walk(args)\n\n const dataTypes = _(response.data).castArray().map('type').value()\n const includedTypes = _.map(response.included, 'type')\n const responseTypes = _.uniq(dataTypes.concat(includedTypes))\n const missingFields = _.difference(responseTypes, fieldTypes).filter(t => t)\n\n if (missingFields.length > 0) {\n throw new Error(\n `Must include fields for types: ${JSON.stringify(missingFields)} for request ${args.url}`\n )\n }\n\n return transformResponse(response)\n}\n\nexport const friendlyErrors = (walk: Walk, args: WalkArgs) =>\n throwErrorIfQueryParams(args.url)\n .then(() => throwErrorIfFieldsMissing(walk, args))\n .then(transformResponse)\n\nexport const noQueryParamsFriendlyErrors = (request: typeof makeRequest, args: WalkArgs) =>\n throwErrorIfQueryParams(args.url)\n .then(() => request(args))\n .then(transformResponse)\n\nconst passthrough = async <T, R>(walk: (args: T) => Promise<R>, args: T) =>\n Promise.resolve(transformResponse(await walk(args)))\n\nexport const ensureFieldsInDev = __DEV__ ? friendlyErrors : passthrough\n\nexport const ensureNoQueryParamsInDev = __DEV__ ? noQueryParamsFriendlyErrors : passthrough\n\nexport const throwErrorIfQueryParams = (url: string) => {\n if (new URI(url).search().length) {\n throw new Error('Must pass query params as data arg')\n }\n\n return Promise.resolve()\n}\n\nexport const transformGetToPost = (args: GetRequest): PostRequest => {\n const { data, ...rest } = args\n const { fields, include } = data\n const fieldsArray = Object.entries(fields).map(([key, value]) => {\n if (Array.isArray(value)) {\n return [key, value.join(',')]\n }\n\n return [key, value]\n })\n\n return {\n ...rest,\n data: {\n fields: Object.fromEntries(fieldsArray),\n include,\n },\n }\n}\n"],"mappings":"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","ignoreList":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@planningcenter/chat-react-native",
3
- "version": "4.3.0-rc.11",
3
+ "version": "4.3.0-rc.12",
4
4
  "description": "",
5
5
  "repository": {
6
6
  "type": "git",
@@ -84,5 +84,5 @@
84
84
  "sf-symbols-typescript": "^2.2.0",
85
85
  "typescript": "~6.0.3"
86
86
  },
87
- "gitHead": "4bf514fb42cdbc7a6bc0cb8fd3b1cee9432acae8"
87
+ "gitHead": "54ba2e2583cf283c4154fe96045ca7c5e5088fd5"
88
88
  }
@@ -59,8 +59,7 @@ describe('get', () => {
59
59
  })
60
60
 
61
61
  expect(fetchSpy).toHaveBeenCalledWith(
62
- // Do not url encode the query params or iOS will double encode
63
- APP_BASE_URL + '/records?fields[Record]=id&per_page=100&where[id]=1',
62
+ APP_BASE_URL + '/records?fields%5BRecord%5D=id&per_page=100&where%5Bid%5D=1',
64
63
  expect.any(Object)
65
64
  )
66
65
  })
@@ -75,7 +74,7 @@ describe('get', () => {
75
74
  })
76
75
 
77
76
  it('walks pagination when walk = true', async () => {
78
- const expectUrl = APP_BASE_URL + '/records?fields[Record]=id&per_page=1'
77
+ const expectUrl = APP_BASE_URL + '/records?fields%5BRecord%5D=id&per_page=1'
79
78
  const nextUrl = expectUrl + '&offset=1'
80
79
 
81
80
  MockServer.get(url, { ...DefaultFixtures.records(), links: { next: nextUrl } }, 200, {
@@ -92,7 +91,7 @@ describe('get', () => {
92
91
  })
93
92
 
94
93
  it('does not overwrite params in `url` when walking', async () => {
95
- const expectUrl = APP_BASE_URL + '/records?fields[Record]=id'
94
+ const expectUrl = APP_BASE_URL + '/records?fields%5BRecord%5D=id'
96
95
  const nextUrl = expectUrl + '&offset=1&per_page=1'
97
96
  MockServer.get(url, { ...DefaultFixtures.records(), links: { next: nextUrl } }, 200, {
98
97
  once: true,
@@ -0,0 +1,40 @@
1
+ import { instrumentedFetch } from '../instrumented_fetch'
2
+ import { makeRequest } from '../request_helpers'
3
+
4
+ jest.mock('../instrumented_fetch', () => ({ instrumentedFetch: jest.fn() }))
5
+
6
+ const mockFetch = jest.mocked(instrumentedFetch)
7
+
8
+ const fetchedUrl = () => new URL(mockFetch.mock.calls[0][0])
9
+
10
+ const get = (data: Record<string, unknown>) =>
11
+ makeRequest({ action: 'GET', url: 'https://api.example.com/search_results', data, headers: {} })
12
+
13
+ describe('makeRequest', () => {
14
+ beforeEach(() => {
15
+ mockFetch.mockResolvedValue(new Response('{}', { status: 200 }))
16
+ })
17
+
18
+ afterEach(() => {
19
+ mockFetch.mockReset()
20
+ })
21
+
22
+ it('serializes data as snake_case query params', async () => {
23
+ await get({ q: 'potluck', perPage: 20 })
24
+
25
+ const { searchParams } = fetchedUrl()
26
+ expect(searchParams.get('q')).toBe('potluck')
27
+ expect(searchParams.get('per_page')).toBe('20')
28
+ })
29
+
30
+ it.each(['Pastor Bob', 'café', '#potluck', 'Q&A', '100%'])(
31
+ 'sends %p so the server reads it back unchanged',
32
+ async term => {
33
+ await get({ q: term })
34
+
35
+ const { search, searchParams } = fetchedUrl()
36
+ expect(searchParams.get('q')).toBe(term)
37
+ expect(() => decodeURIComponent(search)).not.toThrow()
38
+ }
39
+ )
40
+ })
@@ -33,7 +33,7 @@ export const makeRequest = ({ action = 'GET', url, data = {}, headers = {} }: Ma
33
33
 
34
34
  const body = ['POST', 'PATCH'].includes(action) ? JSON.stringify(data) : undefined
35
35
 
36
- return instrumentedFetch(decodeURIComponent(uri.toString()), {
36
+ return instrumentedFetch(uri.toString(), {
37
37
  method: action,
38
38
  headers,
39
39
  body,