@farris/cli 2.3.2 → 2.3.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/commands/add-app.js +1 -1
- package/lib/commands/add-app.js.map +1 -1
- package/lib/commands/add-lib.js +1 -1
- package/lib/commands/add-lib.js.map +1 -1
- package/lib/commands/add-project.js +2 -2
- package/lib/commands/add-project.js.map +1 -1
- package/lib/commands/dev-serve.js +1 -1
- package/lib/commands/dev-serve.js.map +1 -1
- package/lib/common/get-vite-config.js +64 -2
- package/lib/common/get-vite-config.js.map +1 -1
- package/lib/common/project-layout.js +53 -12
- package/lib/common/project-layout.js.map +1 -1
- package/lib/common/safety.js +4 -4
- package/lib/common/safety.js.map +1 -1
- package/lib/common/verifier.js +14 -10
- package/lib/common/verifier.js.map +1 -1
- package/lib/common/workspace-contract.js +2 -2
- package/lib/common/workspace-contract.js.map +1 -1
- package/lib/index.js +4 -2
- package/lib/index.js.map +1 -1
- package/lib/plugins/mock.js +293 -0
- package/lib/plugins/mock.js.map +1 -0
- package/package.json +1 -1
- package/templates/create/AGENTS.md +5 -0
- package/templates/mobile/farris.config.mjs +7 -1
- package/templates/mobile/mock/README.md +34 -0
- package/templates/web/farris.config.mjs +7 -1
- package/templates/web/mock/README.md +34 -0
package/lib/commands/add-app.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-app.js","sourceRoot":"","sources":["../../src/commands/add-app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA0B,MAAM,kBAAkB,CAAC;AAItE
|
|
1
|
+
{"version":3,"file":"add-app.js","sourceRoot":"","sources":["../../src/commands/add-app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA0B,MAAM,kBAAkB,CAAC;AAItE,8CAA8C;AAC9C,MAAM,UAAU,MAAM,CAAC,IAAa,EAAE,UAA6B,EAAE;IACnE,OAAO,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;AAC1C,CAAC"}
|
package/lib/commands/add-lib.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-lib.js","sourceRoot":"","sources":["../../src/commands/add-lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA0B,MAAM,kBAAkB,CAAC;AAItE,
|
|
1
|
+
{"version":3,"file":"add-lib.js","sourceRoot":"","sources":["../../src/commands/add-lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA0B,MAAM,kBAAkB,CAAC;AAItE,2CAA2C;AAC3C,MAAM,UAAU,MAAM,CAAC,IAAa,EAAE,UAA6B,EAAE;IACnE,OAAO,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;AAC1C,CAAC"}
|
|
@@ -6,7 +6,7 @@ import { applyCatalogDeps } from '../common/apply-catalog-deps.js';
|
|
|
6
6
|
import { CreateAppError } from '../common/create-app-target.js';
|
|
7
7
|
import { checkPlannedConflicts } from '../common/safety.js';
|
|
8
8
|
import { refreshAgentsProjectList } from '../common/agents-doc.js';
|
|
9
|
-
import {
|
|
9
|
+
import { deriveAppDir, findWorkspaceRoot, listProjects, validatePackageName, writableContainerFor } from '../common/project-layout.js';
|
|
10
10
|
import { resolveTemplate, getTemplateDir } from '../common/template-manifest.js';
|
|
11
11
|
import { appTemplateFilter, buildTemplateVariables } from '../common/generate-app.js';
|
|
12
12
|
import { collectTemplateOutputPaths, renderTemplateDir } from '../common/template-renderer.js';
|
|
@@ -73,7 +73,7 @@ export async function addProject(type, nameArg, options = {}) {
|
|
|
73
73
|
if (!dir || !/^[a-z0-9-_]+$/.test(dir)) {
|
|
74
74
|
throw new CreateAppError(`无法从工程名 "${name}" 推导出合法的子目录名`);
|
|
75
75
|
}
|
|
76
|
-
const projectRel = `${
|
|
76
|
+
const projectRel = `${writableContainerFor(wsRoot, type)}/${dir}`;
|
|
77
77
|
const projectTargetDir = join(wsRoot, projectRel);
|
|
78
78
|
if (existsSync(projectTargetDir)) {
|
|
79
79
|
throw new CreateAppError(`工程目录已存在: ${projectRel}`, ExitCode.TARGET_CONFLICT);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../src/commands/add-project.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACjG,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EACL,YAAY,EACZ,
|
|
1
|
+
{"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../src/commands/add-project.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { createServer, mergeConfig } from 'vite';
|
|
|
2
2
|
import { getViteConfig } from '../common/get-vite-config.js';
|
|
3
3
|
export const devServe = async (options) => {
|
|
4
4
|
const { port = 1337, host = true } = options;
|
|
5
|
-
const config = await getViteConfig();
|
|
5
|
+
const config = await getViteConfig('app', undefined, { mock: options.mock });
|
|
6
6
|
const devConfig = mergeConfig(config, {
|
|
7
7
|
configFile: false,
|
|
8
8
|
mode: 'dev',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-serve.js","sourceRoot":"","sources":["../../src/commands/dev-serve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"dev-serve.js","sourceRoot":"","sources":["../../src/commands/dev-serve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAQ7D,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAAE,OAAqB,EAAE,EAAE;IACtD,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,IAAI,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IAE7C,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAE7E,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,EAAE;QACpC,UAAU,EAAE,KAAK;QACjB,IAAI,EAAE,KAAK;QACX,MAAM,EAAE;YACN,IAAI;YACJ,IAAI;YACJ,GAAG,EAAE,IAAI;SACV;KACF,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,SAAS,CAAC,CAAC;IAC7C,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC;IAEtB,MAAM,CAAC,SAAS,EAAE,CAAC;AACrB,CAAC,CAAC"}
|
|
@@ -4,6 +4,50 @@ import { getDependencies } from '../common/get-dependencies.js';
|
|
|
4
4
|
import cssInjectedByJsPlugin from 'vite-plugin-css-injected-by-js';
|
|
5
5
|
import { logWarn } from './output.js';
|
|
6
6
|
import { ALLOWED_APP_FORMATS, CWD } from './constant.js';
|
|
7
|
+
import { farrisMockPlugin } from '../plugins/mock.js';
|
|
8
|
+
/**
|
|
9
|
+
* 解析 mock 开关与参数。
|
|
10
|
+
* 优先级：命令行参数（--no-mock）> 环境变量（MOCK=none）> farris.config.mjs 的 mock 键。
|
|
11
|
+
*/
|
|
12
|
+
export function resolveMockOptions(mock, cliOptions = {}, env = process.env) {
|
|
13
|
+
const detailed = mock && typeof mock === 'object' ? mock : {};
|
|
14
|
+
let enabled = typeof mock === 'boolean' ? mock : detailed.enable !== false;
|
|
15
|
+
if (env.MOCK === 'none') {
|
|
16
|
+
enabled = false;
|
|
17
|
+
}
|
|
18
|
+
if (cliOptions.mock === false) {
|
|
19
|
+
enabled = false;
|
|
20
|
+
}
|
|
21
|
+
return {
|
|
22
|
+
enabled,
|
|
23
|
+
dir: detailed.dir ?? 'mock',
|
|
24
|
+
timeout: detailed.timeout ?? 0,
|
|
25
|
+
apiPrefixes: detailed.apiPrefixes ?? ['/api']
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* 校验多来源代理配置没有同键冲突：同一前缀只允许配置在一处
|
|
30
|
+
*/
|
|
31
|
+
export function assertProxyKeysDisjoint(sources) {
|
|
32
|
+
const owners = new Map();
|
|
33
|
+
const conflicts = [];
|
|
34
|
+
for (const source of sources) {
|
|
35
|
+
for (const key of Object.keys(source.proxy ?? {})) {
|
|
36
|
+
const previous = owners.get(key);
|
|
37
|
+
if (previous && previous !== source.name) {
|
|
38
|
+
conflicts.push({ key, names: [previous, source.name] });
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
owners.set(key, source.name);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
if (conflicts.length > 0) {
|
|
46
|
+
throw new Error(`代理配置冲突：${conflicts
|
|
47
|
+
.map((item) => `${item.key}（${item.names.join(' 与 ')}）`)
|
|
48
|
+
.join('；')}。同一前缀只能配置在一处：farris.config.mjs 的 proxy 键、server.proxy 或 viteConfig.server.proxy。`);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
7
51
|
/**
|
|
8
52
|
* 解析有效 Base 及其来源
|
|
9
53
|
*/
|
|
@@ -45,7 +89,7 @@ export function validateBaseAndRouterMode(base, routerMode) {
|
|
|
45
89
|
}
|
|
46
90
|
export const formatFarrisConfig = (farrisConfig, type, cliOptions = {}) => {
|
|
47
91
|
const isApp = type === 'app';
|
|
48
|
-
const { lib, format: configFormat, target, minify = true, outDir: configOutDir, externals = { include: [], exclude: [] }, externalDependencies, plugins = [], alias, server, cssInjected, packageName = '@farris/mobile-ui-vue', base: configBase, publicPath: configPublicPath, routerMode } = farrisConfig;
|
|
92
|
+
const { lib, format: configFormat, target, minify = true, outDir: configOutDir, externals = { include: [], exclude: [] }, externalDependencies, plugins = [], alias, server, proxy, mock, cssInjected, packageName = '@farris/mobile-ui-vue', base: configBase, publicPath: configPublicPath, routerMode } = farrisConfig;
|
|
49
93
|
// CLI 参数覆盖（仅 app）：--format / --outDir
|
|
50
94
|
if (isApp && cliOptions.format != null) {
|
|
51
95
|
if (typeof cliOptions.format !== 'string' ||
|
|
@@ -66,6 +110,14 @@ export const formatFarrisConfig = (farrisConfig, type, cliOptions = {}) => {
|
|
|
66
110
|
if (type === 'app') {
|
|
67
111
|
validateBaseAndRouterMode(effectiveBase, routerMode);
|
|
68
112
|
}
|
|
113
|
+
// proxy 一等键与 server.proxy 合并；同一前缀冲突时报错，不做静默合并
|
|
114
|
+
assertProxyKeysDisjoint([
|
|
115
|
+
{ name: '`proxy` 键', proxy },
|
|
116
|
+
{ name: '`server.proxy`', proxy: server?.proxy }
|
|
117
|
+
]);
|
|
118
|
+
const resolvedServer = proxy || server?.proxy
|
|
119
|
+
? { ...server, proxy: { ...(server?.proxy ?? {}), ...(proxy ?? {}) } }
|
|
120
|
+
: server;
|
|
69
121
|
const dependencies = externalDependencies ? getDependencies() : [];
|
|
70
122
|
let external = externals.include ? [...externals.include, ...dependencies] : dependencies;
|
|
71
123
|
external = external.filter((item) => !externals.exclude?.includes(item));
|
|
@@ -78,6 +130,8 @@ export const formatFarrisConfig = (farrisConfig, type, cliOptions = {}) => {
|
|
|
78
130
|
if (cssInjected) {
|
|
79
131
|
plugins.push(cssInjectedByJsPlugin());
|
|
80
132
|
}
|
|
133
|
+
// 开发期 mock 中间件：apply: 'serve' 只在 dev server 生效，构建产物不受影响
|
|
134
|
+
plugins.push(farrisMockPlugin(resolveMockOptions(mock, cliOptions)));
|
|
81
135
|
if (packageName) {
|
|
82
136
|
process.env.PackageName = packageName;
|
|
83
137
|
}
|
|
@@ -109,7 +163,7 @@ export const formatFarrisConfig = (farrisConfig, type, cliOptions = {}) => {
|
|
|
109
163
|
},
|
|
110
164
|
outDir
|
|
111
165
|
},
|
|
112
|
-
server,
|
|
166
|
+
server: resolvedServer,
|
|
113
167
|
plugins,
|
|
114
168
|
resolve: {
|
|
115
169
|
alias
|
|
@@ -119,6 +173,14 @@ export const formatFarrisConfig = (farrisConfig, type, cliOptions = {}) => {
|
|
|
119
173
|
};
|
|
120
174
|
const formatViteConfig = async (type, configFile, cliOptions = {}) => {
|
|
121
175
|
const { viteConfig = {}, ...farrisConfig } = await getFarrisConfigAsync(configFile);
|
|
176
|
+
// 一等键与 viteConfig 之间的代理同键冲突校验，同一前缀只允许配置在一处
|
|
177
|
+
assertProxyKeysDisjoint([
|
|
178
|
+
{
|
|
179
|
+
name: 'farris.config.mjs',
|
|
180
|
+
proxy: { ...(farrisConfig.proxy ?? {}), ...(farrisConfig.server?.proxy ?? {}) }
|
|
181
|
+
},
|
|
182
|
+
{ name: 'viteConfig.server.proxy', proxy: viteConfig?.server?.proxy }
|
|
183
|
+
]);
|
|
122
184
|
const customViteConfig = formatFarrisConfig(farrisConfig, type, cliOptions);
|
|
123
185
|
return mergeConfig(customViteConfig, viteConfig);
|
|
124
186
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-vite-config.js","sourceRoot":"","sources":["../../src/common/get-vite-config.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"get-vite-config.js","sourceRoot":"","sources":["../../src/common/get-vite-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,57 @@
|
|
|
1
1
|
import { existsSync, readFileSync, readdirSync, statSync } from 'node:fs';
|
|
2
2
|
import { dirname, join, resolve } from 'node:path';
|
|
3
|
-
/** 新结构容器：app →
|
|
4
|
-
export const PROJECT_CONTAINERS = { app: '
|
|
5
|
-
/**
|
|
3
|
+
/** 新结构容器：app → application，lib → library。全仓库唯一来源（写入只用它）。 */
|
|
4
|
+
export const PROJECT_CONTAINERS = { app: 'application', lib: 'library' };
|
|
5
|
+
/**
|
|
6
|
+
* 分层容器的历史别名：`@farris/cli@2.3.2` 曾发布过复数命名 `applications` / `libraries`，
|
|
7
|
+
* 已按该命名生成的 workspace 必须继续可读可校验，因此保留为只读别名（不再写入）。
|
|
8
|
+
*/
|
|
9
|
+
export const LAYERED_CONTAINER_ALIASES = {
|
|
10
|
+
app: ['applications'],
|
|
11
|
+
lib: ['libraries']
|
|
12
|
+
};
|
|
13
|
+
/** 旧平铺结构容器：只读兼容识别，不再写入。 */
|
|
6
14
|
export const LEGACY_CONTAINERS = ['packages'];
|
|
15
|
+
/** 读取与校验可接受的容器命名：当前规范在前，历史别名在后。 */
|
|
16
|
+
export function containerAliases(type) {
|
|
17
|
+
return [PROJECT_CONTAINERS[type], ...LAYERED_CONTAINER_ALIASES[type]];
|
|
18
|
+
}
|
|
19
|
+
/** 分层布局的全部可识别容器命名（当前规范 + 历史别名）。 */
|
|
20
|
+
export const LAYERED_CONTAINERS = [
|
|
21
|
+
...Object.values(PROJECT_CONTAINERS),
|
|
22
|
+
...LAYERED_CONTAINER_ALIASES.app,
|
|
23
|
+
...LAYERED_CONTAINER_ALIASES.lib
|
|
24
|
+
];
|
|
25
|
+
/** 容器命名 → 工程类型；非分层容器（如 `packages`）返回 null，由调用方按工程证据推断。 */
|
|
26
|
+
export function containerType(container) {
|
|
27
|
+
if (containerAliases('app').includes(container)) {
|
|
28
|
+
return 'app';
|
|
29
|
+
}
|
|
30
|
+
if (containerAliases('lib').includes(container)) {
|
|
31
|
+
return 'lib';
|
|
32
|
+
}
|
|
33
|
+
return null;
|
|
34
|
+
}
|
|
7
35
|
export function containerFor(type) {
|
|
8
36
|
return PROJECT_CONTAINERS[type];
|
|
9
37
|
}
|
|
10
38
|
export function resolveProjectPath(wsRoot, type, dir) {
|
|
11
39
|
return join(wsRoot, containerFor(type), dir);
|
|
12
40
|
}
|
|
41
|
+
/**
|
|
42
|
+
* `add-app` / `add-lib` 的写入容器：workspace 已声明同类型容器 glob 时沿用它（含历史复数别名），
|
|
43
|
+
* 否则用当前规范命名。否则在旧命名的 workspace 内会写出**不在 pnpm glob 范围内**的工程。
|
|
44
|
+
*/
|
|
45
|
+
export function writableContainerFor(wsRoot, type) {
|
|
46
|
+
const { globs, fallback } = readWorkspaceGlobs(wsRoot);
|
|
47
|
+
if (!fallback) {
|
|
48
|
+
const declared = containerAliases(type).find((container) => globs.some((glob) => glob === `${container}/*`));
|
|
49
|
+
if (declared) {
|
|
50
|
+
return declared;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
return PROJECT_CONTAINERS[type];
|
|
54
|
+
}
|
|
13
55
|
/**
|
|
14
56
|
* 解析 pnpm-workspace.yaml 的 packages 列表。
|
|
15
57
|
* 只识别 `- "dir/*"` 形式，不引入 yaml 依赖；结构超出该形式时返回空数组，由调用方回退。
|
|
@@ -42,7 +84,7 @@ export function parsePackagesBlock(content) {
|
|
|
42
84
|
* 读出 workspace 的待扫描 glob。解析不到时回退到三个约定容器目录，并置 fallback=true。
|
|
43
85
|
*/
|
|
44
86
|
export function readWorkspaceGlobs(wsRoot) {
|
|
45
|
-
const convention = [...LEGACY_CONTAINERS, ...
|
|
87
|
+
const convention = [...LEGACY_CONTAINERS, ...LAYERED_CONTAINERS].map((container) => `${container}/*`);
|
|
46
88
|
const yamlPath = join(wsRoot, 'pnpm-workspace.yaml');
|
|
47
89
|
if (!existsSync(yamlPath)) {
|
|
48
90
|
return { globs: convention, fallback: true };
|
|
@@ -57,7 +99,8 @@ function detectLegacyType(projectDir) {
|
|
|
57
99
|
return existsSync(join(projectDir, 'components', 'index.ts')) ? 'lib' : 'app';
|
|
58
100
|
}
|
|
59
101
|
/**
|
|
60
|
-
* 扫描 workspace
|
|
102
|
+
* 扫描 workspace 内的工程：同时支持分层结构（`application` / `library`，含历史复数别名）
|
|
103
|
+
* 与旧平铺结构（`packages`）。
|
|
61
104
|
*/
|
|
62
105
|
export function listProjects(wsRoot) {
|
|
63
106
|
const { globs } = readWorkspaceGlobs(wsRoot);
|
|
@@ -83,25 +126,23 @@ export function listProjects(wsRoot) {
|
|
|
83
126
|
continue;
|
|
84
127
|
}
|
|
85
128
|
seen.add(dir);
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
: container === PROJECT_CONTAINERS.lib
|
|
89
|
-
? 'lib'
|
|
90
|
-
: detectLegacyType(projectDir);
|
|
129
|
+
// 分层容器按容器名定类型（含历史别名）；旧平铺结构按工程证据推断。
|
|
130
|
+
const type = containerType(container) ?? detectLegacyType(projectDir);
|
|
91
131
|
entries.push({ type, dir, name });
|
|
92
132
|
}
|
|
93
133
|
}
|
|
94
134
|
return entries;
|
|
95
135
|
}
|
|
96
136
|
/**
|
|
97
|
-
* workspace
|
|
137
|
+
* workspace 是否已采用分层容器结构（当前规范命名或历史复数别名）。
|
|
138
|
+
* verifier 用它区分「新工作空间强校验」与「旧平铺工作空间只读兼容」。
|
|
98
139
|
*/
|
|
99
140
|
export function usesNewContainers(wsRoot) {
|
|
100
141
|
const { globs, fallback } = readWorkspaceGlobs(wsRoot);
|
|
101
142
|
if (fallback) {
|
|
102
143
|
return false;
|
|
103
144
|
}
|
|
104
|
-
return globs.some((glob) =>
|
|
145
|
+
return globs.some((glob) => LAYERED_CONTAINERS.some((container) => glob.startsWith(`${container}/`)));
|
|
105
146
|
}
|
|
106
147
|
/**
|
|
107
148
|
* 从包名推导目录名（去掉 scope 并转为合法 kebab-case）
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-layout.js","sourceRoot":"","sources":["../../src/common/project-layout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEnD,
|
|
1
|
+
{"version":3,"file":"project-layout.js","sourceRoot":"","sources":["../../src/common/project-layout.ts"],"names":[],"mappings":"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"}
|
package/lib/common/safety.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { existsSync, lstatSync, readdirSync } from 'node:fs';
|
|
2
2
|
import { resolve } from 'node:path';
|
|
3
3
|
import { WorkspaceStatus } from './constant.js';
|
|
4
|
+
import { LAYERED_CONTAINERS, LEGACY_CONTAINERS } from './project-layout.js';
|
|
4
5
|
// 已知 AI 配置与项目元数据文件/目录（忽略列表）
|
|
5
6
|
export const KNOWN_AI_AND_META_ENTRIES = new Set([
|
|
6
7
|
'.git',
|
|
@@ -22,7 +23,7 @@ export const KNOWN_AI_AND_META_ENTRIES = new Set([
|
|
|
22
23
|
'.windsurfrules',
|
|
23
24
|
'.cursorrules'
|
|
24
25
|
]);
|
|
25
|
-
//
|
|
26
|
+
// 工程证据关键文件。容器目录名一律取自 project-layout，避免字面量漂移
|
|
26
27
|
export const PROJECT_EVIDENCE_FILES = [
|
|
27
28
|
'package.json',
|
|
28
29
|
'pnpm-workspace.yaml',
|
|
@@ -34,9 +35,8 @@ export const PROJECT_EVIDENCE_FILES = [
|
|
|
34
35
|
'farris.config.mjs',
|
|
35
36
|
'tsconfig.json',
|
|
36
37
|
'src',
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
'packages',
|
|
38
|
+
...LEGACY_CONTAINERS,
|
|
39
|
+
...LAYERED_CONTAINERS,
|
|
40
40
|
'node_modules'
|
|
41
41
|
];
|
|
42
42
|
/**
|
package/lib/common/safety.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"safety.js","sourceRoot":"","sources":["../../src/common/safety.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAmC,MAAM,WAAW,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"safety.js","sourceRoot":"","sources":["../../src/common/safety.ts"],"names":[],"mappings":"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"}
|
package/lib/common/verifier.js
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { existsSync, readFileSync } from 'node:fs';
|
|
2
2
|
import { resolve, join, relative } from 'node:path';
|
|
3
3
|
import { findUnreplacedPlaceholders } from './template-renderer.js';
|
|
4
|
-
import { LEGACY_CONTAINERS,
|
|
4
|
+
import { LEGACY_CONTAINERS, containerAliases, listProjects, usesNewContainers } from './project-layout.js';
|
|
5
5
|
import { CLI_COMMAND_REGISTRY, FORBIDDEN_ROOT_SCRIPTS, ROOT_SCRIPT_CONTRACT, expectedRootScriptValue } from './workspace-contract.js';
|
|
6
6
|
/** 任何布局都必须存在的根脚本。 */
|
|
7
7
|
const REQUIRED_ROOT_SCRIPTS = ['build', 'typecheck'];
|
|
8
|
-
|
|
8
|
+
/** 工程类型全集。容器命名一律经 containerAliases 取值，从而兼容历史别名。 */
|
|
9
|
+
const CONTAINER_TYPES = ['app', 'lib'];
|
|
9
10
|
function readJson(filePath) {
|
|
10
11
|
try {
|
|
11
12
|
return JSON.parse(readFileSync(filePath, 'utf-8'));
|
|
@@ -77,8 +78,8 @@ function verifyProject(wsRoot, project, addCheck) {
|
|
|
77
78
|
/**
|
|
78
79
|
* 校验 Workspace 完整性与规范合规性。
|
|
79
80
|
*
|
|
80
|
-
*
|
|
81
|
-
*
|
|
81
|
+
* 分层结构（pnpm-workspace.yaml 含 application/* 或 library/*，含历史复数别名）走强校验；
|
|
82
|
+
* 旧平铺结构（只含 packages/*）只做兼容校验，不因历史模板缺失的项失败。
|
|
82
83
|
*/
|
|
83
84
|
export function verifyWorkspace(targetDir, preservedInputs = []) {
|
|
84
85
|
const checks = [];
|
|
@@ -134,9 +135,9 @@ export function verifyWorkspace(targetDir, preservedInputs = []) {
|
|
|
134
135
|
else {
|
|
135
136
|
const yamlContent = readFileSync(wsYamlPath, 'utf-8');
|
|
136
137
|
if (isNewLayout) {
|
|
137
|
-
const missingContainers =
|
|
138
|
+
const missingContainers = CONTAINER_TYPES.filter((type) => !containerAliases(type).some((container) => yamlContent.includes(`${container}/*`)));
|
|
138
139
|
addCheck('workspace_packages_glob', missingContainers.length === 0, `pnpm-workspace.yaml 必须包含新容器 glob: ${missingContainers
|
|
139
|
-
.map((
|
|
140
|
+
.map((type) => `${containerAliases(type)[0]}/*`)
|
|
140
141
|
.join(', ')}`);
|
|
141
142
|
}
|
|
142
143
|
else {
|
|
@@ -146,8 +147,9 @@ export function verifyWorkspace(targetDir, preservedInputs = []) {
|
|
|
146
147
|
}
|
|
147
148
|
// 3. 容器目录
|
|
148
149
|
if (isNewLayout) {
|
|
149
|
-
for (const
|
|
150
|
-
|
|
150
|
+
for (const type of CONTAINER_TYPES) {
|
|
151
|
+
const aliases = containerAliases(type);
|
|
152
|
+
addCheck(`container_${aliases[0]}`, aliases.some((container) => existsSync(join(resolvedTarget, container))), `缺少容器目录: ${aliases[0]}/`);
|
|
151
153
|
}
|
|
152
154
|
}
|
|
153
155
|
else {
|
|
@@ -167,8 +169,10 @@ export function verifyWorkspace(targetDir, preservedInputs = []) {
|
|
|
167
169
|
else {
|
|
168
170
|
addCheck('agents_doc_exists', true);
|
|
169
171
|
const content = readFileSync(agentsPath, 'utf-8');
|
|
170
|
-
const missingDeclaration =
|
|
171
|
-
addCheck('agents_doc_containers', missingDeclaration.length === 0, `根 AGENTS.md 未声明容器目录: ${missingDeclaration
|
|
172
|
+
const missingDeclaration = CONTAINER_TYPES.filter((type) => !containerAliases(type).some((container) => content.includes(`${container}/`)));
|
|
173
|
+
addCheck('agents_doc_containers', missingDeclaration.length === 0, `根 AGENTS.md 未声明容器目录: ${missingDeclaration
|
|
174
|
+
.map((type) => containerAliases(type)[0])
|
|
175
|
+
.join(', ')}`);
|
|
172
176
|
const legacyContainer = LEGACY_CONTAINERS[0];
|
|
173
177
|
addCheck('agents_doc_no_legacy_container', !content.includes(`${legacyContainer}/`), `根 AGENTS.md 仍引用旧容器目录 ${legacyContainer}/，与 PROJECT_CONTAINERS 不一致`);
|
|
174
178
|
const missingCommands = CLI_COMMAND_REGISTRY.filter((command) => !content.includes(command));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifier.js","sourceRoot":"","sources":["../../src/common/verifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EACL,iBAAiB,EACjB,
|
|
1
|
+
{"version":3,"file":"verifier.js","sourceRoot":"","sources":["../../src/common/verifier.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ export const ROOT_SCRIPT_CONTRACT = [
|
|
|
6
6
|
{ script: 'add-app', description: '添加应用', kind: 'cli', sampleArg: 'shop', containerKey: 'app' },
|
|
7
7
|
{ script: 'add-lib', description: '添加组件库', kind: 'cli', sampleArg: 'button', containerKey: 'lib' },
|
|
8
8
|
{ script: 'build', description: '构建所有工程', kind: 'pnpm' },
|
|
9
|
-
{ script: 'build:es', description: '构建 ESM
|
|
9
|
+
{ script: 'build:es', description: '构建 ESM 产物', kind: 'pnpm' },
|
|
10
10
|
{ script: 'typecheck', description: '全量类型检查', kind: 'pnpm' },
|
|
11
11
|
{ script: 'lint', description: '全量代码检查', kind: 'pnpm' },
|
|
12
12
|
{ script: 'test', description: '全量单元测试', kind: 'pnpm' },
|
|
@@ -15,7 +15,7 @@ export const ROOT_SCRIPT_CONTRACT = [
|
|
|
15
15
|
/** 仅工程目录内存在的脚本（设计文档 §5.2 规则 2）。 */
|
|
16
16
|
export const PROJECT_SCRIPT_CONTRACT = [
|
|
17
17
|
{ script: 'dev', description: '启动开发服务器' },
|
|
18
|
-
{ script: 'build:es', description: '构建 ESM
|
|
18
|
+
{ script: 'build:es', description: '构建 ESM 产物' },
|
|
19
19
|
{ script: 'preview', description: '预览构建产物' }
|
|
20
20
|
];
|
|
21
21
|
/** 根 package.json 中禁止出现的脚本：长驻服务不递归执行，避免抢端口与日志交织。 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-contract.js","sourceRoot":"","sources":["../../src/common/workspace-contract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAqB,MAAM,qBAAqB,CAAC;AAE5E;;GAEG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE;IAC/F,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE;IAClG,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE;IACxD,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"workspace-contract.js","sourceRoot":"","sources":["../../src/common/workspace-contract.ts"],"names":[],"mappings":"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"}
|
package/lib/index.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { Command } from 'commander';
|
|
3
3
|
import { getVersion } from './common/get-version.js';
|
|
4
|
+
import { PROJECT_CONTAINERS } from './common/project-layout.js';
|
|
4
5
|
const program = new Command();
|
|
5
6
|
program.version(`@farris/cli ${getVersion()}`);
|
|
6
7
|
// ==========================================
|
|
@@ -78,7 +79,7 @@ program
|
|
|
78
79
|
});
|
|
79
80
|
program
|
|
80
81
|
.command('add-app [name]')
|
|
81
|
-
.description(
|
|
82
|
+
.description(`向当前 workspace 添加应用 → ${PROJECT_CONTAINERS.app}/<name>`)
|
|
82
83
|
.option('-t, --title <title>', '应用展示标题')
|
|
83
84
|
.option('--platform <platform>', '应用平台 (web | mobile)', 'web')
|
|
84
85
|
.option('--style <style>', '应用全局样式 (none | css | scss)', 'css')
|
|
@@ -92,7 +93,7 @@ program
|
|
|
92
93
|
});
|
|
93
94
|
program
|
|
94
95
|
.command('add-lib [name]')
|
|
95
|
-
.description(
|
|
96
|
+
.description(`向当前 workspace 添加组件库 → ${PROJECT_CONTAINERS.lib}/<name>`)
|
|
96
97
|
.option('-t, --title <title>', '组件库展示标题')
|
|
97
98
|
.option('--formats <formats>', 'lib 产物格式，逗号分隔 (es,cjs,umd,systemjs)')
|
|
98
99
|
.option('--json', '以 JSON 格式输出结果')
|
|
@@ -119,6 +120,7 @@ program
|
|
|
119
120
|
.command('dev')
|
|
120
121
|
.description('创建 Dev Server')
|
|
121
122
|
.option('-p, --port [port]', '开发服务器端口')
|
|
123
|
+
.option('--no-mock', '关闭开发期 mock，接口请求全部走代理')
|
|
122
124
|
.action(async (options) => {
|
|
123
125
|
process.env.BUILD_TYPE = 'app';
|
|
124
126
|
const { devServe } = await import('./commands/dev-serve.js');
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,293 @@
|
|
|
1
|
+
import { existsSync, readdirSync, statSync } from 'node:fs';
|
|
2
|
+
import { join, relative, resolve, sep } from 'node:path';
|
|
3
|
+
const toPosix = (p) => p.split(sep).join('/');
|
|
4
|
+
const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
|
|
5
|
+
/**
|
|
6
|
+
* 归一化 mock 文件的默认导出。
|
|
7
|
+
* 推荐写法是路由数组；同时兼容 umi 风格的对象映射写法：{ 'GET /api/users': 数据或函数 }
|
|
8
|
+
*/
|
|
9
|
+
export function normalizeRoutes(exported) {
|
|
10
|
+
if (Array.isArray(exported)) {
|
|
11
|
+
return exported.filter((item) => !!item && typeof item === 'object' && typeof item.url === 'string');
|
|
12
|
+
}
|
|
13
|
+
if (exported && typeof exported === 'object') {
|
|
14
|
+
return Object.entries(exported).map(([key, value]) => {
|
|
15
|
+
const parts = key.trim().split(/\s+/);
|
|
16
|
+
const [method, url] = parts.length > 1 ? [parts[0], parts[1]] : ['GET', parts[0]];
|
|
17
|
+
return { url, method, response: value };
|
|
18
|
+
});
|
|
19
|
+
}
|
|
20
|
+
return [];
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* 路径匹配，支持 :param 与尾部 *；命中返回参数表，未命中返回 null
|
|
24
|
+
*/
|
|
25
|
+
export function matchPath(pattern, pathname) {
|
|
26
|
+
const patternParts = pattern.split('/');
|
|
27
|
+
const pathParts = pathname.split('/');
|
|
28
|
+
const params = {};
|
|
29
|
+
for (let i = 0; i < patternParts.length; i++) {
|
|
30
|
+
const segment = patternParts[i];
|
|
31
|
+
const actual = pathParts[i];
|
|
32
|
+
if (segment === '*') {
|
|
33
|
+
return params;
|
|
34
|
+
}
|
|
35
|
+
if (segment.startsWith(':')) {
|
|
36
|
+
if (actual === undefined || actual === '') {
|
|
37
|
+
return null;
|
|
38
|
+
}
|
|
39
|
+
params[segment.slice(1)] = decodeURIComponent(actual);
|
|
40
|
+
continue;
|
|
41
|
+
}
|
|
42
|
+
if (segment !== actual) {
|
|
43
|
+
return null;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
return patternParts.length === pathParts.length ? params : null;
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* 按方法查找首个命中的路由
|
|
50
|
+
*/
|
|
51
|
+
export function findRoute(routes, method, pathname) {
|
|
52
|
+
for (const route of routes) {
|
|
53
|
+
const routeMethod = (route.method ?? 'GET').toUpperCase();
|
|
54
|
+
if (routeMethod !== method) {
|
|
55
|
+
continue;
|
|
56
|
+
}
|
|
57
|
+
const params = matchPath(route.url, pathname);
|
|
58
|
+
if (params) {
|
|
59
|
+
return { route, params };
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
return null;
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
* 查找重复定义的路由（同一方法 + 同一路径出现在多个文件）
|
|
66
|
+
*/
|
|
67
|
+
export function findDuplicates(routes) {
|
|
68
|
+
const grouped = new Map();
|
|
69
|
+
for (const route of routes) {
|
|
70
|
+
const key = `${(route.method ?? 'GET').toUpperCase()} ${route.url}`;
|
|
71
|
+
const files = grouped.get(key) ?? [];
|
|
72
|
+
files.push(route.sourceFile ?? '<未知来源>');
|
|
73
|
+
grouped.set(key, files);
|
|
74
|
+
}
|
|
75
|
+
return Array.from(grouped.entries())
|
|
76
|
+
.filter(([, files]) => files.length > 1)
|
|
77
|
+
.map(([key, files]) => ({ key, files }));
|
|
78
|
+
}
|
|
79
|
+
/**
|
|
80
|
+
* 判断请求路径是否命中了已配置的代理
|
|
81
|
+
*/
|
|
82
|
+
export function isProxied(pathname, server) {
|
|
83
|
+
const proxy = (server.config.server.proxy ?? {});
|
|
84
|
+
return Object.keys(proxy).some((key) => {
|
|
85
|
+
if (key.startsWith('^')) {
|
|
86
|
+
try {
|
|
87
|
+
return new RegExp(key).test(pathname);
|
|
88
|
+
}
|
|
89
|
+
catch {
|
|
90
|
+
return false;
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
return pathname === key || pathname.startsWith(key.endsWith('/') ? key : `${key}/`);
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
/**
|
|
97
|
+
* 判断请求路径是否属于接口前缀
|
|
98
|
+
*/
|
|
99
|
+
export function isApiPath(pathname, apiPrefixes) {
|
|
100
|
+
return apiPrefixes.some((prefix) => pathname === prefix || pathname.startsWith(prefix.endsWith('/') ? prefix : `${prefix}/`));
|
|
101
|
+
}
|
|
102
|
+
function readBody(req) {
|
|
103
|
+
if (req.method === 'GET' || req.method === 'HEAD') {
|
|
104
|
+
return Promise.resolve(undefined);
|
|
105
|
+
}
|
|
106
|
+
return new Promise((resolve) => {
|
|
107
|
+
let data = '';
|
|
108
|
+
req.on('data', (chunk) => {
|
|
109
|
+
data += chunk;
|
|
110
|
+
});
|
|
111
|
+
req.on('end', () => {
|
|
112
|
+
if (!data) {
|
|
113
|
+
return resolve(undefined);
|
|
114
|
+
}
|
|
115
|
+
try {
|
|
116
|
+
resolve(JSON.parse(data));
|
|
117
|
+
}
|
|
118
|
+
catch {
|
|
119
|
+
resolve(data);
|
|
120
|
+
}
|
|
121
|
+
});
|
|
122
|
+
req.on('error', () => resolve(undefined));
|
|
123
|
+
});
|
|
124
|
+
}
|
|
125
|
+
export function farrisMockPlugin(options) {
|
|
126
|
+
const dir = options.dir ?? 'mock';
|
|
127
|
+
const defaultTimeout = options.timeout ?? 0;
|
|
128
|
+
const loggerEnabled = options.logger ?? true;
|
|
129
|
+
const apiPrefixes = options.apiPrefixes ?? ['/api'];
|
|
130
|
+
return {
|
|
131
|
+
name: 'farris:mock',
|
|
132
|
+
apply: 'serve',
|
|
133
|
+
configureServer(server) {
|
|
134
|
+
const root = server.config.root;
|
|
135
|
+
const mockDir = resolve(root, dir);
|
|
136
|
+
let routes = null;
|
|
137
|
+
const log = (msg) => {
|
|
138
|
+
if (loggerEnabled) {
|
|
139
|
+
server.config.logger.info(`[mock] ${msg}`, { timestamp: true });
|
|
140
|
+
}
|
|
141
|
+
};
|
|
142
|
+
const logError = (msg) => {
|
|
143
|
+
server.config.logger.error(`[mock] ${msg}`, { timestamp: true });
|
|
144
|
+
};
|
|
145
|
+
// 收集 mock 目录下的文件，跳过 _ 前缀文件
|
|
146
|
+
const listFiles = () => {
|
|
147
|
+
if (!existsSync(mockDir)) {
|
|
148
|
+
return [];
|
|
149
|
+
}
|
|
150
|
+
const files = [];
|
|
151
|
+
const walk = (current) => {
|
|
152
|
+
for (const name of readdirSync(current)) {
|
|
153
|
+
const full = join(current, name);
|
|
154
|
+
if (statSync(full).isDirectory()) {
|
|
155
|
+
walk(full);
|
|
156
|
+
}
|
|
157
|
+
else if (/\.m?[jt]s$/.test(name) && !name.startsWith('_')) {
|
|
158
|
+
files.push(full);
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
};
|
|
162
|
+
walk(mockDir);
|
|
163
|
+
return files;
|
|
164
|
+
};
|
|
165
|
+
const loadRoutes = async () => {
|
|
166
|
+
if (routes) {
|
|
167
|
+
return routes;
|
|
168
|
+
}
|
|
169
|
+
const collected = [];
|
|
170
|
+
for (const file of listFiles()) {
|
|
171
|
+
const url = '/' + toPosix(relative(root, file));
|
|
172
|
+
const mod = await server.ssrLoadModule(url);
|
|
173
|
+
for (const route of normalizeRoutes(mod.default ?? mod)) {
|
|
174
|
+
collected.push({ ...route, sourceFile: toPosix(relative(root, file)) });
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
const duplicates = findDuplicates(collected);
|
|
178
|
+
if (duplicates.length > 0) {
|
|
179
|
+
throw new Error(`mock 路由重复定义：${duplicates
|
|
180
|
+
.map((item) => `${item.key}（${item.files.join('、')}）`)
|
|
181
|
+
.join('；')}`);
|
|
182
|
+
}
|
|
183
|
+
routes = collected;
|
|
184
|
+
return routes;
|
|
185
|
+
};
|
|
186
|
+
// mock 文件变更时清空缓存并失效模块，下次请求重新加载
|
|
187
|
+
const invalidate = async (file) => {
|
|
188
|
+
routes = null;
|
|
189
|
+
try {
|
|
190
|
+
const id = toPosix(file);
|
|
191
|
+
const mod = await server.moduleGraph.getModuleById(id);
|
|
192
|
+
if (mod) {
|
|
193
|
+
await server.moduleGraph.invalidateModule(mod);
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
catch {
|
|
197
|
+
// 失效失败不阻断，routes 已清空，下次请求会重新加载
|
|
198
|
+
}
|
|
199
|
+
log(`mock 已变更，重新加载: ${toPosix(relative(root, file))}`);
|
|
200
|
+
};
|
|
201
|
+
server.watcher.add(mockDir);
|
|
202
|
+
server.watcher.on('all', (event, file) => {
|
|
203
|
+
if (!file.startsWith(mockDir)) {
|
|
204
|
+
return;
|
|
205
|
+
}
|
|
206
|
+
if (event === 'change' || event === 'add' || event === 'unlink') {
|
|
207
|
+
void invalidate(file);
|
|
208
|
+
}
|
|
209
|
+
});
|
|
210
|
+
// 启动时预加载一次，让重复定义、语法错误在启动阶段可见；失败不阻断，请求时会再次报错并返回 500
|
|
211
|
+
if (options.enabled && server.httpServer) {
|
|
212
|
+
server.httpServer.once('listening', () => {
|
|
213
|
+
void loadRoutes().catch((err) => {
|
|
214
|
+
logError(`mock 加载失败：${err instanceof Error ? err.message : String(err)}`);
|
|
215
|
+
});
|
|
216
|
+
});
|
|
217
|
+
}
|
|
218
|
+
server.middlewares.use(async (req, res, next) => {
|
|
219
|
+
const [pathname, search = ''] = (req.url ?? '/').split('?');
|
|
220
|
+
const method = (req.method ?? 'GET').toUpperCase();
|
|
221
|
+
let hit = null;
|
|
222
|
+
if (options.enabled) {
|
|
223
|
+
try {
|
|
224
|
+
hit = findRoute(await loadRoutes(), method, pathname);
|
|
225
|
+
}
|
|
226
|
+
catch (err) {
|
|
227
|
+
res.statusCode = 500;
|
|
228
|
+
res.setHeader('Content-Type', 'application/json; charset=utf-8');
|
|
229
|
+
res.end(JSON.stringify({ error: `mock 加载失败: ${err instanceof Error ? err.message : String(err)}` }));
|
|
230
|
+
logError(`${method} ${pathname} 500 mock 加载失败`);
|
|
231
|
+
return;
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
if (!hit) {
|
|
235
|
+
// 未命中 mock：配了代理则交给代理接力；没有代理的接口路径给出明确的 404
|
|
236
|
+
if (isApiPath(pathname, apiPrefixes)) {
|
|
237
|
+
if (!isProxied(pathname, server)) {
|
|
238
|
+
res.statusCode = 404;
|
|
239
|
+
res.setHeader('Content-Type', 'application/json; charset=utf-8');
|
|
240
|
+
res.end(JSON.stringify({
|
|
241
|
+
error: `${options.enabled ? '未命中 mock 且未配置代理' : 'mock 已关闭且未配置代理'}: ${method} ${pathname}`
|
|
242
|
+
}));
|
|
243
|
+
log(`${method} ${pathname} 404 (未命中 mock/代理)`);
|
|
244
|
+
return;
|
|
245
|
+
}
|
|
246
|
+
if (options.enabled) {
|
|
247
|
+
log(`${method} ${pathname} 未命中 mock → 交给代理处理`);
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
return next();
|
|
251
|
+
}
|
|
252
|
+
const { route, params } = hit;
|
|
253
|
+
const start = Date.now();
|
|
254
|
+
const ctx = {
|
|
255
|
+
method,
|
|
256
|
+
url: req.url,
|
|
257
|
+
path: pathname,
|
|
258
|
+
query: Object.fromEntries(new URLSearchParams(search)),
|
|
259
|
+
params,
|
|
260
|
+
headers: req.headers,
|
|
261
|
+
body: await readBody(req)
|
|
262
|
+
};
|
|
263
|
+
let payload;
|
|
264
|
+
try {
|
|
265
|
+
payload =
|
|
266
|
+
typeof route.response === 'function'
|
|
267
|
+
? await route.response(ctx)
|
|
268
|
+
: route.response;
|
|
269
|
+
}
|
|
270
|
+
catch (err) {
|
|
271
|
+
res.statusCode = 500;
|
|
272
|
+
res.setHeader('Content-Type', 'application/json; charset=utf-8');
|
|
273
|
+
res.end(JSON.stringify({ error: `mock 处理异常: ${err instanceof Error ? err.message : String(err)}` }));
|
|
274
|
+
logError(`${method} ${pathname} 500 mock 处理异常`);
|
|
275
|
+
return;
|
|
276
|
+
}
|
|
277
|
+
const delay = route.timeout ?? defaultTimeout;
|
|
278
|
+
if (delay > 0) {
|
|
279
|
+
await sleep(delay);
|
|
280
|
+
}
|
|
281
|
+
const status = route.status ?? route.statusCode ?? 200;
|
|
282
|
+
res.statusCode = status;
|
|
283
|
+
res.setHeader('Content-Type', 'application/json; charset=utf-8');
|
|
284
|
+
for (const [key, value] of Object.entries(route.headers ?? {})) {
|
|
285
|
+
res.setHeader(key, value);
|
|
286
|
+
}
|
|
287
|
+
res.end(typeof payload === 'string' ? payload : JSON.stringify(payload));
|
|
288
|
+
log(`${method} ${pathname} ${status} (mock) ${Date.now() - start}ms`);
|
|
289
|
+
});
|
|
290
|
+
}
|
|
291
|
+
};
|
|
292
|
+
}
|
|
293
|
+
//# sourceMappingURL=mock.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mock.js","sourceRoot":"","sources":["../../src/plugins/mock.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -32,6 +32,11 @@
|
|
|
32
32
|
- 禁止手工 `npm install` 单个子包；禁止手改 `pnpm-workspace.yaml` 的 `packages` glob 或 `catalog` 版本。
|
|
33
33
|
- 根脚本一律 `pnpm --recursive --if-present run <script>`。**根目录没有 `dev` / `preview` 是有意为之**：长驻服务不递归执行，避免多工程抢端口、日志交织。
|
|
34
34
|
|
|
35
|
+
### 数据来源与 Mock
|
|
36
|
+
|
|
37
|
+
- 开发期接口数据默认来自工程内 `mock/` 目录，写法与行为见该目录 README；未命中请求按 `farris.config.mjs` 的 `proxy` 转发，联调真实后端执行 `pnpm dev --no-mock`，业务代码不改动。
|
|
38
|
+
- 请求路径必须与 mock 的 url 逐字一致；禁止在组件内散落假数据；mock 不得进入构建产物。
|
|
39
|
+
|
|
35
40
|
## 2. 工程类型差异速查表
|
|
36
41
|
|
|
37
42
|
| 关注点 | 应用 `<%= appContainer %>/<name>` | 组件库 `<%= libContainer %>/<name>` |
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { fileURLToPath, URL } from 'node:url';
|
|
2
2
|
|
|
3
3
|
export default {
|
|
4
|
-
// 相对路径 base：微前端（IBP
|
|
4
|
+
// 相对路径 base：微前端（IBP）与 iframe 嵌入场景都适用
|
|
5
5
|
base: './',
|
|
6
6
|
routerMode: 'hash',
|
|
7
7
|
// iife: IBP 微前端单文件产物（默认）；如需普通 ESM 站点产物，执行 pnpm build:es
|
|
@@ -23,6 +23,12 @@ export default {
|
|
|
23
23
|
],
|
|
24
24
|
// 插件 默认值 [vue(), vueJsx()] 不要重复添加
|
|
25
25
|
// plugins: [],
|
|
26
|
+
// 开发期 mock 默认开启：接口数据来自工程内 mock/ 目录，未命中的请求按下方 proxy 转发
|
|
27
|
+
// mock: true,
|
|
28
|
+
// 开发代理：未命中 mock 的接口转发到真实后端；联调时执行 pnpm dev --no-mock 可整体关闭 mock
|
|
29
|
+
// proxy: {
|
|
30
|
+
// '/api': { target: 'http://localhost:8080', changeOrigin: true }
|
|
31
|
+
// },
|
|
26
32
|
// viteConfig 配置项
|
|
27
33
|
viteConfig: {}
|
|
28
34
|
};
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
# mock 目录
|
|
2
|
+
|
|
3
|
+
开发期接口数据。一个领域一个文件，命名 `*.mock.ts`，默认导出路由数组：
|
|
4
|
+
|
|
5
|
+
```ts
|
|
6
|
+
export default [
|
|
7
|
+
{
|
|
8
|
+
url: '/api/v1/users', // 必须与代码中的请求路径逐字一致
|
|
9
|
+
method: 'GET', // 默认 GET
|
|
10
|
+
timeout: 300, // 可选 模拟延迟毫秒
|
|
11
|
+
status: 200, // 可选 响应状态码
|
|
12
|
+
response: ({ query, params, body }) => ({
|
|
13
|
+
data: [],
|
|
14
|
+
total: 0
|
|
15
|
+
})
|
|
16
|
+
}
|
|
17
|
+
];
|
|
18
|
+
```
|
|
19
|
+
|
|
20
|
+
规则：
|
|
21
|
+
|
|
22
|
+
- url 必须与代码中的请求路径逐字一致，见 `src/api/` 下的接口模块。
|
|
23
|
+
- 路径参数在 url 里用 `:参数名` 表示，例如 `/api/v1/users/:id`；查询参数不写进 url，在 response 的 `query` 里读取。
|
|
24
|
+
- mock 响应体必须能被工程的 HTTP 客户端正确消费，形状跟着客户端出口走。
|
|
25
|
+
- 同一 url 不允许在多个 mock 文件中重复定义，重复时开发服务启动即报错。
|
|
26
|
+
- mock 只用于开发期：不进构建产物，也不要在组件里散落假数据。
|
|
27
|
+
|
|
28
|
+
行为：
|
|
29
|
+
|
|
30
|
+
- 命中 mock → 返回 mock 数据。
|
|
31
|
+
- 未命中 → 按 `farris.config.mjs` 的 `proxy` 配置转发真实后端。
|
|
32
|
+
- 未命中且未配代理的 `/api` 路径 → 返回 404 并提示，便于排查漏配。
|
|
33
|
+
|
|
34
|
+
开关：在工程目录执行 `pnpm dev` 默认生效；`pnpm dev --no-mock` 或 `MOCK=none pnpm dev` 进入真实后端联调。
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { fileURLToPath, URL } from 'node:url';
|
|
2
2
|
|
|
3
3
|
export default {
|
|
4
|
-
// 相对路径 base：微前端（IBP
|
|
4
|
+
// 相对路径 base：微前端（IBP）与 iframe 嵌入场景都适用
|
|
5
5
|
base: './',
|
|
6
6
|
routerMode: 'hash',
|
|
7
7
|
// iife: IBP 微前端单文件产物（默认）；如需普通 ESM 站点产物，执行 pnpm build:es
|
|
@@ -23,6 +23,12 @@ export default {
|
|
|
23
23
|
],
|
|
24
24
|
// 插件 默认值 [vue(), vueJsx()] 不要重复添加
|
|
25
25
|
// plugins: [],
|
|
26
|
+
// 开发期 mock 默认开启：接口数据来自工程内 mock/ 目录，未命中的请求按下方 proxy 转发
|
|
27
|
+
// mock: true,
|
|
28
|
+
// 开发代理：未命中 mock 的接口转发到真实后端；联调时执行 pnpm dev --no-mock 可整体关闭 mock
|
|
29
|
+
// proxy: {
|
|
30
|
+
// '/api': { target: 'http://localhost:8080', changeOrigin: true }
|
|
31
|
+
// },
|
|
26
32
|
// viteConfig 配置项
|
|
27
33
|
viteConfig: {}
|
|
28
34
|
};
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
# mock 目录
|
|
2
|
+
|
|
3
|
+
开发期接口数据。一个领域一个文件，命名 `*.mock.ts`，默认导出路由数组：
|
|
4
|
+
|
|
5
|
+
```ts
|
|
6
|
+
export default [
|
|
7
|
+
{
|
|
8
|
+
url: '/api/v1/users', // 必须与代码中的请求路径逐字一致
|
|
9
|
+
method: 'GET', // 默认 GET
|
|
10
|
+
timeout: 300, // 可选 模拟延迟毫秒
|
|
11
|
+
status: 200, // 可选 响应状态码
|
|
12
|
+
response: ({ query, params, body }) => ({
|
|
13
|
+
data: [],
|
|
14
|
+
total: 0
|
|
15
|
+
})
|
|
16
|
+
}
|
|
17
|
+
];
|
|
18
|
+
```
|
|
19
|
+
|
|
20
|
+
规则：
|
|
21
|
+
|
|
22
|
+
- url 必须与代码中的请求路径逐字一致，见 `src/api/` 下的接口模块。
|
|
23
|
+
- 路径参数在 url 里用 `:参数名` 表示，例如 `/api/v1/users/:id`；查询参数不写进 url，在 response 的 `query` 里读取。
|
|
24
|
+
- mock 响应体必须能被工程的 HTTP 客户端正确消费，形状跟着客户端出口走。
|
|
25
|
+
- 同一 url 不允许在多个 mock 文件中重复定义，重复时开发服务启动即报错。
|
|
26
|
+
- mock 只用于开发期：不进构建产物，也不要在组件里散落假数据。
|
|
27
|
+
|
|
28
|
+
行为：
|
|
29
|
+
|
|
30
|
+
- 命中 mock → 返回 mock 数据。
|
|
31
|
+
- 未命中 → 按 `farris.config.mjs` 的 `proxy` 配置转发真实后端。
|
|
32
|
+
- 未命中且未配代理的 `/api` 路径 → 返回 404 并提示，便于排查漏配。
|
|
33
|
+
|
|
34
|
+
开关：在工程目录执行 `pnpm dev` 默认生效；`pnpm dev --no-mock` 或 `MOCK=none pnpm dev` 进入真实后端联调。
|