Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: OADA/cerebral-module
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 27209d728787b220424779ba179d6a7e8841ea25
Choose a base ref
...
head repository: OADA/cerebral-module
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 105b5cc5377c5bbeb922bd4ee65831a7e8480efb
Choose a head ref
  • 8 commits
  • 5 files changed
  • 2 contributors

Commits on Jun 13, 2019

  1. Removed module syntax

    @cyrusbowman
    cyrusbowman committed Jun 13, 2019
    Copy the full SHA
    277ef76 View commit details

  2. Still not working

    @cyrusbowman
    cyrusbowman committed Jun 13, 2019
    Copy the full SHA
    b5bfd12 View commit details

Commits on Jun 14, 2019

  1. -> cerebral 5.0; rewriting as functions

    @sanoel
    sanoel committed Jun 14, 2019
    Copy the full SHA
    f452542 View commit details

  2. Working with cerebral 5

    @cyrusbowman
    cyrusbowman committed Jun 14, 2019
    Copy the full SHA
    330b8b1 View commit details

Commits on Sep 26, 2019

  1. - Work on updating to cerebral 5. Debugging weird cerebral error.

    @cyrusbowman
    cyrusbowman committed Sep 26, 2019
    Copy the full SHA
    7a69761 View commit details

Commits on Oct 11, 2019

  1. Updated some code to cerebral 5. 

    Building paths part by part because of cerebral problem.
    @cyrusbowman
    cyrusbowman committed Oct 11, 2019
    Copy the full SHA
    49b0ad2 View commit details

Commits on Oct 17, 2019

  1. update version

    @sanoel
    sanoel committed Oct 17, 2019
    Copy the full SHA
    34eaf41 View commit details

  2. update version

    @sanoel
    sanoel committed Oct 17, 2019
    Copy the full SHA
    105b5cc View commit details
Showing with 928 additions and 5,599 deletions.
  1. +0 −4,979 package-lock.json
  2. +5 −4 package.json
  3. +4 −17 src/index.js
  4. +81 −57 src/sequences.js
  5. +838 −542 yarn.lock
4,979 changes: 0 additions & 4,979 deletions package-lock.json
View file

This file was deleted.

9 changes: 5 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oada/cerebral-module",
"version": "2.1.5",
"version": "3.0.0",
"description": "oada cerebral module",
"main": "./index.js",
"scripts": {
@@ -13,20 +13,21 @@
"author": "oada",
"license": "Apache-2.0",
"dependencies": {
"@cerebral/storage": "^4.2.2",
"@oada/cerebral-provider": "^2.1.0",
"@oada/cerebral-provider": "^3.0.0",
"assert": "^1.4.1",
"babel-polyfill": "^6.26.0",
"babel-preset-env": "^1.7.0",
"babel-preset-latest": "^6.24.1",
"babel-preset-stage-3": "^6.24.1",
"babel-register": "^6.26.0",
"cerebral": "^4.2.2",
"chai": "^4.1.2",
"debug": "^4.1.0",
"fs": "^0.0.1-security",
"url": "^0.11.0"
},
"peerDependencies": {
"cerebral": "^5.1.1"
},
"devDependencies": {
"babel-cli": "^6.26.0"
}
21 changes: 4 additions & 17 deletions src/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,12 @@
import { Module } from 'cerebral';
import signals from './sequences';
import sequences from './sequences';
import oada from '@oada/cerebral-provider';
/*import StorageModule from '@cerebral/storage'
const storage = StorageModule({

target: localStorage,
json: true,
sync: {
'connections': 'connections'
}
})*/

export default Module ({
export default {

state: { connections: {} },

providers: { oada },

signals,

// modules: {storage}
sequences

})
}
138 changes: 81 additions & 57 deletions src/sequences.js
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { props, state } from 'cerebral/tags';
import { when, merge, unset, equals, set } from 'cerebral/operators';
import { sequence } from 'cerebral';
import { state } from 'cerebral';
import { when, merge, unset, equals, set } from 'cerebral/factories'

import Promise from 'bluebird';
import url from 'url'
//Promise.config({warnings: false})
//Promise.config({warnings: false})

function domainToConnectionId(domainUrl) {
let domain = url.parse(domainUrl).hostname;
@@ -14,10 +14,10 @@ function domainToConnectionId(domainUrl) {
* connects to the oada, returns and object with get, put, post, resetCache, disconnect
* @type {Primitive}
*/
const connect = sequence('oada.connect', [
({state, oada, path, props}) => {
const connect = [
({oada, path, props}) => {
return oada.connect({
connection_id: domainToConnectionId(props.domain),
connection_id: (props.connection_id || domainToConnectionId(props.domain)),
domain: props.domain,
options: props.options,
cache: props.cache,
@@ -27,63 +27,61 @@ const connect = sequence('oada.connect', [
return path.authorized({
token: response.token,
connection: response,
connection_id: domainToConnectionId(props.domain)
connection_id: (props.connection_id || domainToConnectionId(props.domain))
});
//return result;
}).catch( (err) => {
return path.unauthorized({});
})
}, {
authorized: sequence('oada.authorized', [
set(state`oada.connections.${props`connection_id`}.token`, props`token`),
set(state`oada.connections.${props`connection_id`}.domain`, props`domain`),
when(state`oada.${props`connection_id`}.bookmarks`), {
true: [],
false: [
set(state`oada.${props`connection_id`}.bookmarks`, {}),
]
authorized: [
({store, get, oada, props}) => {
if (get(state`oada.connections.${props.connection_id}`) == null) {
store.set(state`oada.connections.${props.connection_id}`, {});
}
store.set(state`oada.connections.${props.connection_id}.token`, props.token);
store.set(state`oada.connections.${props.connection_id}.domain`, props.domain);
var wh = get(state`oada.${props.connection_id}.bookmarks`)
if (wh) {
store.set(state`oada.${props.connection_id}.bookmarks`, {});
}
}
]),
unauthorized: sequence('oada.unauthorized', [
set(state`error`, {})
]),
],
unauthorized: [
({store}) => {store.set(state`oada.error`, {})}
],
},
]);
];

const handleWatch = sequence('oada.handleWatch', [
equals(props`response.change.type`), {
'merge': [
({state, props}) => {
var oldState = _.cloneDeep(state.get(`oada.${props.connection_id}.${props.path}`));;
var newState = _.merge(oldState, props.response.change.body);
state.set(`oada.${props.connection_id}.${props.path}`, newState);
return {oldState}
},
],
'delete': [
({state, props}) => {
var nullPath = props.nullPath.split('/').join('.');
var oldState = _.cloneDeep(state.get(`oada.${props.connection_id}${nullPath}`));;
state.unset(`oada.${props.connection_id}.${props.path}${nullPath}`);
return {oldState}
}
]
const handleWatch = [
({state, oada, path, props}) => {
if (props.response.change.type === 'merge') {
var oldState = _.cloneDeep(state.get(`oada.${props.connection_id}.${props.path}`));;
var newState = _.merge(oldState, props.response.change.body);
state.set(`oada.${props.connection_id}.${props.path}`, newState);
return {oldState}
} else if (props.response.change.type === 'delete') {
var nullPath = props.nullPath.split('/').join('.');
var oldState = _.cloneDeep(state.get(`oada.${props.connection_id}${nullPath}`));;
state.unset(`oada.${props.connection_id}.${props.path}${nullPath}`);
return {oldState}
}
}
])
]

/**
* using the connection_id provided, it GET requests to the server
* @type {Primitive}
*/
const get = sequence('oada.get', [
({oada, state, props}) => {
const get = [
({oada, store, get, props}) => {
if (!props.requests) throw new Error('Passing request parameters as top level keys of cerebral props has been deprecated. Instead, pass requests in as an array of request objects under the requests key')
var requests = props.requests || [];
return Promise.map(requests, (request, i) => {
if (request.complete) return
let _cerebralPath = request.path.replace(/^\//, '').split('/').join('.')
if (request.watch) {
let conn = state.get(`oada.${request.connection_id || props.connection_id}`);
let conn = get(state`oada.${request.connection_id || props.connection_id}`);
if (conn) {
if (conn && conn.watches && conn.watches[request.path]) return
request.watch.signals = ['oada.handleWatch', ...request.watch.signals];
@@ -101,31 +99,46 @@ const get = sequence('oada.get', [
tree: request.tree || props.tree,
}).then((response) => {
let _responseData = response.data;
if (_responseData) state.set(`oada.${request.connection_id || props.connection_id}.${_cerebralPath}`, _responseData);
//Build out path one object at a time.
var path = `oada.${request.connection_id || props.connection_id}.${_cerebralPath}`;
var parts = path.split('.');
var partialPath = '';
parts.forEach((part) => {
partialPath = partialPath + part;
if (get(state`${partialPath}`) == null) {
store.set(state`${partialPath}`, {});
}
partialPath = partialPath + '.';
})
//Set response
if (_responseData) store.set(state`${path}`, _responseData);
if (request.watch) {
state.set(`oada.${request.connection_id || props.connection_id}.watches.${request.path}`, true)
//TODO build path part by part
store.set(state`oada.${request.connection_id || props.connection_id}.watches.${request.path}`, true)
}
requests[i].complete = true;
return response;
}).catch((err) => {
console.log('Error in oada.get', err);
return err;
})
}).then((responses) => {
return {responses, requests}
})
},// oada state props
]);
]

/**
* it PUT requests the resource to the server
* @type {Primitive}
*/
const put = sequence('oada.put', [
const put = [
({oada, state, props}) => {
if (!props.requests) throw new Error('Passing request parameters as top level keys of cerebral props has been deprecated. Instead, pass requests in as an array of request objects under the requests key')
var requests = props.requests || [];
return Promise.map(requests, (request, i)=>{
if (request.complete) return
console.log('request', request)
return oada.put({
url: request.url, //props.domain + ((request.path[0] === '/') ? '':'/') + request.path,
path: request.path,
@@ -137,21 +150,32 @@ const put = sequence('oada.put', [
}).then((response) => {
var oldState = _.cloneDeep(state.get(`oada.${request.connection_id || props.connection_id}${request.path.split('/').join('.')}`));;
var newState = _.merge(oldState, request.data);
state.set(`oada.${request.connection_id || props.connection_id}${request.path.split('/').join('.')}`, newState);
//Build out path one object at a time.
var path = `oada.${request.connection_id || props.connection_id}${request.path.split('/').join('.')}`;
var parts = path.split('.');
var partialPath = '';
parts.forEach((part) => {
partialPath = partialPath + part;
if (state.get(partialPath) == null) {
state.set(partialPath, {});
}
partialPath = partialPath + '.';
})
state.set(path, newState);
requests[i].complete = true;
return response;
})
}).then((responses) => {
return {responses, requests}
});
},
]);
]

/**
* requests a DELETE operation to the server. We utilize the connection_id to know which connection to use
* @type {Primitive}
*/
const oadaDelete = sequence('oada.delete', [
const oadaDelete = [
({oada, state, props}) => {
if (!props.requests) throw new Error('Passing request parameters as top level keys of cerebral props has been deprecated. Instead, pass requests in as an array of request objects under the requests key')
var requests = props.requests || [];
@@ -185,35 +209,35 @@ const oadaDelete = sequence('oada.delete', [
return {responses, requests};
})
},
]);
]

/**
* resets or clears the cache
* @type {Primitive}
*/
const resetCache = sequence('oada.resetCache', [
const resetCache = [
({oada, state, props}) => {
return oada.resetCache({
connection_id: props.connection_id || domainToConnectionId(props.domain),
});
}
]);
]

/**
* disconnects from the framework
* @type {Primitive}
*/
const disconnect = sequence('oada.disconnect', [
const disconnect = [
({oada, state, props}) => {
return oada.disconnect({connection_id: props.connection_id});
}
]);
]

/**
* it POST requests the resource to the server
* @type {Primitive}
*/
const post = sequence('oada.post', [
const post = [
({oada, state, props}) => {
if (!props.requests) throw new Error('Passing request parameters as top level keys of cerebral props has been deprecated. Instead, pass requests in as an array of request objects under the requests key')
var requests = props.requests || [];
@@ -239,7 +263,7 @@ const post = sequence('oada.post', [
return {responses}
});
},
]);
]

export default {
delete: oadaDelete,
1,380 changes: 838 additions & 542 deletions yarn.lock
View file

Large diffs are not rendered by default.