@flowgram.ai/cli 0.4.11 → 0.4.13

package/src/utils/ts-file.ts

@@ -3,15 +3,12 @@
  * SPDX-License-Identifier: MIT
  */
 
-import path from "path";
-import fs from "fs";
-import { File, traverseRecursiveFilePaths } from "./file";
-import { extractNamedExports } from "./export";
-import {
-  assembleImport,
-  ImportDeclaration,
-  traverseFileImports,
-} from "./import";
+import path, { join } from 'path';
+import fs from 'fs';
+
+import { assembleImport, ImportDeclaration, traverseFileImports } from './import';
+import { File, traverseRecursiveFilePaths } from './file';
+import { extractNamedExports } from './export';
 
 class TsFile extends File {
   exports: {
@@ -28,13 +25,11 @@ class TsFile extends File {
     return [...this.exports.values, ...this.exports.types];
   }
 
-  constructor(filePath: string) {
-    super(filePath);
+  constructor(filePath: string, root?: string) {
+    super(filePath, root);
 
-    this.exports = extractNamedExports(fs.readFileSync(filePath, "utf-8"));
-    this.imports = Array.from(
-      traverseFileImports(fs.readFileSync(filePath, "utf-8")),
-    );
+    this.exports = extractNamedExports(fs.readFileSync(filePath, 'utf-8'));
+    this.imports = Array.from(traverseFileImports(fs.readFileSync(filePath, 'utf-8')));
   }
 
   addImport(importDeclarations: ImportDeclaration[]) {
@@ -46,9 +41,7 @@ class TsFile extends File {
       const lastImportStatement = this.imports[this.imports.length - 1];
       return content.replace(
         lastImportStatement.statement,
-        `${lastImportStatement?.statement}\n${importDeclarations.map(
-          (item) => item.statement,
-        )}\n`,
+        `${lastImportStatement?.statement}\n${importDeclarations.map((item) => item.statement)}\n`
       );
     });
     this.imports.push(...importDeclarations);
@@ -56,20 +49,12 @@ class TsFile extends File {
 
   removeImport(importDeclarations: ImportDeclaration[]) {
     this.replace((content) =>
-      importDeclarations.reduce(
-        (prev, cur) => prev.replace(cur.statement, ""),
-        content,
-      ),
-    );
-    this.imports = this.imports.filter(
-      (item) => !importDeclarations.includes(item),
+      importDeclarations.reduce((prev, cur) => prev.replace(cur.statement, ''), content)
     );
+    this.imports = this.imports.filter((item) => !importDeclarations.includes(item));
   }
 
-  replaceImport(
-    oldImports: ImportDeclaration[],
-    newImports: ImportDeclaration[],
-  ) {
+  replaceImport(oldImports: ImportDeclaration[], newImports: ImportDeclaration[]) {
     newImports.forEach((importDeclaration) => {
       importDeclaration.statement = assembleImport(importDeclaration);
     });
@@ -84,9 +69,9 @@ class TsFile extends File {
             }
           });
         } else {
-          content = content.replace(oldImport.statement, "");
+          content = content.replace(oldImport.statement, '');
           this.imports = this.imports.filter(
-            (_import) => _import.statement !== oldImport.statement,
+            (_import) => _import.statement !== oldImport.statement
           );
         }
       });
@@ -96,9 +81,9 @@ class TsFile extends File {
         const lastImportStatement = newImports[oldImports.length - 1].statement;
         content = content.replace(
           lastImportStatement,
-          `${lastImportStatement}\n${restNewImports.map(
-            (item) => item.statement,
-          )}\n`,
+          `${lastImportStatement}
+${restNewImports.map((item) => item.statement).join('\n')}
+`
         );
       }
       this.imports.push(...restNewImports);
@@ -110,8 +95,8 @@ class TsFile extends File {
 
 export function* traverseRecursiveTsFiles(folder: string): Generator<TsFile> {
   for (const filePath of traverseRecursiveFilePaths(folder)) {
-    if (filePath.endsWith(".ts") || filePath.endsWith(".tsx")) {
-      yield new TsFile(filePath);
+    if (filePath.endsWith('.ts') || filePath.endsWith('.tsx')) {
+      yield new TsFile(filePath, folder);
     }
   }
 }
@@ -120,8 +105,8 @@ export function getIndexTsFile(folder: string): TsFile | undefined {
   // ts or tsx
   const files = fs.readdirSync(folder);
   for (const file of files) {
-    if (file === "index.ts" || file === "index.tsx") {
-      return new TsFile(path.join(folder, file));
+    if (file === 'index.ts' || file === 'index.tsx') {
+      return new TsFile(path.join(folder, file), folder);
     }
   }
   return undefined;

package/src/materials/materials.ts

@@ -1,127 +0,0 @@
-/**
- * Copyright (c) 2025 Bytedance Ltd. and/or its affiliates
- * SPDX-License-Identifier: MIT
- */
-
-import path from "path";
-import fs from "fs";
-
-import { Project } from "../utils/project"; // Import ProjectInfo
-import { traverseRecursiveTsFiles } from "../utils/ts-file";
-
-// Added type definitions
-export interface Material {
-  name: string;
-  type: string;
-  path: string;
-  [key: string]: any; // For other properties from config.json
-}
-
-const _types: string[] = [
-  "components",
-  "effects",
-  "plugins",
-  "shared",
-  "typings",
-  "validate",
-  "form-plugins",
-  "hooks",
-];
-
-export function listAllMaterials(formMaterialSrc: string): Material[] {
-  const _materials: Material[] = [];
-
-  for (const _type of _types) {
-    // 在 Node.js 中，import.meta.dirname 不可用，可使用 import.meta.url 结合 url 模块来获取目录路径
-
-    const materialsPath: string = path.join(formMaterialSrc, _type);
-    _materials.push(
-      ...fs
-        .readdirSync(materialsPath)
-        .map((_path: string) => {
-          if (_path === "index.ts") {
-            return null;
-          }
-
-          return {
-            name: _path, // Assuming the folder name is the material name
-            type: _type,
-            path: path.join(materialsPath, _path),
-          } as Material;
-        })
-        .filter((material): material is Material => material !== null),
-    );
-  }
-
-  return _materials;
-}
-
-export const getFormMaterialDependencies = (
-  formMaterialPath: string,
-): Record<string, string> => {
-  const packageJsonPath: string = path.join(formMaterialPath, "package.json");
-  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
-
-  return packageJson.dependencies;
-};
-
-export const copyMaterial = (
-  material: Material,
-  project: Project,
-  formMaterialPath: string,
-): {
-  packagesToInstall: string[];
-} => {
-  const formMaterialDependencies =
-    getFormMaterialDependencies(formMaterialPath);
-
-  const sourceDir: string = material.path;
-  const materialRoot: string = path.join(
-    project.projectPath,
-    "src",
-    "form-materials",
-    `${material.type}`,
-  );
-  const targetDir = path.join(materialRoot, material.name);
-  const packagesToInstall: Set<string> = new Set();
-
-  fs.cpSync(sourceDir, targetDir, { recursive: true });
-
-  for (const file of traverseRecursiveTsFiles(targetDir)) {
-    for (const importDeclaration of file.imports) {
-      const { source } = importDeclaration;
-
-      if (source.startsWith("@/")) {
-        // is inner import
-        console.log(
-          `Replace Import from ${source} to @flowgram.ai/form-materials`,
-        );
-        file.replaceImport(
-          [importDeclaration],
-          [{ ...importDeclaration, source: "@flowgram.ai/form-materials" }],
-        );
-        packagesToInstall.add(
-          `@flowgram.ai/form-materials@${project.flowgramVersion}`,
-        );
-      } else if (!source.startsWith(".") && !source.startsWith("react")) {
-        // check if is in form material dependencies
-        const [dep, version] =
-          Object.entries(formMaterialDependencies).find(([_key]) =>
-            source.startsWith(_key),
-          ) || [];
-        if (!dep) {
-          continue;
-        }
-        if (dep.startsWith("@flowgram.ai/")) {
-          packagesToInstall.add(`${dep}@${project.flowgramVersion}`);
-        } else {
-          packagesToInstall.add(`${dep}@${version}`);
-        }
-      }
-    }
-  }
-
-  return {
-    packagesToInstall: [...packagesToInstall],
-  };
-};