lucy-cli 2.0.0-alpha.9 → 2.0.0-beta.2

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 (453) hide show
  1. package/.yarnrc.yml +0 -1
  2. package/README.md +117 -102
  3. package/dist/args.d.ts +1 -6
  4. package/dist/args.js +103 -7
  5. package/dist/args.js.map +1 -0
  6. package/dist/commands/checks.d.ts +7 -0
  7. package/dist/commands/checks.js +47 -0
  8. package/dist/commands/checks.js.map +1 -0
  9. package/dist/commands/cleanup.d.ts +4 -0
  10. package/dist/commands/cleanup.js +10 -0
  11. package/dist/commands/cleanup.js.map +1 -0
  12. package/dist/commands/copy.d.ts +6 -0
  13. package/dist/commands/copy.js +20 -0
  14. package/dist/commands/copy.js.map +1 -0
  15. package/dist/commands/edit.d.ts +10 -0
  16. package/dist/commands/edit.js +67 -0
  17. package/dist/commands/edit.js.map +1 -0
  18. package/dist/commands/exec.d.ts +7 -0
  19. package/dist/commands/exec.js +67 -0
  20. package/dist/commands/exec.js.map +1 -0
  21. package/dist/commands/git.d.ts +8 -0
  22. package/dist/commands/git.js +104 -0
  23. package/dist/commands/git.js.map +1 -0
  24. package/dist/commands/home.d.ts +4 -0
  25. package/dist/commands/home.js +18 -0
  26. package/dist/commands/home.js.map +1 -0
  27. package/dist/commands/install.d.ts +8 -0
  28. package/dist/commands/install.js +165 -0
  29. package/dist/commands/install.js.map +1 -0
  30. package/dist/commands/read.d.ts +6 -0
  31. package/dist/commands/read.js +40 -0
  32. package/dist/commands/read.js.map +1 -0
  33. package/dist/commands/write.d.ts +7 -0
  34. package/dist/commands/write.js +28 -0
  35. package/dist/commands/write.js.map +1 -0
  36. package/dist/commands.js +1 -0
  37. package/dist/commands.js.map +1 -0
  38. package/dist/config.d.ts +29 -7
  39. package/dist/config.js +90 -26
  40. package/dist/config.js.map +1 -0
  41. package/dist/error.d.ts +1 -9
  42. package/dist/error.js +1 -2
  43. package/dist/error.js.map +1 -0
  44. package/dist/helpers.d.ts +9 -0
  45. package/dist/helpers.js +83 -0
  46. package/dist/helpers.js.map +1 -0
  47. package/dist/index.d.ts +1 -0
  48. package/dist/index.js +77 -9
  49. package/dist/index.js.map +1 -0
  50. package/dist/init/blocks.d.ts +5 -0
  51. package/dist/init/blocks.js +62 -0
  52. package/dist/init/blocks.js.map +1 -0
  53. package/dist/init/cargo.d.ts +2 -0
  54. package/dist/init/cargo.js +21 -0
  55. package/dist/init/cargo.js.map +1 -0
  56. package/dist/init/expo.d.ts +5 -0
  57. package/dist/init/expo.js +52 -0
  58. package/dist/init/expo.js.map +1 -0
  59. package/dist/init/gitModules.d.ts +2 -0
  60. package/dist/init/gitModules.js +13 -0
  61. package/dist/init/gitModules.js.map +1 -0
  62. package/dist/init/index.d.ts +4 -0
  63. package/dist/init/index.js +77 -0
  64. package/dist/init/index.js.map +1 -0
  65. package/dist/init/monorepo.d.ts +4 -0
  66. package/dist/init/monorepo.js +48 -0
  67. package/dist/init/monorepo.js.map +1 -0
  68. package/dist/init/prepareVelo.d.ts +2 -0
  69. package/dist/init/prepareVelo.js +16 -0
  70. package/dist/init/prepareVelo.js.map +1 -0
  71. package/dist/init/tauri.d.ts +5 -0
  72. package/dist/init/tauri.js +32 -0
  73. package/dist/init/tauri.js.map +1 -0
  74. package/dist/init/templates.d.ts +5 -0
  75. package/dist/init/templates.js +93 -0
  76. package/dist/init/templates.js.map +1 -0
  77. package/dist/init/velo.d.ts +5 -0
  78. package/dist/init/velo.js +60 -0
  79. package/dist/init/velo.js.map +1 -0
  80. package/dist/policy.js +1 -0
  81. package/dist/policy.js.map +1 -0
  82. package/dist/prepare.js +1 -0
  83. package/dist/prepare.js.map +1 -0
  84. package/dist/runtime.d.ts +1 -1
  85. package/dist/runtime.js +1 -0
  86. package/dist/runtime.js.map +1 -0
  87. package/dist/schemas/gulp.d.ts +25 -0
  88. package/dist/schemas/gulp.js +8 -0
  89. package/dist/schemas/gulp.js.map +1 -0
  90. package/dist/schemas/index.d.ts +10 -0
  91. package/dist/schemas/index.js +9 -0
  92. package/dist/schemas/index.js.map +1 -0
  93. package/dist/schemas/lucy.d.ts +29 -0
  94. package/dist/schemas/lucy.js +42 -0
  95. package/dist/schemas/lucy.js.map +1 -0
  96. package/dist/schemas/tsconfig.js +2 -0
  97. package/dist/schemas/tsconfig.js.map +1 -0
  98. package/dist/schemas/types.d.ts +33 -0
  99. package/dist/schemas/types.js +5 -1
  100. package/dist/schemas/types.js.map +1 -0
  101. package/dist/states.js +1 -0
  102. package/dist/states.js.map +1 -0
  103. package/dist/tasks/Gulpfile.d.ts +4 -0
  104. package/dist/tasks/Gulpfile.js +111 -0
  105. package/dist/tasks/Gulpfile.js.map +1 -0
  106. package/dist/tasks/gulp/backend.d.ts +4 -0
  107. package/dist/tasks/gulp/backend.js +92 -0
  108. package/dist/tasks/gulp/backend.js.map +1 -0
  109. package/dist/tasks/gulp/checks.d.ts +4 -0
  110. package/dist/tasks/gulp/checks.js +202 -0
  111. package/dist/tasks/gulp/checks.js.map +1 -0
  112. package/dist/tasks/gulp/clean.d.ts +3 -0
  113. package/dist/tasks/gulp/clean.js +33 -0
  114. package/dist/tasks/gulp/clean.js.map +1 -0
  115. package/dist/tasks/gulp/copy.d.ts +3 -0
  116. package/dist/tasks/gulp/copy.js +34 -0
  117. package/dist/tasks/gulp/copy.js.map +1 -0
  118. package/dist/tasks/gulp/helpers.d.ts +3 -0
  119. package/dist/tasks/gulp/helpers.js +19 -0
  120. package/dist/tasks/gulp/helpers.js.map +1 -0
  121. package/dist/tasks/gulp/pages.d.ts +2 -0
  122. package/dist/tasks/gulp/pages.js +39 -0
  123. package/dist/tasks/gulp/pages.js.map +1 -0
  124. package/dist/tasks/gulp/pipeline.d.ts +1 -0
  125. package/dist/tasks/gulp/pipeline.js +29 -0
  126. package/dist/tasks/gulp/pipeline.js.map +1 -0
  127. package/dist/tasks/gulp/public.d.ts +3 -0
  128. package/dist/tasks/gulp/public.js +50 -0
  129. package/dist/tasks/gulp/public.js.map +1 -0
  130. package/dist/tasks/gulp/styles.d.ts +3 -0
  131. package/dist/tasks/gulp/styles.js +40 -0
  132. package/dist/tasks/gulp/styles.js.map +1 -0
  133. package/dist/tasks/gulp/templates.d.ts +2 -0
  134. package/dist/tasks/gulp/templates.js +45 -0
  135. package/dist/tasks/gulp/templates.js.map +1 -0
  136. package/dist/tasks/gulp/types.d.ts +4 -0
  137. package/dist/tasks/gulp/types.js +293 -0
  138. package/dist/tasks/gulp/types.js.map +1 -0
  139. package/dist/tasks/gulp/watchers.d.ts +3 -0
  140. package/dist/tasks/gulp/watchers.js +59 -0
  141. package/dist/tasks/gulp/watchers.js.map +1 -0
  142. package/dist/tasks/index.d.ts +4 -0
  143. package/dist/tasks/index.js +23 -0
  144. package/dist/tasks/index.js.map +1 -0
  145. package/dist/tasks/syncSettings.d.ts +3 -0
  146. package/dist/tasks/syncSettings.js +18 -0
  147. package/dist/tasks/syncSettings.js.map +1 -0
  148. package/dist/utils/index.js +2 -0
  149. package/dist/utils/index.js.map +1 -0
  150. package/dist/utils/logger.d.ts +17 -0
  151. package/dist/utils/logger.js +37 -0
  152. package/dist/utils/logger.js.map +1 -0
  153. package/dist/wix-sdk/check.d.ts +4 -0
  154. package/dist/wix-sdk/check.js +23 -0
  155. package/dist/wix-sdk/check.js.map +1 -0
  156. package/dist/wix-sdk/client.d.ts +10 -0
  157. package/dist/wix-sdk/client.js +18 -0
  158. package/dist/wix-sdk/client.js.map +1 -0
  159. package/dist/wix-sdk/index.d.ts +4 -0
  160. package/dist/wix-sdk/index.js +15 -0
  161. package/dist/wix-sdk/index.js.map +1 -0
  162. package/dist/wix-sdk/init.d.ts +4 -0
  163. package/dist/wix-sdk/init.js +51 -0
  164. package/dist/wix-sdk/init.js.map +1 -0
  165. package/dist/wix-sdk/run.d.ts +4 -0
  166. package/dist/wix-sdk/run.js +53 -0
  167. package/dist/wix-sdk/run.js.map +1 -0
  168. package/dist/wix-sync/client.d.ts +3 -0
  169. package/dist/wix-sync/client.js +5 -0
  170. package/dist/wix-sync/client.js.map +1 -0
  171. package/dist/wix-sync/export.d.ts +4 -0
  172. package/dist/wix-sync/export.js +15 -0
  173. package/dist/wix-sync/export.js.map +1 -0
  174. package/dist/wix-sync/import.d.ts +4 -0
  175. package/dist/wix-sync/import.js +26 -0
  176. package/dist/wix-sync/import.js.map +1 -0
  177. package/dist/wix-sync/index.d.ts +4 -0
  178. package/dist/wix-sync/index.js +35 -0
  179. package/dist/wix-sync/index.js.map +1 -0
  180. package/dist/wix-sync/init.d.ts +4 -0
  181. package/dist/wix-sync/init.js +74 -0
  182. package/dist/wix-sync/init.js.map +1 -0
  183. package/dist/wix-sync/is-alive.d.ts +4 -0
  184. package/dist/wix-sync/is-alive.js +23 -0
  185. package/dist/wix-sync/is-alive.js.map +1 -0
  186. package/dist/wix-sync/migrate.d.ts +4 -0
  187. package/dist/wix-sync/migrate.js +21 -0
  188. package/dist/wix-sync/migrate.js.map +1 -0
  189. package/dist/wix-sync/sync.d.ts +4 -0
  190. package/dist/wix-sync/sync.js +26 -0
  191. package/dist/wix-sync/sync.js.map +1 -0
  192. package/files/sync-data/data/test.csv +17 -0
  193. package/files/sync-data/files/lucy.jpg +0 -0
  194. package/files/sync-data/schema/test.json +11 -0
  195. package/files/templates/block[D]/files/.stylelintrc.js +8 -0
  196. package/files/templates/block[D]/lucy.json +9 -0
  197. package/files/templates/cargo[D]/files/.env +1 -0
  198. package/files/templates/cargo[D]/files/Cargo.toml +238 -0
  199. package/files/templates/cargo[D]/files/Makefile.toml +4 -0
  200. package/files/templates/cargo[D]/files/build/main.rs +35 -0
  201. package/files/templates/cargo[D]/files/config/beta.json +19 -0
  202. package/files/templates/cargo[D]/files/config/ci.json +15 -0
  203. package/files/templates/cargo[D]/files/config/default.json +71 -0
  204. package/files/templates/cargo[D]/files/config/development.json +10 -0
  205. package/files/templates/cargo[D]/files/config/produktion.json +5 -0
  206. package/files/templates/cargo[D]/files/config/stage.json +4 -0
  207. package/files/templates/cargo[D]/files/locales/todo.yml +3 -0
  208. package/files/templates/cargo[D]/files/public/index.html +1 -0
  209. package/files/templates/cargo[D]/lucy.json +15 -0
  210. package/files/templates/expo[D]/files/.stylelintrc.js +8 -0
  211. package/files/{expo → templates/expo[D]/files}/eas.json +9 -3
  212. package/files/templates/expo[D]/files/lib/data.ts +197 -0
  213. package/files/{expo → templates/expo[D]/files}/metro.config.js +6 -0
  214. package/files/templates/expo[D]/files/pnpm-workspace.yaml +3 -0
  215. package/files/templates/expo[D]/lucy.json +86 -0
  216. package/files/templates/monorepo[D]/files/.editorconfig +10 -0
  217. package/files/templates/monorepo[D]/files/.nvmrc +1 -0
  218. package/files/templates/monorepo[D]/files/.prettierignore +23 -0
  219. package/files/templates/monorepo[D]/files/.prettierrc.json +15 -0
  220. package/files/templates/monorepo[D]/files/.stylelintrc.js +8 -0
  221. package/files/templates/monorepo[D]/files/.yarnrc +1 -0
  222. package/files/templates/monorepo[D]/files/.yarnrc.yml +3 -0
  223. package/files/templates/monorepo[D]/files/README.md +109 -0
  224. package/files/templates/monorepo[D]/files/currents.config.ts +5 -0
  225. package/files/templates/monorepo[D]/files/nx.json +25 -0
  226. package/files/templates/monorepo[D]/files/pnpm-workspace.yaml +11 -0
  227. package/files/templates/monorepo[D]/files/tsconfig.json +6 -0
  228. package/files/templates/monorepo[D]/files/typedoc.json +25 -0
  229. package/files/templates/monorepo[D]/files/vitest.config.ts +27 -0
  230. package/files/templates/monorepo[D]/lucy.json +69 -0
  231. package/files/templates/tauri[D]/lucy.json +9 -0
  232. package/files/templates/velo[D]/files/.prettierignore +23 -0
  233. package/files/templates/velo[D]/files/.prettierrc.js +16 -0
  234. package/files/templates/velo[D]/lucy.json +137 -0
  235. package/lucy.jpg +0 -0
  236. package/old/Gulpfile.d.ts +34 -0
  237. package/old/Gulpfile.js +116 -0
  238. package/old/Gulpfile.js.map +1 -0
  239. package/old/gulp/backend.d.ts +3 -0
  240. package/old/gulp/backend.js +92 -0
  241. package/old/gulp/backend.js.map +1 -0
  242. package/old/gulp/checks.d.ts +3 -0
  243. package/old/gulp/checks.js +205 -0
  244. package/old/gulp/checks.js.map +1 -0
  245. package/old/gulp/clean.d.ts +3 -0
  246. package/old/gulp/clean.js +29 -0
  247. package/old/gulp/clean.js.map +1 -0
  248. package/old/gulp/copy.d.ts +2 -0
  249. package/old/gulp/copy.js +34 -0
  250. package/old/gulp/copy.js.map +1 -0
  251. package/old/gulp/helpers.d.ts +2 -0
  252. package/old/gulp/helpers.js +25 -0
  253. package/old/gulp/helpers.js.map +1 -0
  254. package/old/gulp/pages.d.ts +2 -0
  255. package/old/gulp/pages.js +37 -0
  256. package/old/gulp/pages.js.map +1 -0
  257. package/old/gulp/pipeline.d.ts +1 -0
  258. package/old/gulp/pipeline.js +29 -0
  259. package/old/gulp/pipeline.js.map +1 -0
  260. package/old/gulp/public.d.ts +2 -0
  261. package/old/gulp/public.js +50 -0
  262. package/old/gulp/public.js.map +1 -0
  263. package/old/gulp/styles.d.ts +2 -0
  264. package/old/gulp/styles.js +40 -0
  265. package/old/gulp/styles.js.map +1 -0
  266. package/old/gulp/templates.d.ts +2 -0
  267. package/old/gulp/templates.js +33 -0
  268. package/old/gulp/templates.js.map +1 -0
  269. package/old/gulp/types.d.ts +4 -0
  270. package/old/gulp/types.js +289 -0
  271. package/old/gulp/types.js.map +1 -0
  272. package/old/gulp/watchers.d.ts +9 -0
  273. package/old/gulp/watchers.js +59 -0
  274. package/old/gulp/watchers.js.map +1 -0
  275. package/old/helpers.d.ts +32 -0
  276. package/old/helpers.js +267 -0
  277. package/old/helpers.js.map +1 -0
  278. package/{src copy/helpers.ts → old/helpers.ts} +1 -1
  279. package/old/index.d.ts +59 -0
  280. package/old/index.js +288 -0
  281. package/old/index.js.map +1 -0
  282. package/old/init.d.ts +8 -0
  283. package/old/init.js +165 -0
  284. package/old/init.js.map +1 -0
  285. package/old/models.d.ts +37 -0
  286. package/old/models.js +2 -0
  287. package/old/models.js.map +1 -0
  288. package/old/prepare.d.ts +8 -0
  289. package/old/prepare.js +20 -0
  290. package/old/prepare.js.map +1 -0
  291. package/old/schemas/index.js +2 -0
  292. package/old/schemas/index.js.map +1 -0
  293. package/old/schemas/index.ts +0 -0
  294. package/old/schemas/types.d.ts +0 -0
  295. package/old/schemas/types.js +2 -0
  296. package/old/schemas/types.js.map +1 -0
  297. package/old/schemas/types.ts +0 -0
  298. package/old/sync.d.ts +2 -0
  299. package/old/sync.js +88 -0
  300. package/old/sync.js.map +1 -0
  301. package/package.json +18 -19
  302. package/patches/velo-sync+0.0.9.patch +13 -0
  303. package/src/args.ts +103 -17
  304. package/src/commands/checks.ts +51 -0
  305. package/src/commands/cleanup.ts +11 -0
  306. package/src/commands/copy.ts +28 -0
  307. package/src/commands/edit.ts +81 -0
  308. package/src/commands/exec.ts +69 -0
  309. package/src/commands/git.ts +113 -0
  310. package/src/commands/home.ts +22 -0
  311. package/src/commands/install.ts +249 -0
  312. package/src/commands/read.ts +45 -0
  313. package/src/commands/write.ts +45 -0
  314. package/src/config.ts +116 -35
  315. package/src/error.ts +1 -2
  316. package/src/helpers.ts +92 -0
  317. package/src/index.ts +88 -13
  318. package/src/init/blocks.ts +85 -0
  319. package/src/init/cargo.ts +25 -0
  320. package/src/init/expo.ts +69 -0
  321. package/src/init/gitModules.ts +15 -0
  322. package/src/init/index.ts +81 -0
  323. package/src/init/monorepo.ts +72 -0
  324. package/src/init/prepareVelo.ts +19 -0
  325. package/src/init/tauri.ts +42 -0
  326. package/src/init/templates.ts +98 -0
  327. package/src/init/velo.ts +65 -0
  328. package/src/runtime.ts +1 -0
  329. package/src/schemas/gulp.ts +31 -0
  330. package/src/schemas/index.ts +13 -1
  331. package/src/schemas/lucy.ts +43 -0
  332. package/src/schemas/types.ts +40 -0
  333. package/src/tasks/Gulpfile.ts +207 -0
  334. package/src/tasks/gulp/backend.ts +113 -0
  335. package/src/tasks/gulp/checks.ts +218 -0
  336. package/src/tasks/gulp/clean.ts +38 -0
  337. package/src/tasks/gulp/copy.ts +38 -0
  338. package/src/tasks/gulp/helpers.ts +18 -0
  339. package/src/tasks/gulp/pages.ts +43 -0
  340. package/src/tasks/gulp/pipeline.ts +31 -0
  341. package/src/tasks/gulp/public.ts +61 -0
  342. package/src/tasks/gulp/styles.ts +47 -0
  343. package/src/tasks/gulp/templates.ts +53 -0
  344. package/src/tasks/gulp/types.ts +310 -0
  345. package/src/tasks/gulp/watchers.ts +97 -0
  346. package/src/tasks/index.ts +24 -0
  347. package/src/tasks/syncSettings.ts +21 -0
  348. package/src/types.d.ts +1 -1
  349. package/src/utils/index.ts +0 -0
  350. package/src/utils/logger.ts +40 -0
  351. package/src/wix-sdk/check.ts +24 -0
  352. package/src/wix-sdk/client.ts +18 -0
  353. package/src/wix-sdk/index.ts +17 -0
  354. package/src/wix-sdk/init.ts +54 -0
  355. package/src/wix-sdk/run.ts +56 -0
  356. package/src/wix-sync/client.ts +6 -0
  357. package/src/wix-sync/export.ts +19 -0
  358. package/src/wix-sync/import.ts +27 -0
  359. package/src/wix-sync/index.ts +36 -0
  360. package/src/wix-sync/init.ts +77 -0
  361. package/src/wix-sync/is-alive.ts +25 -0
  362. package/src/wix-sync/migrate.ts +23 -0
  363. package/src/wix-sync/sync.ts +27 -0
  364. package/tsconfig.json +6 -5
  365. package/dist/init.d.ts +0 -4
  366. package/dist/init.js +0 -275
  367. package/dist/models.js +0 -1
  368. package/dist/params.d.ts +0 -7
  369. package/dist/params.js +0 -23
  370. package/files/expo/lib/data.ts +0 -48
  371. package/files/expo/lucy.json +0 -8
  372. package/src/init.ts +0 -392
  373. /package/dist/{models.d.ts → schemas/tsconfig.d.ts} +0 -0
  374. /package/{files/expo/components/.gitkeep → dist/utils/index.d.ts} +0 -0
  375. /package/files/{expo → templates/expo[D]/files}/.nvmrc +0 -0
  376. /package/files/{expo → templates/expo[D]/files}/.prettierignore +0 -0
  377. /package/files/{expo → templates/expo[D]/files}/.prettierrc.js +0 -0
  378. /package/files/{expo → templates/expo[D]/files}/.yarnrc +0 -0
  379. /package/files/{expo → templates/expo[D]/files}/.yarnrc.yml +0 -0
  380. /package/files/{expo → templates/expo[D]/files}/README.md +0 -0
  381. /package/files/{expo → templates/expo[D]/files}/assets/fonts/SpaceMono-Regular.ttf +0 -0
  382. /package/files/{expo → templates/expo[D]/files}/assets/images/adaptive-icon.png +0 -0
  383. /package/files/{expo → templates/expo[D]/files}/assets/images/favicon.png +0 -0
  384. /package/files/{expo → templates/expo[D]/files}/assets/images/icon.png +0 -0
  385. /package/files/{expo → templates/expo[D]/files}/assets/images/splash-icon.png +0 -0
  386. /package/files/{expo → templates/expo[D]/files}/babel.config.js +0 -0
  387. /package/files/{expo/components/ui → templates/expo[D]/files/components}/.gitkeep +0 -0
  388. /package/files/{velo/typescript/__mocks__ → templates/expo[D]/files/components/ui}/.gitkeep +0 -0
  389. /package/files/{expo → templates/expo[D]/files}/constants/theme.ts +0 -0
  390. /package/files/{expo → templates/expo[D]/files}/eslint.config.mjs +0 -0
  391. /package/files/{expo → templates/expo[D]/files}/global.css +0 -0
  392. /package/files/{expo → templates/expo[D]/files}/hooks/useColorScheme.ts +0 -0
  393. /package/files/{expo → templates/expo[D]/files}/index.ts +0 -0
  394. /package/files/{expo → templates/expo[D]/files}/lib/utils/index.ts +0 -0
  395. /package/files/{expo → templates/expo[D]/files}/lib/utils/polyfills.ts +0 -0
  396. /package/files/{expo → templates/expo[D]/files}/lib/wix/client.ts +0 -0
  397. /package/files/{expo → templates/expo[D]/files}/lib/wix/error.ts +0 -0
  398. /package/files/{expo → templates/expo[D]/files}/lib/wix/index.ts +0 -0
  399. /package/files/{expo → templates/expo[D]/files}/nativewind-env.d.ts +0 -0
  400. /package/files/{expo → templates/expo[D]/files}/scripts/reset-project.ts +0 -0
  401. /package/files/{expo → templates/expo[D]/files}/tailwind.config.js +0 -0
  402. /package/files/{expo → templates/expo[D]/files}/tsconfig.json +0 -0
  403. /package/files/{expo → templates/expo[D]/files}/types/reset.d.ts +0 -0
  404. /package/files/{velo → templates/velo[D]/files}/.gitmodules +0 -0
  405. /package/files/{velo → templates/velo[D]/files}/.madgerc +0 -0
  406. /package/files/{velo → templates/velo[D]/files}/.nvmrc +0 -0
  407. /package/files/{velo → templates/velo[D]/files}/.stylelintrc.js +0 -0
  408. /package/files/{velo → templates/velo[D]/files}/.yarnrc.yml +0 -0
  409. /package/files/{velo → templates/velo[D]/files}/currents.config.js +0 -0
  410. /package/files/{velo → templates/velo[D]/files}/cypress/e2e/base/base.cy.ts +0 -0
  411. /package/files/{velo → templates/velo[D]/files}/cypress/fixtures/example.json +0 -0
  412. /package/files/{velo → templates/velo[D]/files}/cypress/support/commands.ts +0 -0
  413. /package/files/{velo → templates/velo[D]/files}/cypress/support/e2e.ts +0 -0
  414. /package/files/{velo → templates/velo[D]/files}/cypress/tsconfig.json +0 -0
  415. /package/files/{velo → templates/velo[D]/files}/cypress.config.mjs +0 -0
  416. /package/files/{velo → templates/velo[D]/files}/eslint.config.mjs +0 -0
  417. /package/files/{velo → templates/velo[D]/files}/local.tsconfig.json +0 -0
  418. /package/files/{velo → templates/velo[D]/files}/typedoc.json +0 -0
  419. /package/files/{velo/typescript/pages → templates/velo[D]/files/typescript/__mocks__}/.gitkeep +0 -0
  420. /package/files/{velo → templates/velo[D]/files}/typescript/backend/data.ts +0 -0
  421. /package/files/{velo → templates/velo[D]/files}/typescript/backend/events.ts +0 -0
  422. /package/files/{velo → templates/velo[D]/files}/typescript/backend/http-functions.ts +0 -0
  423. /package/files/{velo → templates/velo[D]/files}/typescript/backend/lib/http-functions/sync.ts +0 -0
  424. /package/files/{velo → templates/velo[D]/files}/typescript/backend/permissions.json +0 -0
  425. /package/files/{velo/typescript/public → templates/velo[D]/files/typescript/pages}/.gitkeep +0 -0
  426. /package/files/{velo/typescript/styles → templates/velo[D]/files/typescript/public}/.gitkeep +0 -0
  427. /package/files/{velo → templates/velo[D]/files}/typescript/public/scss/app.scss +0 -0
  428. /package/files/{velo/typescript/styles/global.scss → templates/velo[D]/files/typescript/styles/.gitkeep} +0 -0
  429. /package/{src copy/schemas/index.ts → files/templates/velo[D]/files/typescript/styles/global.scss} +0 -0
  430. /package/files/{velo → templates/velo[D]/files}/typescript/tsconfig.json +0 -0
  431. /package/files/{velo → templates/velo[D]/files}/vitest.config.ts +0 -0
  432. /package/{src copy → old}/Gulpfile.ts +0 -0
  433. /package/{src copy → old}/gulp/backend.ts +0 -0
  434. /package/{src copy → old}/gulp/checks.ts +0 -0
  435. /package/{src copy → old}/gulp/clean.ts +0 -0
  436. /package/{src copy → old}/gulp/copy.ts +0 -0
  437. /package/{src copy → old}/gulp/helpers.ts +0 -0
  438. /package/{src copy → old}/gulp/pages.ts +0 -0
  439. /package/{src copy → old}/gulp/pipeline.ts +0 -0
  440. /package/{src copy → old}/gulp/public.ts +0 -0
  441. /package/{src copy → old}/gulp/styles.ts +0 -0
  442. /package/{src copy → old}/gulp/templates.ts +0 -0
  443. /package/{src copy → old}/gulp/types.ts +0 -0
  444. /package/{src copy → old}/gulp/watchers.ts +0 -0
  445. /package/{src copy → old}/index.ts +0 -0
  446. /package/{src copy → old}/init.ts +0 -0
  447. /package/{src copy → old}/models.ts +0 -0
  448. /package/{src copy → old}/prepare.ts +0 -0
  449. /package/{src copy/schemas/types.ts → old/schemas/index.d.ts} +0 -0
  450. /package/{src copy → old}/settings.json +0 -0
  451. /package/{src copy → old}/sync.ts +0 -0
  452. /package/{src copy → old}/types.d.ts +0 -0
  453. /package/src/{models.ts → schemas/tsconfig.ts} +0 -0
@@ -0,0 +1,65 @@
1
+ import { Effect, Schema } from "effect/index"
2
+ import { Config } from "../config.js";
3
+ import { FileSystem, Path } from "@effect/platform"
4
+ import { logger } from "../utils/logger.js";
5
+ import { mergeAdditions, mergeLucySettings2PackageJson, setInitialized, setProjectName, stringReplace } from "../commands/edit.js";
6
+ import { writeLucySettings, writePackageJson } from "../commands/write.js";
7
+ import { copyTemplateFiles } from "../commands/copy.js";
8
+ import { readPackageJson } from "../commands/read.js";
9
+ import { installVeloPackages, runInstall } from "../commands/install.js";
10
+ import { cleanup } from "../commands/cleanup.js";
11
+ import { gitInit } from "../commands/git.js";
12
+ import { checkForVelo } from "../commands/checks.js";
13
+ import { AppError } from "../error.js";
14
+ import Enquirer from "enquirer";
15
+ import { prepareVelo } from "./prepareVelo.js";
16
+ import { openVSCode } from "../commands/exec.js";
17
+
18
+ export const init_velo = () => {
19
+ return Effect.gen(function*() {
20
+ const config = yield* Config;
21
+ const path = yield* Path.Path;
22
+
23
+ logger.action("Initializing Velo...");
24
+
25
+ yield* checkForVelo();
26
+
27
+ if(config.config.lucySettings.initialized && !config.config.force) {
28
+ const question = new Enquirer();
29
+ const choice = yield* Effect.tryPromise({
30
+ try: () => question.prompt({
31
+ type: 'confirm',
32
+ name: 'prepare',
33
+ message: 'Do you want to prepare the velo project?(install packages, git init)',
34
+ }),
35
+ catch: (e) => {
36
+ return new AppError({ cause: e, message: 'Error selecting template' });
37
+ }
38
+ })
39
+ const prepare = yield* Schema.decodeUnknown(Schema.Struct({ prepare: Schema.Boolean }))(choice)
40
+ if(prepare.prepare) return yield* prepareVelo
41
+ }
42
+
43
+
44
+ if(config.config.lucySettings.initialized && !config.config.force) return yield* Effect.fail(new AppError({ message: "Lucy is already initialized in this directory. Use --force to reinitialize.", cause: new Error("Lucy is already initialized in this directory") }));
45
+ if ((config.config.lucySettings.initialized && config.config.force) || (config.config.lucySettings.initialized && config.config.force)) logger.alert("Forced initialization!");
46
+
47
+ yield* copyTemplateFiles;
48
+ yield* stringReplace(path.join(config.config.cwd, 'currents.config.js'), ['__ProjectName__'], [config.config.projectName]);
49
+ yield* readPackageJson;
50
+ yield* setProjectName;
51
+ yield* mergeLucySettings2PackageJson;
52
+ yield* mergeAdditions;
53
+ yield* writeLucySettings;
54
+ yield* writePackageJson;
55
+ yield* gitInit();
56
+ yield* installVeloPackages;
57
+ yield* runInstall;
58
+ yield* cleanup;
59
+ yield* setInitialized;
60
+
61
+ logger.success("Velo initialized successfully!");
62
+
63
+ yield* openVSCode;
64
+ })
65
+ }
package/src/runtime.ts CHANGED
@@ -18,3 +18,4 @@ export const build_runtime = (args: Awaited<ReturnType<typeof get_args>>) => {
18
18
  }))
19
19
  ))
20
20
  };
21
+
@@ -0,0 +1,31 @@
1
+ import { LucySettings } from "./lucy";
2
+ import * as dartSass from 'sass';
3
+ import gulpSass from 'gulp-sass';
4
+ import backendSettings from '../../settings/backend-settings.json' with { type: "json" };;
5
+ import masterSettings from '../../settings/master-settings.json' with { type: "json" };;
6
+ import pageSettings from '../../settings/page-settings.json' with { type: "json" };;
7
+ import publicSettings from '../../settings/public-settings.json' with { type: "json" };;
8
+
9
+ const sass = gulpSass(dartSass);
10
+
11
+ export type TaskOptions = {
12
+ enableIncrementalBuild: boolean;
13
+ outputDir: string;
14
+ sass: ReturnType<typeof gulpSass>;
15
+ replaceOptions: {
16
+ logs: {
17
+ enabled: boolean;
18
+ }
19
+ };
20
+ backendSettings: typeof backendSettings,
21
+ masterSettings: typeof masterSettings,
22
+ pageSettings: typeof pageSettings,
23
+ publicSettings: typeof publicSettings,
24
+ modulesSourcePaths: string[];
25
+ cwd: string;
26
+ }
27
+
28
+ export interface File {
29
+ path: string;
30
+ dirname: string;
31
+ }
@@ -1,3 +1,15 @@
1
1
  import { Schema } from "effect/index";
2
2
 
3
- export const JsonSchema = Schema.parseJson()
3
+ export const JsonSchema = Schema.parseJson()
4
+
5
+ export const veloSyncSettings = Schema.Struct({
6
+ siteUrl: Schema.String,
7
+ secret: Schema.String,
8
+ });
9
+ export type VeloSyncSettings = typeof veloSyncSettings.Type;
10
+
11
+ export const wixSDKSettings = Schema.Struct({
12
+ apiKey: Schema.String,
13
+ siteId: Schema.String,
14
+ });
15
+ export type WixSDKSettings = typeof wixSDKSettings.Type;
@@ -0,0 +1,43 @@
1
+ import { Schema } from "effect/index";
2
+ import { initTypes } from "./types.js";
3
+
4
+ export const pkgManagers = ['pnpm', 'npm', 'yarn'] as const;
5
+ export const lucySettings = Schema.mutable(Schema.Struct({
6
+ modules: Schema.Record({
7
+ key: Schema.String,
8
+ value: Schema.Struct({
9
+ source: Schema.String,
10
+ branch: Schema.String,
11
+ path: Schema.optional(Schema.String),
12
+ noCompile: Schema.optional(Schema.Boolean),
13
+ })}),
14
+ veloSettings: Schema.optional(Schema.NullOr(Schema.Struct({
15
+ compilerOptions: Schema.optional(Schema.Struct({
16
+ composite: Schema.Boolean,
17
+ noEmit: Schema.Boolean,
18
+ lib: Schema.Array(Schema.String),
19
+ jsx: Schema.String,
20
+ })),
21
+ exclude: Schema.optional(Schema.Array(Schema.String)),
22
+ }))),
23
+ initialized: Schema.Boolean,
24
+ type: Schema.Literal(...initTypes),
25
+ dependencies: Schema.mutable(Schema.Record({
26
+ key: Schema.String,
27
+ value: Schema.String,
28
+ })),
29
+ devDependencies: Schema.mutable(Schema.Record({
30
+ key: Schema.String,
31
+ value: Schema.String,
32
+ })),
33
+ scripts: Schema.Record({
34
+ key: Schema.String,
35
+ value: Schema.String,
36
+ }),
37
+ additionalCommands: Schema.optional(Schema.Array(Schema.Array(Schema.String))),
38
+ additionalPkgProps: Schema.optional(Schema.Object),
39
+ packageManager: Schema.mutable(Schema.Literal(...pkgManagers)),
40
+ defaultModulePath: Schema.optional(Schema.String),
41
+ }));
42
+
43
+ export type LucySettings = typeof lucySettings.Type;
@@ -0,0 +1,40 @@
1
+ export const initTypes = ["velo", "expo", "blocks", "monorepo", "tauri", "cargo", 'submodules', 'wix-sdk'] as const;
2
+ export const taskNames = ["dev", "build", "build-prod", "build-pipeline", "sync-settings"] as const;
3
+ export const syncActions = ["sync", "import", "init", "is-alive", "migrate", "export"] as const;
4
+ export const WixSDKActions = ["init", ""] as const;
5
+ export type Action = 'init' | 'open' | 'task' | 'wix-sync';
6
+ import gulp from 'gulp';
7
+
8
+ export type SyncTaskType = (filename: string, collection: string, schemaFilename: string, importOnly: boolean, dryrun: boolean) => Promise<void>;
9
+ export type MigrateFileCache = () => Promise<void>;
10
+ export type TaskType = ReturnType< typeof gulp.parallel>
11
+
12
+ export type Actions = {
13
+ action: Action;
14
+ initType?: typeof initTypes[number];
15
+ tasksName?: typeof taskNames[number];
16
+ syncAction?: typeof syncActions[number];
17
+ wixSDKAction?: typeof WixSDKActions[number];
18
+ }
19
+
20
+ export interface LucyArgs {
21
+ [x: string]: unknown;
22
+ // This will hold the command used, e.g., 'init'
23
+ _: Action[];
24
+ $0: string;
25
+ // Arguments for the 'init' command
26
+ initType?: Actions['initType'];
27
+ tasksName?: Actions['tasksName'];
28
+ syncAction?: Actions['syncAction'];
29
+ wixSDKAction?: Actions['wixSDKAction'];
30
+ // wix-sync options
31
+ input?: string; // Alias for -f
32
+ collection?: string; // Alias for -c
33
+ schema?: string; // Alias for -s
34
+ d?: boolean;
35
+ }
36
+
37
+ export interface VeloSyncConfig {
38
+ siteUrl: string;
39
+ secret: string;
40
+ }
@@ -0,0 +1,207 @@
1
+ import gulp from 'gulp';
2
+ import gulpSass from 'gulp-sass';
3
+ import shell from 'gulp-shell';
4
+ import * as os from 'os';
5
+ import * as dartSass from 'sass';
6
+ import { join } from "path";
7
+
8
+ import backendSettings from '../../settings/backend-settings.json' with { type: "json" };;
9
+ import masterSettings from '../../settings/master-settings.json' with { type: "json" };;
10
+ import pageSettings from '../../settings/page-settings.json' with { type: "json" };;
11
+ import publicSettings from '../../settings/public-settings.json' with { type: "json" };;
12
+
13
+ import { buildPublic } from './gulp/public.js';
14
+ import { buildBackend, buildBackendJSW } from './gulp/backend.js';
15
+ import { checkPages, checkTs } from './gulp/checks.js';
16
+ import { compileScss } from './gulp/styles.js';
17
+ import { buildPages } from './gulp/pages.js';
18
+ import { previewTemplates } from './gulp/templates.js';
19
+ import { copyFiles } from './gulp/copy.js';
20
+ import { cleanSrc, cleanWix } from './gulp/clean.js';
21
+ import { addTypes, updateWixTypes } from './gulp/types.js';
22
+ import { setProdConfig } from './gulp/pipeline.js';
23
+ import { watchAll } from './gulp/watchers.js';
24
+ import { getModulesSourcePaths } from './gulp/helpers.js';
25
+ import { logger } from '../utils/logger.js';
26
+ import { Effect } from 'effect/index';
27
+ import { Config } from '../config.js';
28
+ import { AppError } from '../error.js';
29
+ import { TaskOptions } from '../schemas/gulp.js';
30
+
31
+ const sass = gulpSass(dartSass);
32
+
33
+ export const task_runGulp = Effect.gen(function* (_) {
34
+ const config = (yield* Config).config;
35
+ const task = config.action.tasksName || "dev";
36
+
37
+ const taskOptions: TaskOptions = {
38
+ enableIncrementalBuild: config.action.tasksName === 'dev' ? true : false,
39
+ outputDir: './src',
40
+ sass,
41
+ pageSettings,
42
+ publicSettings,
43
+ backendSettings,
44
+ masterSettings,
45
+ replaceOptions: {
46
+ logs: {
47
+ enabled: false
48
+ }
49
+ },
50
+ cwd: process.cwd(),
51
+ modulesSourcePaths: yield* getModulesSourcePaths,
52
+ };
53
+
54
+
55
+ logger.action(`Running task: ${task}`);
56
+
57
+ gulp.task('check-ts', gulp.parallel(
58
+ checkTs(taskOptions),
59
+ ));
60
+
61
+ gulp.task('scss', gulp.parallel(
62
+ compileScss(taskOptions),
63
+ ));
64
+
65
+ gulp.task('build-backend', gulp.parallel(
66
+ buildBackend(taskOptions),
67
+ buildBackendJSW(taskOptions),
68
+ // buildBackendHTTP(taskOptions),
69
+ ));
70
+
71
+ gulp.task('build-public', gulp.parallel(
72
+ buildPublic(taskOptions),
73
+ ));
74
+
75
+ gulp.task('preview-templates', gulp.parallel(
76
+ previewTemplates(taskOptions),
77
+ ));
78
+
79
+ gulp.task('copy-files', gulp.parallel(
80
+ copyFiles(taskOptions),
81
+ ));
82
+
83
+ gulp.task('test', function () {
84
+ return shell.task(
85
+ ['yarn test'],
86
+ { ignoreErrors: true }
87
+ )().then(() => {
88
+ logger.success("Tests completed successfully.");
89
+ }).catch(err => {
90
+ logger.error("Error in test task!");
91
+ });
92
+ });
93
+ gulp.task('test-ci', function () {
94
+ return shell.task(
95
+ ['yarn test --run'],
96
+ { ignoreErrors: true }
97
+ )().then(() => {
98
+ logger.success("Tests completed successfully.");
99
+ }).catch(err => {
100
+ logger.error("Error in test task!");
101
+ });
102
+ });
103
+
104
+ gulp.task('sync-types', shell.task([
105
+ 'yarn postinstall',
106
+ ]));
107
+
108
+ gulp.task('fix-wix-types', gulp.parallel(
109
+ updateWixTypes(taskOptions)
110
+ ));
111
+
112
+ gulp.task('add-wix-types', function(done: gulp.TaskFunctionCallback) {
113
+ return addTypes(taskOptions, done);
114
+ });
115
+
116
+ gulp.task('set-production', gulp.parallel(
117
+ setProdConfig()
118
+ ));
119
+
120
+ gulp.task('start-wix', shell.task([
121
+ 'yarn wix:dev',
122
+ ]));
123
+
124
+ gulp.task('gen-docs', shell.task([
125
+ 'yarn docs',
126
+ ]));
127
+
128
+ gulp.task('fix-wix', gulp.series(
129
+ cleanWix(),
130
+ 'sync-types',
131
+ 'fix-wix-types',
132
+ 'add-wix-types'
133
+ ));
134
+
135
+ gulp.task('build', gulp.parallel(
136
+ 'build-backend',
137
+ 'build-public',
138
+ 'preview-templates',
139
+ buildPages(taskOptions),
140
+ compileScss(taskOptions),
141
+ 'copy-files'
142
+ )
143
+ );
144
+
145
+ gulp.task('build-pipeline', gulp.series(
146
+ cleanSrc(taskOptions),
147
+ 'set-production',
148
+ 'check-ts',
149
+ 'fix-wix-types',
150
+ 'add-wix-types',
151
+ 'test-ci',
152
+ 'build',
153
+ ));
154
+
155
+ gulp.task('build-prod', gulp.series(
156
+ (done) => checkPages(true, false).then(() => done(), (err) => done(err)),
157
+ cleanSrc(taskOptions),
158
+ 'set-production',
159
+ 'fix-wix',
160
+ 'check-ts',
161
+ 'test-ci',
162
+ 'build-backend',
163
+ 'build-public',
164
+ buildPages(taskOptions),
165
+ 'copy-files',
166
+ compileScss(taskOptions),
167
+ // 'gen-docs'
168
+ ));
169
+
170
+ gulp.task('start-dev-env', gulp.parallel(
171
+ watchAll(taskOptions),
172
+ 'test',
173
+ 'start-wix',
174
+ 'check-ts',
175
+ (done) => checkPages(false, config.force).then(() => done(), (err) => done(err)),
176
+ ));
177
+
178
+ gulp.task('dev', gulp.series(
179
+ cleanSrc(taskOptions),
180
+ 'fix-wix',
181
+ 'build',
182
+ 'start-dev-env',
183
+ )
184
+ );
185
+
186
+ yield* Effect.tryPromise({
187
+ try: () => {
188
+ return new Promise(function (resolve, reject) {
189
+ gulp.series(task, (done) => {
190
+ resolve(true);
191
+ done();
192
+ })(function (err) {
193
+ if (err) {
194
+ logger.error("Error starting tasks:", err);
195
+ reject(err);
196
+ }
197
+ });
198
+ });
199
+ },
200
+ catch: (e) => {
201
+ logger.error("Error starting tasks:", e);
202
+ return new AppError({ message: 'Error starting tasks', cause: e });
203
+ }
204
+ })
205
+
206
+ logger.report("Task completed successfully:", task);
207
+ });
@@ -0,0 +1,113 @@
1
+ import gulp from 'gulp';
2
+ import rename from 'gulp-rename';
3
+ import * as path from 'path';
4
+ import swc from 'gulp-swc';
5
+ import { logger } from '../../utils/logger.js';
6
+ import { TaskOptions } from '../../schemas/gulp.js';
7
+ import { TaskType } from '../../schemas/types.js';
8
+
9
+ const swcOptions = {
10
+ jsc: {
11
+ target: 'es2020',
12
+ parser: {
13
+ syntax: "typescript",
14
+ tsx: true,
15
+ decorators: true,
16
+ // preserveAllComments: true
17
+ },
18
+ preserveAllComments: false,
19
+ minify: {
20
+ compress: true // equivalent to {}
21
+ }
22
+ },
23
+ };
24
+
25
+ export function buildBackend(options: TaskOptions): TaskType {
26
+ const folders = ['typescript', ...options.modulesSourcePaths];
27
+
28
+ const { outputDir } = options;
29
+
30
+ // Create tasks for each folder
31
+ const tasks = folders.map((folder) => {
32
+ const taskName = `build_Backend-${folder}`; // Create a unique name for each task
33
+
34
+ const task = () =>
35
+ gulp.src([
36
+ `${folder}/backend/**/*.ts`,
37
+ `${folder}/backend/**/*.tsx`,
38
+ `!${folder}/backend/**/*.jsw.ts`,
39
+ `!${folder}/backend/**/*.spec.ts`,
40
+ ])
41
+ .pipe(swc(swcOptions))
42
+ .on('error', function (e: Error) {
43
+ logger.error(`Build of Backend files for ${folder} failed!`);
44
+ logger.error(`Error: ${e.message}`);
45
+
46
+ this.emit('end');
47
+ })
48
+ .pipe(gulp.dest(path.join(outputDir, 'backend')))
49
+ .on('error', function (e: Error) {
50
+ logger.error(`Build of Backend files for ${folder} failed!`);
51
+ logger.error(`Error: ${e.message}`);
52
+
53
+ this.emit('end');
54
+ })
55
+ .on('end', function () {
56
+ logger.success(`Build of Backend files for ${folder} succeeded!`);
57
+ });
58
+
59
+ // Register the task with Gulp
60
+ Object.defineProperty(task, 'name', { value: taskName }); // Set a unique name for debugging
61
+ return task;
62
+ });
63
+
64
+ // Run all tasks in parallel
65
+ return gulp.parallel(...tasks);
66
+ }
67
+
68
+
69
+ export function buildBackendJSW(options: TaskOptions): TaskType {
70
+ const folders = ['typescript', ...options.modulesSourcePaths];
71
+
72
+ const swcOptions = {
73
+ jsc: {
74
+ target: 'es6',
75
+ },
76
+ };
77
+ const { outputDir } = options;
78
+
79
+ // Create tasks for each folder
80
+ const tasks = folders.map((folder) => {
81
+ const taskName = `build-${folder}`; // Create a unique name for each task
82
+
83
+ const task = () =>
84
+ gulp.src([
85
+ `${folder}/backend/**/*.jsw.ts`,
86
+ ])
87
+ .pipe(swc(swcOptions))
88
+ .on('error', function (e: Error) {
89
+ logger.error(`Build of JSW files for ${folder} failed!`);
90
+ logger.error(`Error: ${e.message}`);
91
+
92
+ this.emit('end');
93
+ })
94
+ .pipe(rename({ extname: '' }))
95
+ .pipe(gulp.dest(path.join(outputDir, 'backend')))
96
+ .on('error', function (e: Error) {
97
+ logger.error(`Build of JSW files for ${folder} failed!`);
98
+ logger.error(`Error: ${e.message}`);
99
+
100
+ this.emit('end');
101
+ })
102
+ .on('end', function () {
103
+ logger.success(`Build of JSW files for ${folder} succeeded!`);
104
+ });
105
+
106
+ // Register the task with Gulp
107
+ Object.defineProperty(task, 'name', { value: taskName }); // Set a unique name for debugging
108
+ return task;
109
+ });
110
+
111
+ // Run all tasks in parallel
112
+ return gulp.parallel(...tasks);
113
+ }