Merge pull request #108 from lvhuichao/develop

component explorer, dynamic table column .etc

Author: hanshuai

client/packages/openblocks-cli/actions/build.js

@@ -5,6 +5,7 @@ import { writeFileSync, existsSync, readFileSync } from "fs";
 import { resolve } from "path";
 import paths from "../config/paths.js";
 import "../util/log.js";
+import chalk from "chalk";
 
 const { copySync } = fsExtra;
 const packageJSON = JSON.parse(readFileSync(paths.appPackageJson).toString());
@@ -28,14 +29,14 @@ function validPackageJSON() {
   Object.keys(openblocks.comps).forEach((name) => {
     const compManifest = packageJSON.openblocks.comps[name];
     if (!compManifest.icon) {
-      compErrors.push(`- comp ${name} must specify an icon`);
+      // compErrors.push(`- comp ${name} must specify an icon`);
       return;
     }
     if (
       !compManifest.icon.startsWith("data:") &&
       !existsSync(paths.resolveApp(compManifest.icon))
     ) {
-      compErrors.push(`- comp ${name}'s icon path ${compManifest} not exist`);
+      compErrors.push(`- comp ${name}'s icon file ${chalk.cyan(compManifest.icon)} not found`);
       return;
     }
   });
@@ -88,7 +89,9 @@ export default async function buildAction(options) {
   // copy icon files
   compNames.forEach((name) => {
     const compManifest = packageJSON.openblocks.comps[name];
-    copySync(paths.resolveApp(compManifest.icon), resolve(paths.appOutPath, compManifest.icon));
+    if (compManifest.icon) {
+      copySync(paths.resolveApp(compManifest.icon), resolve(paths.appOutPath, compManifest.icon));
+    }
   });
 
   if (options.publish) {

client/packages/openblocks-cli/client.d.ts

@@ -17,7 +17,7 @@ declare module "*.md" {
   export default value;
 }
 
-declare module "eslint4b-prebuilt";
+declare module "eslint4b-prebuilt-2";
 declare module "mq-polyfill";
 declare module "@rjsf/antd";
 declare module "really-relaxed-json";

client/packages/openblocks-cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "openblocks-cli",
   "description": "CLI tool used to start build publish openblocks components",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "bin": "./index.js",
   "type": "module",
   "exports": {

client/packages/openblocks-core/lib/index.d.ts

@@ -297,6 +297,23 @@ declare class WrapNode<T> extends AbstractNode<T> {
   dependValues(): Record<string, unknown>;
 }
 
+/**
+ * build a new node by setting new dependent nodes in child node
+ */
+declare class WrapContextNodeV2<T> extends AbstractNode<T> {
+  readonly child: Node<T>;
+  readonly paramNodes: Record<string, Node<unknown>>;
+  readonly type = "wrapContextV2";
+  constructor(child: Node<T>, paramNodes: Record<string, Node<unknown>>);
+  wrapContext(paramName: string): AbstractNode<ValueFn<T>>;
+  filterNodes(exposingNodes: Record<string, Node<unknown>>): Map<Node<unknown>, string[]>;
+  justEval(exposingNodes: Record<string, Node<unknown>>, methods?: EvalMethods): T;
+  getChildren(): Node<unknown>[];
+  dependValues(): Record<string, unknown>;
+  fetchInfo(exposingNodes: Record<string, Node<unknown>>): FetchInfo;
+  private wrap;
+}
+
 declare function transformWrapper<T>(
   transformFn: (value: unknown) => T,
   defaultValue?: T
@@ -305,7 +322,7 @@ declare function transformWrapper<T>(
 declare function relaxedJSONToJSON(text: string, compact: boolean): string;
 
 declare function isDynamicSegment(segment: string): boolean;
-declare function getDynamicStringSegments(dynamicString: string): string[];
+declare function getDynamicStringSegments(input: string): string[];
 
 declare function clearMockWindow(): void;
 interface SandBoxOption {
@@ -318,12 +335,19 @@ declare function evalFunc(
   functionBody: string,
   context: any,
   methods?: EvalMethods,
-  options?: SandBoxOption
+  options?: SandBoxOption,
+  isAsync?: boolean
 ): any;
 
 declare function evalStyle(id: string, css: string[]): void;
 declare function clearStyleEval(id?: string): void;
 
+declare function evalFunctionResult(
+  unevaledValue: string,
+  context: Record<string, unknown>,
+  methods?: EvalMethods
+): Promise<ValueAndMsg<unknown>>;
+
 declare function nodeIsRecord(
   node: Node<unknown>
 ): node is RecordNode<Record<string, Node<unknown>>>;
@@ -735,6 +759,7 @@ export {
   EvalMethods,
   ExecuteQueryAction,
   ExtraActionType,
+  ExtraNodeType,
   FetchCheckNode,
   FetchInfo,
   FunctionNode,
@@ -764,6 +789,7 @@ export {
   UpdateNodesV2Action,
   ValueAndMsg,
   ValueFn,
+  WrapContextNodeV2,
   WrapNode,
   addChildAction,
   changeChildAction,
@@ -776,6 +802,7 @@ export {
   deleteCompAction,
   dependingNodeMapEquals,
   evalFunc,
+  evalFunctionResult,
   evalNodeOrMinor,
   evalStyle,
   executeQueryAction,