@flowgram.ai/form-materials 0.4.3 → 0.4.4

package/bin/index.ts

@@ -72,17 +72,6 @@ program
     let { packagesToInstall } = copyMaterial(material, projectInfo);
 
     // 4. Install the dependencies
-    packagesToInstall = packagesToInstall.map((_pkg) => {
-      if (
-        _pkg.startsWith(`@flowgram.ai/`) &&
-        projectInfo.flowgramVersion !== 'workspace:*' &&
-        !_pkg.endsWith(`@${projectInfo.flowgramVersion}`)
-      ) {
-        return `${_pkg}@${projectInfo.flowgramVersion}`;
-      }
-      return _pkg;
-    });
-
     console.log(chalk.bold('These npm dependencies will be added to your project'));
     console.log(packagesToInstall);
     installDependencies(packagesToInstall, projectInfo);

package/bin/materials.ts

@@ -61,12 +61,21 @@ export function listAllMaterials(): Material[] {
   return _materials;
 }
 
+export const getFormMaterialDependencies = (): Record<string, string> => {
+  const packageJsonPath: string = path.join(__dirname, '..', 'package.json');
+  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+
+  return packageJson.dependencies;
+};
+
 export const copyMaterial = (
   material: Material,
   projectInfo: ProjectInfo
 ): {
   packagesToInstall: string[];
 } => {
+  const formMaterialDependencies = getFormMaterialDependencies();
+
   const sourceDir: string = material.path;
   const materialRoot: string = path.join(
     projectInfo.projectPath,
@@ -92,10 +101,28 @@ export const copyMaterial = (
               { ...importDeclaration, source: '@flowgram.ai/form-materials' },
             ])
           );
+          if (projectInfo.flowgramVersion !== 'workspace:*') {
+            packagesToInstall.add(`@flowgram.ai/form-materials@${projectInfo.flowgramVersion}`);
+            continue;
+          }
           packagesToInstall.add('@flowgram.ai/form-materials');
         } else if (!source.startsWith('.') && !source.startsWith('react')) {
-          // check if is third party npm packages
-          packagesToInstall.add(source);
+          // check if is in form material dependencies
+          const [dep, version] =
+            Object.entries(formMaterialDependencies).find(([_key]) => source.startsWith(_key)) ||
+            [];
+          if (!dep) {
+            continue;
+          }
+          if (version === 'workspace:*') {
+            if (projectInfo.flowgramVersion !== 'workspace:*') {
+              packagesToInstall.add(`${dep}@${projectInfo.flowgramVersion}`);
+            } else {
+              packagesToInstall.add(dep);
+            }
+          } else {
+            packagesToInstall.add(`${dep}@${version}`);
+          }
         }
       }
     }

package/dist/esm/index.js

@@ -1448,7 +1448,7 @@ function PropertyEdit(props) {
     BlurInput,
     {
       disabled: readonly,
-      placeholder: config?.placeholder ?? "Input Variable Name",
+      placeholder: config?.placeholder ?? I18n9.t("Input Variable Name"),
       size: "small",
       value: name,
       onChange: (value2) => onChange("name", value2)
@@ -2985,6 +2985,7 @@ function VariableTagInject2() {
 }
 
 // src/components/json-editor-with-variables/index.tsx
+import { I18n as I18n13 } from "@flowgram.ai/editor";
 function findAllMatches(inputString, regex) {
   const globalRegex = new RegExp(
     regex,
@@ -3018,7 +3019,7 @@ function JsonEditorWithVariables(props) {
     CodeEditor,
     {
       languageId: "json",
-      activeLinePlaceholder: "Press '@' to Select variable",
+      activeLinePlaceholder: I18n13.t("Press '@' to Select variable"),
       ...props,
       options: {
         transformer,
@@ -3032,7 +3033,7 @@ function JsonEditorWithVariables(props) {
 
 // src/components/inputs-values/index.tsx
 import React34 from "react";
-import { I18n as I18n13 } from "@flowgram.ai/editor";
+import { I18n as I18n14 } from "@flowgram.ai/editor";
 import { Button as Button4, IconButton as IconButton4 } from "@douyinfe/semi-ui";
 import { IconDelete as IconDelete2, IconPlus as IconPlus3 } from "@douyinfe/semi-icons";
 
@@ -3073,7 +3074,7 @@ function InputsValues({
       size: "small",
       value: item.key,
       onChange: (v) => updateKey(item.id, v),
-      placeholder: I18n13.t("Input Key")
+      placeholder: I18n14.t("Input Key")
     }
   ), /* @__PURE__ */ React34.createElement(
     InjectDynamicValueInput,
@@ -3110,7 +3111,7 @@ function InputsValues({
         schema: { type: "string" }
       })
     },
-    I18n13.t("Add")
+    I18n14.t("Add")
   ));
 }
 
@@ -3509,7 +3510,7 @@ function AssignRows(props) {
 
 // src/components/inputs-values-tree/index.tsx
 import React45 from "react";
-import { I18n as I18n15 } from "@flowgram.ai/editor";
+import { I18n as I18n16 } from "@flowgram.ai/editor";
 import { Button as Button6 } from "@douyinfe/semi-ui";
 import { IconPlus as IconPlus5 } from "@douyinfe/semi-icons";
 
@@ -3619,7 +3620,7 @@ var IconAddChildren2 = () => /* @__PURE__ */ React43.createElement(Icon4, { size
 
 // src/components/inputs-values-tree/row.tsx
 import React44, { useMemo as useMemo13, useState as useState10 } from "react";
-import { I18n as I18n14 } from "@flowgram.ai/editor";
+import { I18n as I18n15 } from "@flowgram.ai/editor";
 import { IconButton as IconButton6, Input as Input7 } from "@douyinfe/semi-ui";
 import { IconChevronDown as IconChevronDown2, IconChevronRight as IconChevronRight2, IconDelete as IconDelete3 } from "@douyinfe/semi-icons";
 
@@ -3676,7 +3677,7 @@ var AddObjectChildStrategy = {
       size: "small",
       disabled: true,
       style: { pointerEvents: "none" },
-      value: I18n14.t("Configure via child fields")
+      value: I18n15.t("Configure via child fields")
     }
   )
 };
@@ -3717,7 +3718,7 @@ function InputValueRow(props) {
       size: "small",
       value: keyName,
       onChange: (v) => onUpdateKey?.(v),
-      placeholder: I18n14.t("Input Key")
+      placeholder: I18n15.t("Input Key")
     }
   ), /* @__PURE__ */ React44.createElement(
     InjectDynamicValueInput,
@@ -3817,7 +3818,7 @@ function InputsValuesTree(props) {
         });
       }
     },
-    I18n15.t("Add")
+    I18n16.t("Add")
   ));
 }