cha0s/persea-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: type rendering

Browse Source
This commit is contained in:
cha0s 2020-06-21 00:50:33 -05:00
parent c8ddacd5dd
commit 0c8ec0b1d2
18 changed files with 264 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/client/components/persea.jsx
View File

@ -1,10 +1,23 @@
import {hot} from 'react-hot-loader';
import React from 'react';
import React, {useState} from 'react';
import TypeRenderersContext from '~/client/context/typeRenderers';
import {all as allTypeRenderers} from '~/client/type-renderers.scwp';
import Entity from './entity';
const Persea = () => (
const typeRenderMap = () => Object.values(allTypeRenderers()).reduce((r, M) => {
const {default: {type, Component}} = M;
return {...r, [type]: Component};
}, {});
const Persea = () => {
const [typeRenderers] = useState(typeRenderMap());
return (
<TypeRenderersContext.Provider value={typeRenderers}>
<Entity />
);
</TypeRenderersContext.Provider>
);
};
export default hot(module)(Persea);

27
src/client/components/traits.jsx
View File

@ -15,7 +15,7 @@ import {
import {createSelector} from '@reduxjs/toolkit';
import {deregisterHooks, registerHooks} from 'scwp';
import {all as allTypeRenderers} from './types/type-renderers.scwp';
import Value from './types/value.type-renderer';
const SCROLL_MAG = 80;
@ -43,20 +43,10 @@ const ensureTraitComponents = () => {
}, {});
}
};
let TypeRenderers;
const ensureTypeRenderers = () => {
if (!TypeRenderers) {
TypeRenderers = Object.values(allTypeRenderers()).reduce((r, M) => {
const {default: {type, Component}} = M;
return {...r, [type]: Component};
}, {});
}
};
const makeTabSelector = (context, type) => createSelector(
(_) => _,
(trait) => {
ensureTypeRenderers();
ensureTraitComponents();
const {params: paramsRaw, state: stateRaw} = trait;
const {[type]: TraitComponent} = TraitComponents;
@ -68,27 +58,19 @@ const makeTabSelector = (context, type) => createSelector(
const renderComponents = (description, values) => (
// eslint-disable-next-line no-shadow
Object.values(mapObject(description, (description, key) => {
const {label, options, type: componentType} = description;
const Component = TypeRenderers[componentType];
const {label, options} = description;
return (
<label>
<label key={key}>
<span className="text">
{label}
:
</span>
<div className="invisible-separator" />
{
Component
? (
<Component
<Value.Component
context={context}
key={key}
options={options}
value={values[key]}
/>
)
: <div className="unrenderable" title="No renderer found!">?</div>
}
</label>
);
}))
@ -187,6 +169,7 @@ const Traits = (props) => {
};
Traits.propTypes = {
context: PropTypes.shape({}).isRequired,
traits: PropTypes.shape({}).isRequired,
};

11
src/client/components/types/actions.type-renderer.jsx
View File

@ -19,13 +19,10 @@ const Actions = ({
{
value && value.traversals.length > 0 && (
value.traversals.map(
(traversal) => (
<li>
<Value.Component
context={context}
type="any"
value={traversal}
/>
(traversal, i) => (
// eslint-disable-next-line react/no-array-index-key
<li key={i}>
<Value.Component context={context} value={traversal} />
</li>
),
)

2
src/client/components/types/condition.raw.scss
View File

@ -11,6 +11,6 @@
text-align-last: center;
}
.operand .steps {
.operand .traversal {
display: flex;
}

9
src/client/components/types/condition.type-renderer.jsx
View File

@ -6,9 +6,9 @@ import React from 'react';
import propertyPropTypes from './property-prop-types';
import Value from './value.type-renderer';
const renderOperand = (context, operand, type) => (
const renderOperand = (context, operand) => (
<span className="operand">
<Value.Component context={context} type={type} value={operand} />
<Value.Component context={context} value={operand} />
</span>
);
@ -39,7 +39,6 @@ const Condition = ({
case '>=':
case '<':
case '<=': {
const type = -1 !== ['is', 'isnt'].indexOf(value.operator) ? 'any' : 'number';
return value.operands.slice(1).reduce(
(r, operand) => (
<>
@ -47,10 +46,10 @@ const Condition = ({
<select className="operator" readOnly value={value.operator}>
{binaryOps.map(([k, v]) => <option value={k}>{v}</option>)}
</select>
{renderOperand(context, operand, type)}
{renderOperand(context, operand)}
</>
),
renderOperand(context, value.operands[0], type),
renderOperand(context, value.operands[0]),
);
}
default:

9
src/client/components/types/literal.raw.scss Normal file
View File

@ -0,0 +1,9 @@
:scope {
display: flex;
align-items: center;
}
select {
margin-right: 0.25em;
}

58
src/client/components/types/literal.type-renderer.jsx Normal file
View File

@ -0,0 +1,58 @@
import {compose} from '@avocado/core';
import contempo from 'contempo';
import React from 'react';
import useTypeRenderers from '~/client/hooks/useTypeRenderers';
import propertyPropTypes from './property-prop-types';
import {contextStepsList} from './steps-lists';
import {typeFromLiteral} from './typing';
const decorate = compose(
contempo(require('./literal.raw.scss')),
);
const Literal = ({
context,
value,
}) => {
const typeRenderers = useTypeRenderers();
const type = typeFromLiteral(value.value);
const stepsList = contextStepsList(context, type);
const tierOptions = Object.keys(stepsList.reduce((r, optionSteps) => {
if (!optionSteps[0] || !optionSteps[0].key) {
return r;
}
return {...r, [optionSteps[0].key]: true};
}, {}));
tierOptions.splice(tierOptions.indexOf('context'), 1);
tierOptions.push('<literal>');
return (
<div className="literal">
<select readOnly value="<literal>">
{
tierOptions
.sort((l, r) => (l.toLowerCase() < r.toLowerCase() ? -1 : 1))
.map((tierOption) => <option key={tierOption}>{tierOption}</option>)
}
</select>
{
(() => {
const Component = typeRenderers[type];
return Component
? <Component value={value.value} />
: null;
})()
}
</div>
);
};
Literal.propTypes = {
...propertyPropTypes,
};
export default {
type: 'literal',
Component: decorate(Literal),
};

2
src/client/components/types/property-prop-types.js
View File

@ -1,5 +1,7 @@
import PropTypes from 'prop-types';
export default {
context: PropTypes.shape({}),
options: PropTypes.shape({}),
value: PropTypes.any,
};

2
src/client/components/types/routines.type-renderer.jsx
View File

@ -22,7 +22,7 @@ const Routines = ({
entries.length > 0 && (
entries.map(
([name, routine]) => (
<li className="routine">
<li className="routine" key={name}>
<label>
<span className="text">{name}</span>
<Actions.Component context={context} value={routine.routine} />

105
src/client/components/types/steps.jsx
View File

@ -1,105 +0,0 @@
import {compose} from '@avocado/core';
import contempo from 'contempo';
import React from 'react';
import {contextStepsList} from './steps-lists';
import {typeFromSteps, typeFromLiteral} from './typing';
import Value from './value.type-renderer';
const decorate = compose(
contempo(require('./steps.raw.scss')),
);
const Steps = (props) => {
const {
context,
steps,
type,
value,
} = props;
let stepsType;
if ('undefined' === typeof value) {
stepsType = type;
}
else if (value.steps) {
stepsType = typeFromSteps(context, value.steps);
}
else {
stepsType = typeFromLiteral(value);
}
const stepsList = contextStepsList(context, stepsType);
return (
<div className="steps">
{steps.map((step, i) => {
switch (step.type) {
case 'key': {
const tierOptions = Object.keys(stepsList.reduce((r, optionSteps) => {
if (!optionSteps[i] || !optionSteps[i].key) {
return r;
}
for (let j = 0; j < i; ++j) {
if (steps[j].key !== optionSteps[j].key) {
return r;
}
}
return {...r, [optionSteps[i].key]: true};
}, {}));
if (0 === i) {
tierOptions.push('<literal>');
}
return (
<span className="key">
<select readOnly value={steps[i].key}>
{
tierOptions
.sort((l, r) => (l.toLowerCase() < r.toLowerCase() ? -1 : 1))
.map((tierOption) => <option>{tierOption}</option>)
}
</select>
</span>
);
}
case 'invoke':
return (
<div className="invoke">
<span className="paren open">(</span>
{step.args.map((arg) => (
<div className="arg">
<label>
{arg.label}
<Value.Component
context={context}
type={
arg.steps
? typeFromSteps(context, arg.steps)
: typeFromLiteral(arg)
}
value={arg}
/>
</label>
</div>
))}
<span className="paren close">)</span>
</div>
);
default:
return null;
}
})}
{
value && (
<span className="assign">
<span className="op">=</span>
<Value.Component
context={context}
type={typeFromSteps(context, steps)}
value={value}
/>
</span>
)
}
</div>
);
};
export default decorate(Steps);

2
src/client/components/types/steps.raw.scss → src/client/components/types/traversal.raw.scss
View File

@ -37,7 +37,7 @@
padding: 0.5em;
}
.arg .steps {
.arg .traversal {
display: flex;
}

96
src/client/components/types/traversal.type-renderer.jsx Normal file
View File

@ -0,0 +1,96 @@
import {compose} from '@avocado/core';
import contempo from 'contempo';
import React from 'react';
import propertyPropTypes from './property-prop-types';
import {contextStepsList} from './steps-lists';
import {typeFromSteps} from './typing';
import Value from './value.type-renderer';
const decorate = compose(
contempo(require('./traversal.raw.scss')),
);
const Traversal = (props) => {
const {
context,
value: {steps, value},
} = props;
const stepsList = contextStepsList(context, typeFromSteps(context, steps));
return (
<div className="traversal">
{steps.map((step, i) => (
// eslint-disable-next-line react/no-array-index-key
<span className="step" key={i}>
{
(() => {
switch (step.type) {
case 'key': {
const tierOptions = Object.keys(stepsList.reduce((r, optionSteps) => {
if (!optionSteps[i] || !optionSteps[i].key) {
return r;
}
for (let j = 0; j < i; ++j) {
if (steps[j].key !== optionSteps[j].key) {
return r;
}
}
return {...r, [optionSteps[i].key]: true};
}, {}));
if (0 === i) {
tierOptions.push('<literal>');
}
return (
<span className="key">
<select readOnly value={steps[i].key}>
{
tierOptions
.sort((l, r) => (l.toLowerCase() < r.toLowerCase() ? -1 : 1))
.map((tierOption) => <option key={tierOption}>{tierOption}</option>)
}
</select>
</span>
);
}
case 'invoke':
return (
<div className="invoke">
<span className="paren open">(</span>
{step.args.map((arg) => (
<div className="arg" key={JSON.stringify(arg)}>
<label>
{arg.label}
<Value.Component context={context} value={arg} />
</label>
</div>
))}
<span className="paren close">)</span>
</div>
);
default:
return null;
}
})()
}
</span>
))}
{
value && (
<span className="assign">
<span className="op">=</span>
<Value.Component context={context} value={value} />
</span>
)
}
</div>
);
};
Traversal.propTypes = {
...propertyPropTypes,
};
export default {
type: 'traversal',
Component: decorate(Traversal),
};

20
src/client/components/types/typing.js
View File

@ -1,8 +1,6 @@
import {Context} from '@avocado/behavior';
export function typeFromLiteral(v) {
if ('literal' === v.type) {
const {value} = v;
export function typeFromLiteral(value) {
if ('undefined' === typeof value) {
return 'undefined';
}
@ -21,11 +19,25 @@ export function typeFromLiteral(v) {
if (value.length && 2 === value.length && value instanceof Array) {
return 'vector';
}
return 'object';
}
export function typeFromValue(v) {
if ('object' === typeof v) {
if ('routines' === v.type) {
return 'routines';
}
if ('traversal' === v.type) {
return 'traversal';
}
if ('actions' === v.type && v.traversals) {
return 'actions';
}
return 'object';
if ('literal' === v.type) {
return 'literal';
}
}
return undefined;
}
export function typeFromSteps(context, steps) {

9
src/client/components/types/value.raw.scss
View File

@ -1,12 +1,3 @@
.fn {
text-align-last: right;
}
.literal {
display: flex;
align-items: center;
}
.literal select {
margin-right: 0.25em;
}

80
src/client/components/types/value.type-renderer.jsx
View File

@ -3,66 +3,10 @@ import contempo from 'contempo';
import PropTypes from 'prop-types';
import React from 'react';
import useTypeRenderers from '~/client/hooks/useTypeRenderers';
import {typeFromLiteral, typeFromValue} from '~/client/components/types/typing';
import propertyPropTypes from './property-prop-types';
import Steps from './steps';
import {contextStepsList} from './steps-lists';
import {typeFromLiteral} from './typing';
let TypeRenderers;
const ensureTypeRenderers = () => {
if (!TypeRenderers) {
const {all: allTypeRenderers} = require('./type-renderers.scwp');
TypeRenderers = Object.values(allTypeRenderers()).reduce((r, M) => {
const {default: {type, Component}} = M;
return {...r, [type]: Component};
}, {});
}
};
const renderValue = (context, type, value) => {
ensureTypeRenderers();
switch (value.type) {
case 'traversal': {
return <Steps context={context} steps={value.steps} type={type} value={value.value} />;
}
case 'actions': {
const Component = TypeRenderers.actions;
return <Component context={context} value={value} />;
}
case 'literal': {
const stepsList = contextStepsList(context, type);
const tierOptions = Object.keys(stepsList.reduce((r, optionSteps) => {
if (!optionSteps[0] || !optionSteps[0].key) {
return r;
}
return {...r, [optionSteps[0].key]: true};
}, {}));
tierOptions.splice(tierOptions.indexOf('context'), 1);
tierOptions.push('<literal>');
return (
<div className="literal">
<select readOnly value="<literal>">
{
tierOptions
.sort((l, r) => (l.toLowerCase() < r.toLowerCase() ? -1 : 1))
.map((tierOption) => <option>{tierOption}</option>)
}
</select>
{
(() => {
const Component = TypeRenderers['any' === type ? typeFromLiteral(value) : type];
return Component
? <Component value={value.value} />
: null;
})()
}
</div>
);
}
default:
return null;
}
};
const decorate = compose(
contempo(require('./value.raw.scss')),
@ -70,9 +14,23 @@ const decorate = compose(
const Value = ({
context,
type,
options,
value,
}) => <span className="value">{renderValue(context, type, value)}</span>;
}) => {
const typeRenderers = useTypeRenderers();
const fromValue = typeFromValue(value);
const type = 'undefined' !== typeof fromValue ? fromValue : typeFromLiteral(value);
const Component = typeRenderers[type];
return (
<span className="value">
{
Component
? <Component context={context} options={options} value={value} />
: <div className="unrenderable" title={`No renderer for '${type}' found!`}>?</div>
}
</span>
);
};
Value.propTypes = {
...propertyPropTypes,

3
src/client/context/typeRenderers.js Normal file
View File

@ -0,0 +1,3 @@
import {createContext} from 'react';
export default createContext({});

5
src/client/hooks/useTypeRenderers.js Normal file
View File

@ -0,0 +1,5 @@
import {useContext} from 'react';
import TypeRenderersContext from '~/client/context/typeRenderers';
export default () => useContext(TypeRenderersContext);

0
src/client/components/types/type-renderers.scwp.js → src/client/type-renderers.scwp.js
View File