@flowgram.ai/form-materials 0.4.12 → 0.4.13

package/dist/cjs/components/variable-selector/index.js

@@ -65,7 +65,6 @@ const VariableSelector = ({ value, config = {}, onChange, style, readonly = fals
         });
         return icon;
     };
-    console.log('debugger treeValue', treeValue);
     return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(jsx_runtime_namespaceObject.Fragment, {
         children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_styles_js_namespaceObject.UITreeSelect, {
             dropdownMatchSelectWidth: false,

package/dist/cjs/form-plugins/batch-outputs-plugin/index.js

@@ -27,6 +27,8 @@ __webpack_require__.d(__webpack_exports__, {
     createBatchOutputsFormPlugin: ()=>createBatchOutputsFormPlugin,
     provideBatchOutputsEffect: ()=>provideBatchOutputsEffect
 });
+const external_lodash_es_namespaceObject = require("lodash-es");
+const json_schema_namespaceObject = require("@flowgram.ai/json-schema");
 const editor_namespaceObject = require("@flowgram.ai/editor");
 const provideBatchOutputsEffect = (0, editor_namespaceObject.createEffectFromVariableProvider)({
     parse: (value, ctx)=>[
@@ -51,10 +53,15 @@ const provideBatchOutputsEffect = (0, editor_namespaceObject.createEffectFromVar
 });
 const createBatchOutputsFormPlugin = (0, editor_namespaceObject.defineFormPluginCreator)({
     name: 'batch-outputs-plugin',
-    onSetupFormMeta ({ mergeEffect }, { outputKey }) {
+    onSetupFormMeta ({ mergeEffect, addFormatOnSubmit }, { outputKey, inferTargetKey }) {
         mergeEffect({
             [outputKey]: provideBatchOutputsEffect
         });
+        if (inferTargetKey) addFormatOnSubmit((formData, ctx)=>{
+            const outputVariable = (0, editor_namespaceObject.getNodeScope)(ctx.node).output.variables?.[0];
+            if (outputVariable?.type) (0, external_lodash_es_namespaceObject.set)(formData, inferTargetKey, json_schema_namespaceObject.JsonSchemaUtils.astToSchema(outputVariable?.type));
+            return formData;
+        });
     },
     onInit (ctx, { outputKey }) {
         const chainTransformService = ctx.node.getService(editor_namespaceObject.ScopeChainTransformService);

package/dist/esm/components/variable-selector/index.mjs

@@ -34,7 +34,6 @@ const VariableSelector = ({ value, config = {}, onChange, style, readonly = fals
         });
         return icon;
     };
-    console.log('debugger treeValue', treeValue);
     return /*#__PURE__*/ jsx(Fragment, {
         children: /*#__PURE__*/ jsx(UITreeSelect, {
             dropdownMatchSelectWidth: false,

package/dist/esm/form-plugins/batch-outputs-plugin/index.mjs

@@ -1,3 +1,5 @@
+import { set } from "lodash-es";
+import { JsonSchemaUtils } from "@flowgram.ai/json-schema";
 import { ASTFactory, FlowNodeScopeType, ScopeChainTransformService, createEffectFromVariableProvider, defineFormPluginCreator, getNodeForm, getNodePrivateScope, getNodeScope } from "@flowgram.ai/editor";
 const provideBatchOutputsEffect = createEffectFromVariableProvider({
     parse: (value, ctx)=>[
@@ -22,10 +24,15 @@ const provideBatchOutputsEffect = createEffectFromVariableProvider({
 });
 const createBatchOutputsFormPlugin = defineFormPluginCreator({
     name: 'batch-outputs-plugin',
-    onSetupFormMeta ({ mergeEffect }, { outputKey }) {
+    onSetupFormMeta ({ mergeEffect, addFormatOnSubmit }, { outputKey, inferTargetKey }) {
         mergeEffect({
             [outputKey]: provideBatchOutputsEffect
         });
+        if (inferTargetKey) addFormatOnSubmit((formData, ctx)=>{
+            const outputVariable = getNodeScope(ctx.node).output.variables?.[0];
+            if (outputVariable?.type) set(formData, inferTargetKey, JsonSchemaUtils.astToSchema(outputVariable?.type));
+            return formData;
+        });
     },
     onInit (ctx, { outputKey }) {
         const chainTransformService = ctx.node.getService(ScopeChainTransformService);

package/dist/types/form-plugins/batch-outputs-plugin/index.d.ts

@@ -9,4 +9,8 @@ export declare const provideBatchOutputsEffect: EffectOptions[];
  */
 export declare const createBatchOutputsFormPlugin: FormPluginCreator<{
     outputKey: string;
+    /**
+     * if set, infer json schema to inferTargetKey when submit
+     */
+    inferTargetKey?: string;
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowgram.ai/form-materials",
-  "version": "0.4.12",
+  "version": "0.4.13",
   "homepage": "https://flowgram.ai/",
   "repository": "https://github.com/bytedance/flowgram.ai",
   "license": "MIT",
@@ -63,21 +63,21 @@
     "@douyinfe/semi-illustrations": "^2.80.0",
     "@douyinfe/semi-ui": "^2.80.0",
     "lodash-es": "^4.17.21",
-    "nanoid": "^4.0.2",
+    "nanoid": "^5.0.9",
     "immer": "~10.1.1",
     "@codemirror/view": "~6.38.0",
     "@codemirror/state": "~6.5.2",
     "zod": "^3.24.4",
-    "@flowgram.ai/editor": "0.4.12",
-    "@flowgram.ai/json-schema": "0.4.12",
-    "@flowgram.ai/coze-editor": "0.4.12"
+    "@flowgram.ai/editor": "0.4.13",
+    "@flowgram.ai/json-schema": "0.4.13",
+    "@flowgram.ai/coze-editor": "0.4.13"
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^18",
     "@types/react": "^18",
     "@types/react-dom": "^18",
-    "@types/inquirer": "9.0.7",
+    "@types/inquirer": "^9.0.9",
     "@types/styled-components": "^5",
     "eslint": "^8.54.0",
     "react": "^18",
@@ -88,8 +88,8 @@
     "@rslib/core": "~0.12.4",
     "cross-env": "~7.0.3",
     "@rsbuild/plugin-react": "^1.1.1",
-    "@flowgram.ai/eslint-config": "0.4.12",
-    "@flowgram.ai/ts-config": "0.4.12"
+    "@flowgram.ai/ts-config": "0.4.13",
+    "@flowgram.ai/eslint-config": "0.4.13"
   },
   "peerDependencies": {
     "react": ">=16.8",

package/src/components/variable-selector/index.tsx

@@ -73,8 +73,6 @@ export const VariableSelector = ({
     return icon;
   };
 
-  console.log('debugger treeValue', treeValue);
-
   return (
     <>
       <UITreeSelect

package/src/form-plugins/batch-outputs-plugin/index.ts

@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: MIT
  */
 
+import { set } from 'lodash-es';
+import { JsonSchemaUtils } from '@flowgram.ai/json-schema';
 import {
   ASTFactory,
   createEffectFromVariableProvider,
@@ -46,59 +48,76 @@ export const provideBatchOutputsEffect: EffectOptions[] = createEffectFromVariab
 /**
  * Free Layout only right now
  */
-export const createBatchOutputsFormPlugin: FormPluginCreator<{ outputKey: string }> =
-  defineFormPluginCreator({
-    name: 'batch-outputs-plugin',
-    onSetupFormMeta({ mergeEffect }, { outputKey }) {
-      mergeEffect({
-        [outputKey]: provideBatchOutputsEffect,
+export const createBatchOutputsFormPlugin: FormPluginCreator<{
+  outputKey: string;
+  /**
+   * if set, infer json schema to inferTargetKey when submit
+   */
+  inferTargetKey?: string;
+}> = defineFormPluginCreator({
+  name: 'batch-outputs-plugin',
+  onSetupFormMeta({ mergeEffect, addFormatOnSubmit }, { outputKey, inferTargetKey }) {
+    mergeEffect({
+      [outputKey]: provideBatchOutputsEffect,
+    });
+
+    if (inferTargetKey) {
+      addFormatOnSubmit((formData, ctx) => {
+        const outputVariable = getNodeScope(ctx.node).output.variables?.[0];
+
+        if (outputVariable?.type) {
+          set(formData, inferTargetKey, JsonSchemaUtils.astToSchema(outputVariable?.type));
+        }
+
+        return formData;
       });
-    },
-    onInit(ctx, { outputKey }) {
-      const chainTransformService = ctx.node.getService(ScopeChainTransformService);
+    }
+  },
+  onInit(ctx, { outputKey }) {
+    const chainTransformService = ctx.node.getService(ScopeChainTransformService);
 
-      const batchNodeType = ctx.node.flowNodeType;
+    const batchNodeType = ctx.node.flowNodeType;
 
-      const transformerId = `${batchNodeType}-outputs`;
+    const transformerId = `${batchNodeType}-outputs`;
 
-      if (chainTransformService.hasTransformer(transformerId)) {
-        return;
-      }
+    if (chainTransformService.hasTransformer(transformerId)) {
+      return;
+    }
 
-      chainTransformService.registerTransformer(transformerId, {
-        transformCovers: (covers, ctx) => {
-          const node = ctx.scope.meta?.node;
+    chainTransformService.registerTransformer(transformerId, {
+      transformCovers: (covers, ctx) => {
+        const node = ctx.scope.meta?.node;
 
-          // Child Node's variable can cover parent
-          if (node?.parent?.flowNodeType === batchNodeType) {
-            return [...covers, getNodeScope(node.parent)];
-          }
+        // Child Node's variable can cover parent
+        if (node?.parent?.flowNodeType === batchNodeType) {
+          return [...covers, getNodeScope(node.parent)];
+        }
 
-          return covers;
-        },
-        transformDeps(scopes, ctx) {
-          const scopeMeta = ctx.scope.meta;
+        return covers;
+      },
+      transformDeps(scopes, ctx) {
+        const scopeMeta = ctx.scope.meta;
 
-          if (scopeMeta?.type === FlowNodeScopeType.private) {
-            return scopes;
-          }
+        if (scopeMeta?.type === FlowNodeScopeType.private) {
+          return scopes;
+        }
 
-          const node = scopeMeta?.node;
+        const node = scopeMeta?.node;
 
-          // Public of Loop Node depends on child Node
-          if (node?.flowNodeType === batchNodeType) {
-            // Get all child blocks
-            const childBlocks = node.blocks;
+        // Public of Loop Node depends on child Node
+        if (node?.flowNodeType === batchNodeType) {
+          // Get all child blocks
+          const childBlocks = node.blocks;
 
-            // public scope of all child blocks
-            return [
-              getNodePrivateScope(node),
-              ...childBlocks.map((_childBlock) => getNodeScope(_childBlock)),
-            ];
-          }
+          // public scope of all child blocks
+          return [
+            getNodePrivateScope(node),
+            ...childBlocks.map((_childBlock) => getNodeScope(_childBlock)),
+          ];
+        }
 
-          return scopes;
-        },
-      });
-    },
-  });
+        return scopes;
+      },
+    });
+  },
+});