@nocobase/build 2.0.0-beta.8 → 2.0.0

package/lib/buildDeclaration.js

@@ -30,32 +30,76 @@ __export(buildDeclaration_exports, {
   buildDeclaration: () => buildDeclaration
 });
 module.exports = __toCommonJS(buildDeclaration_exports);
-var import_gulp = __toESM(require("gulp"));
-var import_gulp_typescript = __toESM(require("gulp-typescript"));
+var import_fast_glob = __toESM(require("fast-glob"));
 var import_path = __toESM(require("path"));
+var import_typescript = __toESM(require("typescript"));
 var import_constant = require("./constant");
-const buildDeclaration = (cwd, targetDir) => {
-  return new Promise((resolve, reject) => {
-    const srcPath = import_path.default.join(cwd, "src");
-    const targetPath = import_path.default.join(cwd, targetDir);
-    const tsConfig = import_gulp_typescript.default.createProject(import_path.default.join(import_constant.ROOT_PATH, "tsconfig.json"));
-    delete tsConfig.config.compilerOptions.paths;
-    const patterns = [
-      import_path.default.join(srcPath, "**/*.{ts,tsx}"),
-      `!${import_path.default.join(srcPath, "**/fixtures{,/**}")}`,
-      `!${import_path.default.join(srcPath, "**/demos{,/**}")}`,
-      `!${import_path.default.join(srcPath, "**/__test__{,/**}")}`,
-      `!${import_path.default.join(srcPath, "**/__tests__{,/**}")}`,
-      `!${import_path.default.join(srcPath, "**/__benchmarks__{,/**}")}`,
-      `!${import_path.default.join(srcPath, "**/__e2e__{,/**}")}`,
-      `!${import_path.default.join(srcPath, "**/*.mdx")}`,
-      `!${import_path.default.join(srcPath, "**/*.md")}`,
-      `!${import_path.default.join(srcPath, "**/*.+(test|e2e|spec).+(js|jsx|ts|tsx)")}`,
-      `!${import_path.default.join(srcPath, "**/tsconfig{,.*}.json")}`,
-      `!${import_path.default.join(srcPath, ".umi{,-production,-test}{,/**}")}`
-    ];
-    import_gulp.default.src(patterns, { base: srcPath, allowEmpty: true }).pipe((0, import_gulp_typescript.default)(tsConfig.config.compilerOptions)).dts.pipe(import_gulp.default.dest(targetPath)).on("end", resolve).on("error", reject);
+const INCLUDE_PATTERNS = ["**/*.{ts,tsx}"];
+const EXCLUDE_PATTERNS = [
+  "**/fixtures{,/**}",
+  "**/demos{,/**}",
+  "**/__test__{,/**}",
+  "**/__tests__{,/**}",
+  "**/__benchmarks__{,/**}",
+  "**/__e2e__{,/**}",
+  "**/*.mdx",
+  "**/*.md",
+  "**/*.+(test|e2e|spec).+(js|jsx|ts|tsx)",
+  "**/tsconfig{,.*}.json",
+  ".umi{,-production,-test}{,/**}"
+];
+const diagnosticHost = {
+  getCurrentDirectory: () => process.cwd(),
+  getCanonicalFileName: (fileName) => import_typescript.default.sys.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase(),
+  getNewLine: () => import_typescript.default.sys.newLine
+};
+function loadCompilerOptions() {
+  const configPath = import_path.default.join(import_constant.ROOT_PATH, "tsconfig.json");
+  const configFile = import_typescript.default.readConfigFile(configPath, import_typescript.default.sys.readFile);
+  if (configFile.error) {
+    throw new Error(import_typescript.default.formatDiagnosticsWithColorAndContext([configFile.error], diagnosticHost));
+  }
+  const parsedConfig = import_typescript.default.parseJsonConfigFileContent(
+    configFile.config,
+    import_typescript.default.sys,
+    import_path.default.dirname(configPath),
+    void 0,
+    configPath
+  );
+  const options = {
+    ...parsedConfig.options
+  };
+  delete options.paths;
+  return options;
+}
+const buildDeclaration = async (cwd, targetDir) => {
+  const srcPath = import_path.default.join(cwd, "src");
+  const targetPath = import_path.default.join(cwd, targetDir);
+  const files = await (0, import_fast_glob.default)(INCLUDE_PATTERNS, {
+    cwd: srcPath,
+    ignore: EXCLUDE_PATTERNS,
+    absolute: true,
+    dot: true
   });
+  if (!files.length) {
+    return;
+  }
+  const compilerOptions = {
+    ...loadCompilerOptions(),
+    declaration: true,
+    emitDeclarationOnly: true,
+    declarationDir: targetPath,
+    outDir: targetPath,
+    rootDir: srcPath
+  };
+  const program = import_typescript.default.createProgram(files, compilerOptions);
+  const emitResult = program.emit(void 0, void 0, void 0, true);
+  const diagnostics = import_typescript.default.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
+  if (diagnostics.length) {
+    const details = import_typescript.default.formatDiagnosticsWithColorAndContext(diagnostics, diagnosticHost);
+    throw new Error(`Failed to build declarations for ${cwd} 
+${details}`);
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/buildPlugin.js

@@ -54,13 +54,10 @@ var import_obfuscationResult = require("./utils/obfuscationResult");
 const validExts = [".ts", ".tsx", ".js", ".jsx", ".mjs"];
 const serverGlobalFiles = ["src/**", "!src/client/**", ...import_constant.globExcludeFiles];
 const clientGlobalFiles = ["src/**", "!src/server/**", ...import_constant.globExcludeFiles];
-const sourceGlobalFiles = [
-  "src/**/*.{ts,js,tsx,jsx,mjs}",
-  "!src/**/__tests__",
-  "!src/**/__benchmarks__"
-];
+const sourceGlobalFiles = ["src/**/*.{ts,js,tsx,jsx,mjs}", "!src/**/__tests__", "!src/**/__benchmarks__"];
 const external = [
   // nocobase
+  "@nocobase/ai",
   "@nocobase/acl",
   "@nocobase/actions",
   "@nocobase/auth",
@@ -148,6 +145,79 @@ const external = [
 ];
 const pluginPrefix = (process.env.PLUGIN_PACKAGE_PREFIX || "@nocobase/plugin-,@nocobase/preset-,@nocobase/plugin-pro-").split(",");
 const target_dir = "dist";
+function appendAiFiles(cwd, files) {
+  const aiFiles = import_fast_glob.default.globSync(["src/ai/**/*.md"], { cwd, absolute: true });
+  if (!aiFiles.length) return files;
+  return Array.from(/* @__PURE__ */ new Set([...files, ...aiFiles]));
+}
+function normalizeAiMetaEntries(meta, fallbackModule) {
+  if (Array.isArray(meta)) {
+    return meta.filter((item) => item && typeof item.module === "string").map((item) => ({
+      module: item.module.trim(),
+      description: typeof item.description === "string" ? item.description.trim() : "",
+      source: typeof item.source === "string" ? item.source.trim() : ""
+    })).filter((item) => item.module);
+  }
+  if (meta && typeof meta.module === "string") {
+    return [
+      {
+        module: meta.module.trim() || fallbackModule,
+        description: typeof meta.description === "string" ? meta.description.trim() : "",
+        source: typeof meta.source === "string" ? meta.source.trim() : ""
+      }
+    ];
+  }
+  return [
+    {
+      module: fallbackModule,
+      description: "",
+      source: ""
+    }
+  ];
+}
+async function copyAiDocSources(cwd, log) {
+  const metaFiles = import_fast_glob.default.globSync(["src/ai/docs/**/meta.json"], { cwd, absolute: true });
+  if (!metaFiles.length) return;
+  const rootMetaMap = /* @__PURE__ */ new Map();
+  for (const metaFile of metaFiles) {
+    let entries = [];
+    try {
+      const meta = await import_fs_extra.default.readJson(metaFile);
+      const fallbackModule = import_path.default.basename(import_path.default.dirname(metaFile));
+      entries = normalizeAiMetaEntries(meta, fallbackModule);
+    } catch (error) {
+      log("failed to read ai docs meta.json", metaFile, error);
+      continue;
+    }
+    for (const entry of entries) {
+      const source = entry.source?.trim();
+      if (!source) continue;
+      const absoluteSource = import_path.default.isAbsolute(source) ? source : import_path.default.resolve(process.cwd(), source);
+      const fallbackSource = import_path.default.isAbsolute(source) ? "" : import_path.default.resolve(cwd, source);
+      const resolvedSource = await import_fs_extra.default.pathExists(absoluteSource) ? absoluteSource : fallbackSource && await import_fs_extra.default.pathExists(fallbackSource) ? fallbackSource : "";
+      if (!resolvedSource) {
+        log("ai docs source not found", source, metaFile);
+        continue;
+      }
+      const targetRoot = import_path.default.join(cwd, target_dir, "ai", "docs", entry.module);
+      await import_fs_extra.default.remove(targetRoot);
+      await import_fs_extra.default.ensureDir(targetRoot);
+      await import_fs_extra.default.copy(resolvedSource, targetRoot, {
+        overwrite: true,
+        filter: (src) => import_path.default.basename(src) !== "_meta.json"
+      });
+      rootMetaMap.set(entry.module, {
+        module: entry.module,
+        description: entry.description ?? ""
+      });
+    }
+  }
+  if (rootMetaMap.size) {
+    const rootMetaPath = import_path.default.join(cwd, target_dir, "ai", "docs", "meta.json");
+    await import_fs_extra.default.ensureDir(import_path.default.dirname(rootMetaPath));
+    await import_fs_extra.default.writeJSON(rootMetaPath, Array.from(rootMetaMap.values()), { spaces: 2 });
+  }
+}
 function deleteServerFiles(cwd, log) {
   log("delete server files");
   const files = import_fast_glob.default.globSync(["*"], {
@@ -258,7 +328,8 @@ async function buildServerDeps(cwd, serverFiles, log) {
 async function buildPluginServer(cwd, userConfig, sourcemap, log) {
   log("build plugin server source");
   const packageJson = (0, import_utils.getPackageJson)(cwd);
-  const serverFiles = import_fast_glob.default.globSync(serverGlobalFiles, { cwd, absolute: true });
+  let serverFiles = import_fast_glob.default.globSync(serverGlobalFiles, { cwd, absolute: true });
+  serverFiles = appendAiFiles(cwd, serverFiles);
   (0, import_buildPluginUtils.buildCheck)({ cwd, packageJson, entry: "server", files: serverFiles, log });
   const otherExts = Array.from(
     new Set(serverFiles.map((item) => import_path.default.extname(item)).filter((item) => !import_constant.EsbuildSupportExts.includes(item)))
@@ -286,12 +357,14 @@ async function buildPluginServer(cwd, userConfig, sourcemap, log) {
       }
     })
   );
+  await copyAiDocSources(cwd, log);
   await buildServerDeps(cwd, serverFiles, log);
 }
 async function buildProPluginServer(cwd, userConfig, sourcemap, log) {
   log("build pro plugin server source");
   const packageJson = (0, import_utils.getPackageJson)(cwd);
-  const serverFiles = import_fast_glob.default.globSync(serverGlobalFiles, { cwd, absolute: true });
+  let serverFiles = import_fast_glob.default.globSync(serverGlobalFiles, { cwd, absolute: true });
+  serverFiles = appendAiFiles(cwd, serverFiles);
   (0, import_buildPluginUtils.buildCheck)({ cwd, packageJson, entry: "server", files: serverFiles, log });
   const otherExts = Array.from(
     new Set(serverFiles.map((item) => import_path.default.extname(item)).filter((item) => !import_constant.EsbuildSupportExts.includes(item)))
@@ -301,10 +374,17 @@ async function buildProPluginServer(cwd, userConfig, sourcemap, log) {
   }
   deleteServerFiles(cwd, log);
   let tsconfig = bundleRequire.loadTsConfig(import_path.default.join(cwd, "tsconfig.json"));
-  import_fs_extra.default.writeFileSync(import_path.default.join(cwd, "tsconfig.json"), JSON.stringify({
-    ...tsconfig.data,
-    compilerOptions: { ...tsconfig.data.compilerOptions, paths: [] }
-  }, null, 2));
+  import_fs_extra.default.writeFileSync(
+    import_path.default.join(cwd, "tsconfig.json"),
+    JSON.stringify(
+      {
+        ...tsconfig.data,
+        compilerOptions: { ...tsconfig.data.compilerOptions, paths: [] }
+      },
+      null,
+      2
+    )
+  );
   tsconfig = bundleRequire.loadTsConfig(import_path.default.join(cwd, "tsconfig.json"));
   await (0, import_tsup.build)(
     userConfig.modifyTsupConfig({
@@ -325,6 +405,7 @@ async function buildProPluginServer(cwd, userConfig, sourcemap, log) {
       }
     })
   );
+  await copyAiDocSources(cwd, log);
   const entryFile = import_path.default.join(cwd, "src/server/index.ts");
   if (!import_fs_extra.default.existsSync(entryFile)) {
     log("server entry file not found", entryFile);
@@ -339,11 +420,7 @@ async function buildProPluginServer(cwd, userConfig, sourcemap, log) {
   };
   if (!cwd.includes(import_constant.PLUGIN_COMMERCIAL)) {
     externalOptions.external = [/^[./]/];
-    externalOptions.noExternal = [
-      entryFile,
-      /@nocobase\/plugin-commercial\/server/,
-      /dist\/server\/index\.js/
-    ];
+    externalOptions.noExternal = [entryFile, /@nocobase\/plugin-commercial\/server/, /dist\/server\/index\.js/];
     externalOptions.onSuccess = async () => {
       const serverFiles2 = [import_path.default.join(cwd, target_dir, "server", "index.js")];
       serverFiles2.forEach((file) => {
@@ -385,7 +462,10 @@ async function buildPluginClient(cwd, userConfig, sourcemap, log, isCommercial =
   const packageJson = (0, import_utils.getPackageJson)(cwd);
   const clientFiles = import_fast_glob.default.globSync(clientGlobalFiles, { cwd, absolute: true });
   if (isCommercial) {
-    const commercialFiles = import_fast_glob.default.globSync(clientGlobalFiles, { cwd: import_path.default.join(process.cwd(), "packages/pro-plugins", import_constant.PLUGIN_COMMERCIAL), absolute: true });
+    const commercialFiles = import_fast_glob.default.globSync(clientGlobalFiles, {
+      cwd: import_path.default.join(process.cwd(), "packages/pro-plugins", import_constant.PLUGIN_COMMERCIAL),
+      absolute: true
+    });
     clientFiles.push(...commercialFiles);
   }
   const clientFileSource = clientFiles.map((item) => import_fs_extra.default.readFileSync(item, "utf-8"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/build",
-  "version": "2.0.0-beta.8",
+  "version": "2.0.0",
   "description": "Library build tool based on rollup.",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
@@ -19,7 +19,6 @@
     "@rsdoctor/rspack-plugin": "^0.4.8",
     "@rspack/core": "1.3.2",
     "@svgr/webpack": "^8.1.0",
-    "@types/gulp": "^4.0.13",
     "@types/lerna__package": "5.1.0",
     "@types/lerna__project": "5.1.0",
     "@types/tar": "^6.1.5",
@@ -31,8 +30,6 @@
     "css-loader": "^6.8.1",
     "esbuild-register": "^3.4.2",
     "fast-glob": "^3.3.1",
-    "gulp": "4.0.2",
-    "gulp-typescript": "6.0.0-alpha.1",
     "javascript-obfuscator": "^4.1.1",
     "less": "^4.2.0",
     "less-loader": "^12.2.0",
@@ -54,5 +51,5 @@
     "build": "tsup",
     "build:watch": "tsup --watch"
   },
-  "gitHead": "6bd912b1028eb8bc09a823d35e4d37b3000861b1"
+  "gitHead": "3590c0087a56f0f285a5357f43a80bdc62b11bec"
 }