proteum 1.0.2 → 2.0.0
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/AGENTS.md +101 -0
- package/agents/codex/AGENTS.md +95 -0
- package/agents/codex/CODING_STYLE.md +71 -0
- package/agents/codex/agents.md.zip +0 -0
- package/agents/codex/client/AGENTS.md +102 -0
- package/agents/codex/client/pages/AGENTS.md +35 -0
- package/agents/codex/server/routes/AGENTS.md +12 -0
- package/agents/codex/server/services/AGENTS.md +137 -0
- package/agents/codex/tests/AGENTS.md +8 -0
- package/cli/app/config.ts +13 -11
- package/cli/app/index.ts +74 -82
- package/cli/bin.js +1 -1
- package/cli/commands/build.ts +51 -14
- package/cli/commands/check.ts +19 -0
- package/cli/commands/deploy/app.ts +4 -8
- package/cli/commands/deploy/web.ts +16 -20
- package/cli/commands/dev.ts +189 -64
- package/cli/commands/devEvents.ts +106 -0
- package/cli/commands/init.ts +63 -57
- package/cli/commands/lint.ts +21 -0
- package/cli/commands/refresh.ts +18 -0
- package/cli/commands/typecheck.ts +18 -0
- package/cli/compiler/client/identite.ts +80 -53
- package/cli/compiler/client/index.ts +139 -213
- package/cli/compiler/common/bundleAnalysis.ts +94 -0
- package/cli/compiler/common/clientManifest.ts +67 -0
- package/cli/compiler/common/controllers.ts +288 -0
- package/cli/compiler/common/files/autres.ts +7 -18
- package/cli/compiler/common/files/images.ts +40 -37
- package/cli/compiler/common/files/style.ts +11 -22
- package/cli/compiler/common/generatedRouteModules.ts +368 -0
- package/cli/compiler/common/index.ts +31 -65
- package/cli/compiler/common/loaders/forbid-ssr-import.js +13 -0
- package/cli/compiler/common/rspackAliases.ts +13 -0
- package/cli/compiler/common/scripts.ts +37 -0
- package/cli/compiler/index.ts +781 -230
- package/cli/compiler/server/index.ts +59 -75
- package/cli/compiler/writeIfChanged.ts +21 -0
- package/cli/index.ts +71 -72
- package/cli/paths.ts +51 -57
- package/cli/print.ts +17 -11
- package/cli/tsconfig.json +5 -4
- package/cli/utils/agents.ts +100 -0
- package/cli/utils/check.ts +71 -0
- package/cli/utils/index.ts +1 -3
- package/cli/utils/keyboard.ts +8 -25
- package/cli/utils/runProcess.ts +30 -0
- package/client/app/component.tsx +29 -29
- package/client/app/index.ts +36 -57
- package/client/app/service.ts +7 -12
- package/client/app.tsconfig.json +2 -2
- package/client/components/Dialog/Manager.ssr.tsx +40 -0
- package/client/components/Dialog/Manager.tsx +119 -150
- package/client/components/Dialog/status.tsx +3 -3
- package/client/components/index.ts +1 -1
- package/client/components/types.d.ts +1 -3
- package/client/dev/hmr.ts +65 -0
- package/client/global.d.ts +2 -2
- package/client/hooks.ts +6 -9
- package/client/index.ts +2 -1
- package/client/islands/index.ts +7 -0
- package/client/islands/useDeferredModule.ts +199 -0
- package/client/pages/_layout/index.tsx +4 -12
- package/client/pages/useHeader.tsx +14 -21
- package/client/router.ts +27 -0
- package/client/services/router/components/Link.tsx +34 -27
- package/client/services/router/components/Page.tsx +6 -14
- package/client/services/router/components/router.ssr.tsx +36 -0
- package/client/services/router/components/router.tsx +63 -83
- package/client/services/router/index.tsx +185 -220
- package/client/services/router/request/api.ts +97 -119
- package/client/services/router/request/history.ts +2 -2
- package/client/services/router/request/index.ts +13 -12
- package/client/services/router/request/multipart.ts +72 -62
- package/client/services/router/response/index.tsx +68 -61
- package/client/services/router/response/page.ts +28 -32
- package/client/utils/dom.ts +17 -33
- package/common/app/index.ts +3 -3
- package/common/data/chaines/index.ts +22 -23
- package/common/data/dates.ts +35 -70
- package/common/data/markdown.ts +42 -39
- package/common/dev/serverHotReload.ts +26 -0
- package/common/errors/index.tsx +110 -142
- package/common/router/contracts.ts +29 -0
- package/common/router/index.ts +89 -108
- package/common/router/layouts.ts +34 -47
- package/common/router/pageSetup.ts +50 -0
- package/common/router/register.ts +53 -24
- package/common/router/request/api.ts +30 -36
- package/common/router/request/index.ts +2 -8
- package/common/router/response/index.ts +8 -15
- package/common/router/response/page.ts +70 -58
- package/common/utils.ts +1 -1
- package/doc/TODO.md +1 -1
- package/eslint.js +62 -0
- package/package.json +12 -47
- package/prettier.config.cjs +9 -0
- package/scripts/cleanup-generated-controllers.ts +62 -0
- package/scripts/fix-reference-app-typing.ts +490 -0
- package/scripts/refactor-client-app-imports.ts +244 -0
- package/scripts/refactor-client-pages.ts +587 -0
- package/scripts/refactor-server-controllers.ts +470 -0
- package/scripts/refactor-server-runtime-aliases.ts +360 -0
- package/scripts/restore-client-app-import-files.ts +41 -0
- package/scripts/restore-files-from-git-head.ts +20 -0
- package/scripts/update-codex-agents.ts +35 -0
- package/server/app/commands.ts +35 -64
- package/server/app/container/config.ts +48 -59
- package/server/app/container/console/index.ts +202 -248
- package/server/app/container/index.ts +33 -71
- package/server/app/controller/index.ts +61 -0
- package/server/app/index.ts +39 -105
- package/server/app/service/container.ts +41 -42
- package/server/app/service/index.ts +120 -147
- package/server/context.ts +1 -1
- package/server/index.ts +25 -1
- package/server/services/auth/index.ts +75 -115
- package/server/services/auth/router/index.ts +31 -32
- package/server/services/auth/router/request.ts +14 -16
- package/server/services/cron/CronTask.ts +13 -26
- package/server/services/cron/index.ts +14 -36
- package/server/services/disks/driver.ts +40 -58
- package/server/services/disks/drivers/local/index.ts +79 -90
- package/server/services/disks/drivers/s3/index.ts +116 -163
- package/server/services/disks/index.ts +23 -38
- package/server/services/email/index.ts +45 -104
- package/server/services/email/utils.ts +14 -27
- package/server/services/fetch/index.ts +53 -85
- package/server/services/prisma/Facet.ts +39 -91
- package/server/services/prisma/index.ts +74 -110
- package/server/services/router/generatedRuntime.ts +29 -0
- package/server/services/router/http/index.ts +78 -73
- package/server/services/router/http/multipart.ts +19 -42
- package/server/services/router/index.ts +378 -365
- package/server/services/router/request/api.ts +26 -25
- package/server/services/router/request/index.ts +44 -51
- package/server/services/router/request/service.ts +7 -11
- package/server/services/router/request/validation/zod.ts +111 -148
- package/server/services/router/response/index.ts +110 -125
- package/server/services/router/response/mask/Filter.ts +31 -72
- package/server/services/router/response/mask/index.ts +8 -15
- package/server/services/router/response/mask/selecteurs.ts +11 -25
- package/server/services/router/response/page/clientManifest.ts +25 -0
- package/server/services/router/response/page/document.tsx +199 -127
- package/server/services/router/response/page/index.tsx +89 -94
- package/server/services/router/service.ts +13 -15
- package/server/services/schema/index.ts +17 -26
- package/server/services/schema/request.ts +19 -33
- package/server/services/schema/router/index.ts +8 -11
- package/server/services/security/encrypt/aes/index.ts +15 -35
- package/server/utils/slug.ts +29 -35
- package/skills/clean-project-code/SKILL.md +63 -0
- package/skills/clean-project-code/agents/openai.yaml +4 -0
- package/tsconfig.common.json +4 -3
- package/tsconfig.json +4 -1
- package/types/aliases.d.ts +17 -21
- package/types/controller-input.test.ts +48 -0
- package/types/express-extra.d.ts +6 -0
- package/types/global/constants.d.ts +13 -0
- package/types/global/express-extra.d.ts +6 -0
- package/types/global/modules.d.ts +13 -16
- package/types/global/utils.d.ts +17 -49
- package/types/global/vendors.d.ts +62 -0
- package/types/icons.d.ts +65 -1
- package/types/uuid.d.ts +3 -0
- package/types/vendors.d.ts +62 -0
- package/cli/compiler/common/babel/index.ts +0 -170
- package/cli/compiler/common/babel/plugins/index.ts +0 -0
- package/cli/compiler/common/babel/plugins/services.ts +0 -586
- package/cli/compiler/common/babel/routes/imports.ts +0 -127
- package/cli/compiler/common/babel/routes/routes.ts +0 -1130
- package/client/services/captcha/index.ts +0 -67
- package/client/services/socket/index.ts +0 -147
- package/common/data/rte/nodes.ts +0 -83
- package/common/data/stats.ts +0 -90
- package/common/utils/rte.ts +0 -183
- package/server/services/auth/old.ts +0 -277
- package/server/services/cache/commands.ts +0 -41
- package/server/services/cache/index.ts +0 -297
- package/server/services/cache/service.json +0 -6
- package/server/services/socket/index.ts +0 -162
- package/server/services/socket/scope.ts +0 -226
- package/server/services/socket/service.json +0 -6
- package/server/services_old/SocketClient.ts +0 -92
- package/server/services_old/Token.old.ts +0 -97
|
@@ -0,0 +1,587 @@
|
|
|
1
|
+
import fs from 'fs-extra';
|
|
2
|
+
import path from 'path';
|
|
3
|
+
import { parse } from '@babel/parser';
|
|
4
|
+
import traverse, { NodePath } from '@babel/traverse';
|
|
5
|
+
import generate from '@babel/generator';
|
|
6
|
+
import * as types from '@babel/types';
|
|
7
|
+
|
|
8
|
+
const findFiles = (dir: string): string[] => {
|
|
9
|
+
if (!fs.existsSync(dir)) return [];
|
|
10
|
+
|
|
11
|
+
const files: string[] = [];
|
|
12
|
+
|
|
13
|
+
for (const dirent of fs.readdirSync(dir, { withFileTypes: true })) {
|
|
14
|
+
const filepath = path.join(dir, dirent.name);
|
|
15
|
+
|
|
16
|
+
if (dirent.isDirectory()) {
|
|
17
|
+
files.push(...findFiles(filepath));
|
|
18
|
+
continue;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
if (dirent.isFile() && /\.(tsx?|jsx?)$/.test(filepath)) files.push(filepath);
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
return files;
|
|
25
|
+
};
|
|
26
|
+
|
|
27
|
+
const ensureRouterImport = (programPath: NodePath<types.Program>) => {
|
|
28
|
+
const hasRouterImport = programPath.node.body.some(
|
|
29
|
+
(statement) =>
|
|
30
|
+
statement.type === 'ImportDeclaration' &&
|
|
31
|
+
statement.source.value === '@/client/router' &&
|
|
32
|
+
statement.specifiers.some(
|
|
33
|
+
(specifier) => specifier.type === 'ImportDefaultSpecifier' && specifier.local.name === 'Router',
|
|
34
|
+
),
|
|
35
|
+
);
|
|
36
|
+
|
|
37
|
+
if (!hasRouterImport) {
|
|
38
|
+
programPath.unshiftContainer(
|
|
39
|
+
'body',
|
|
40
|
+
types.importDeclaration(
|
|
41
|
+
[types.importDefaultSpecifier(types.identifier('Router'))],
|
|
42
|
+
types.stringLiteral('@/client/router'),
|
|
43
|
+
),
|
|
44
|
+
);
|
|
45
|
+
}
|
|
46
|
+
};
|
|
47
|
+
|
|
48
|
+
const ensureBlockBody = (
|
|
49
|
+
functionPath: NodePath<types.FunctionExpression | types.ArrowFunctionExpression | types.FunctionDeclaration>,
|
|
50
|
+
) => {
|
|
51
|
+
if (functionPath.isArrowFunctionExpression() && functionPath.node.body.type !== 'BlockStatement') {
|
|
52
|
+
functionPath.node.body = types.blockStatement([types.returnStatement(functionPath.node.body)]);
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
return functionPath.get('body') as NodePath<types.BlockStatement>;
|
|
56
|
+
};
|
|
57
|
+
|
|
58
|
+
const ensureObjectPatternParam = (
|
|
59
|
+
functionPath: NodePath<types.FunctionExpression | types.ArrowFunctionExpression | types.FunctionDeclaration>,
|
|
60
|
+
) => {
|
|
61
|
+
if (!functionPath.node.params.length) {
|
|
62
|
+
functionPath.node.params = [types.objectPattern([])];
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
const firstParam = functionPath.node.params[0];
|
|
66
|
+
if (firstParam.type === 'ObjectPattern') return firstParam;
|
|
67
|
+
|
|
68
|
+
return null;
|
|
69
|
+
};
|
|
70
|
+
|
|
71
|
+
const findObjectPatternParam = (
|
|
72
|
+
functionNode: types.FunctionExpression | types.ArrowFunctionExpression | types.FunctionDeclaration,
|
|
73
|
+
) => {
|
|
74
|
+
const firstParam = functionNode.params[0];
|
|
75
|
+
|
|
76
|
+
if (!firstParam || firstParam.type !== 'ObjectPattern') return null;
|
|
77
|
+
|
|
78
|
+
return firstParam;
|
|
79
|
+
};
|
|
80
|
+
|
|
81
|
+
const getReturnedObjectExpression = (
|
|
82
|
+
functionNode: types.FunctionExpression | types.ArrowFunctionExpression | types.FunctionDeclaration,
|
|
83
|
+
) => {
|
|
84
|
+
if (functionNode.body.type === 'ObjectExpression') return functionNode.body;
|
|
85
|
+
|
|
86
|
+
if (functionNode.body.type !== 'BlockStatement') return null;
|
|
87
|
+
|
|
88
|
+
for (const statement of functionNode.body.body) {
|
|
89
|
+
if (statement.type === 'ReturnStatement' && statement.argument?.type === 'ObjectExpression')
|
|
90
|
+
return statement.argument;
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
return null;
|
|
94
|
+
};
|
|
95
|
+
|
|
96
|
+
const objectPatternHasProperty = (pattern: types.ObjectPattern, localName: string) =>
|
|
97
|
+
pattern.properties.some(
|
|
98
|
+
(property) =>
|
|
99
|
+
property.type === 'ObjectProperty' &&
|
|
100
|
+
property.value.type === 'Identifier' &&
|
|
101
|
+
property.value.name === localName,
|
|
102
|
+
);
|
|
103
|
+
|
|
104
|
+
const addObjectPatternProperty = (pattern: types.ObjectPattern, keyName: string, localName: string = keyName) => {
|
|
105
|
+
if (objectPatternHasProperty(pattern, localName)) return;
|
|
106
|
+
|
|
107
|
+
pattern.properties.push(
|
|
108
|
+
types.objectProperty(types.identifier(keyName), types.identifier(localName), false, keyName === localName),
|
|
109
|
+
);
|
|
110
|
+
};
|
|
111
|
+
|
|
112
|
+
const getObjectPropertyKeyName = (property: types.ObjectProperty) => {
|
|
113
|
+
if (property.key.type === 'Identifier') return property.key.name;
|
|
114
|
+
|
|
115
|
+
if (property.key.type === 'StringLiteral') return property.key.value;
|
|
116
|
+
|
|
117
|
+
return null;
|
|
118
|
+
};
|
|
119
|
+
|
|
120
|
+
const pushUniqueObjectProperty = (
|
|
121
|
+
properties: (types.ObjectProperty | types.SpreadElement)[],
|
|
122
|
+
property: types.ObjectProperty,
|
|
123
|
+
) => {
|
|
124
|
+
const nextKey = getObjectPropertyKeyName(property);
|
|
125
|
+
if (!nextKey) {
|
|
126
|
+
properties.push(property);
|
|
127
|
+
return;
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
const existingIndex = properties.findIndex(
|
|
131
|
+
(existingProperty) =>
|
|
132
|
+
existingProperty.type === 'ObjectProperty' && getObjectPropertyKeyName(existingProperty) === nextKey,
|
|
133
|
+
);
|
|
134
|
+
|
|
135
|
+
if (existingIndex >= 0) {
|
|
136
|
+
properties[existingIndex] = property;
|
|
137
|
+
return;
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
properties.push(property);
|
|
141
|
+
};
|
|
142
|
+
|
|
143
|
+
const getObjectPatternPropertyLocalName = (property: types.ObjectProperty) => {
|
|
144
|
+
if (property.value.type === 'Identifier') return property.value.name;
|
|
145
|
+
|
|
146
|
+
if (property.value.type === 'AssignmentPattern' && property.value.left.type === 'Identifier')
|
|
147
|
+
return property.value.left.name;
|
|
148
|
+
|
|
149
|
+
return null;
|
|
150
|
+
};
|
|
151
|
+
|
|
152
|
+
const pushUniqueObjectPatternProperty = (properties: types.ObjectProperty[], property: types.ObjectProperty) => {
|
|
153
|
+
const nextLocalName = getObjectPatternPropertyLocalName(property);
|
|
154
|
+
const nextKeyName = getObjectPropertyKeyName(property);
|
|
155
|
+
|
|
156
|
+
const existingIndex = properties.findIndex(
|
|
157
|
+
(existingProperty) =>
|
|
158
|
+
(nextLocalName && getObjectPatternPropertyLocalName(existingProperty) === nextLocalName) ||
|
|
159
|
+
(nextKeyName && getObjectPropertyKeyName(existingProperty) === nextKeyName),
|
|
160
|
+
);
|
|
161
|
+
|
|
162
|
+
if (existingIndex >= 0) {
|
|
163
|
+
properties[existingIndex] = property;
|
|
164
|
+
return;
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
properties.push(property);
|
|
168
|
+
};
|
|
169
|
+
|
|
170
|
+
const unwrapFetchExpression = (init: types.Expression | null | undefined) => {
|
|
171
|
+
const wrappers: Array<(expression: types.Expression) => types.Expression> = [];
|
|
172
|
+
let current = init || null;
|
|
173
|
+
|
|
174
|
+
while (current) {
|
|
175
|
+
if (current.type === 'ParenthesizedExpression') {
|
|
176
|
+
wrappers.push((expression) => types.parenthesizedExpression(expression));
|
|
177
|
+
current = current.expression;
|
|
178
|
+
continue;
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
if (current.type === 'TSAsExpression') {
|
|
182
|
+
const typeAnnotation = current.typeAnnotation;
|
|
183
|
+
wrappers.push((expression) => types.tsAsExpression(expression, typeAnnotation));
|
|
184
|
+
current = current.expression;
|
|
185
|
+
continue;
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
if (current.type === 'TSTypeAssertion') {
|
|
189
|
+
const typeAnnotation = current.typeAnnotation;
|
|
190
|
+
wrappers.push((expression) => types.tsTypeAssertion(typeAnnotation, expression));
|
|
191
|
+
current = current.expression;
|
|
192
|
+
continue;
|
|
193
|
+
}
|
|
194
|
+
|
|
195
|
+
if (current.type === 'TSNonNullExpression') {
|
|
196
|
+
wrappers.push((expression) => types.tsNonNullExpression(expression));
|
|
197
|
+
current = current.expression;
|
|
198
|
+
continue;
|
|
199
|
+
}
|
|
200
|
+
|
|
201
|
+
break;
|
|
202
|
+
}
|
|
203
|
+
|
|
204
|
+
if (
|
|
205
|
+
!current ||
|
|
206
|
+
current.type !== 'CallExpression' ||
|
|
207
|
+
current.callee.type !== 'MemberExpression' ||
|
|
208
|
+
current.callee.object.type !== 'Identifier' ||
|
|
209
|
+
current.callee.object.name !== 'api' ||
|
|
210
|
+
current.callee.property.type !== 'Identifier' ||
|
|
211
|
+
current.callee.property.name !== 'fetch' ||
|
|
212
|
+
current.arguments[0]?.type !== 'ObjectExpression'
|
|
213
|
+
)
|
|
214
|
+
return null;
|
|
215
|
+
|
|
216
|
+
return {
|
|
217
|
+
callExpression: current,
|
|
218
|
+
wrapExpression(expression: types.Expression) {
|
|
219
|
+
return wrappers.reduceRight((acc, applyWrapper) => applyWrapper(acc), expression);
|
|
220
|
+
},
|
|
221
|
+
};
|
|
222
|
+
};
|
|
223
|
+
|
|
224
|
+
const removeUnusedUseContextImport = (programPath: NodePath<types.Program>) => {
|
|
225
|
+
let useContextReferenced = false;
|
|
226
|
+
|
|
227
|
+
traverse(programPath.node, {
|
|
228
|
+
noScope: true,
|
|
229
|
+
Identifier(path) {
|
|
230
|
+
if (path.node.name !== 'useContext') return;
|
|
231
|
+
|
|
232
|
+
if (path.parent.type === 'ImportDefaultSpecifier') return;
|
|
233
|
+
|
|
234
|
+
useContextReferenced = true;
|
|
235
|
+
path.stop();
|
|
236
|
+
},
|
|
237
|
+
});
|
|
238
|
+
|
|
239
|
+
if (useContextReferenced) return;
|
|
240
|
+
|
|
241
|
+
for (const statementPath of programPath.get('body')) {
|
|
242
|
+
if (!statementPath.isImportDeclaration()) continue;
|
|
243
|
+
|
|
244
|
+
if (statementPath.node.source.value !== '@/client/context') continue;
|
|
245
|
+
|
|
246
|
+
const nextSpecifiers = statementPath.node.specifiers.filter(
|
|
247
|
+
(specifier) => specifier.type !== 'ImportDefaultSpecifier' || specifier.local.name !== 'useContext',
|
|
248
|
+
);
|
|
249
|
+
|
|
250
|
+
if (!nextSpecifiers.length) statementPath.remove();
|
|
251
|
+
else statementPath.node.specifiers = nextSpecifiers;
|
|
252
|
+
|
|
253
|
+
break;
|
|
254
|
+
}
|
|
255
|
+
};
|
|
256
|
+
|
|
257
|
+
const prefixOptionsObject = (options: types.ObjectExpression) => {
|
|
258
|
+
const properties: (types.ObjectProperty | types.SpreadElement)[] = [];
|
|
259
|
+
|
|
260
|
+
for (const property of options.properties) {
|
|
261
|
+
if (property.type !== 'ObjectProperty') {
|
|
262
|
+
properties.push(property);
|
|
263
|
+
continue;
|
|
264
|
+
}
|
|
265
|
+
|
|
266
|
+
if (property.key.type === 'Identifier') {
|
|
267
|
+
properties.push(
|
|
268
|
+
types.objectProperty(types.identifier(`_${property.key.name}`), property.value, false, false),
|
|
269
|
+
);
|
|
270
|
+
continue;
|
|
271
|
+
}
|
|
272
|
+
|
|
273
|
+
if (property.key.type === 'StringLiteral') {
|
|
274
|
+
properties.push(types.objectProperty(types.stringLiteral(`_${property.key.value}`), property.value));
|
|
275
|
+
continue;
|
|
276
|
+
}
|
|
277
|
+
|
|
278
|
+
properties.push(property);
|
|
279
|
+
}
|
|
280
|
+
|
|
281
|
+
return types.objectExpression(properties);
|
|
282
|
+
};
|
|
283
|
+
|
|
284
|
+
const repoRoots = process.argv.slice(2);
|
|
285
|
+
if (!repoRoots.length) throw new Error('Usage: ts-node scripts/refactor-client-pages.ts <repo-root> [repo-root...]');
|
|
286
|
+
|
|
287
|
+
for (const repoRoot of repoRoots) {
|
|
288
|
+
const pagesRoot = path.join(repoRoot, 'client', 'pages');
|
|
289
|
+
const files = findFiles(pagesRoot);
|
|
290
|
+
let changedFiles = 0;
|
|
291
|
+
|
|
292
|
+
for (const filepath of files) {
|
|
293
|
+
const code = fs.readFileSync(filepath, 'utf8');
|
|
294
|
+
if (
|
|
295
|
+
!code.includes('Router.page(') &&
|
|
296
|
+
!code.includes('api.fetch(') &&
|
|
297
|
+
!code.includes('@app') &&
|
|
298
|
+
!code.includes('"@app"')
|
|
299
|
+
)
|
|
300
|
+
continue;
|
|
301
|
+
|
|
302
|
+
const ast = parse(code, {
|
|
303
|
+
sourceType: 'module',
|
|
304
|
+
errorRecovery: true,
|
|
305
|
+
plugins: ['typescript', 'jsx', 'decorators-legacy', 'classProperties'],
|
|
306
|
+
});
|
|
307
|
+
|
|
308
|
+
const importedServices = new Set<string>();
|
|
309
|
+
let hasAppImport = false;
|
|
310
|
+
let routeCallPath: NodePath<types.CallExpression> | null = null;
|
|
311
|
+
let renderFunctionPath: NodePath<
|
|
312
|
+
types.FunctionExpression | types.ArrowFunctionExpression | types.FunctionDeclaration
|
|
313
|
+
> | null = null;
|
|
314
|
+
|
|
315
|
+
traverse(ast, {
|
|
316
|
+
noScope: true,
|
|
317
|
+
ImportDeclaration(path) {
|
|
318
|
+
if (path.node.source.value !== '@app') return;
|
|
319
|
+
|
|
320
|
+
hasAppImport = true;
|
|
321
|
+
|
|
322
|
+
for (const specifier of path.node.specifiers) {
|
|
323
|
+
if (
|
|
324
|
+
specifier.type === 'ImportSpecifier' &&
|
|
325
|
+
specifier.imported.type === 'Identifier' &&
|
|
326
|
+
specifier.imported.name !== 'Router'
|
|
327
|
+
)
|
|
328
|
+
importedServices.add(specifier.local.name);
|
|
329
|
+
}
|
|
330
|
+
|
|
331
|
+
path.remove();
|
|
332
|
+
},
|
|
333
|
+
CallExpression(path) {
|
|
334
|
+
if (routeCallPath) return;
|
|
335
|
+
|
|
336
|
+
const callee = path.node.callee;
|
|
337
|
+
if (
|
|
338
|
+
callee.type === 'MemberExpression' &&
|
|
339
|
+
callee.object.type === 'Identifier' &&
|
|
340
|
+
callee.object.name === 'Router' &&
|
|
341
|
+
callee.property.type === 'Identifier' &&
|
|
342
|
+
callee.property.name === 'page'
|
|
343
|
+
) {
|
|
344
|
+
routeCallPath = path;
|
|
345
|
+
|
|
346
|
+
const renderArg = path.get('arguments')[path.node.arguments.length - 1];
|
|
347
|
+
if (
|
|
348
|
+
renderArg &&
|
|
349
|
+
(renderArg.isArrowFunctionExpression() ||
|
|
350
|
+
renderArg.isFunctionExpression() ||
|
|
351
|
+
renderArg.isFunctionDeclaration())
|
|
352
|
+
)
|
|
353
|
+
renderFunctionPath = renderArg as NodePath<
|
|
354
|
+
types.FunctionExpression | types.ArrowFunctionExpression | types.FunctionDeclaration
|
|
355
|
+
>;
|
|
356
|
+
}
|
|
357
|
+
},
|
|
358
|
+
});
|
|
359
|
+
|
|
360
|
+
if (!routeCallPath || !renderFunctionPath) {
|
|
361
|
+
if (!hasAppImport) continue;
|
|
362
|
+
}
|
|
363
|
+
|
|
364
|
+
let changed = hasAppImport;
|
|
365
|
+
|
|
366
|
+
traverse(ast, {
|
|
367
|
+
noScope: true,
|
|
368
|
+
Program(programPath) {
|
|
369
|
+
if (hasAppImport) ensureRouterImport(programPath);
|
|
370
|
+
},
|
|
371
|
+
});
|
|
372
|
+
|
|
373
|
+
if (renderFunctionPath) {
|
|
374
|
+
ensureBlockBody(renderFunctionPath);
|
|
375
|
+
const renderParam = ensureObjectPatternParam(renderFunctionPath);
|
|
376
|
+
if (!renderParam) continue;
|
|
377
|
+
|
|
378
|
+
const fetcherProperties: types.ObjectProperty[] = [];
|
|
379
|
+
const extraRenderProperties: Array<{ key: string; local: string }> = [];
|
|
380
|
+
const setupContextNames = new Set<string>();
|
|
381
|
+
let setupNeeded = false;
|
|
382
|
+
|
|
383
|
+
renderFunctionPath.traverse({
|
|
384
|
+
noScope: true,
|
|
385
|
+
VariableDeclarator(path) {
|
|
386
|
+
const fetchExpression = unwrapFetchExpression(path.node.init);
|
|
387
|
+
if (!fetchExpression) return;
|
|
388
|
+
|
|
389
|
+
const declarationPath = path.findParent((parentPath) => parentPath.isVariableDeclaration());
|
|
390
|
+
if (!declarationPath?.isVariableDeclaration()) return;
|
|
391
|
+
|
|
392
|
+
setupNeeded = true;
|
|
393
|
+
changed = true;
|
|
394
|
+
|
|
395
|
+
for (const property of fetchExpression.callExpression.arguments[0].properties) {
|
|
396
|
+
if (property.type === 'ObjectProperty') fetcherProperties.push(property);
|
|
397
|
+
}
|
|
398
|
+
|
|
399
|
+
if (path.node.id.type === 'ObjectPattern') {
|
|
400
|
+
for (const property of path.node.id.properties) {
|
|
401
|
+
if (property.type !== 'ObjectProperty' || property.key.type !== 'Identifier') continue;
|
|
402
|
+
|
|
403
|
+
if (property.value.type === 'Identifier')
|
|
404
|
+
extraRenderProperties.push({ key: property.key.name, local: property.value.name });
|
|
405
|
+
else if (
|
|
406
|
+
property.value.type === 'AssignmentPattern' &&
|
|
407
|
+
property.value.left.type === 'Identifier'
|
|
408
|
+
)
|
|
409
|
+
extraRenderProperties.push({ key: property.key.name, local: property.value.left.name });
|
|
410
|
+
}
|
|
411
|
+
|
|
412
|
+
declarationPath.remove();
|
|
413
|
+
return;
|
|
414
|
+
}
|
|
415
|
+
|
|
416
|
+
if (path.node.id.type === 'Identifier') {
|
|
417
|
+
const objectProperties = fetchExpression.callExpression.arguments[0].properties
|
|
418
|
+
.filter(
|
|
419
|
+
(property): property is types.ObjectProperty =>
|
|
420
|
+
property.type === 'ObjectProperty' && property.key.type === 'Identifier',
|
|
421
|
+
)
|
|
422
|
+
.map((property) => {
|
|
423
|
+
extraRenderProperties.push({ key: property.key.name, local: property.key.name });
|
|
424
|
+
return types.objectProperty(
|
|
425
|
+
types.identifier(property.key.name),
|
|
426
|
+
types.identifier(property.key.name),
|
|
427
|
+
false,
|
|
428
|
+
true,
|
|
429
|
+
);
|
|
430
|
+
});
|
|
431
|
+
|
|
432
|
+
declarationPath.replaceWith(
|
|
433
|
+
types.variableDeclaration('const', [
|
|
434
|
+
types.variableDeclarator(
|
|
435
|
+
types.identifier(path.node.id.name),
|
|
436
|
+
fetchExpression.wrapExpression(types.objectExpression(objectProperties)),
|
|
437
|
+
),
|
|
438
|
+
]),
|
|
439
|
+
);
|
|
440
|
+
}
|
|
441
|
+
},
|
|
442
|
+
VariableDeclaration(path) {
|
|
443
|
+
const declaration = path.node.declarations[0];
|
|
444
|
+
if (
|
|
445
|
+
!declaration ||
|
|
446
|
+
declaration.id.type !== 'ObjectPattern' ||
|
|
447
|
+
declaration.init?.type !== 'CallExpression' ||
|
|
448
|
+
declaration.init.callee.type !== 'Identifier' ||
|
|
449
|
+
declaration.init.callee.name !== 'useContext'
|
|
450
|
+
)
|
|
451
|
+
return;
|
|
452
|
+
|
|
453
|
+
const names = declaration.id.properties
|
|
454
|
+
.filter(
|
|
455
|
+
(property): property is types.ObjectProperty =>
|
|
456
|
+
property.type === 'ObjectProperty' && property.key.type === 'Identifier',
|
|
457
|
+
)
|
|
458
|
+
.map((property) => property.key.name);
|
|
459
|
+
|
|
460
|
+
if (!names.length) return;
|
|
461
|
+
|
|
462
|
+
for (const name of names) {
|
|
463
|
+
setupContextNames.add(name);
|
|
464
|
+
extraRenderProperties.push({ key: name, local: name });
|
|
465
|
+
}
|
|
466
|
+
|
|
467
|
+
path.remove();
|
|
468
|
+
},
|
|
469
|
+
});
|
|
470
|
+
|
|
471
|
+
for (const { key, local } of extraRenderProperties) addObjectPatternProperty(renderParam, key, local);
|
|
472
|
+
|
|
473
|
+
for (const name of [...importedServices].sort((a, b) => a.localeCompare(b)))
|
|
474
|
+
addObjectPatternProperty(renderParam, name);
|
|
475
|
+
|
|
476
|
+
if (routeCallPath) {
|
|
477
|
+
const args = routeCallPath.node.arguments;
|
|
478
|
+
const pathArg = args[0];
|
|
479
|
+
const lastArg = args[args.length - 1];
|
|
480
|
+
const maybeSetupArg =
|
|
481
|
+
args.length >= 3 &&
|
|
482
|
+
(args[1].type === 'ArrowFunctionExpression' || args[1].type === 'FunctionExpression')
|
|
483
|
+
? args[1]
|
|
484
|
+
: null;
|
|
485
|
+
const maybeOptionsArg = args.length >= 3 && args[1].type === 'ObjectExpression' ? args[1] : null;
|
|
486
|
+
|
|
487
|
+
if (setupNeeded || maybeOptionsArg || maybeSetupArg) {
|
|
488
|
+
const setupProperties: (types.ObjectProperty | types.SpreadElement)[] = [];
|
|
489
|
+
const setupParamProperties: types.ObjectProperty[] = [];
|
|
490
|
+
const existingSetupDataKeys = new Set<string>();
|
|
491
|
+
|
|
492
|
+
if (maybeSetupArg) {
|
|
493
|
+
const existingReturnedObject = getReturnedObjectExpression(maybeSetupArg);
|
|
494
|
+
if (existingReturnedObject) {
|
|
495
|
+
for (const property of existingReturnedObject.properties) {
|
|
496
|
+
if (property.type !== 'ObjectProperty') continue;
|
|
497
|
+
|
|
498
|
+
const propertyKey = getObjectPropertyKeyName(property);
|
|
499
|
+
if (!propertyKey || propertyKey.startsWith('_')) continue;
|
|
500
|
+
|
|
501
|
+
existingSetupDataKeys.add(propertyKey);
|
|
502
|
+
}
|
|
503
|
+
}
|
|
504
|
+
}
|
|
505
|
+
|
|
506
|
+
const fetcherKeys = new Set(
|
|
507
|
+
fetcherProperties
|
|
508
|
+
.map((property) => getObjectPropertyKeyName(property))
|
|
509
|
+
.filter((key): key is string => Boolean(key)),
|
|
510
|
+
);
|
|
511
|
+
|
|
512
|
+
for (const property of renderParam.properties) {
|
|
513
|
+
if (property.type !== 'ObjectProperty') continue;
|
|
514
|
+
|
|
515
|
+
const propertyKey = getObjectPropertyKeyName(property);
|
|
516
|
+
if (propertyKey && fetcherKeys.has(propertyKey)) continue;
|
|
517
|
+
|
|
518
|
+
if (propertyKey && existingSetupDataKeys.has(propertyKey)) continue;
|
|
519
|
+
|
|
520
|
+
pushUniqueObjectPatternProperty(setupParamProperties, types.cloneNode(property, true));
|
|
521
|
+
}
|
|
522
|
+
|
|
523
|
+
if (maybeOptionsArg) setupProperties.push(...prefixOptionsObject(maybeOptionsArg).properties);
|
|
524
|
+
|
|
525
|
+
if (maybeSetupArg) {
|
|
526
|
+
const existingSetupParam = findObjectPatternParam(maybeSetupArg);
|
|
527
|
+
if (existingSetupParam) {
|
|
528
|
+
for (const property of existingSetupParam.properties) {
|
|
529
|
+
if (property.type !== 'ObjectProperty') continue;
|
|
530
|
+
|
|
531
|
+
const propertyKey = getObjectPropertyKeyName(property);
|
|
532
|
+
if (propertyKey && existingSetupDataKeys.has(propertyKey)) continue;
|
|
533
|
+
|
|
534
|
+
if (property.type === 'ObjectProperty')
|
|
535
|
+
pushUniqueObjectPatternProperty(
|
|
536
|
+
setupParamProperties,
|
|
537
|
+
types.cloneNode(property, true),
|
|
538
|
+
);
|
|
539
|
+
}
|
|
540
|
+
}
|
|
541
|
+
|
|
542
|
+
const returnedObject = getReturnedObjectExpression(maybeSetupArg);
|
|
543
|
+
if (returnedObject) {
|
|
544
|
+
for (const property of returnedObject.properties) {
|
|
545
|
+
if (property.type === 'ObjectProperty')
|
|
546
|
+
pushUniqueObjectProperty(setupProperties, property);
|
|
547
|
+
else setupProperties.push(property);
|
|
548
|
+
}
|
|
549
|
+
}
|
|
550
|
+
}
|
|
551
|
+
|
|
552
|
+
for (const property of fetcherProperties) pushUniqueObjectProperty(setupProperties, property);
|
|
553
|
+
|
|
554
|
+
const setupParam = types.objectPattern(setupParamProperties);
|
|
555
|
+
for (const name of [...new Set([...importedServices, ...setupContextNames])].sort((a, b) =>
|
|
556
|
+
a.localeCompare(b),
|
|
557
|
+
))
|
|
558
|
+
addObjectPatternProperty(setupParam, name);
|
|
559
|
+
|
|
560
|
+
const setupFunction = types.arrowFunctionExpression(
|
|
561
|
+
[setupParam],
|
|
562
|
+
types.objectExpression(setupProperties),
|
|
563
|
+
);
|
|
564
|
+
|
|
565
|
+
routeCallPath.node.arguments = [pathArg, setupFunction, lastArg];
|
|
566
|
+
changed = true;
|
|
567
|
+
} else {
|
|
568
|
+
routeCallPath.node.arguments = [pathArg, lastArg];
|
|
569
|
+
}
|
|
570
|
+
}
|
|
571
|
+
}
|
|
572
|
+
|
|
573
|
+
traverse(ast, {
|
|
574
|
+
noScope: true,
|
|
575
|
+
Program(programPath) {
|
|
576
|
+
removeUnusedUseContextImport(programPath);
|
|
577
|
+
},
|
|
578
|
+
});
|
|
579
|
+
|
|
580
|
+
if (!changed) continue;
|
|
581
|
+
|
|
582
|
+
fs.writeFileSync(filepath, generate(ast, {}, code).code);
|
|
583
|
+
changedFiles++;
|
|
584
|
+
}
|
|
585
|
+
|
|
586
|
+
console.log(`[refactor-client-pages] ${repoRoot}: changed ${changedFiles} files`);
|
|
587
|
+
}
|