Merge aef289b into 7ec2ebf

packages/classic/src/core/elements/read.js

@@ -13,15 +13,16 @@ export default class Read extends React.Component {
     ]).isRequired,
     uri: PropTypes.string.isRequired,
     revalidate: PropTypes.bool,
+    readMeta: PropTypes.object,
   }
 
   constructor(props) {
     super(props)
   }
 
   componentDidMount() {
-    const { dispatch, uri, revalidate } = this.props
-    dispatch(readAction(uri, { revalidate }))
+    const { dispatch, uri, revalidate, readMeta } = this.props
+    dispatch(readAction(uri, { revalidate, readMeta }))
   }
 
   render() {

packages/classic/src/core/index.js

@@ -51,6 +51,7 @@ core.ui.register(['__read'], ({ element, dispatch }) => {
       uri={element.get('uri')}
       dispatch={dispatch}
       revalidate={element.get('revalidate')}
+      readMeta={element.get('readMeta')}
     />
   )
 })

packages/classic/src/read/__tests__/read.js

@@ -18,7 +18,7 @@ import * as data from '../../data'
 import * as readActions from '../actions'
 import * as propNames from '../../propNames'
 
-describe('Read Subsytem', () => {
+describe('Read Subsystem', () => {
   const app = Subsystem.create(() => ({
     name: 'app',
   }))
@@ -70,6 +70,9 @@ describe('Read Subsytem', () => {
     content = kernel.query(['content'])
     expect(data.isExactlyOfKind('scene', content)).toBeTruthy()
     expect(content.get('title')).toEqual('Scene Title')
+    expect(content.getIn([propNames.metadata, 'request']).toJS()).toEqual(
+      readAction
+    )
   })
 
   it('handles failures', async () => {
@@ -126,7 +129,10 @@ describe('Read function', () => {
     kernel.dispatch(
       action.atCursor(
         content,
-        readActions.read(content.get('uri'), { revalidate: true })
+        readActions.read(content.get('uri'), {
+          revalidate: true,
+          alpha: 'beta',
+        })
       )
     )
 
@@ -136,6 +142,7 @@ describe('Read function', () => {
       'https://netcetera.com/test.json',
       {
         revalidate: true,
+        alpha: 'beta',
       },
       expect.any(Object)
     )
@@ -292,6 +299,13 @@ describe('Performing reads manually', async () => {
   expect(result.value.getIn([propNames.metadata, 'uri'])).toEqual(
     'https://netcetera.com/test.json'
   )
+  expect(
+    result.value.getIn([propNames.metadata, 'request']).toJS()
+  ).toMatchObject({
+    revalidate: true,
+    a: 1,
+    uri: 'https://netcetera.com/test.json',
+  })
 })
 
 function sleep(ms) {

packages/classic/src/read/actions.js

@@ -10,7 +10,19 @@ export const types = {
   fail: '@@skele/actions.read.fail',
 }
 
-export function read(uri, opts) {
+/**
+ * Creates a read action.
+ *
+ * @param { String } uri the URI to be read, or an ob
+ * @param {*} opts read options that will be passed onto the reader.
+ *    Currently, only `revalidate` is supported
+ *   (which instructs the reader to perform revalidation of the content).
+ *   If used in conjuction with the standard httpRead, one controls
+ *   the http options eventually passed to `fetch` via this argument.
+ *   Any extra properties are allowed. These may affect specific readers.
+ *
+ */
+export function read(uri, opts = {}) {
   const defaults = {
     revalidate: false,
   }

packages/classic/src/read/impl.js

@@ -81,7 +81,7 @@ export function fail(element, action) {
   )
 }
 
-export async function performRead(context, readParams) {
+export async function performRead(context, action) {
   const {
     registry,
     enrichment,
@@ -91,7 +91,8 @@ export async function performRead(context, readParams) {
 
   const kernel = context
 
-  const { uri, opts } = readParams
+  const { uri, ...opts } = R.omit(['type', propNames.actionMeta], action)
+
   const reader = registry.get(uri) || registry.get(fallback)
 
   if (reader != null) {
@@ -126,7 +127,9 @@ export async function performRead(context, readParams) {
     }
     if (isOK(readResponse)) {
       const readValue = fromJS(readResponse.value).merge({
-        [propNames.metadata]: fromJS(readResponse.meta || defaultMeta(uri)),
+        [propNames.metadata]: fromJS(
+          readResponse.meta || defaultMeta(uri)
+        ).merge({ request: R.omit([propNames.actionMeta], action) }),
       })
 
       enhanceContext = {
@@ -181,7 +184,7 @@ export async function performRead(context, readParams) {
         url: uri,
         uri,
         status: 999,
-        message: `There's no reader defined for ${pattern}. Did you forget to register a fallback reader?`,
+        message: `There's no reader defined for ${uri}. Did you forget to register a fallback reader?`,
       },
     }
   }
@@ -205,10 +208,7 @@ export async function read(context, action) {
     const readResponse = await time(
       `TIME-performRead-(${action.uri})`,
       performRead
-    )(context, {
-      uri: action.uri,
-      opts: R.pick(['revalidate'], action),
-    })
+    )(context, action)
 
     if (isOK(readResponse)) {
       dispatch({
@@ -245,25 +245,32 @@ export async function read(context, action) {
 export async function readRefresh(context, action) {
   const { dispatch } = context
   const element = context.query()
-  const uri = action.uri || element.getIn([propNames.metadata, 'uri'])
   const readId = uuid()
 
+  let readAction = element.getIn([propNames.metadata, 'request']).toJS()
+
+  if (readAction == null && action.uri != null) {
+    readAction = action
+  }
+
   invariant(
-    uri != null,
-    'The element you are refreshing must have been loaded via a read'
+    readAction != null,
+    'The element you are refreshing must have been loaded via a read, or you must provide an uri yourself.'
   )
 
+  readAction.revalidate = flow(action, R.prop('revalidate'), R.defaultTo(true))
+  if (action.uri != null) {
+    readAction.uri = action.uri
+  }
+
   context.dispatch({
     ...action,
     readId,
     type: readActions.types.setRefreshing,
   })
 
   try {
-    const response = await performRead(context, {
-      uri: uri,
-      opts: { ...{ revalidate: true }, ...R.pick(['revalidate'], action) },
-    })
+    const response = await performRead(context, readAction)
 
     if (isOK(response)) {
       dispatch({
@@ -274,7 +281,7 @@ export async function readRefresh(context, action) {
         readValue: response.value,
       })
     } else {
-      info(`Unsuccessful refreshing (read) ${uri} `, response)
+      info(`Unsuccessful refreshing (read) ${readAction.uri} `, response)
 
       dispatch({
         ...action,
@@ -284,7 +291,7 @@ export async function readRefresh(context, action) {
       })
     }
   } catch (e) {
-    error(`Error while refreshing (read) ${uri} `, e)
+    error(`Error while refreshing (read) ${readAction.uri} `, e)
 
     dispatch({
       ...action,

packages/classic/src/read/index.js

@@ -86,7 +86,7 @@ const read = SubSystem.create((system, instantiatedSubsystems) => {
      *
      * @returns Promise<ReadResponse> the read response
      */
-    perform: (uri, opts = {}) => impl.performRead(system, { uri, opts }),
+    perform: (uri, opts = {}) => impl.performRead(system, { ...opts, uri }),
   }
 })