github/lowcode-engine
1
0
Fork 0
mirror of https://github.com/alibaba/lowcode-engine.git synced 2026-02-28 21:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix code style conflicts

Browse Source
This commit is contained in:
力皓 2020-09-14 15:21:56 +08:00
commit 9cf809436e
82 changed files with 1407 additions and 14446 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintignore
View File

@ -2,6 +2,7 @@
node_modules
build
dist
demo
es
lib
.*

2
.vscode/launch.json vendored
View File

@ -9,7 +9,7 @@
"type": "node",
"request": "launch",
"runtimeExecutable": "${workspaceFolder}/packages/material-parser/node_modules/.bin/ava",
"runtimeArgs": ["debug", "--break", "${file}"]
"runtimeArgs": ["debug", "--break", "${workspaceFolder}/packages/material-parser/test/antd.ts"]
}
]
}

4
packages/demo-server/src/api/api.controller.ts
View File

@ -7,6 +7,10 @@ import { GenerateProjectDto } from '../dto/generate-project.dto';
export class ApiController {
private readonly apiService: ApiService;
constructor(apiService: ApiService) {
this.apiService = apiService;
}
@Get('generate/test')
generateTest() {
return 'generate test';

4
packages/demo-server/src/app.controller.ts
View File

@ -5,6 +5,10 @@ import { AppService } from './app.service';
export class AppController {
private readonly appService: AppService;
constructor(appService: AppService) {
this.appService = appService;
}
@Get()
getHello(): string {
return this.appService.getHello();

2
packages/designer/.eslintrc.js
View File

@ -1,7 +1,7 @@
module.exports = {
extends: 'eslint-config-ali/typescript/react',
rules: {
'react/no-multi-comp': 1,
'react/no-multi-comp': 0,
'no-unused-expressions': 1,
'implicit-arrow-linebreak': 1,
'no-nested-ternary': 1,

1
packages/designer/src/builtin-simulator/bem-tools/border-detecting.tsx
View File

@ -38,7 +38,6 @@ export class BorderDetectingInstance extends PureComponent<{
}
@observer
// eslint-disable-next-line react/no-multi-comp
export class BorderDetecting extends Component<{ host: BuiltinSimulatorHost }> {
shouldComponentUpdate() {
return false;

2
packages/designer/src/builtin-simulator/bem-tools/border-resizing.tsx
View File

@ -58,7 +58,6 @@ export default class BoxResizing extends Component<{ host: BuiltinSimulatorHost
}
@observer
// eslint-disable-next-line react/no-multi-comp
export class BoxResizingForNode extends Component<{ host: BuiltinSimulatorHost; node: Node }> {
static contextType = SimulatorContext;
@ -106,7 +105,6 @@ export class BoxResizingForNode extends Component<{ host: BuiltinSimulatorHost;
}
@observer
// eslint-disable-next-line react/no-multi-comp
export class BoxResizingInstance extends Component<{
observed: OffsetObserver;
highlight?: boolean;

3
packages/designer/src/builtin-simulator/bem-tools/border-selecting.tsx
View File

@ -55,7 +55,6 @@ export class BorderSelectingInstance extends Component<{
}
@observer
// eslint-disable-next-line react/no-multi-comp
class Toolbar extends Component<{ observed: OffsetObserver }> {
shouldComponentUpdate() {
return false;
@ -151,7 +150,6 @@ function createAction(content: ReactNode | ComponentType<any> | ActionContentObj
}
@observer
// eslint-disable-next-line react/no-multi-comp
export class BorderSelectingForNode extends Component<{ host: BuiltinSimulatorHost; node: Node }> {
get host(): BuiltinSimulatorHost {
return this.props.host;
@ -195,7 +193,6 @@ export class BorderSelectingForNode extends Component<{ host: BuiltinSimulatorHo
}
@observer
// eslint-disable-next-line react/no-multi-comp
export class BorderSelecting extends Component<{ host: BuiltinSimulatorHost }> {
get host(): BuiltinSimulatorHost {
return this.props.host;

2
packages/designer/src/builtin-simulator/host-view.tsx
View File

@ -49,7 +49,6 @@ export class BuiltinSimulatorHostView extends Component<SimulatorHostProps> {
}
}
// eslint-disable-next-line react/no-multi-comp
@observer
class Canvas extends Component<{ host: BuiltinSimulatorHost }> {
render() {
@ -72,7 +71,6 @@ class Canvas extends Component<{ host: BuiltinSimulatorHost }> {
}
}
// eslint-disable-next-line react/no-multi-comp
@observer
class Content extends Component<{ host: BuiltinSimulatorHost }> {
render() {

6
packages/editor-preset-vision/.eslintrc.js
View File

@ -10,5 +10,11 @@ module.exports = {
'@typescript-eslint/ban-types': 1,
'no-shadow': 1,
'no-prototype-builtins': 1,
'@typescript-eslint/no-unused-vars': 1,
'no-multi-assign': 1,
'no-dupe-class-members': 1,
'react/no-deprecated': 1,
'no-useless-escape': 1,
'brace-style': 1,
}
}

44
packages/editor-setters/src/expression-setter/index.tsx
View File

@ -68,12 +68,13 @@ export default class ExpressionView extends PureComponent {
return val;
}
constructor(props: Readonly) {
constructor(props: Readonly<{}>) {
super(props);
this.expression = React.createRef();
this.i18n = generateI18n(props.locale, props.messages);
this.state = {
value: ExpressionView.getInitValue(props.value),
context: props.context || {},
dataSource: props.dataSource || [],
};
}
@ -126,23 +127,32 @@ export default class ExpressionView extends PureComponent {
* @return {Array}
*/
getDataSource(tempStr: string): any[] {
// eslint-disable-next-line no-useless-escape
if (/[^\w\.]$/.test(tempStr)) {
return [];
} else if (tempStr === null || tempStr === '') {
return this.getContextKeys([]);
} else if (/\w\.$/.test(tempStr)) {
const currentField = this.getCurrentFiled(tempStr);
if (!currentField) return null;
let tempKeys = this.getObjectKeys(currentField.str);
tempKeys = this.getContextKeys(tempKeys);
if (!tempKeys) return null;
return tempKeys;
} else if (/\.$/.test(tempStr)) {
return [];
} else {
return null;
const {editor} = this.props.field;
const schema = editor.get('designer').project.getSchema();
const stateMap = schema.componentsTree[0].state;
let dataSource = [];
for (let key in stateMap){
dataSource.push(`this.state.${key}`);
}
// if (/[^\w\.]$/.test(tempStr)) {
// return [];
// } else if (tempStr === null || tempStr === '') {
// return this.getContextKeys([]);
// } else if (/\w\.$/.test(tempStr)) {
// const currentField = this.getCurrentFiled(tempStr);
// if (!currentField) return null;
// let tempKeys = this.getObjectKeys(currentField.str);
// tempKeys = this.getContextKeys(tempKeys);
// if (!tempKeys) return null;
// return tempKeys;
// } else if (/\.$/.test(tempStr)) {
// return [];
// } else {
// return null;
// }
return dataSource;
}
/**

2
packages/material-parser/.eslintignore Normal file
View File

@ -0,0 +1,2 @@
test/fixtures/**
lib/**

3
packages/material-parser/.eslintrc.js Normal file
View File

@ -0,0 +1,3 @@
module.exports = {
extends: 'eslint-config-ali/typescript/react',
};

2
packages/material-parser/README.md
View File

@ -12,3 +12,5 @@
cd demo
node index.js
```
## API

7
packages/material-parser/demo/component.jsx
View File

@ -1,3 +1,4 @@
/* eslint-disable react/forbid-prop-types,react/no-unused-prop-types */
import React from 'react';
import PropTypes from 'prop-types';
@ -37,7 +38,11 @@ Demo.propTypes = {
optionalEnum: PropTypes.oneOf(['News', 'Photos']),
// An object that could be one of many types
optionalUnion: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.instanceOf(Demo)]),
optionalUnion: PropTypes.oneOfType([
PropTypes.string,
PropTypes.number,
PropTypes.instanceOf(Demo),
]),
// An array of a certain type
optionalArrayOf: PropTypes.arrayOf(PropTypes.number),

1
packages/material-parser/package.json
View File

@ -63,6 +63,7 @@
"prop-types": "^15.7.2",
"react-docgen": "^5.3.0",
"react-docgen-typescript": "^1.16.5",
"safe-eval": "^0.4.1",
"semver": "^7.1.3",
"short-uuid": "^3.1.1",
"typescript": "^3.9.5",

2
packages/material-parser/src/core/index.ts
View File

@ -5,6 +5,6 @@ export * from './schema/types';
/**
* Dev helper
*/
export const debug = _debug('lowcode');
export const debug = _debug('lowcode:mat');
export const enableDebug = () => _debug.enable('lowcode:*');
export const disableDebug = () => _debug.disable();

4
packages/material-parser/src/core/schema/types.ts
View File

@ -80,7 +80,7 @@ export interface ObjectOf {
[k: string]: any;
}
export interface Shape {
type: "shape";
type: 'shape';
value: {
name?: string;
propType?: PropType;
@ -89,7 +89,7 @@ export interface Shape {
[k: string]: any;
}
export interface Exact {
type: "exact";
type: 'exact';
value: {
name?: string;
propType?: PropType;

3
packages/material-parser/src/generate.ts
View File

@ -1,7 +1,7 @@
import { debug, ComponentMeta } from './core';
import { IMaterialParsedModel, IMaterialScanModel } from './types';
const log = debug.extend('mat');
const log = debug.extend('gen');
export default async function (
matScanModel: IMaterialScanModel,
@ -41,6 +41,7 @@ export async function genManifest(
title: matScanModel.pkgName,
docUrl: '',
screenshot: '',
devMode: 'proCode', // 需要入料的组件都是源码模式，低代码组件在平台上即可直接生成描述
npm: {
package: matScanModel.pkgName,
version: matScanModel.pkgVersion,

3
packages/material-parser/src/localize.ts
View File

@ -1,12 +1,11 @@
import spawn from 'cross-spawn-promise';
import { ensureDir, ensureFile, writeFile } from 'fs-extra';
import { join } from 'path';
import semver from 'semver';
import uuid from 'short-uuid';
import { debug } from './core';
import { IMaterializeOptions } from './types';
const log = debug.extend('mat');
const log = debug.extend('localize');
/**
* 创建组件包

11
packages/material-parser/src/parse/index.ts
View File

@ -3,6 +3,9 @@ import parseJS from './js';
import parseTS from './ts';
import { install, installPeerDeps, installTypeModules } from '../utils';
import { IMaterialScanModel } from '../types';
import { debug } from '../core';
const log = debug.extend('parse');
export interface IParseArgs extends IMaterialScanModel {
accesser?: 'online' | 'local';
@ -15,7 +18,11 @@ export interface IParseArgs extends IMaterialScanModel {
}
export default async (args: IParseArgs) => {
const { typingsFileAbsolutePath, mainFileAbsolutePath, moduleFileAbsolutePath = mainFileAbsolutePath } = args;
const {
typingsFileAbsolutePath,
mainFileAbsolutePath,
moduleFileAbsolutePath = mainFileAbsolutePath,
} = args;
if (args.accesser === 'local') {
if (moduleFileAbsolutePath.endsWith('ts') || moduleFileAbsolutePath.endsWith('tsx')) {
await install(args);
@ -48,7 +55,7 @@ export default async (args: IParseArgs) => {
}
return info;
} catch (e) {
console.error(e);
log(e);
// if error, use static js parsing instead
return parseJS(moduleFileAbsolutePath);
}

52
packages/material-parser/src/parse/js/handlers/defaultPropsHandler.ts
View File

@ -1,5 +1,8 @@
// import { debug } from '../../../core';
const { namedTypes: t, NodePath } = require('ast-types');
// const log = debug.extend('parse:js');
type NodePathType = typeof NodePath;
const {
getPropertyName,
@ -7,7 +10,6 @@ const {
getMemberValuePath,
isReactForwardRefCall,
printValue,
resolveExportDeclaration,
resolveToValue,
} = require('react-docgen').utils;
const resolveFunctionDefinitionToReturnValue = require('react-docgen/dist/utils/resolveFunctionDefinitionToReturnValue');
@ -29,16 +31,17 @@ function getDefaultValue(path: NodePathType) {
node = path.node;
try {
defaultValue = printValue(path);
} catch (e) {}
} catch (e) {
// log(e);
// TODO
}
}
}
if (typeof defaultValue !== 'undefined') {
return {
value: defaultValue,
computed:
t.CallExpression.check(node) ||
t.MemberExpression.check(node) ||
t.Identifier.check(node),
t.CallExpression.check(node) || t.MemberExpression.check(node) || t.Identifier.check(node),
};
}
@ -55,10 +58,7 @@ function getStatelessPropsPath(componentDefinition: any) {
}
function getDefaultPropsPath(componentDefinition: any) {
let defaultPropsPath = getMemberValuePath(
componentDefinition,
'defaultProps',
);
let defaultPropsPath = getMemberValuePath(componentDefinition, 'defaultProps');
if (!defaultPropsPath) {
return null;
}
@ -71,9 +71,7 @@ function getDefaultPropsPath(componentDefinition: any) {
if (t.FunctionExpression.check(defaultPropsPath.node)) {
// Find the value that is returned from the function and process it if it is
// an object literal.
const returnValue = resolveFunctionDefinitionToReturnValue(
defaultPropsPath,
);
const returnValue = resolveFunctionDefinitionToReturnValue(defaultPropsPath);
if (returnValue && t.ObjectExpression.check(returnValue.node)) {
defaultPropsPath = returnValue;
}
@ -81,16 +79,11 @@ function getDefaultPropsPath(componentDefinition: any) {
return defaultPropsPath;
}
function getDefaultValuesFromProps(
properties: any[],
documentation: any,
isStateless: boolean,
) {
function getDefaultValuesFromProps(properties: any[], documentation: any, isStateless: boolean) {
properties
// Don't evaluate property if component is functional and the node is not an AssignmentPattern
.filter(
propertyPath => !isStateless ||
t.AssignmentPattern.check(propertyPath.get('value').node),
propertyPath => !isStateless || t.AssignmentPattern.check(propertyPath.get('value').node),
)
.forEach(propertyPath => {
if (t.Property.check(propertyPath.node)) {
@ -99,9 +92,7 @@ function getDefaultValuesFromProps(
const propDescriptor = documentation.getPropDescriptor(propName);
const defaultValue = getDefaultValue(
isStateless
? propertyPath.get('value', 'right')
: propertyPath.get('value'),
isStateless ? propertyPath.get('value', 'right') : propertyPath.get('value'),
);
if (defaultValue) {
propDescriptor.defaultValue = defaultValue;
@ -119,10 +110,7 @@ function getDefaultValuesFromProps(
});
}
export default function defaultPropsHandler(
documentation: any,
componentDefinition: any,
) {
export default function defaultPropsHandler(documentation: any, componentDefinition: any) {
let statelessProps = null;
const defaultPropsPath = getDefaultPropsPath(componentDefinition);
/**
@ -134,17 +122,9 @@ export default function defaultPropsHandler(
// Do both statelessProps and defaultProps if both are available so defaultProps can override
if (statelessProps && t.ObjectPattern.check(statelessProps.node)) {
getDefaultValuesFromProps(
statelessProps.get('properties'),
documentation,
true,
);
getDefaultValuesFromProps(statelessProps.get('properties'), documentation, true);
}
if (defaultPropsPath && t.ObjectExpression.check(defaultPropsPath.node)) {
getDefaultValuesFromProps(
defaultPropsPath.get('properties'),
documentation,
false,
);
getDefaultValuesFromProps(defaultPropsPath.get('properties'), documentation, false);
}
}

6
packages/material-parser/src/parse/js/handlers/flowTypeHandler.ts
View File

@ -7,9 +7,9 @@
import { namedTypes as t } from 'ast-types';
import getTSType from '../utils/getTSType';
import getRoot from '../utils/getRoot';
import parseTS from '../../ts';
import getFlowTypeFromReactComponent, { applyToFlowTypeProperties } from '../utils/getFlowTypeFromReactComponent';
import getFlowTypeFromReactComponent, {
applyToFlowTypeProperties,
} from '../utils/getFlowTypeFromReactComponent';
const { unwrapUtilityType } = require('react-docgen/dist/utils/flowUtilityTypes');
const { getFlowType, getPropertyName, resolveToValue } = require('react-docgen').utils;

4
packages/material-parser/src/parse/js/index.ts
View File

@ -26,9 +26,9 @@ export default function parse(filePath: string): IMaterialParsedModel[] {
const item: any = transformItem(name, info.props[name]);
acc.push(item);
} catch (e) {
} finally {
return acc;
// TODO
}
return acc;
}, []);
res.push({
componentName: info.displayName,

16
packages/material-parser/src/parse/js/resolver/index.ts
View File

@ -3,7 +3,7 @@ import { uniqBy } from 'lodash';
import checkIsIIFE from './checkIsIIFE';
import resolveHOC from './resolveHOC';
import resolveIIFE from './resolveIIFE';
import resolveImport, { isImportLike } from './resolveImport';
import resolveImport from './resolveImport';
import resolveTranspiledClass from './resolveTranspiledClass';
import isStaticMethod from './isStaticMethod';
import findAssignedMethods from './findAssignedMethods';
@ -253,14 +253,16 @@ function getSubComponents(path: any, scope: any, cache: ICache) {
value: def.flatMap((x: any) => x).filter((x: any) => isComponentDefinition(x)),
};
})
.map(({ subName, localName, value }: IMethodsPath) => value.map((x: any) => ({
subName,
localName,
value: x,
})))
.map(({ subName, localName, value }: IMethodsPath) => {
return value.map((x: any) => ({
subName,
localName,
value: x,
}));
})
// @ts-ignore
.flatMap((x: any) => x)
.map(({ subName, localName, value }: IMethodsPath) => {
.map(({ subName, value }: IMethodsPath) => {
const __meta = {
subName,
exportName: path.__meta && path.__meta.exportName,

8
packages/material-parser/src/parse/js/resolver/resolveHOC.ts
View File

@ -1,10 +1,6 @@
import { namedTypes as t, visit } from 'ast-types';
import { namedTypes as t } from 'ast-types';
const {
isReactCreateClassCall,
isReactForwardRefCall,
resolveToValue,
} = require('react-docgen').utils;
const { isReactCreateClassCall, isReactForwardRefCall } = require('react-docgen').utils;
/**
* If the path is a call expression, it recursively resolves to the

8
packages/material-parser/src/parse/js/resolver/resolveTranspiledClass.ts
View File

@ -1,4 +1,4 @@
import { builders, namedTypes as t, NodePath, visit } from 'ast-types';
import { builders, NodePath, visit } from 'ast-types';
/**
* If the path is a call expression, it recursively resolves to the
* rightmost argument, stopping if it finds a React.createClass call expression
@ -17,11 +17,7 @@ export default function resolveTranspiledClass(path: any) {
builders.blockStatement([
builders.returnStatement(
builders.jsxElement(
builders.jsxOpeningElement(
builders.jsxIdentifier('div'),
[],
true,
),
builders.jsxOpeningElement(builders.jsxIdentifier('div'), [], true),
),
),
]),

2
packages/material-parser/src/parse/js/utils/cache.ts
View File

@ -14,5 +14,5 @@ export function get(scope: string, name: string) {
}
export function has(scope: string, name: string) {
return cache[scope] && cache[scope].hasOwnProperty(name);
return cache[scope] && Object.prototype.hasOwnProperty.call(cache[scope], name);
}

9
packages/material-parser/src/parse/js/utils/makeProxy.ts
View File

@ -9,10 +9,15 @@ function makeProxy(target: { [name: string]: any }, meta: any = {}): any {
if (prop === '__isProxy') return true;
if (prop === '__getRaw') return () => target;
if (prop === '__getMeta') return () => meta;
return meta.hasOwnProperty(prop) ? meta[prop] : obj[prop];
return Object.prototype.hasOwnProperty.call(meta, prop) ? meta[prop] : obj[prop];
// return obj[prop];
},
has: (obj, prop) => obj.hasOwnProperty(prop) || meta.hasOwnProperty(prop),
has: (obj, prop) => {
return (
Object.prototype.hasOwnProperty.call(obj, prop) ||
Object.prototype.hasOwnProperty.call(meta, prop)
);
},
});
}

23
packages/material-parser/src/parse/runtime/index.ts
View File

@ -4,7 +4,6 @@ import { isEmpty } from 'lodash';
import parsePropTypes from 'parse-prop-types';
import PropTypes from 'prop-types';
import { transformItem } from '../transform';
import { IParseArgs } from '../index';
import requireInSandbox from './requireInSandbox';
export interface IComponentInfo {
@ -29,7 +28,7 @@ const reservedKeys = [
];
function getKeys(com: any) {
const keys = Object.keys(com).filter((x) => {
const keys = Object.keys(com).filter(x => {
return !reservedKeys.includes(x) && !x.startsWith('_');
});
@ -37,7 +36,11 @@ function getKeys(com: any) {
}
function isComponent(obj: any) {
return typeof obj === 'function' && (obj.hasOwnProperty('propTypes') || obj.hasOwnProperty('defaultProps'));
return (
typeof obj === 'function' &&
(Object.prototype.hasOwnProperty.call(obj, 'propTypes') ||
Object.prototype.hasOwnProperty.call(obj, 'defaultProps'))
);
}
export default function (filePath: string) {
@ -50,7 +53,7 @@ export default function (filePath: string) {
if (Com.__esModule) {
const keys = getKeys(Com);
keys.forEach((k) => {
keys.forEach(k => {
if (isComponent(Com[k])) {
components.push({
component: Com[k],
@ -75,8 +78,8 @@ export default function (filePath: string) {
const keys = getKeys(item.component);
const subs = keys
.filter((k) => isComponent(item.component[k]))
.map((k) => ({
.filter(k => isComponent(item.component[k]))
.map(k => ({
component: item.component[k],
meta: {
...item.meta,
@ -91,14 +94,14 @@ export default function (filePath: string) {
const result = components.reduce((acc: any, { meta, component }) => {
const componentInfo = parsePropTypes(component);
if (!isEmpty(componentInfo)) {
const props = Object.keys(componentInfo).reduce((acc: any[], name) => {
const props = Object.keys(componentInfo).reduce((acc2: any[], name) => {
try {
const item: any = transformItem(name, componentInfo[name]);
acc.push(item);
acc2.push(item);
} catch (e) {
} finally {
return acc;
// TODO
}
return acc2;
}, []);
return [

78
packages/material-parser/src/parse/transform.ts
View File

@ -1,4 +1,8 @@
import { omit, pick } from 'lodash';
import { omit, pick, isNil } from 'lodash';
import { safeEval, isEvaluable } from '../utils';
import { debug } from '../core';
const log = debug.extend('parse:transform');
export function transformType(itemType: any) {
if (typeof itemType === 'string') return itemType;
@ -7,7 +11,7 @@ export function transformType(itemType: any) {
// return name;
// }
if (computed !== undefined && value) {
return eval(value);
return safeEval(value);
}
const result: any = {
type: name,
@ -24,16 +28,31 @@ export function transformType(itemType: any) {
case 'symbol':
case 'object':
case 'null':
case 'array':
case 'element':
case 'node':
break;
case 'literal':
return eval(value);
return safeEval(value);
case 'enum':
case 'tuple':
case 'oneOf':
result.type = 'oneOf';
result.value = value.map(transformType);
break;
case 'union':
case 'union': {
const { raw } = itemType;
if (raw) {
if (raw.match(/ReactNode$/)) {
result.type = 'node';
break;
} else if (raw.match(/Element$/)) {
result.type = 'element';
break;
}
}
}
// eslint-disable-next-line no-fallthrough
case 'oneOfType':
result.type = 'oneOfType';
result.value = value.map(transformType);
@ -77,12 +96,9 @@ export function transformType(itemType: any) {
result.value = properties
.filter((item: any) => typeof item.key !== 'object')
.map((prop: any) => {
const {
key,
value: { name, ...others },
} = prop;
const { key } = prop;
return transformItem(key, {
...others,
...omit(prop.value, 'name'),
type: pick(prop.value, ['name', 'value']),
});
});
@ -90,7 +106,6 @@ export function transformType(itemType: any) {
break;
}
case 'objectOf':
case 'arrayOf':
case 'instanceOf':
result.value = transformType(value);
break;
@ -107,18 +122,19 @@ export function transformType(itemType: any) {
});
});
break;
case (name.match('ReactNode$') || {}).input:
case (name.match(/ReactNode$/) || {}).input:
result.type = 'node';
break;
case (name.match('Element$') || {}).input:
case (name.match(/Element$/) || {}).input:
result.type = 'element';
break;
case (name.match('ElementType$') || {}).input:
result.type = 'elementType';
break;
// case (name.match(/ElementType$/) || {}).input:
// result.type = 'elementType';
// break;
default:
result.type = 'instanceOf';
result.value = name;
// result.type = 'instanceOf';
// result.value = name;
result.type = 'any';
break;
}
if (Object.keys(result).length === 1) {
@ -128,7 +144,15 @@ export function transformType(itemType: any) {
}
export function transformItem(name: string, item: any) {
const { description, flowType, tsType, type = tsType || flowType, required, defaultValue, ...others } = item;
const {
description,
flowType,
tsType,
type = tsType || flowType,
required,
defaultValue,
...others
} = item;
const result: any = {
name,
};
@ -147,11 +171,19 @@ export function transformItem(name: string, item: any) {
result.description = description;
}
}
if (defaultValue !== undefined) {
try {
const value = eval(defaultValue.value);
result.defaultValue = value;
} catch (e) {}
if (!isNil(defaultValue) && typeof defaultValue === 'object' && isEvaluable(defaultValue)) {
if (defaultValue === null) {
result.defaultValue = defaultValue;
} else {
try {
const value = safeEval(defaultValue.value);
if (isEvaluable(value)) {
result.defaultValue = value;
}
} catch (e) {
log(e);
}
}
}
if (result.propType === undefined) {
delete result.propType;

91
packages/material-parser/src/parse/ts/index.ts
View File

@ -1,8 +1,17 @@
import { Parser, ComponentDoc } from 'react-docgen-typescript';
import ts, { SymbolFlags, TypeFlags } from 'typescript';
import { isEmpty, isEqual } from 'lodash';
import { debug } from '../../core';
import { Json } from '../../types';
import { transformItem } from '../transform';
const log = debug.extend('parse:ts');
type ExtendedType = ts.Type & {
id: string;
typeArguments: any[];
};
function getSymbolName(symbol: ts.Symbol) {
// @ts-ignore
const prefix: string = symbol.parent && getSymbolName(symbol.parent);
@ -32,13 +41,10 @@ function getDocgenTypeHelper(
parentIds: number[] = [],
isRequired = false,
): any {
function isTuple(type: ts.Type) {
function isTuple(_type: ts.Type) {
// @ts-ignore use internal methods
return checker.isArrayLikeType(type) && !checker.isArrayType(type);
return checker.isArrayLikeType(_type) && !checker.isArrayType(_type);
}
// if (type.aliasSymbol && type.aliasSymbol.getName() === 'ReactNode') {
// return 'children';
// }
let required: boolean;
if (isRequired !== undefined) {
required = isRequired;
@ -46,7 +52,7 @@ function getDocgenTypeHelper(
required = !(type.flags & SymbolFlags.Optional) || isRequired;
}
function makeResult(typeInfo: object) {
function makeResult(typeInfo: Json) {
if (skipRequired) {
return {
raw: checker.typeToString(type),
@ -61,7 +67,7 @@ function getDocgenTypeHelper(
}
}
function getShapeFromArray(symbolArr: ts.Symbol[], type: ts.Type) {
function getShapeFromArray(symbolArr: ts.Symbol[], _type: ts.Type) {
const shape: Array<{
key:
| {
@ -69,7 +75,7 @@ function getDocgenTypeHelper(
}
| string;
value: any;
}> = symbolArr.map((prop) => {
}> = symbolArr.map(prop => {
const propType = checker.getTypeOfSymbolAtLocation(
prop,
// @ts-ignore
@ -83,19 +89,19 @@ function getDocgenTypeHelper(
propType,
false,
// @ts-ignore
[...parentIds, type.id],
[...parentIds, _type.id],
// @ts-ignore
prop?.valueDeclaration?.questionToken ? false : undefined,
),
};
});
// @ts-ignore use internal methods
if (checker.isArrayLikeType(type)) {
if (checker.isArrayLikeType(_type)) {
return shape;
}
if (type.getStringIndexType()) {
if (_type.getStringIndexType()) {
// @ts-ignore use internal methods
if (!type.stringIndexInfo) {
if (!_type.stringIndexInfo) {
return shape;
}
shape.push({
@ -103,11 +109,14 @@ function getDocgenTypeHelper(
name: 'string',
},
// @ts-ignore use internal methods
value: getDocgenTypeHelper(checker, type.stringIndexInfo.type, false, [...parentIds, type.id]),
value: getDocgenTypeHelper(checker, _type.stringIndexInfo.type, false, [
...parentIds,
(_type as ExtendedType).id,
]),
});
} else if (type.getNumberIndexType()) {
} else if (_type.getNumberIndexType()) {
// @ts-ignore use internal methods
if (!type.numberIndexInfo) {
if (!_type.numberIndexInfo) {
return shape;
}
shape.push({
@ -116,32 +125,34 @@ function getDocgenTypeHelper(
},
// @ts-ignore use internal methods
value: getDocgenTypeHelper(checker, type.numberIndexInfo.type, false, [...parentIds, type.id]),
value: getDocgenTypeHelper(checker, _type.numberIndexInfo.type, false, [
...parentIds,
(_type as ExtendedType).id,
]),
});
}
return shape;
}
function getShape(type: ts.Type) {
const { symbol } = type;
function getShape(_type: ts.Type) {
const { symbol } = _type;
if (symbol && symbol.members) {
// @ts-ignore
const props: ts.Symbol[] = Array.from(symbol.members.values());
return getShapeFromArray(
props.filter((prop) => prop.getName() !== '__index'),
type,
props.filter(prop => prop.getName() !== '__index'),
_type,
);
} else {
// @ts-ignore
const args = type.resolvedTypeArguments || [];
const props = checker.getPropertiesOfType(type);
const shape = getShapeFromArray(props.slice(0, args.length), type);
const args = _type.resolvedTypeArguments || [];
const props = checker.getPropertiesOfType(_type);
const shape = getShapeFromArray(props.slice(0, args.length), _type);
return shape;
}
}
const pattern = /^__global\.(.+)$/;
// @ts-ignore
if (parentIds.includes(type.id)) {
return makeResult({
@ -191,21 +202,26 @@ function getDocgenTypeHelper(
return makeResult({
name: 'union',
// @ts-ignore
value: type.types.map((t) => getDocgenTypeHelper(checker, t, true, [...parentIds, type.id])),
value: type.types.map(t => getDocgenTypeHelper(checker, t, true, [...parentIds, type.id])),
});
} else if (type.flags & (TypeFlags.Object | TypeFlags.Intersection)) {
if (isTuple(type)) {
const props = getShape(type);
return makeResult({
name: 'union',
value: props.map((p) => p.value),
value: props.map(p => p.value),
});
// @ts-ignore
} else if (checker.isArrayType(type)) {
return makeResult({
name: 'Array',
// @ts-ignore
elements: [getDocgenTypeHelper(checker, type.typeArguments[0], false, [...parentIds, type.id])],
elements: [
getDocgenTypeHelper(checker, (type as ExtendedType).typeArguments[0], false, [
...parentIds,
(type as any).id,
]),
],
});
} else if (type.aliasSymbol) {
return makeResult({
@ -254,7 +270,10 @@ interface SymbolWithMeta extends ts.Symbol {
};
}
export default function parseTS(filePathOrPaths: string | string[], parserOpts: any = {}): ComponentDoc[] {
export default function parseTS(
filePathOrPaths: string | string[],
parserOpts: any = {},
): ComponentDoc[] {
const filePaths = Array.isArray(filePathOrPaths) ? filePathOrPaths : [filePathOrPaths];
const program = ts.createProgram(filePaths, compilerOptions);
@ -264,8 +283,8 @@ export default function parseTS(filePathOrPaths: string | string[], parserOpts:
const checker = program.getTypeChecker();
const result = filePaths
.map((filePath) => program.getSourceFile(filePath))
.filter((sourceFile) => typeof sourceFile !== 'undefined')
.map(filePath => program.getSourceFile(filePath))
.filter(sourceFile => typeof sourceFile !== 'undefined')
.reduce((docs: any[], sourceFile) => {
const moduleSymbol = checker.getSymbolAtLocation(sourceFile as ts.Node);
@ -291,7 +310,7 @@ export default function parseTS(filePathOrPaths: string | string[], parserOpts:
subName: exportName ? name : '',
exportName: exportName || name,
};
if (docs.find((x) => isEqual(x.meta, meta))) {
if (docs.find(x => isEqual(x.meta, meta))) {
continue;
}
docs.push({
@ -303,7 +322,10 @@ export default function parseTS(filePathOrPaths: string | string[], parserOpts:
continue;
}
const type = checker.getTypeOfSymbolAtLocation(sym, sym.valueDeclaration || sym.declarations[0]);
const type = checker.getTypeOfSymbolAtLocation(
sym,
sym.valueDeclaration || sym.declarations[0],
);
Array.prototype.push.apply(
exportSymbols,
@ -323,10 +345,9 @@ export default function parseTS(filePathOrPaths: string | string[], parserOpts:
const item: any = transformItem(name, info.props[name]);
acc.push(item);
} catch (e) {
console.log('error', e);
} finally {
return acc;
log(e);
}
return acc;
}, []);
res.push({
componentName: info?.meta?.exportName || info.displayName,

4
packages/material-parser/src/types/Basic.ts Normal file
View File

@ -0,0 +1,4 @@
export interface Json {
[x: string]: string | number | boolean | Date | Json | JsonArray;
}
export type JsonArray = Array<string | number | boolean | Date | Json | JsonArray>;

4
packages/material-parser/src/types/ChannelType.ts
View File

@ -1,11 +1,9 @@
/**
* 物料接入渠道
*/
enum ChannelType {
export enum ChannelType {
/** 本地 */
LOCAL = 'local',
/** 在线 */
ONLINE = 'online',
}
export default ChannelType;

4
packages/material-parser/src/types/EcologyType.ts
View File

@ -1,7 +1,7 @@
/**
* 语法生态
*/
enum EcologyType {
export enum EcologyType {
/** react 生态 */
REACT = 'react',
/** vue 生态 */
@ -11,5 +11,3 @@ enum EcologyType {
/** angular 生态 */
ANGULAR = 'angular',
}
export default EcologyType;

9
packages/material-parser/src/types/ExtensionName.ts
View File

@ -1,9 +0,0 @@
/**
* 扩展点名称
*/
enum ExtensionName {
/** 配置 manifest */
CONFIGMANIFEST = 'mat:config:manifest',
}
export default ExtensionName;

4
packages/material-parser/src/types/IAccesser.ts
View File

@ -4,7 +4,7 @@ import { ComponentMeta } from '../core';
* 接入器接口（用于定义物料化组件的接入渠道）
* @interface IAccesser
*/
interface IAccesser {
export interface IAccesser {
/**
* 接入
* @returns {Promise<IMaterialinSchema>}
@ -12,5 +12,3 @@ interface IAccesser {
*/
access(): Promise<ComponentMeta[]>;
}
export default IAccesser;

15
packages/material-parser/src/types/ICompiler.ts
View File

@ -1,15 +0,0 @@
/**
* 编译器 - 用于编译并打包生成 bundle.js
* @interface ICompiler
*/
interface ICompiler {
/**
* 编译
* @param {{ [key: string]: any }} config webpack 配置文件
* @returns {Promise<void>}
* @memberof ICompiler
*/
compile(config: { [key: string]: any }): Promise<void>;
}
export default ICompiler;

4
packages/material-parser/src/types/IExtensionConfigManifest.ts
View File

@ -3,7 +3,7 @@ import { ComponentMeta } from '../core';
* 扩展点：配置 manifest
* （物料化场景）
*/
type IExtensionConfigManifest = (params: {
export type IExtensionConfigManifest = (params: {
manifestObj: ComponentMeta; // manifest 配置对象
manifestFilePath: string; // manifest 文件默认路径
}) => Promise<{
@ -11,5 +11,3 @@ type IExtensionConfigManifest = (params: {
manifestFilePath: string; // manifest 文件路径
manifestObj: ComponentMeta; // manifest 文件对象
}>;
export default IExtensionConfigManifest;

4
packages/material-parser/src/types/IMaterialScanModel.ts
View File

@ -1,7 +1,7 @@
/**
* 对应扫描阶段的产物
*/
interface IMaterialScanModel {
export interface IMaterialScanModel {
/** 当前包名 */
pkgName: string;
/** 当前包版本 */
@ -19,5 +19,3 @@ interface IMaterialScanModel {
/** typings文件绝对路径 */
typingsFileAbsolutePath?: string;
}
export default IMaterialScanModel;

7
packages/material-parser/src/types/IMaterializeOptions.ts
View File

@ -1,11 +1,8 @@
import ExtensionName from './ExtensionName';
import IExtensionConfigManifest from './IExtensionConfigManifest';
/**
* 物料化配置项
* @interface IMaterializeOptions
*/
interface IMaterializeOptions {
export interface IMaterializeOptions {
/**
* 组件文件(夹)路径或包名
* 形如：
@ -35,5 +32,3 @@ interface IMaterializeOptions {
*/
npmClient?: string;
}
export default IMaterializeOptions;

2
packages/material-parser/src/types/Meta.ts
View File

@ -1,4 +1,4 @@
import { NodePath, Path } from 'ast-types';
import { Path } from 'ast-types';
export interface IFileMeta {
src: string;

29
packages/material-parser/src/types/index.ts
View File

@ -1,21 +1,8 @@
import ChannelType from './ChannelType';
import EcologyType from './EcologyType';
import ExtensionName from './ExtensionName';
import IAccesser from './IAccesser';
import ICompiler from './ICompiler';
import IExtensionConfigManifest from './IExtensionConfigManifest';
import IMaterializeOptions from './IMaterializeOptions';
import IMaterialScanModel from './IMaterialScanModel';
import { IMaterialParsedModel } from './IMaterialParsedModel';
export {
ExtensionName,
IExtensionConfigManifest,
IMaterialParsedModel,
IMaterializeOptions,
IMaterialScanModel,
ChannelType,
EcologyType,
IAccesser,
ICompiler,
};
export * from './ChannelType';
export * from './EcologyType';
export * from './IAccesser';
export * from './IExtensionConfigManifest';
export * from './IMaterializeOptions';
export * from './IMaterialScanModel';
export * from './IMaterialParsedModel';
export * from './Basic';

53
packages/material-parser/src/utils.ts
View File

@ -1,27 +1,42 @@
import { pathExists, readFileSync, writeFile } from 'fs-extra';
import { isPlainObject } from 'lodash';
import safeEval from 'safe-eval';
import * as path from 'path';
import spawn from 'cross-spawn-promise';
export async function isNPMInstalled(args: { workDir: string; moduleDir: string; npmClient?: string }) {
return await pathExists(path.join(args.workDir, 'node_modules'));
export async function isNPMInstalled(args: {
workDir: string;
moduleDir: string;
npmClient?: string;
}) {
return pathExists(path.join(args.workDir, 'node_modules'));
}
export async function install(args: { workDir: string; moduleDir: string; npmClient?: string }) {
if (await isNPMInstalled(args)) return;
const { workDir, moduleDir, npmClient = 'tnpm' } = args;
const { workDir, npmClient = 'tnpm' } = args;
try {
await spawn(npmClient, ['i'], { stdio: 'inherit', cwd: workDir } as any);
} catch (e) {}
} catch (e) {
// TODO
}
}
export async function installTypeScript(args: { workDir: string; moduleDir: string; npmClient?: string }) {
export async function installTypeScript(args: {
workDir: string;
moduleDir: string;
npmClient?: string;
}) {
if (await isNPMInstalled(args)) return;
const { workDir, moduleDir, npmClient = 'tnpm' } = args;
const { workDir, npmClient = 'tnpm' } = args;
await spawn(npmClient, ['i', 'typescript'], { stdio: 'inherit', cwd: workDir } as any);
}
export async function installPeerDeps(args: { workDir: string; moduleDir: string; npmClient?: string }) {
export async function installPeerDeps(args: {
workDir: string;
moduleDir: string;
npmClient?: string;
}) {
const { workDir, moduleDir, npmClient = 'tnpm' } = args;
const modulePkgJsonPath = path.resolve(moduleDir, 'package.json');
if (!(await pathExists(modulePkgJsonPath))) {
@ -43,7 +58,11 @@ export async function installPeerDeps(args: { workDir: string; moduleDir: string
await spawn(npmClient, ['i'], { stdio: 'inherit', cwd: workDir } as any);
}
export async function installTypeModules(args: { workDir: string; moduleDir: string; npmClient?: string }) {
export async function installTypeModules(args: {
workDir: string;
moduleDir: string;
npmClient?: string;
}) {
const { workDir, moduleDir, npmClient = 'tnpm' } = args;
const pkgJsonPath = path.resolve(moduleDir, 'package.json');
if (!(await pathExists(pkgJsonPath))) {
@ -65,3 +84,19 @@ export function loadFile(filePath: string): string {
}
return content.toString();
}
export function isPrimitive(val) {
return !['object', 'function'].includes(typeof val) || val === null;
}
export function isEvaluable(value) {
if (isPrimitive(value)) return true;
if (Array.isArray(value)) {
return value.every(isEvaluable);
} else if (isPlainObject(value)) {
return Object.keys(value).every(key => isEvaluable(value[key]));
}
return false;
}
export { safeEval };

3
packages/material-parser/src/validate/index.ts
View File

@ -1,10 +1,11 @@
import Ajv from 'ajv';
import { Json } from '../types/Basic';
import schema from './schema.json';
const ajv = new Ajv({ jsonPointers: true });
const validate = ajv.compile(schema);
export default function validateSchema(json: object) {
export default function validateSchema(json: Json) {
if (validate(json) === false) {
throw new Error(JSON.stringify(validate.errors, null, 2));
}

13353
packages/material-parser/test/fixtures/__snapshots__/test/antd.ts.md vendored
View File

File diff suppressed because it is too large Load Diff

BIN
packages/material-parser/test/fixtures/__snapshots__/test/antd.ts.snap vendored
View File

Binary file not shown.

1396
packages/material-parser/test/fixtures/__snapshots__/test/fusion.ts.md vendored
View File

File diff suppressed because it is too large Load Diff

BIN
packages/material-parser/test/fixtures/__snapshots__/test/fusion.ts.snap vendored
View File

Binary file not shown.

95
packages/material-parser/test/fixtures/__snapshots__/test/index.ts.md vendored
View File

@ -11,6 +11,7 @@ Generated by [AVA](https://avajs.dev).
[
{
componentName: 'AIMakeBlank',
devMode: 'proCode',
docUrl: '',
npm: {
destructuring: true,
@ -63,6 +64,7 @@ Generated by [AVA](https://avajs.dev).
},
{
componentName: 'AIMakeIcon',
devMode: 'proCode',
docUrl: '',
npm: {
destructuring: true,
@ -112,6 +114,7 @@ Generated by [AVA](https://avajs.dev).
},
{
componentName: 'AIMakeImage',
devMode: 'proCode',
docUrl: '',
npm: {
destructuring: true,
@ -139,6 +142,7 @@ Generated by [AVA](https://avajs.dev).
},
{
componentName: 'AIMakeLink',
devMode: 'proCode',
docUrl: '',
npm: {
destructuring: true,
@ -187,6 +191,7 @@ Generated by [AVA](https://avajs.dev).
},
{
componentName: 'AIMakePlaceholder',
devMode: 'proCode',
docUrl: '',
npm: {
destructuring: true,
@ -221,6 +226,7 @@ Generated by [AVA](https://avajs.dev).
},
{
componentName: 'AIMakeText',
devMode: 'proCode',
docUrl: '',
npm: {
destructuring: true,
@ -273,6 +279,7 @@ Generated by [AVA](https://avajs.dev).
},
{
componentName: 'Root',
devMode: 'proCode',
docUrl: '',
npm: {
destructuring: true,
@ -300,6 +307,7 @@ Generated by [AVA](https://avajs.dev).
[
{
componentName: 'Demo',
devMode: 'proCode',
docUrl: '',
npm: {
destructuring: false,
@ -312,10 +320,7 @@ Generated by [AVA](https://avajs.dev).
props: [
{
name: 'optionalArray',
propType: {
type: 'instanceOf',
value: 'array',
},
propType: 'array',
},
{
name: 'optionalBool',
@ -344,24 +349,15 @@ Generated by [AVA](https://avajs.dev).
},
{
name: 'optionalNode',
propType: {
type: 'instanceOf',
value: 'node',
},
propType: 'node',
},
{
name: 'optionalElement',
propType: {
type: 'instanceOf',
value: 'element',
},
propType: 'element',
},
{
name: 'optionalElementType',
propType: {
type: 'instanceOf',
value: 'elementType',
},
propType: 'any',
},
{
name: 'optionalMessage',
@ -486,6 +482,7 @@ Generated by [AVA](https://avajs.dev).
[
{
componentName: 'default',
devMode: 'proCode',
docUrl: '',
npm: {
destructuring: false,
@ -498,70 +495,7 @@ Generated by [AVA](https://avajs.dev).
props: [
{
name: 'node',
propType: {
type: 'oneOfType',
value: [
'string',
'number',
false,
true,
'object',
{
type: 'shape',
value: [
{
name: 'P',
propType: 'any',
},
{
name: 'T',
propType: 'any',
},
{
name: 'type',
propType: 'any',
},
{
name: 'props',
propType: 'any',
},
{
name: 'key',
propType: {
type: 'oneOfType',
value: [
'string',
'number',
],
},
},
],
},
{
type: 'oneOfType',
value: [],
},
{
type: 'shape',
value: [
{
name: 'key',
propType: {
type: 'oneOfType',
value: [
'string',
'number',
],
},
},
{
name: 'children',
propType: 'node',
},
],
},
],
},
propType: 'node',
},
],
screenshot: '',
@ -569,6 +503,7 @@ Generated by [AVA](https://avajs.dev).
},
{
componentName: 'default',
devMode: 'proCode',
docUrl: '',
npm: {
destructuring: false,

BIN
packages/material-parser/test/fixtures/__snapshots__/test/index.ts.snap vendored
View File

Binary file not shown.

213
packages/material-parser/test/fixtures/__snapshots__/test/online.ts.md vendored
View File

@ -4,199 +4,54 @@ The actual snapshot is saved in `online.ts.snap`.
Generated by [AVA](https://avajs.dev).
## materialize custom breadcrumb by online
## materialize mc-hello by online
> Snapshot 1
[
{
componentName: 'default',
devMode: 'proCode',
docUrl: '',
npm: {
destructuring: false,
exportName: 'default',
main: 'lib/index.js',
package: 'mc-breadcrumb',
package: 'mc-hello',
subName: '',
version: '1.0.1',
},
props: [
{
name: 'prefix',
name: 'color',
propType: 'string',
},
{
name: 'rtl',
name: 'background',
propType: 'string',
},
{
defaultValue: false,
name: 'round',
propType: 'bool',
},
{
defaultValue: 200,
name: 'width',
propType: 'number',
},
{
defaultValue: 40,
name: 'height',
propType: 'number',
},
{
name: 'children',
propType: {
type: 'instanceOf',
value: 'custom',
},
},
{
name: 'maxNode',
propType: {
type: 'oneOfType',
value: [
'number',
{
type: 'oneOf',
value: [
'auto',
],
},
],
},
},
{
name: 'separator',
propType: {
type: 'oneOfType',
value: [
{
type: 'instanceOf',
value: 'node',
},
'string',
],
},
},
{
name: 'component',
propType: {
type: 'oneOfType',
value: [
'string',
'func',
],
},
},
{
name: 'className',
propType: 'any',
},
{
name: 'locale',
propType: 'object',
},
{
name: 'pure',
propType: 'bool',
},
{
name: 'device',
propType: {
type: 'oneOf',
value: [
'tablet',
'desktop',
'phone',
],
},
},
{
name: 'popupContainer',
propType: 'any',
},
{
name: 'errorBoundary',
propType: {
type: 'oneOfType',
value: [
'bool',
'object',
],
},
propType: 'node',
},
],
screenshot: '',
title: 'mc-breadcrumb',
},
{
componentName: 'Item',
docUrl: '',
npm: {
destructuring: false,
exportName: 'default',
main: 'lib/index.js',
package: 'mc-breadcrumb',
subName: 'Item',
version: '1.0.1',
},
props: [
{
name: 'prefix',
propType: 'string',
},
{
name: 'rtl',
propType: 'bool',
},
{
name: 'link',
propType: 'string',
},
{
name: 'activated',
propType: 'bool',
},
{
name: 'separator',
propType: {
type: 'instanceOf',
value: 'node',
},
},
{
name: 'className',
propType: 'any',
},
{
name: 'children',
propType: {
type: 'instanceOf',
value: 'node',
},
},
{
name: 'locale',
propType: 'object',
},
{
name: 'pure',
propType: 'bool',
},
{
name: 'device',
propType: {
type: 'oneOf',
value: [
'tablet',
'desktop',
'phone',
],
},
},
{
name: 'popupContainer',
propType: 'any',
},
{
name: 'errorBoundary',
propType: {
type: 'oneOfType',
value: [
'bool',
'object',
],
},
},
],
screenshot: '',
title: 'mc-breadcrumb',
title: 'mc-hello',
},
]
@ -207,6 +62,7 @@ Generated by [AVA](https://avajs.dev).
[
{
componentName: 'BlockPicker',
devMode: 'proCode',
docUrl: '',
npm: {
destructuring: true,
@ -239,7 +95,6 @@ Generated by [AVA](https://avajs.dev).
},
},
{
defaultValue: {},
name: 'styles',
propType: 'object',
},
@ -249,6 +104,7 @@ Generated by [AVA](https://avajs.dev).
},
{
componentName: 'CirclePicker',
devMode: 'proCode',
docUrl: '',
npm: {
destructuring: true,
@ -281,7 +137,6 @@ Generated by [AVA](https://avajs.dev).
propType: 'number',
},
{
defaultValue: {},
name: 'styles',
propType: 'object',
},
@ -291,6 +146,7 @@ Generated by [AVA](https://avajs.dev).
},
{
componentName: 'default',
devMode: 'proCode',
docUrl: '',
npm: {
destructuring: false,
@ -318,7 +174,6 @@ Generated by [AVA](https://avajs.dev).
propType: 'bool',
},
{
defaultValue: {},
name: 'styles',
propType: 'object',
},
@ -339,6 +194,7 @@ Generated by [AVA](https://avajs.dev).
},
{
componentName: 'ChromePicker',
devMode: 'proCode',
docUrl: '',
npm: {
destructuring: true,
@ -366,7 +222,6 @@ Generated by [AVA](https://avajs.dev).
propType: 'bool',
},
{
defaultValue: {},
name: 'styles',
propType: 'object',
},
@ -387,6 +242,7 @@ Generated by [AVA](https://avajs.dev).
},
{
componentName: 'CompactPicker',
devMode: 'proCode',
docUrl: '',
npm: {
destructuring: true,
@ -398,7 +254,6 @@ Generated by [AVA](https://avajs.dev).
},
props: [
{
defaultValue: {},
name: 'styles',
propType: 'object',
},
@ -408,6 +263,7 @@ Generated by [AVA](https://avajs.dev).
},
{
componentName: 'GithubPicker',
devMode: 'proCode',
docUrl: '',
npm: {
destructuring: true,
@ -443,7 +299,6 @@ Generated by [AVA](https://avajs.dev).
},
},
{
defaultValue: {},
name: 'styles',
propType: 'object',
},
@ -453,6 +308,7 @@ Generated by [AVA](https://avajs.dev).
},
{
componentName: 'HuePicker',
devMode: 'proCode',
docUrl: '',
npm: {
destructuring: true,
@ -464,7 +320,6 @@ Generated by [AVA](https://avajs.dev).
},
props: [
{
defaultValue: {},
name: 'styles',
propType: 'object',
},
@ -474,6 +329,7 @@ Generated by [AVA](https://avajs.dev).
},
{
componentName: 'PhotoshopPicker',
devMode: 'proCode',
docUrl: '',
npm: {
destructuring: true,
@ -489,7 +345,6 @@ Generated by [AVA](https://avajs.dev).
propType: 'string',
},
{
defaultValue: {},
name: 'styles',
propType: 'object',
},
@ -499,6 +354,7 @@ Generated by [AVA](https://avajs.dev).
},
{
componentName: 'SketchPicker',
devMode: 'proCode',
docUrl: '',
npm: {
destructuring: true,
@ -526,7 +382,6 @@ Generated by [AVA](https://avajs.dev).
},
},
{
defaultValue: {},
name: 'styles',
propType: 'object',
},
@ -536,6 +391,7 @@ Generated by [AVA](https://avajs.dev).
},
{
componentName: 'SliderPicker',
devMode: 'proCode',
docUrl: '',
npm: {
destructuring: true,
@ -547,7 +403,6 @@ Generated by [AVA](https://avajs.dev).
},
props: [
{
defaultValue: {},
name: 'styles',
propType: 'object',
},
@ -557,6 +412,7 @@ Generated by [AVA](https://avajs.dev).
},
{
componentName: 'SwatchesPicker',
devMode: 'proCode',
docUrl: '',
npm: {
destructuring: true,
@ -590,7 +446,6 @@ Generated by [AVA](https://avajs.dev).
},
},
{
defaultValue: {},
name: 'styles',
propType: 'object',
},
@ -600,6 +455,7 @@ Generated by [AVA](https://avajs.dev).
},
{
componentName: 'TwitterPicker',
devMode: 'proCode',
docUrl: '',
npm: {
destructuring: true,
@ -633,7 +489,6 @@ Generated by [AVA](https://avajs.dev).
},
},
{
defaultValue: {},
name: 'styles',
propType: 'object',
},

BIN
packages/material-parser/test/fixtures/__snapshots__/test/online.ts.snap vendored
View File

Binary file not shown.

1
packages/material-parser/test/fixtures/ts-component/src/index.tsx vendored
View File

@ -29,7 +29,6 @@ interface Props {
node?: React.ReactNode;
// element?: JSX.Element;
// elementType?: React.ElementType;
// instance: Props;
}
const App = (props: Props) => {

1
packages/material-parser/test/index.ts
View File

@ -39,4 +39,3 @@ test('ts component by local', async t => {
t.snapshot(actual);
});

4
packages/material-parser/test/online.ts
View File

@ -3,7 +3,7 @@ import parse from '../src';
import { IMaterializeOptions } from '../src/types';
const reactColorComponent = 'react-color';
const customComponent = 'mc-breadcrumb';
const customComponent = 'mc-hello@1.0.1';
test('materialize react-color by online', async t => {
const options: IMaterializeOptions = {
@ -15,7 +15,7 @@ test('materialize react-color by online', async t => {
t.snapshot(actual);
});
test('materialize custom breadcrumb by online', async t => {
test('materialize mc-hello by online', async t => {
const options: IMaterializeOptions = {
entry: customComponent,
accesser: 'online',

7
packages/plugin-outline-pane/.eslintrc.js Normal file
View File

@ -0,0 +1,7 @@
module.exports = {
extends: 'eslint-config-ali/typescript/react',
rules: {
'no-unused-expressions': 1,
'react/no-multi-comp': 1,
}
}

9
packages/plugin-outline-pane/src/helper/dwell-timer.ts
View File

@ -10,7 +10,14 @@ export default class DwellTimer {
private event?: LocateEvent;
constructor(private decide: (node: ParentalNode, event: LocateEvent) => void, private timeout: number = 500) {}
private decide: (node: ParentalNode, event: LocateEvent) => void;
private timeout: number = 500;
constructor(decide: (node: ParentalNode, event: LocateEvent) => void, timeout: number = 500) {
this.decide = decide;
this.timeout = timeout;
}
focus(node: ParentalNode, event: LocateEvent) {
this.event = event;

2
packages/plugin-outline-pane/src/helper/indent-track.ts
View File

@ -1,4 +1,4 @@
import { DropLocation, ParentalNode, isLocationChildrenDetail, Node } from '@ali/lowcode-designer';
import { DropLocation, ParentalNode, isLocationChildrenDetail } from '@ali/lowcode-designer';
const IndentSensitive = 15;
export class IndentTrack {

26
packages/plugin-outline-pane/src/main.ts
View File

@ -46,7 +46,13 @@ export class OutlineMain implements ISensor, ITreeBoard, IScrollable {
return this._visible;
}
constructor(readonly editor: IEditor, readonly at: string | symbol) {
readonly editor: IEditor;
readonly at: string | symbol;
constructor(editor: IEditor, at: string | symbol) {
this.editor = editor;
this.at = at;
let inited = false;
const setup = async () => {
if (inited) {
@ -195,12 +201,10 @@ export class OutlineMain implements ISensor, ITreeBoard, IScrollable {
} else {
this.dwell.reset();
}
} else {
// FIXME: recreate new location
if ((originLoc.detail as LocationChildrenDetail).near) {
(originLoc.detail as LocationChildrenDetail).near = undefined;
this.dwell.reset();
}
// FIXME: recreate new location
} else if ((originLoc.detail as LocationChildrenDetail).near) {
(originLoc.detail as LocationChildrenDetail).near = undefined;
this.dwell.reset();
}
return;
}
@ -213,12 +217,12 @@ export class OutlineMain implements ISensor, ITreeBoard, IScrollable {
let { focusSlots } = pos;
let { node } = treeNode;
if (isDragNodeObject(dragObject)) {
const nodes = operationalNodes;
let i = nodes.length;
const newNodes = operationalNodes;
let i = newNodes.length;
let p: any = node;
while (i-- > 0) {
if (contains(nodes[i], p)) {
p = nodes[i].parent;
if (contains(newNodes[i], p)) {
p = newNodes[i].parent;
}
}
if (p !== node) {

5
packages/plugin-outline-pane/src/tree-master.ts
View File

@ -11,7 +11,10 @@ export interface ITreeBoard {
}
export class TreeMaster {
constructor(readonly designer: Designer) {
readonly designer: Designer;
constructor(designer: Designer) {
this.designer = designer;
let startTime: any;
designer.dragon.onDragstart(() => {
startTime = Date.now() / 1000;

5
packages/plugin-outline-pane/src/tree-node.ts
View File

@ -218,7 +218,10 @@ export default class TreeNode {
return this._node;
}
constructor(readonly tree: Tree, node: Node) {
readonly tree: Tree;
constructor(tree: Tree, node: Node) {
this.tree = tree;
this.document = node.document;
this.designer = this.document.designer;
this._node = node;

5
packages/plugin-outline-pane/src/tree.ts
View File

@ -8,7 +8,10 @@ export class Tree {
readonly id: string;
constructor(readonly document: DocumentModel) {
readonly document: DocumentModel;
constructor(document: DocumentModel) {
this.document = document;
this.root = this.getTreeNode(document.rootNode);
this.id = document.id;
}

46
packages/plugin-outline-pane/src/views/tree-title.tsx
View File

@ -3,8 +3,6 @@ import classNames from 'classnames';
import { observer, Title, Tip, globalContext, Editor } from '@ali/lowcode-editor-core';
import { IconArrowRight } from '../icons/arrow-right';
import { IconEyeClose } from '../icons/eye-close';
import { IconLock } from '../icons/lock';
import { IconUnlock } from '../icons/unlock';
import { intl, intlNode } from '../locale';
import TreeNode from '../tree-node';
import { IconEye } from '../icons/eye';
@ -14,7 +12,7 @@ import { IconRadioActive } from '../icons/radio-active';
import { IconRadio } from '../icons/radio';
import { createIcon } from '@ali/lowcode-utils';
function emitOutlineEvent(type: string, treeNode: TreeNode, rest?: object) {
function emitOutlineEvent(type: string, treeNode: TreeNode, rest?: Record<string, unknown>) {
const editor = globalContext.get(Editor);
const node = treeNode?.node;
const npm = node?.componentMeta?.npm;
@ -172,28 +170,28 @@ export default class TreeTitle extends Component<{
}
}
@observer
class LockBtn extends Component<{ treeNode: TreeNode }> {
shouldComponentUpdate() {
return false;
}
// @observer
// class LockBtn extends Component<{ treeNode: TreeNode }> {
// shouldComponentUpdate() {
// return false;
// }
render() {
const { treeNode } = this.props;
return (
<div
className="tree-node-lock-btn"
onClick={(e) => {
e.stopPropagation();
treeNode.setLocked(!treeNode.locked);
}}
>
{treeNode.locked ? <IconLock /> : <IconUnlock />}
<Tip>{treeNode.locked ? intl('Unlock') : intl('Lock')}</Tip>
</div>
);
}
}
// render() {
// const { treeNode } = this.props;
// return (
// <div
// className="tree-node-lock-btn"
// onClick={(e) => {
// e.stopPropagation();
// treeNode.setLocked(!treeNode.locked);
// }}
// >
// {treeNode.locked ? <IconLock /> : <IconUnlock />}
// <Tip>{treeNode.locked ? intl('Unlock') : intl('Lock')}</Tip>
// </div>
// );
// }
// }
@observer
class HideBtn extends Component<{ treeNode: TreeNode }> {

2
packages/plugin-outline-pane/src/views/tree.tsx
View File

@ -152,7 +152,7 @@ export default class TreeView extends Component<{ tree: Tree }> {
return (
<div
className="lc-outline-tree"
ref={(shell) => (this.shell = shell)}
ref={(shell) => { this.shell = shell; }}
onMouseDownCapture={this.onMouseDown}
onMouseOver={this.onMouseOver}
onClick={this.onClick}

6
packages/plugin-source-editor/src/index.scss
View File

@ -13,6 +13,12 @@
height: 100%;
}
.button-container{
position: absolute;
top: 0px;
right: 10px;
}
.editor-context-container{
height: 100%;
width: 100%;

19
packages/plugin-source-editor/src/index.tsx
View File

@ -14,7 +14,7 @@ const TAB_KEY = {
const defaultEditorOption = {
width: '100%',
height: '100%',
height: '95%',
options: {
readOnly: false,
automaticLayout: true,
@ -46,8 +46,6 @@ export default class SourceEditor extends Component<{
}> {
private monocoEditor;
private monocoEditorCss;
private editorCmd;
private editorJsRef = React.createRef();
@ -56,12 +54,17 @@ export default class SourceEditor extends Component<{
private editorNode;
private editorParentNode;
state = {
isFullScreen:false,
tabKey: TAB_KEY.JS_TAB,
isShowSaveBtn:true
};
// eslint-disable-next-line react/no-deprecated
componentWillMount() {
const { editor } = this.props;
// 添加函数
editor.on('sourceEditor.addFunction', (params: FunctionEventParam) => {
this.callEditorEvent('sourceEditor.addFunction', params);
@ -72,7 +75,6 @@ export default class SourceEditor extends Component<{
this.callEditorEvent('sourceEditor.focusByFunction', params);
});
// 插件面板关闭事件,监听规则同上
editor.on('skeleton.panel-dock.unactive', (pluginName) => {
if (pluginName == 'sourceEditor') {
@ -93,7 +95,6 @@ export default class SourceEditor extends Component<{
componentDidMount() {
this.editorNode = this.editorJsRef.current; // 记录当前dom节点；
this.editorParentNode = this.editorNode.parentNode; // 记录父节点;
}
/**
@ -268,11 +269,12 @@ export default class SourceEditor extends Component<{
if (newSchema != '' && JSON.stringify(newSchema) != oldSchemaStr) {
editor.get('designer').project.setSchema(newSchema);
successFlag && Message.success('保存成功')
}
};
render() {
const { selectTab, jsCode, css } = this.state;
const { selectTab, jsCode, css ,isShowSaveBtn} = this.state;
const tabs = [
{ tab: 'index.js', key: TAB_KEY.JS_TAB },
{ tab: 'style.css', key: TAB_KEY.CSS_TAB },
@ -280,12 +282,13 @@ export default class SourceEditor extends Component<{
return (
<div className="source-editor-container">
<Tab size="small" shape="wrapped" onChange={this.onTabChange} activeKey={selectTab}>
{tabs.map((item) => (
<Tab.Item key={item.key} title={item.tab} />
))}
</Tab>
{ isShowSaveBtn && <div className="button-container"><Button type="primary" onClick={()=>this.saveSchema(successFlag)}>保存代码</Button></div>}
<div style={{ height: '100%' }} className="editor-context-container">
<div id="jsEditorDom" className="editor-context" ref={this.editorJsRef}>

8
packages/plugin-source-editor/src/transform.ts
View File

@ -54,8 +54,12 @@ const transfrom = {
return `\n\t${functionName}(){\n\t}\n`;
},
setFunction2Schema(functionMap, schema) {
const pageNode = schema.componentsTree[0];
setFunction2Schema(functionMap, schema){
let pageNode = schema.componentsTree[0];
// 先清除原有的schema的值
delete pageNode.state;
pageNode.lifeCycles = {};
pageNode.methods = {};
if (!pageNode) return '';
for (const key in functionMap) {
if (key == 'state') {

8
packages/rax-provider/src/provider.ts
View File

@ -12,7 +12,9 @@ export default class RaxProvider extends Provider {
let App;
const layoutConfig = this.getLayoutConfig();
if (!layoutConfig || !layoutConfig.componentName) {
App = (props) => (RouterView ? createElement(RouterView, { ...props }) : null);
App = (props) => {
return RouterView ? createElement(RouterView, { ...props }) : null;
};
return App;
}
const { componentName: layoutName, props: layoutProps } = layoutConfig;
@ -25,7 +27,9 @@ export default class RaxProvider extends Provider {
RouterView ? createElement(RouterView, props) : null,
);
} else {
App = (props) => (RouterView ? createElement(RouterView, props) : null);
App = (props) => {
return RouterView ? createElement(RouterView, props) : null;
};
}
return App;
}

9
packages/rax-render/.eslintrc.js Normal file
View File

@ -0,0 +1,9 @@
module.exports = {
extends: 'eslint-config-ali/typescript/react',
rules: {
'no-proto': 1,
'no-new-func': 1,
'no-shadow': 1,
'@typescript-eslint/no-unused-vars': 1,
}
}

7
packages/rax-render/src/engine/base.tsx
View File

@ -43,6 +43,7 @@ export default class BaseEngine extends Component {
messages: PropTypes.object,
__appHelper: PropTypes.object,
__components: PropTypes.object,
// eslint-disable-next-line react/no-unused-prop-types
__componentsMap: PropTypes.object,
__ctx: PropTypes.object,
__schema: PropTypes.object,
@ -294,7 +295,6 @@ export default class BaseEngine extends Component {
__schema: schema,
__appHelper: appHelper,
__components: components,
// __componentsMap: componentsMap,
}
: {};
if (engine && engine.props.designMode) {
@ -336,9 +336,8 @@ export default class BaseEngine extends Component {
}
props.__id = schema.id;
let Child = null;
if (!isFileSchema(schema) && schema.children) {
Child = this.__createVirtualDom(
this.__createVirtualDom(
isJSExpression(schema.children) ? parseExpression(schema.children, self) : schema.children,
self,
{
@ -462,7 +461,7 @@ export default class BaseEngine extends Component {
return checkProps(function () {
const args = {};
if (Array.isArray(params) && params.length) {
params.map((item, idx) => {
params.forEach((item, idx) => {
if (typeof item === 'string') {
args[item] = arguments[idx];
} else if (item && typeof item === 'object') {

2
packages/rax-render/src/engine/compEngine.tsx
View File

@ -61,7 +61,7 @@ export default class CompEngine extends BaseEngine {
debug(`comp.componentWillUnmount - ${this.props.__schema.fileName}`);
}
async componentDidCatch(e) {
async componentDidCatch() {
super.componentDidCatch(...arguments);
debug(`comp.componentDidCatch - ${this.props.__schema.fileName}`);
}

5
packages/rax-render/src/engine/pageEngine.tsx
View File

@ -78,7 +78,7 @@ export default class PageEngine extends BaseEngine {
debug(`page.render - ${__schema.fileName}`);
const {
id, className, style, autoLoading, defaultHeight = 300, loading,
id, className, style,
} = this.__parseData(__schema.props);
const { Page } = __components;
@ -88,9 +88,6 @@ export default class PageEngine extends BaseEngine {
<AppContext.Consumer>
{(context) => {
this.context = context;
{
/* this.__generateCtx(currCtx); */
}
this.__render();
return (
<AppContext.Provider

2
packages/rax-render/src/engine/tempEngine.tsx
View File

@ -40,7 +40,7 @@ export default class TempEngine extends BaseEngine {
debug(`temp.componentDidMount - ${this.props.__schema.fileName}`);
}
componentDidUpdate(prevProps, prevState, snapshot) {
componentDidUpdate() {
debug(`temp.componentDidUpdate - ${this.props.__schema.fileName}`);
}

1
packages/rax-render/src/hoc/compWrapper.tsx
View File

@ -3,6 +3,7 @@ import { createElement, Component, forwardRef } from 'rax';
export default function (Comp) {
class compWrapper extends Component {
// eslint-disable-next-line no-useless-constructor
constructor(props, context) {
super(props, context);
}

3
packages/rax-render/src/utils/dataHelper.ts
View File

@ -157,7 +157,7 @@ export default class DataHelper {
const afterRequest = this.appHelper && this.appHelper.utils && this.appHelper.utils.afterRequest;
const csrfInput = document.getElementById('_csrf_token');
const _tb_token_ = csrfInput && csrfInput.value;
asyncDataList.map(req => {
asyncDataList.forEach(req => {
const { id, type, options } = req;
if (!id || !type) return;
if (type === 'doServer') {
@ -271,6 +271,7 @@ export default class DataHelper {
fetchOne(type, req) {
const { options } = req;
// eslint-disable-next-line prefer-const
let { uri, method = 'GET', headers, params, ...otherProps } = options;
otherProps = otherProps || {};
switch (type) {

8
packages/rax-render/src/utils/index.ts
View File

@ -50,8 +50,6 @@ const EXPRESSION_TYPE = {
JSSLOT: 'JSSlot',
};
const EXPRESSION_REG = /^\{\{(\{.*\}|.*?)\}\}$/;
const hasSymbol = typeof Symbol === 'function' && Symbol.for;
const REACT_FORWARD_REF_TYPE = hasSymbol ? Symbol.for('react.forward_ref') : 0xead0;
const debug = Debug('utils:index');
const ENV = {
@ -180,6 +178,7 @@ export function fillObj(receiver = {}, ...suppliers) {
// 中划线转驼峰
export function toHump(name) {
// eslint-disable-next-line no-useless-escape
return name.replace(/\-(\w)/g, (all, letter) => letter.toUpperCase());
}
// 驼峰转中划线
@ -525,7 +524,7 @@ export function addCssTag(id, content) {
// 注册快捷
export function registShortCuts(config, appHelper) {
const keyboardFilter = (keymaster.filter = (event) => {
keymaster.filter = (event) => {
const eTarget = event.target || event.srcElement;
const { tagName } = eTarget;
const isInput = !!(tagName == 'INPUT' || tagName == 'SELECT' || tagName == 'TEXTAREA');
@ -541,7 +540,8 @@ export function registShortCuts(config, appHelper) {
return false;
}
return true;
});
};
const keyboardFilter = keymaster.filter;
const ideMessage = appHelper.utils && appHelper.utils.ideMessage;

4
packages/react-provider/src/components/LazyComponent/index.tsx
View File

@ -8,7 +8,7 @@ interface IProps {
}
interface IState {
schema: object | null;
schema: Record<string, unknown> | null;
hasError: boolean;
}
@ -76,6 +76,6 @@ export default class LazyComponent extends Component<IProps, IState> {
loading={Loading ? <Loading /> : null}
{...restProps}
/>
)
);
}
}

22
packages/react-provider/src/provider.tsx
View File

@ -8,11 +8,13 @@ import LazyComponent from './components/LazyComponent';
export default class ReactProvider extends Provider {
// 定制构造根组件的逻辑，如切换路由机制
createApp() {
let RouterView = this.getRouterView();
const RouterView = this.getRouterView();
let App: any;
const layoutConfig = this.getLayoutConfig();
if (!layoutConfig || !layoutConfig.componentName) {
App = (props: any) => (RouterView ? createElement(RouterView, { ...props }) : null);
App = (props: any) => {
return (RouterView ? createElement(RouterView, { ...props }) : null);
};
return App;
}
const { componentName: layoutName, props: layoutProps } = layoutConfig;
@ -25,7 +27,9 @@ export default class ReactProvider extends Provider {
RouterView ? createElement(RouterView, props) : null,
);
} else {
App = (props: any) => (RouterView ? createElement(RouterView, props) : null);
App = (props: any) => {
return (RouterView ? createElement(RouterView, props) : null);
};
}
return App;
}
@ -83,13 +87,14 @@ export default class ReactProvider extends Provider {
const appHelper = new AppHelper();
appHelper.set('utils', this.getUtils());
appHelper.set('constants', this.getConstants());
const self = this;
const RouterView = (props: any) => {
return createElement(Router as any, {
routes,
components: this.getComponents(),
utils: this.getUtils(),
components: self.getComponents(),
utils: self.getUtils(),
appHelper,
componentsMap: this.getComponentsMapObj(),
componentsMap: self.getComponentsMapObj(),
...props,
});
};
@ -104,7 +109,10 @@ export default class ReactProvider extends Provider {
return this.getLazyElement(pageId);
} else {
const lazyElement = createElement(LazyComponent as any, {
getPageData: async () => await this.getPageData(pageId),
getPageData: async () => {
const pageData = await this.getPageData(pageId);
return pageData;
},
key: pageId,
context: this,
...props,

9
packages/runtime/src/core/provider.ts
View File

@ -56,7 +56,7 @@ export interface DataSourceItem {
type: string;
options: {
uri: string;
params: object;
params: Record<string, unknown>;
method: string;
shouldFetch?: string;
willFetch?: string;
@ -121,6 +121,7 @@ export default class Provider {
}
async(): Promise<IAppConfig> {
// eslint-disable-next-line no-async-promise-executor
return new Promise(async (resolve, reject) => {
try {
const appData: IAppData = await this.getAppData();
@ -216,11 +217,11 @@ export default class Provider {
throw new Error('Method called "getAppData" not implemented.');
}
getPageData(pageId?: string): any {
getPageData(): any {
throw new Error('Method called "getPageData" not implemented.');
}
getLazyComponent(pageId: string, props: any): any {
getLazyComponent(): any {
throw new Error('Method called "getLazyComponent" not implemented.');
}
@ -229,7 +230,7 @@ export default class Provider {
throw new Error('Method called "createApp" not implemented.');
}
runApp(App: any, config: IAppConfig) {
runApp() {
throw new Error('Method called "runApp" not implemented.');
}

18
packages/runtime/src/core/runApp.ts
View File

@ -37,15 +37,15 @@ export default function runApp() {
const App = provider.createApp();
provider.runApp(App, config);
}).catch((err: Error) => {
console.error(err.message);
const { fallbackUI, afterCatch } = app.getErrorBoundary() || {};
if (typeof afterCatch === 'function') {
afterCatch(err.message, err.stack);
}
if (!fallbackUI) {
return;
}
provider.runApp(fallbackUI, {});
console.error(err.message);
const { fallbackUI, afterCatch } = app.getErrorBoundary() || {};
if (typeof afterCatch === 'function') {
afterCatch(err.message, err.stack);
}
if (!fallbackUI) {
return;
}
provider.runApp(fallbackUI, {});
});
});
}

4
packages/utils/src/asset.ts
View File

@ -105,6 +105,10 @@ export class StylePoint {
readonly id: string;
constructor(level: number, id?: string) {
this.level = level;
if (id) {
this.id = id;
}
let placeholder: any;
if (id) {
placeholder = document.head.querySelector(`style[data-id="${id}"]`);