@modern-js/app-tools 2.0.0-beta.3 → 2.0.0-beta.6

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.
Files changed (261) hide show
  1. package/CHANGELOG.md +619 -0
  2. package/bin/modern.js +3 -0
  3. package/dist/js/modern/analyze/Builder.js +39 -0
  4. package/dist/js/modern/analyze/constants.js +48 -18
  5. package/dist/js/modern/analyze/generateCode.js +264 -225
  6. package/dist/js/modern/analyze/getBundleEntry.js +34 -32
  7. package/dist/js/modern/analyze/getClientRoutes/getRoutes.js +99 -52
  8. package/dist/js/modern/analyze/getClientRoutes/getRoutesLegacy.js +89 -47
  9. package/dist/js/modern/analyze/getClientRoutes/index.js +6 -2
  10. package/dist/js/modern/analyze/getClientRoutes/utils.js +23 -10
  11. package/dist/js/modern/analyze/getFileSystemEntry.js +52 -23
  12. package/dist/js/modern/analyze/getHtmlTemplate.js +89 -49
  13. package/dist/js/modern/analyze/getServerRoutes.js +122 -126
  14. package/dist/js/modern/analyze/index.js +204 -161
  15. package/dist/js/modern/analyze/isDefaultExportFunction.js +30 -16
  16. package/dist/js/modern/analyze/makeLegalIdentifier.js +10 -11
  17. package/dist/js/modern/analyze/nestedRoutes.js +118 -65
  18. package/dist/js/modern/analyze/templates.js +170 -81
  19. package/dist/js/modern/analyze/utils.js +104 -67
  20. package/dist/js/modern/builder/builderPlugins/compatModern.js +128 -109
  21. package/dist/js/modern/builder/index.js +120 -89
  22. package/dist/js/modern/builder/loaders/routerLoader.js +9 -12
  23. package/dist/js/modern/builder/loaders/serverModuleLoader.js +4 -1
  24. package/dist/js/modern/builder/share.js +23 -21
  25. package/dist/js/modern/builder/webpackPlugins/htmlAsyncChunkPlugin.js +23 -22
  26. package/dist/js/modern/builder/webpackPlugins/htmlBottomTemplate.js +31 -27
  27. package/dist/js/modern/builder/webpackPlugins/routerPlugin.js +100 -84
  28. package/dist/js/modern/commands/build.js +67 -42
  29. package/dist/js/modern/commands/deploy.js +27 -4
  30. package/dist/js/modern/commands/dev.js +81 -34
  31. package/dist/js/modern/commands/index.js +1 -1
  32. package/dist/js/modern/commands/inspect.js +30 -5
  33. package/dist/js/modern/commands/serve.js +54 -0
  34. package/dist/js/modern/config/default.js +112 -145
  35. package/dist/js/modern/config/index.js +8 -2
  36. package/dist/js/modern/config/initial/createHtmlConfig.js +5 -2
  37. package/dist/js/modern/config/initial/createOutputConfig.js +10 -13
  38. package/dist/js/modern/config/initial/createSourceConfig.js +10 -3
  39. package/dist/js/modern/config/initial/createToolsConfig.js +7 -6
  40. package/dist/js/modern/config/initial/index.js +9 -4
  41. package/dist/js/modern/config/initial/inits.js +109 -73
  42. package/dist/js/modern/config/initial/transformNormalizedConfig.js +11 -4
  43. package/dist/js/modern/defineConfig.js +26 -11
  44. package/dist/js/modern/exports/server.js +4 -1
  45. package/dist/js/modern/hooks.js +16 -4
  46. package/dist/js/modern/index.js +178 -90
  47. package/dist/js/modern/initialize/index.js +100 -52
  48. package/dist/js/modern/locale/en.js +20 -21
  49. package/dist/js/modern/locale/index.js +6 -6
  50. package/dist/js/modern/locale/zh.js +21 -22
  51. package/dist/js/modern/schema/Schema.js +6 -5
  52. package/dist/js/modern/schema/index.js +53 -100
  53. package/dist/js/modern/schema/legacy.js +96 -231
  54. package/dist/js/modern/types/config/index.js +0 -1
  55. package/dist/js/modern/types/index.js +0 -1
  56. package/dist/js/modern/types/legacyConfig/output.js +0 -1
  57. package/dist/js/modern/utils/commands.js +10 -2
  58. package/dist/js/modern/utils/config.js +102 -41
  59. package/dist/js/modern/utils/createFileWatcher.js +84 -51
  60. package/dist/js/modern/utils/createServer.js +63 -17
  61. package/dist/js/modern/utils/getServerInternalPlugins.js +58 -0
  62. package/dist/js/modern/utils/getSpecifiedEntries.js +46 -19
  63. package/dist/js/modern/utils/language.js +6 -3
  64. package/dist/js/modern/utils/printInstructions.js +27 -8
  65. package/dist/js/modern/utils/restart.js +43 -16
  66. package/dist/js/modern/utils/routes.js +29 -12
  67. package/dist/js/node/analyze/Builder.js +64 -0
  68. package/dist/js/node/analyze/constants.js +86 -39
  69. package/dist/js/node/analyze/generateCode.js +285 -239
  70. package/dist/js/node/analyze/getBundleEntry.js +62 -44
  71. package/dist/js/node/analyze/getClientRoutes/getRoutes.js +138 -77
  72. package/dist/js/node/analyze/getClientRoutes/getRoutesLegacy.js +130 -74
  73. package/dist/js/node/analyze/getClientRoutes/index.js +27 -16
  74. package/dist/js/node/analyze/getClientRoutes/utils.js +51 -21
  75. package/dist/js/node/analyze/getFileSystemEntry.js +82 -39
  76. package/dist/js/node/analyze/getHtmlTemplate.js +120 -61
  77. package/dist/js/node/analyze/getServerRoutes.js +145 -137
  78. package/dist/js/node/analyze/index.js +233 -174
  79. package/dist/js/node/analyze/isDefaultExportFunction.js +59 -26
  80. package/dist/js/node/analyze/makeLegalIdentifier.js +31 -15
  81. package/dist/js/node/analyze/nestedRoutes.js +150 -79
  82. package/dist/js/node/analyze/templates.js +198 -90
  83. package/dist/js/node/analyze/utils.js +136 -81
  84. package/dist/js/node/builder/builderPlugins/compatModern.js +158 -122
  85. package/dist/js/node/builder/index.js +142 -98
  86. package/dist/js/node/builder/loaders/routerLoader.js +29 -18
  87. package/dist/js/node/builder/loaders/serverModuleLoader.js +24 -7
  88. package/dist/js/node/builder/share.js +50 -26
  89. package/dist/js/node/builder/webpackPlugins/htmlAsyncChunkPlugin.js +43 -26
  90. package/dist/js/node/builder/webpackPlugins/htmlBottomTemplate.js +51 -31
  91. package/dist/js/node/builder/webpackPlugins/routerPlugin.js +120 -90
  92. package/dist/js/node/commands/build.js +91 -52
  93. package/dist/js/node/commands/deploy.js +49 -10
  94. package/dist/js/node/commands/dev.js +105 -48
  95. package/dist/js/node/commands/index.js +19 -38
  96. package/dist/js/node/commands/inspect.js +52 -11
  97. package/dist/js/node/commands/serve.js +83 -0
  98. package/dist/js/node/config/default.js +131 -149
  99. package/dist/js/node/config/index.js +31 -28
  100. package/dist/js/node/config/initial/createHtmlConfig.js +26 -6
  101. package/dist/js/node/config/initial/createOutputConfig.js +31 -17
  102. package/dist/js/node/config/initial/createSourceConfig.js +31 -7
  103. package/dist/js/node/config/initial/createToolsConfig.js +28 -10
  104. package/dist/js/node/config/initial/index.js +34 -17
  105. package/dist/js/node/config/initial/inits.js +130 -81
  106. package/dist/js/node/config/initial/transformNormalizedConfig.js +40 -16
  107. package/dist/js/node/defineConfig.js +46 -17
  108. package/dist/js/node/exports/server.js +25 -10
  109. package/dist/js/node/hooks.js +53 -29
  110. package/dist/js/node/index.js +213 -129
  111. package/dist/js/node/initialize/index.js +117 -61
  112. package/dist/js/node/locale/en.js +40 -25
  113. package/dist/js/node/locale/index.js +31 -14
  114. package/dist/js/node/locale/zh.js +41 -26
  115. package/dist/js/node/schema/Schema.js +27 -10
  116. package/dist/js/node/schema/index.js +84 -114
  117. package/dist/js/node/schema/legacy.js +119 -240
  118. package/dist/js/node/types/config/deploy.js +15 -0
  119. package/dist/js/node/types/config/dev.js +15 -0
  120. package/dist/js/node/types/config/experiments.js +15 -0
  121. package/dist/js/node/types/config/html.js +15 -0
  122. package/dist/js/node/types/config/index.js +17 -16
  123. package/dist/js/node/types/config/output.js +15 -0
  124. package/dist/js/node/types/config/performance.js +15 -0
  125. package/dist/js/node/types/config/security.js +15 -0
  126. package/dist/js/node/types/config/source.js +15 -0
  127. package/dist/js/node/types/config/tools.js +15 -0
  128. package/dist/js/node/types/hooks.js +15 -0
  129. package/dist/js/node/types/index.js +19 -38
  130. package/dist/js/node/types/legacyConfig/deploy.js +15 -0
  131. package/dist/js/node/types/legacyConfig/dev.js +15 -0
  132. package/dist/js/node/types/legacyConfig/index.js +15 -0
  133. package/dist/js/node/types/legacyConfig/output.js +15 -5
  134. package/dist/js/node/types/legacyConfig/source.js +15 -0
  135. package/dist/js/node/types/legacyConfig/tools.js +15 -0
  136. package/dist/js/node/utils/commands.js +31 -6
  137. package/dist/js/node/utils/config.js +125 -51
  138. package/dist/js/node/utils/createFileWatcher.js +109 -61
  139. package/dist/js/node/utils/createServer.js +92 -25
  140. package/dist/js/node/utils/getServerInternalPlugins.js +79 -0
  141. package/dist/js/node/utils/getSpecifiedEntries.js +68 -25
  142. package/dist/js/node/utils/language.js +28 -8
  143. package/dist/js/node/utils/printInstructions.js +51 -16
  144. package/dist/js/node/utils/restart.js +65 -21
  145. package/dist/js/node/utils/routes.js +58 -19
  146. package/dist/js/node/utils/types.js +15 -0
  147. package/dist/js/treeshaking/analyze/Builder.js +199 -0
  148. package/dist/js/treeshaking/analyze/constants.js +37 -18
  149. package/dist/js/treeshaking/analyze/generateCode.js +597 -407
  150. package/dist/js/treeshaking/analyze/getBundleEntry.js +55 -63
  151. package/dist/js/treeshaking/analyze/getClientRoutes/getRoutes.js +217 -168
  152. package/dist/js/treeshaking/analyze/getClientRoutes/getRoutesLegacy.js +215 -169
  153. package/dist/js/treeshaking/analyze/getClientRoutes/index.js +3 -2
  154. package/dist/js/treeshaking/analyze/getClientRoutes/utils.js +19 -20
  155. package/dist/js/treeshaking/analyze/getFileSystemEntry.js +97 -86
  156. package/dist/js/treeshaking/analyze/getHtmlTemplate.js +298 -125
  157. package/dist/js/treeshaking/analyze/getServerRoutes.js +210 -147
  158. package/dist/js/treeshaking/analyze/index.js +575 -305
  159. package/dist/js/treeshaking/analyze/isDefaultExportFunction.js +45 -26
  160. package/dist/js/treeshaking/analyze/makeLegalIdentifier.js +13 -16
  161. package/dist/js/treeshaking/analyze/nestedRoutes.js +419 -201
  162. package/dist/js/treeshaking/analyze/templates.js +438 -236
  163. package/dist/js/treeshaking/analyze/utils.js +367 -153
  164. package/dist/js/treeshaking/builder/builderPlugins/compatModern.js +285 -199
  165. package/dist/js/treeshaking/builder/index.js +365 -165
  166. package/dist/js/treeshaking/builder/loaders/routerLoader.js +11 -12
  167. package/dist/js/treeshaking/builder/loaders/serverModuleLoader.js +3 -2
  168. package/dist/js/treeshaking/builder/share.js +38 -44
  169. package/dist/js/treeshaking/builder/webpackPlugins/htmlAsyncChunkPlugin.js +108 -44
  170. package/dist/js/treeshaking/builder/webpackPlugins/htmlBottomTemplate.js +70 -39
  171. package/dist/js/treeshaking/builder/webpackPlugins/routerPlugin.js +334 -112
  172. package/dist/js/treeshaking/commands/build.js +286 -88
  173. package/dist/js/treeshaking/commands/deploy.js +153 -25
  174. package/dist/js/treeshaking/commands/dev.js +313 -131
  175. package/dist/js/treeshaking/commands/index.js +1 -1
  176. package/dist/js/treeshaking/commands/inspect.js +147 -32
  177. package/dist/js/treeshaking/commands/serve.js +199 -0
  178. package/dist/js/treeshaking/config/default.js +207 -198
  179. package/dist/js/treeshaking/config/index.js +3 -2
  180. package/dist/js/treeshaking/config/initial/createHtmlConfig.js +19 -31
  181. package/dist/js/treeshaking/config/initial/createOutputConfig.js +41 -70
  182. package/dist/js/treeshaking/config/initial/createSourceConfig.js +41 -40
  183. package/dist/js/treeshaking/config/initial/createToolsConfig.js +23 -38
  184. package/dist/js/treeshaking/config/initial/index.js +10 -9
  185. package/dist/js/treeshaking/config/initial/inits.js +205 -106
  186. package/dist/js/treeshaking/config/initial/transformNormalizedConfig.js +31 -34
  187. package/dist/js/treeshaking/defineConfig.js +60 -13
  188. package/dist/js/treeshaking/exports/server.js +2 -1
  189. package/dist/js/treeshaking/hooks.js +31 -25
  190. package/dist/js/treeshaking/index.js +681 -256
  191. package/dist/js/treeshaking/initialize/index.js +292 -113
  192. package/dist/js/treeshaking/locale/en.js +34 -33
  193. package/dist/js/treeshaking/locale/index.js +5 -5
  194. package/dist/js/treeshaking/locale/zh.js +34 -33
  195. package/dist/js/treeshaking/schema/Schema.js +267 -69
  196. package/dist/js/treeshaking/schema/index.js +171 -121
  197. package/dist/js/treeshaking/schema/legacy.js +323 -256
  198. package/dist/js/treeshaking/types/config/deploy.js +1 -0
  199. package/dist/js/treeshaking/types/config/dev.js +1 -0
  200. package/dist/js/treeshaking/types/config/experiments.js +1 -0
  201. package/dist/js/treeshaking/types/config/html.js +1 -0
  202. package/dist/js/treeshaking/types/config/index.js +0 -1
  203. package/dist/js/treeshaking/types/config/output.js +1 -0
  204. package/dist/js/treeshaking/types/config/performance.js +1 -0
  205. package/dist/js/treeshaking/types/config/security.js +1 -0
  206. package/dist/js/treeshaking/types/config/source.js +1 -0
  207. package/dist/js/treeshaking/types/config/tools.js +1 -0
  208. package/dist/js/treeshaking/types/hooks.js +1 -0
  209. package/dist/js/treeshaking/types/index.js +0 -1
  210. package/dist/js/treeshaking/types/legacyConfig/deploy.js +1 -0
  211. package/dist/js/treeshaking/types/legacyConfig/dev.js +1 -0
  212. package/dist/js/treeshaking/types/legacyConfig/index.js +1 -0
  213. package/dist/js/treeshaking/types/legacyConfig/output.js +1 -1
  214. package/dist/js/treeshaking/types/legacyConfig/source.js +1 -0
  215. package/dist/js/treeshaking/types/legacyConfig/tools.js +1 -0
  216. package/dist/js/treeshaking/utils/commands.js +10 -5
  217. package/dist/js/treeshaking/utils/config.js +295 -117
  218. package/dist/js/treeshaking/utils/createFileWatcher.js +278 -118
  219. package/dist/js/treeshaking/utils/createServer.js +252 -67
  220. package/dist/js/treeshaking/utils/getServerInternalPlugins.js +210 -0
  221. package/dist/js/treeshaking/utils/getSpecifiedEntries.js +182 -55
  222. package/dist/js/treeshaking/utils/language.js +6 -5
  223. package/dist/js/treeshaking/utils/printInstructions.js +151 -29
  224. package/dist/js/treeshaking/utils/restart.js +184 -42
  225. package/dist/js/treeshaking/utils/routes.js +151 -27
  226. package/dist/js/treeshaking/utils/types.js +1 -0
  227. package/dist/types/analyze/Builder.d.ts +8 -0
  228. package/dist/types/analyze/constants.d.ts +10 -1
  229. package/dist/types/analyze/index.d.ts +2 -0
  230. package/dist/types/analyze/templates.d.ts +3 -1
  231. package/dist/types/analyze/utils.d.ts +2 -1
  232. package/dist/types/builder/builderPlugins/compatModern.d.ts +2 -1
  233. package/dist/types/builder/index.d.ts +3 -3
  234. package/dist/types/builder/webpackPlugins/routerPlugin.d.ts +1 -7
  235. package/dist/types/commands/index.d.ts +1 -1
  236. package/dist/types/commands/{start.d.ts → serve.d.ts} +0 -0
  237. package/dist/types/defineConfig.d.ts +1 -0
  238. package/dist/types/index.d.ts +7 -1
  239. package/dist/types/initialize/index.d.ts +2 -0
  240. package/dist/types/locale/en.d.ts +1 -1
  241. package/dist/types/locale/index.d.ts +2 -2
  242. package/dist/types/locale/zh.d.ts +1 -1
  243. package/dist/types/types/config/dev.d.ts +2 -2
  244. package/dist/types/types/config/index.d.ts +4 -0
  245. package/dist/types/types/config/output.d.ts +0 -1
  246. package/dist/types/types/config/source.d.ts +2 -0
  247. package/dist/types/types/config/tools.d.ts +2 -0
  248. package/dist/types/types/hooks.d.ts +8 -0
  249. package/dist/types/types/legacyConfig/dev.d.ts +1 -0
  250. package/dist/types/types/legacyConfig/output.d.ts +1 -1
  251. package/dist/types/types/legacyConfig/source.d.ts +1 -0
  252. package/dist/types/types/legacyConfig/tools.d.ts +1 -0
  253. package/dist/types/utils/commands.d.ts +2 -1
  254. package/dist/types/utils/config.d.ts +1 -0
  255. package/dist/types/utils/createServer.d.ts +1 -0
  256. package/dist/types/utils/getServerInternalPlugins.d.ts +2 -0
  257. package/dist/types/utils/restart.d.ts +1 -1
  258. package/package.json +26 -22
  259. package/dist/js/modern/commands/start.js +0 -30
  260. package/dist/js/node/commands/start.js +0 -38
  261. package/dist/js/treeshaking/commands/start.js +0 -69
@@ -1,208 +1,426 @@
1
- import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
2
- import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
3
- import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
4
- import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
5
- import * as path from 'path';
6
- import { fs, getRouteId, normalizeToPosixPath } from '@modern-js/utils';
7
- import { JS_EXTENSIONS } from "./constants";
8
- import { hasLoader, replaceWithAlias } from "./utils";
9
- var LAYOUT_FILE = 'layout';
10
- var PAGE_FILE = 'page';
11
- var LOADING_FILE = 'loading';
12
- var ERROR_FILE = 'error';
13
- var LOADER_FILE = 'loader';
14
- var conventionNames = [LAYOUT_FILE, PAGE_FILE, LOADING_FILE, ERROR_FILE, LOADER_FILE];
15
- var getLoaderPath = /*#__PURE__*/function () {
16
- var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(filename) {
17
- return _regeneratorRuntime().wrap(function _callee$(_context) {
18
- while (1) {
19
- switch (_context.prev = _context.next) {
20
- case 0:
21
- _context.next = 2;
22
- return hasLoader(filename);
23
- case 2:
24
- if (!_context.sent) {
25
- _context.next = 4;
26
- break;
1
+ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
2
+ try {
3
+ var info = gen[key](arg);
4
+ var value = info.value;
5
+ } catch (error) {
6
+ reject(error);
7
+ return;
8
+ }
9
+ if (info.done) {
10
+ resolve(value);
11
+ } else {
12
+ Promise.resolve(value).then(_next, _throw);
13
+ }
14
+ }
15
+ function _asyncToGenerator(fn) {
16
+ return function() {
17
+ var self = this, args = arguments;
18
+ return new Promise(function(resolve, reject) {
19
+ var gen = fn.apply(self, args);
20
+ function _next(value) {
21
+ asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
22
+ }
23
+ function _throw(err) {
24
+ asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
25
+ }
26
+ _next(undefined);
27
+ });
28
+ };
29
+ }
30
+ function _defineProperty(obj, key, value) {
31
+ if (key in obj) {
32
+ Object.defineProperty(obj, key, {
33
+ value: value,
34
+ enumerable: true,
35
+ configurable: true,
36
+ writable: true
37
+ });
38
+ } else {
39
+ obj[key] = value;
40
+ }
41
+ return obj;
42
+ }
43
+ function _objectSpread(target) {
44
+ for(var i = 1; i < arguments.length; i++){
45
+ var source = arguments[i] != null ? arguments[i] : {};
46
+ var ownKeys = Object.keys(source);
47
+ if (typeof Object.getOwnPropertySymbols === "function") {
48
+ ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
49
+ return Object.getOwnPropertyDescriptor(source, sym).enumerable;
50
+ }));
51
+ }
52
+ ownKeys.forEach(function(key) {
53
+ _defineProperty(target, key, source[key]);
54
+ });
55
+ }
56
+ return target;
57
+ }
58
+ function ownKeys(object, enumerableOnly) {
59
+ var keys = Object.keys(object);
60
+ if (Object.getOwnPropertySymbols) {
61
+ var symbols = Object.getOwnPropertySymbols(object);
62
+ if (enumerableOnly) {
63
+ symbols = symbols.filter(function(sym) {
64
+ return Object.getOwnPropertyDescriptor(object, sym).enumerable;
65
+ });
66
+ }
67
+ keys.push.apply(keys, symbols);
68
+ }
69
+ return keys;
70
+ }
71
+ function _objectSpreadProps(target, source) {
72
+ source = source != null ? source : {};
73
+ if (Object.getOwnPropertyDescriptors) {
74
+ Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
75
+ } else {
76
+ ownKeys(Object(source)).forEach(function(key) {
77
+ Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
78
+ });
79
+ }
80
+ return target;
81
+ }
82
+ var __generator = this && this.__generator || function(thisArg, body) {
83
+ var f, y, t, g, _ = {
84
+ label: 0,
85
+ sent: function() {
86
+ if (t[0] & 1) throw t[1];
87
+ return t[1];
88
+ },
89
+ trys: [],
90
+ ops: []
91
+ };
92
+ return(g = {
93
+ next: verb(0),
94
+ "throw": verb(1),
95
+ "return": verb(2)
96
+ }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
97
+ return this;
98
+ }), g);
99
+ function verb(n) {
100
+ return function(v) {
101
+ return step([
102
+ n,
103
+ v
104
+ ]);
105
+ };
106
+ }
107
+ function step(op) {
108
+ if (f) throw new TypeError("Generator is already executing.");
109
+ while(_)try {
110
+ if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
111
+ if (y = 0, t) op = [
112
+ op[0] & 2,
113
+ t.value
114
+ ];
115
+ switch(op[0]){
116
+ case 0:
117
+ case 1:
118
+ t = op;
119
+ break;
120
+ case 4:
121
+ _.label++;
122
+ return {
123
+ value: op[1],
124
+ done: false
125
+ };
126
+ case 5:
127
+ _.label++;
128
+ y = op[1];
129
+ op = [
130
+ 0
131
+ ];
132
+ continue;
133
+ case 7:
134
+ op = _.ops.pop();
135
+ _.trys.pop();
136
+ continue;
137
+ default:
138
+ if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
139
+ _ = 0;
140
+ continue;
141
+ }
142
+ if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
143
+ _.label = op[1];
144
+ break;
145
+ }
146
+ if (op[0] === 6 && _.label < t[1]) {
147
+ _.label = t[1];
148
+ t = op;
149
+ break;
150
+ }
151
+ if (t && _.label < t[2]) {
152
+ _.label = t[2];
153
+ _.ops.push(op);
154
+ break;
155
+ }
156
+ if (t[2]) _.ops.pop();
157
+ _.trys.pop();
158
+ continue;
27
159
  }
28
- return _context.abrupt("return", normalizeToPosixPath(filename));
29
- case 4:
30
- return _context.abrupt("return", undefined);
31
- case 5:
32
- case "end":
33
- return _context.stop();
160
+ op = body.call(thisArg, _);
161
+ } catch (e) {
162
+ op = [
163
+ 6,
164
+ e
165
+ ];
166
+ y = 0;
167
+ } finally{
168
+ f = t = 0;
34
169
  }
35
- }
36
- }, _callee);
37
- }));
38
- return function getLoaderPath(_x) {
39
- return _ref.apply(this, arguments);
40
- };
170
+ if (op[0] & 5) throw op[1];
171
+ return {
172
+ value: op[0] ? op[1] : void 0,
173
+ done: true
174
+ };
175
+ }
176
+ };
177
+ import * as path from "path";
178
+ import { fs, getRouteId } from "@modern-js/utils";
179
+ import { JS_EXTENSIONS, NESTED_ROUTE } from "./constants";
180
+ import { hasLoader, replaceWithAlias } from "./utils";
181
+ var conventionNames = Object.values(NESTED_ROUTE);
182
+ var getLoaderPath = function() {
183
+ var _ref = _asyncToGenerator(function(filename) {
184
+ return __generator(this, function(_state) {
185
+ switch(_state.label){
186
+ case 0:
187
+ return [
188
+ 4,
189
+ hasLoader(filename)
190
+ ];
191
+ case 1:
192
+ if (_state.sent()) {
193
+ return [
194
+ 2,
195
+ filename
196
+ ];
197
+ }
198
+ return [
199
+ 2,
200
+ void 0
201
+ ];
202
+ }
203
+ });
204
+ });
205
+ return function getLoaderPath(filename) {
206
+ return _ref.apply(this, arguments);
207
+ };
41
208
  }();
42
- var replaceDynamicPath = function replaceDynamicPath(routePath) {
43
- return routePath.replace(/\[(.*?)\]/g, ':$1');
209
+ var replaceDynamicPath = function(routePath) {
210
+ return routePath.replace(/\[(.*?)\]/g, ":$1");
44
211
  };
45
- var createIndexRoute = function createIndexRoute(routeInfo, rootDir, filename, entryName) {
46
- return createRoute(_objectSpread(_objectSpread({}, routeInfo), {}, {
47
- index: true,
48
- children: undefined
49
- }), rootDir, filename, entryName);
212
+ var createIndexRoute = function(routeInfo, rootDir, filename, entryName) {
213
+ return createRoute(_objectSpreadProps(_objectSpread({}, routeInfo), {
214
+ index: true,
215
+ children: void 0
216
+ }), rootDir, filename, entryName);
50
217
  };
51
- var createRoute = function createRoute(routeInfo, rootDir, filename, entryName) {
52
- var id = getRouteId(filename, rootDir, entryName);
53
- return _objectSpread(_objectSpread({}, routeInfo), {}, {
54
- id: id,
55
- type: 'nested'
56
- });
218
+ var createRoute = function(routeInfo, rootDir, filename, entryName) {
219
+ var id = getRouteId(filename, rootDir, entryName);
220
+ return _objectSpreadProps(_objectSpread({}, routeInfo), {
221
+ id: id,
222
+ type: "nested"
223
+ });
57
224
  };
58
- export var walk = /*#__PURE__*/function () {
59
- var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(dirname, rootDir, alias, entryName) {
60
- var isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, items, _iterator, _step, item, itemPath, extname, itemWithoutExt, _isDirectory, childRoute, _route$children, _route$children2, _childRoute, finalRoute;
61
- return _regeneratorRuntime().wrap(function _callee2$(_context2) {
62
- while (1) {
63
- switch (_context2.prev = _context2.next) {
64
- case 0:
65
- _context2.next = 2;
66
- return fs.pathExists(dirname);
67
- case 2:
68
- if (_context2.sent) {
69
- _context2.next = 4;
70
- break;
71
- }
72
- return _context2.abrupt("return", null);
73
- case 4:
74
- _context2.next = 6;
75
- return fs.stat(dirname);
76
- case 6:
77
- isDirectory = _context2.sent.isDirectory();
78
- if (isDirectory) {
79
- _context2.next = 9;
80
- break;
81
- }
82
- return _context2.abrupt("return", null);
83
- case 9:
84
- relativeDir = path.relative(rootDir, dirname);
85
- pathSegments = relativeDir.split(path.sep);
86
- lastSegment = pathSegments[pathSegments.length - 1];
87
- isRoot = lastSegment === '';
88
- isPathlessLayout = lastSegment.startsWith('__');
89
- isWithoutLayoutPath = lastSegment.includes('.');
90
- routePath = isRoot || isPathlessLayout ? '/' : "".concat(lastSegment);
91
- if (isWithoutLayoutPath) {
92
- routePath = lastSegment.split('.').join('/');
93
- }
94
- routePath = replaceDynamicPath(routePath);
95
- route = {
96
- path: routePath,
97
- children: [],
98
- isRoot: isRoot
99
- };
100
- _context2.next = 21;
101
- return fs.readdir(dirname);
102
- case 21:
103
- items = _context2.sent;
104
- _iterator = _createForOfIteratorHelper(items);
105
- _context2.prev = 23;
106
- _iterator.s();
107
- case 25:
108
- if ((_step = _iterator.n()).done) {
109
- _context2.next = 55;
110
- break;
225
+ var walk = function() {
226
+ var _ref = _asyncToGenerator(function(dirname, rootDir, alias, entryName) {
227
+ var isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory2, childRoute, ref, loaderPath, ref1, loaderPath1, err, finalRoute;
228
+ return __generator(this, function(_state) {
229
+ switch(_state.label){
230
+ case 0:
231
+ return [
232
+ 4,
233
+ fs.pathExists(dirname)
234
+ ];
235
+ case 1:
236
+ if (!_state.sent()) {
237
+ return [
238
+ 2,
239
+ null
240
+ ];
241
+ }
242
+ return [
243
+ 4,
244
+ fs.stat(dirname)
245
+ ];
246
+ case 2:
247
+ isDirectory = _state.sent().isDirectory();
248
+ if (!isDirectory) {
249
+ return [
250
+ 2,
251
+ null
252
+ ];
253
+ }
254
+ relativeDir = path.relative(rootDir, dirname);
255
+ pathSegments = relativeDir.split(path.sep);
256
+ lastSegment = pathSegments[pathSegments.length - 1];
257
+ isRoot = lastSegment === "";
258
+ isPathlessLayout = lastSegment.startsWith("__");
259
+ isWithoutLayoutPath = lastSegment.includes(".");
260
+ routePath = isRoot || isPathlessLayout ? "/" : "".concat(lastSegment);
261
+ if (isWithoutLayoutPath) {
262
+ routePath = lastSegment.split(".").join("/");
263
+ }
264
+ routePath = replaceDynamicPath(routePath);
265
+ route = {
266
+ path: routePath,
267
+ children: [],
268
+ isRoot: isRoot
269
+ };
270
+ pageLoaderFile = "";
271
+ pageRoute = null;
272
+ return [
273
+ 4,
274
+ fs.readdir(dirname)
275
+ ];
276
+ case 3:
277
+ items = _state.sent();
278
+ _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
279
+ _state.label = 4;
280
+ case 4:
281
+ _state.trys.push([
282
+ 4,
283
+ 15,
284
+ 16,
285
+ 17
286
+ ]);
287
+ _iterator = items[Symbol.iterator]();
288
+ _state.label = 5;
289
+ case 5:
290
+ if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done)) return [
291
+ 3,
292
+ 14
293
+ ];
294
+ item = _step.value;
295
+ itemPath = path.join(dirname, item);
296
+ extname = path.extname(item);
297
+ itemWithoutExt = item.slice(0, -extname.length);
298
+ return [
299
+ 4,
300
+ fs.stat(itemPath)
301
+ ];
302
+ case 6:
303
+ isDirectory2 = _state.sent().isDirectory();
304
+ if (!isDirectory2) return [
305
+ 3,
306
+ 8
307
+ ];
308
+ return [
309
+ 4,
310
+ walk(itemPath, rootDir, alias, entryName)
311
+ ];
312
+ case 7:
313
+ childRoute = _state.sent();
314
+ if (childRoute) {
315
+ ;
316
+ (ref = route.children) === null || ref === void 0 ? void 0 : ref.push(childRoute);
317
+ }
318
+ _state.label = 8;
319
+ case 8:
320
+ if (extname && (!JS_EXTENSIONS.includes(extname) || !conventionNames.includes(itemWithoutExt))) {
321
+ return [
322
+ 3,
323
+ 13
324
+ ];
325
+ }
326
+ if (itemWithoutExt === NESTED_ROUTE.LAYOUT_LOADER_FILE) {
327
+ if (!route.loader) {
328
+ route.loader = itemPath;
329
+ }
330
+ }
331
+ if (!(itemWithoutExt === NESTED_ROUTE.LAYOUT_FILE)) return [
332
+ 3,
333
+ 10
334
+ ];
335
+ route._component = replaceWithAlias(alias.basename, itemPath, alias.name);
336
+ return [
337
+ 4,
338
+ getLoaderPath(itemPath)
339
+ ];
340
+ case 9:
341
+ loaderPath = _state.sent();
342
+ if (loaderPath) {
343
+ route.loader = loaderPath;
344
+ }
345
+ _state.label = 10;
346
+ case 10:
347
+ if (itemWithoutExt === NESTED_ROUTE.PAGE_LOADER_FILE) {
348
+ pageLoaderFile = itemPath;
349
+ }
350
+ if (!(itemWithoutExt === NESTED_ROUTE.PAGE_FILE)) return [
351
+ 3,
352
+ 12
353
+ ];
354
+ pageRoute = createIndexRoute({
355
+ _component: replaceWithAlias(alias.basename, itemPath, alias.name)
356
+ }, rootDir, itemPath, entryName);
357
+ return [
358
+ 4,
359
+ getLoaderPath(itemPath)
360
+ ];
361
+ case 11:
362
+ loaderPath1 = _state.sent();
363
+ if (loaderPath1) {
364
+ pageRoute.loader = loaderPath1;
365
+ } else if (pageLoaderFile) {
366
+ pageRoute.loader = pageLoaderFile;
367
+ }
368
+ (ref1 = route.children) === null || ref1 === void 0 ? void 0 : ref1.push(pageRoute);
369
+ _state.label = 12;
370
+ case 12:
371
+ if (itemWithoutExt === NESTED_ROUTE.LOADING_FILE) {
372
+ route.loading = replaceWithAlias(alias.basename, itemPath, alias.name);
373
+ }
374
+ if (itemWithoutExt === NESTED_ROUTE.ERROR_FILE) {
375
+ route.error = replaceWithAlias(alias.basename, itemPath, alias.name);
376
+ }
377
+ _state.label = 13;
378
+ case 13:
379
+ _iteratorNormalCompletion = true;
380
+ return [
381
+ 3,
382
+ 5
383
+ ];
384
+ case 14:
385
+ return [
386
+ 3,
387
+ 17
388
+ ];
389
+ case 15:
390
+ err = _state.sent();
391
+ _didIteratorError = true;
392
+ _iteratorError = err;
393
+ return [
394
+ 3,
395
+ 17
396
+ ];
397
+ case 16:
398
+ try {
399
+ if (!_iteratorNormalCompletion && _iterator.return != null) {
400
+ _iterator.return();
401
+ }
402
+ } finally{
403
+ if (_didIteratorError) {
404
+ throw _iteratorError;
405
+ }
406
+ }
407
+ return [
408
+ 7
409
+ ];
410
+ case 17:
411
+ finalRoute = createRoute(route, rootDir, path.join(dirname, "".concat(NESTED_ROUTE.LAYOUT_FILE, ".ts")), entryName);
412
+ if (isPathlessLayout) {
413
+ delete finalRoute.path;
414
+ }
415
+ return [
416
+ 2,
417
+ finalRoute
418
+ ];
111
419
  }
112
- item = _step.value;
113
- itemPath = path.join(dirname, item);
114
- extname = path.extname(item);
115
- itemWithoutExt = item.slice(0, -extname.length);
116
- _context2.next = 32;
117
- return fs.stat(itemPath);
118
- case 32:
119
- _isDirectory = _context2.sent.isDirectory();
120
- if (!_isDirectory) {
121
- _context2.next = 38;
122
- break;
123
- }
124
- _context2.next = 36;
125
- return walk(itemPath, rootDir, alias, entryName);
126
- case 36:
127
- childRoute = _context2.sent;
128
- if (childRoute) {
129
- (_route$children = route.children) === null || _route$children === void 0 ? void 0 : _route$children.push(childRoute);
130
- }
131
- case 38:
132
- if (!(extname && (!JS_EXTENSIONS.includes(extname) || !conventionNames.includes(itemWithoutExt)))) {
133
- _context2.next = 40;
134
- break;
135
- }
136
- return _context2.abrupt("continue", 53);
137
- case 40:
138
- if (!(itemWithoutExt === LAYOUT_FILE)) {
139
- _context2.next = 45;
140
- break;
141
- }
142
- route._component = replaceWithAlias(alias.basename, itemPath, alias.name);
143
- _context2.next = 44;
144
- return getLoaderPath(itemPath);
145
- case 44:
146
- route.loader = _context2.sent;
147
- case 45:
148
- if (!(itemWithoutExt === PAGE_FILE)) {
149
- _context2.next = 51;
150
- break;
151
- }
152
- _childRoute = createIndexRoute({
153
- _component: replaceWithAlias(alias.basename, itemPath, alias.name)
154
- }, rootDir, itemPath, entryName);
155
- _context2.next = 49;
156
- return getLoaderPath(itemPath);
157
- case 49:
158
- _childRoute.loader = _context2.sent;
159
- (_route$children2 = route.children) === null || _route$children2 === void 0 ? void 0 : _route$children2.push(_childRoute);
160
- case 51:
161
- // if (itemWithoutExt === LOADER_FILE) {
162
- // route.loader = replaceWithAlias(alias.basename, itemPath, alias.name);
163
- // }
164
-
165
- if (itemWithoutExt === LOADING_FILE) {
166
- route.loading = replaceWithAlias(alias.basename, itemPath, alias.name);
167
- }
168
- if (itemWithoutExt === ERROR_FILE) {
169
- route.error = replaceWithAlias(alias.basename, itemPath, alias.name);
170
- }
171
- case 53:
172
- _context2.next = 25;
173
- break;
174
- case 55:
175
- _context2.next = 60;
176
- break;
177
- case 57:
178
- _context2.prev = 57;
179
- _context2.t0 = _context2["catch"](23);
180
- _iterator.e(_context2.t0);
181
- case 60:
182
- _context2.prev = 60;
183
- _iterator.f();
184
- return _context2.finish(60);
185
- case 63:
186
- finalRoute = createRoute(route, rootDir, path.join(dirname, "".concat(LAYOUT_FILE, ".ts")), entryName);
187
- /**
188
- * when the url is /, the __auth/layout.tsx component should not be rendered
189
- * - routes
190
- * - __auth
191
- * - layout.tsx
192
- * - layout.tsx
193
- */
194
- if (isPathlessLayout) {
195
- delete finalRoute.path;
196
- }
197
- return _context2.abrupt("return", finalRoute);
198
- case 66:
199
- case "end":
200
- return _context2.stop();
201
- }
202
- }
203
- }, _callee2, null, [[23, 57, 60, 63]]);
204
- }));
205
- return function walk(_x2, _x3, _x4, _x5) {
206
- return _ref2.apply(this, arguments);
207
- };
208
- }();
420
+ });
421
+ });
422
+ return function walk(dirname, rootDir, alias, entryName) {
423
+ return _ref.apply(this, arguments);
424
+ };
425
+ }();
426
+ export { walk };