openxiangda 1.0.85 → 1.0.86

package/lib/cli.js

@@ -2,6 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const crypto = require('crypto');
 const os = require('os');
+const { builtinModules } = require('module');
 const { spawnSync } = require('child_process');
 const { pathToFileURL } = require('url');
 const esbuild = require('esbuild');
@@ -7107,10 +7108,18 @@ function resolveJsCodeBundlePathForPlan(localPath) {
   const extension = path.extname(localPath).toLowerCase();
   if (extension && extension !== '.ts' && extension !== '.tsx') return null;
   const normalized = localPath.replace(/\\/g, '/');
-  const matched = normalized.match(/src\/js-code-nodes\/([^/]+)\/index\.tsx?$/);
+  const jsCodeMatched = normalized.match(/src\/js-code-nodes\/([^/]+)\/index\.tsx?$/);
+  const automationMatched = normalized.match(/src\/automations\/([^/]+)\/index\.tsx?$/);
+  const functionMatched = normalized.match(/src\/functions\/([^/]+)\/index\.tsx?$/);
+  const matched = jsCodeMatched || automationMatched || functionMatched;
   if (!matched) return null;
+  const sourceKind = functionMatched
+    ? 'functions'
+    : automationMatched
+      ? 'automations'
+      : 'js-code-nodes';
   const workspaceRoot = findWorkspaceRoot(localPath);
-  return path.join(workspaceRoot, 'dist', 'js-code-nodes', matched[1], 'index.cjs');
+  return path.join(workspaceRoot, 'dist', sourceKind, matched[1], 'index.cjs');
 }
 
 function sortObjectForStableJson(value) {
@@ -7272,7 +7281,7 @@ async function uploadJsCodeSnapshotFile(
   const resolvedLocalPath = fs.existsSync(baseResolvedPath)
     ? baseResolvedPath
     : cwdResolvedPath;
-  const bundlePath = resolveJsCodeBundlePath(resolvedLocalPath, scriptCode);
+  const bundlePath = await resolveJsCodeBundlePath(resolvedLocalPath, scriptCode);
   if (!fs.existsSync(bundlePath)) {
     fail(`JS_CODE bundle不存在: ${bundlePath}`);
   }
@@ -7308,14 +7317,14 @@ async function uploadJsCodeSnapshotFile(
   return sourceFile;
 }
 
-function resolveJsCodeBundlePath(localPath, scriptCode) {
+async function resolveJsCodeBundlePath(localPath, scriptCode) {
   const extension = path.extname(localPath).toLowerCase();
   if (['.js', '.cjs', '.mjs'].includes(extension)) {
     fail(
       `JS_CODE V2 要求 AI 源码使用 TypeScript，请把 sourceFile.localPath 指向 src/js-code-nodes/<scriptCode>/index.ts、src/automations/<scriptCode>/index.ts 或 src/functions/<functionCode>/index.ts，而不是已构建的 ${extension} 文件: ${localPath}`
     );
   }
-  if (extension !== '.ts') {
+  if (!['.ts', '.tsx'].includes(extension)) {
     fail(
       `JS_CODE V2 sourceFile.localPath 必须指向 TypeScript 源文件 src/js-code-nodes/<scriptCode>/index.ts、src/automations/<scriptCode>/index.ts 或 src/functions/<functionCode>/index.ts: ${localPath}`
     );
@@ -7339,16 +7348,88 @@ function resolveJsCodeBundlePath(localPath, scriptCode) {
       : 'js-code-nodes';
 
   const workspaceRoot = findWorkspaceRoot(localPath);
-  const result = spawnSync('pnpm', ['build-js-code', '--script', resolvedScriptCode, '--source', sourceKind], {
-    cwd: workspaceRoot,
-    stdio: 'inherit',
-  });
-  if (result.status !== 0) {
+  const result = runWorkspaceJsCodeBuild(workspaceRoot, resolvedScriptCode, sourceKind);
+  if (result.status !== 0 && sourceKind === 'functions' && isUnsupportedFunctionsBuildScript(result)) {
+    warn(
+      `当前工作区 scripts/build-js-code.mjs 不支持 App Function source=functions，已使用 openxiangda 内置构建器兼容构建 ${resolvedScriptCode}`
+    );
+    await buildFunctionSourceWithBundledEsbuild(localPath, workspaceRoot, resolvedScriptCode);
+  } else if (result.status !== 0) {
+    if (result.stdout) process.stdout.write(result.stdout);
+    if (result.stderr) process.stderr.write(result.stderr);
     fail(`JS_CODE bundle构建失败: ${resolvedScriptCode}`);
+  } else {
+    if (result.stdout) process.stdout.write(result.stdout);
+    if (result.stderr) process.stderr.write(result.stderr);
   }
   return path.join(workspaceRoot, 'dist', sourceKind, resolvedScriptCode, 'index.cjs');
 }
 
+function runWorkspaceJsCodeBuild(workspaceRoot, resolvedScriptCode, sourceKind) {
+  return spawnSync('pnpm', ['build-js-code', '--script', resolvedScriptCode, '--source', sourceKind], {
+    cwd: workspaceRoot,
+    encoding: 'utf8',
+  });
+}
+
+function isUnsupportedFunctionsBuildScript(result) {
+  const output = `${result.stdout || ''}\n${result.stderr || ''}`;
+  return (
+    output.includes('unsupported source: functions') ||
+    output.includes('Expected js-code-nodes or automations')
+  );
+}
+
+async function buildFunctionSourceWithBundledEsbuild(localPath, workspaceRoot, functionCode) {
+  const outfile = path.join(workspaceRoot, 'dist', 'functions', functionCode, 'index.cjs');
+  fs.mkdirSync(path.dirname(outfile), { recursive: true });
+  const external = Array.from(
+    new Set([...builtinModules, ...builtinModules.map(name => `node:${name}`)])
+  );
+  try {
+    await esbuild.build({
+      entryPoints: [localPath],
+      outfile,
+      bundle: true,
+      platform: 'node',
+      format: 'cjs',
+      target: ['node20'],
+      sourcemap: true,
+      logLevel: 'silent',
+      external,
+      plugins: [
+        {
+          name: 'openxiangda-workspace-alias',
+          setup(build) {
+            build.onResolve({ filter: /^@\// }, args => ({
+              path: resolveWorkspaceAliasPath(workspaceRoot, args.path),
+            }));
+          },
+        },
+      ],
+    });
+  } catch (error) {
+    fail(`App Function 内置构建失败: ${functionCode}: ${error.message}`);
+  }
+  print(`built functions/${functionCode} -> ${path.relative(workspaceRoot, outfile)}`);
+}
+
+function resolveWorkspaceAliasPath(workspaceRoot, importPath) {
+  const raw = path.join(workspaceRoot, 'src', importPath.replace(/^@\//, ''));
+  const candidates = [
+    raw,
+    `${raw}.ts`,
+    `${raw}.tsx`,
+    `${raw}.js`,
+    `${raw}.mjs`,
+    `${raw}.cjs`,
+    path.join(raw, 'index.ts'),
+    path.join(raw, 'index.tsx'),
+    path.join(raw, 'index.js'),
+  ];
+  return candidates.find(candidate => fs.existsSync(candidate)) || raw;
+}
+
 function findWorkspaceRoot(startPath) {
   if (!fs.existsSync(startPath)) {
     return process.cwd();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openxiangda",
-  "version": "1.0.85",
+  "version": "1.0.86",
   "description": "OpenXiangda CLI, workspace build tools, runtime SDK, and form components.",
   "private": false,
   "bin": {
@@ -65,6 +65,7 @@
     "prepack": "npm run build:sdk",
     "test:profile-isolation": "bash scripts/profile-isolation-smoke.sh",
     "test:resource-plan": "node scripts/resource-plan-smoke.mjs",
+    "test:app-function-fallback": "node scripts/app-function-source-fallback-smoke.mjs",
     "test:runtime-deploy": "node scripts/runtime-deploy-smoke.mjs",
     "test:skill-install": "bash scripts/skill-install-smoke.sh",
     "test:workspace-init": "bash scripts/workspace-init-smoke.sh"