@reglow/reglow 0.10.0 → 0.12.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.
Files changed (162) hide show
  1. package/dist/reglow/common/errors.js +1 -1
  2. package/dist/reglow/common/errors.js.map +1 -1
  3. package/dist/reglow/core/config.js +1 -1
  4. package/dist/reglow/core/entities.d.ts +113 -1
  5. package/dist/reglow/core/models.d.ts +16 -0
  6. package/dist/reglow/core/models.js +9 -0
  7. package/dist/reglow/core/models.js.map +1 -1
  8. package/dist/reglow/modules/ai/controller.d.ts +15 -0
  9. package/dist/reglow/modules/ai/controller.js +21 -16
  10. package/dist/reglow/modules/ai/controller.js.map +1 -1
  11. package/dist/reglow/modules/ai/service.d.ts +4 -0
  12. package/dist/reglow/modules/ai/service.js +31 -1
  13. package/dist/reglow/modules/ai/service.js.map +1 -1
  14. package/dist/reglow/modules/analytics/collect.d.ts +13 -0
  15. package/dist/reglow/modules/analytics/collect.js +237 -0
  16. package/dist/reglow/modules/analytics/collect.js.map +1 -0
  17. package/dist/reglow/modules/analytics/controller.d.ts +6 -0
  18. package/dist/reglow/modules/analytics/controller.js +338 -0
  19. package/dist/reglow/modules/analytics/controller.js.map +1 -0
  20. package/dist/reglow/modules/analytics/controller_client.d.ts +6 -0
  21. package/dist/reglow/modules/analytics/controller_client.js +34 -0
  22. package/dist/reglow/modules/analytics/controller_client.js.map +1 -0
  23. package/dist/reglow/modules/analytics/gov.d.ts +30 -0
  24. package/dist/reglow/modules/analytics/gov.js +140 -0
  25. package/dist/reglow/modules/analytics/gov.js.map +1 -0
  26. package/dist/reglow/modules/analytics/model.d.ts +190 -0
  27. package/dist/reglow/modules/analytics/model.js +14 -0
  28. package/dist/reglow/modules/analytics/model.js.map +1 -0
  29. package/dist/reglow/modules/analytics/repository.d.ts +66 -0
  30. package/dist/reglow/modules/analytics/repository.js +451 -0
  31. package/dist/reglow/modules/analytics/repository.js.map +1 -0
  32. package/dist/reglow/modules/analytics/rollup.d.ts +17 -0
  33. package/dist/reglow/modules/analytics/rollup.js +299 -0
  34. package/dist/reglow/modules/analytics/rollup.js.map +1 -0
  35. package/dist/reglow/modules/analytics/router.d.ts +16 -0
  36. package/dist/reglow/modules/analytics/router.js +11 -0
  37. package/dist/reglow/modules/analytics/router.js.map +1 -0
  38. package/dist/reglow/modules/analytics/schema.d.ts +275 -0
  39. package/dist/reglow/modules/analytics/schema.js +7 -0
  40. package/dist/reglow/modules/analytics/schema.js.map +1 -0
  41. package/dist/reglow/modules/analytics/service.d.ts +51 -0
  42. package/dist/reglow/modules/analytics/service.js +653 -0
  43. package/dist/reglow/modules/analytics/service.js.map +1 -0
  44. package/dist/reglow/modules/analytics/snapshot.d.ts +10 -0
  45. package/dist/reglow/modules/analytics/snapshot.js +63 -0
  46. package/dist/reglow/modules/analytics/snapshot.js.map +1 -0
  47. package/dist/reglow/modules/article/controller.js +1 -0
  48. package/dist/reglow/modules/article/controller.js.map +1 -1
  49. package/dist/reglow/modules/article/schema.d.ts +2 -0
  50. package/dist/reglow/modules/article/schema.js +2 -0
  51. package/dist/reglow/modules/article/schema.js.map +1 -1
  52. package/dist/reglow/modules/article/service.d.ts +5 -0
  53. package/dist/reglow/modules/article/service.js +26 -1
  54. package/dist/reglow/modules/article/service.js.map +1 -1
  55. package/dist/reglow/modules/config/controller.js +3 -1
  56. package/dist/reglow/modules/config/controller.js.map +1 -1
  57. package/dist/reglow/modules/customer_service/repository.js +4 -2
  58. package/dist/reglow/modules/customer_service/repository.js.map +1 -1
  59. package/dist/reglow/modules/customer_service/sdk_template.html +4 -3
  60. package/dist/reglow/modules/dashboard/controller.js +7 -1
  61. package/dist/reglow/modules/dashboard/controller.js.map +1 -1
  62. package/dist/reglow/modules/dashboard/service.d.ts +1 -0
  63. package/dist/reglow/modules/dashboard/service.js +152 -0
  64. package/dist/reglow/modules/dashboard/service.js.map +1 -1
  65. package/dist/reglow/modules/material/controller.js +16 -0
  66. package/dist/reglow/modules/material/controller.js.map +1 -1
  67. package/dist/reglow/modules/material/repository.js +2 -2
  68. package/dist/reglow/modules/material/repository.js.map +1 -1
  69. package/dist/reglow/modules/material/service.d.ts +2 -0
  70. package/dist/reglow/modules/material/service.js +46 -4
  71. package/dist/reglow/modules/material/service.js.map +1 -1
  72. package/dist/reglow/modules/payment/service.js +7 -1
  73. package/dist/reglow/modules/payment/service.js.map +1 -1
  74. package/dist/reglow/modules/photo/controller.js +81 -55
  75. package/dist/reglow/modules/photo/controller.js.map +1 -1
  76. package/dist/reglow/modules/photo/repository.js +1 -1
  77. package/dist/reglow/modules/photo/repository.js.map +1 -1
  78. package/dist/reglow/modules/photo/service.d.ts +11 -1
  79. package/dist/reglow/modules/photo/service.js +65 -3
  80. package/dist/reglow/modules/photo/service.js.map +1 -1
  81. package/dist/reglow/modules/skill/controller.d.ts +8 -0
  82. package/dist/reglow/modules/skill/controller.js +93 -0
  83. package/dist/reglow/modules/skill/controller.js.map +1 -0
  84. package/dist/reglow/modules/skill/model.d.ts +19 -0
  85. package/dist/reglow/modules/skill/model.js +49 -0
  86. package/dist/reglow/modules/skill/model.js.map +1 -0
  87. package/dist/reglow/modules/skill/repository.d.ts +8 -0
  88. package/dist/reglow/modules/skill/repository.js +101 -0
  89. package/dist/reglow/modules/skill/repository.js.map +1 -0
  90. package/dist/reglow/modules/skill/router.d.ts +10 -0
  91. package/dist/reglow/modules/skill/router.js +8 -0
  92. package/dist/reglow/modules/skill/router.js.map +1 -0
  93. package/dist/reglow/modules/skill/schema.d.ts +39 -0
  94. package/dist/reglow/modules/skill/schema.js +38 -0
  95. package/dist/reglow/modules/skill/schema.js.map +1 -0
  96. package/dist/reglow/modules/skill/service.d.ts +62 -0
  97. package/dist/reglow/modules/skill/service.js +285 -0
  98. package/dist/reglow/modules/skill/service.js.map +1 -0
  99. package/dist/reglow/modules/studio/controller.d.ts +9 -0
  100. package/dist/reglow/modules/studio/controller.js +303 -0
  101. package/dist/reglow/modules/studio/controller.js.map +1 -0
  102. package/dist/reglow/modules/studio/deps.d.ts +47 -0
  103. package/dist/reglow/modules/studio/deps.js +175 -0
  104. package/dist/reglow/modules/studio/deps.js.map +1 -0
  105. package/dist/reglow/modules/studio/engine.d.ts +85 -0
  106. package/dist/reglow/modules/studio/engine.js +881 -0
  107. package/dist/reglow/modules/studio/engine.js.map +1 -0
  108. package/dist/reglow/modules/studio/llm.d.ts +30 -0
  109. package/dist/reglow/modules/studio/llm.js +151 -0
  110. package/dist/reglow/modules/studio/llm.js.map +1 -0
  111. package/dist/reglow/modules/studio/mcp/client.d.ts +22 -0
  112. package/dist/reglow/modules/studio/mcp/client.js +99 -0
  113. package/dist/reglow/modules/studio/mcp/client.js.map +1 -0
  114. package/dist/reglow/modules/studio/mcp/transport.d.ts +59 -0
  115. package/dist/reglow/modules/studio/mcp/transport.js +259 -0
  116. package/dist/reglow/modules/studio/mcp/transport.js.map +1 -0
  117. package/dist/reglow/modules/studio/media.d.ts +52 -0
  118. package/dist/reglow/modules/studio/media.js +484 -0
  119. package/dist/reglow/modules/studio/media.js.map +1 -0
  120. package/dist/reglow/modules/studio/model.d.ts +23 -0
  121. package/dist/reglow/modules/studio/model.js +35 -0
  122. package/dist/reglow/modules/studio/model.js.map +1 -0
  123. package/dist/reglow/modules/studio/repository.d.ts +31 -0
  124. package/dist/reglow/modules/studio/repository.js +300 -0
  125. package/dist/reglow/modules/studio/repository.js.map +1 -0
  126. package/dist/reglow/modules/studio/router.d.ts +10 -0
  127. package/dist/reglow/modules/studio/router.js +8 -0
  128. package/dist/reglow/modules/studio/router.js.map +1 -0
  129. package/dist/reglow/modules/studio/schema.d.ts +194 -0
  130. package/dist/reglow/modules/studio/schema.js +739 -0
  131. package/dist/reglow/modules/studio/schema.js.map +1 -0
  132. package/dist/reglow/modules/studio/service.d.ts +168 -0
  133. package/dist/reglow/modules/studio/service.js +673 -0
  134. package/dist/reglow/modules/studio/service.js.map +1 -0
  135. package/dist/reglow/modules/studio/tools/builtins.d.ts +9 -0
  136. package/dist/reglow/modules/studio/tools/builtins.js +162 -0
  137. package/dist/reglow/modules/studio/tools/builtins.js.map +1 -0
  138. package/dist/reglow/modules/studio/tools/media_tools.d.ts +31 -0
  139. package/dist/reglow/modules/studio/tools/media_tools.js +412 -0
  140. package/dist/reglow/modules/studio/tools/media_tools.js.map +1 -0
  141. package/dist/reglow/modules/studio/tools/registry.d.ts +46 -0
  142. package/dist/reglow/modules/studio/tools/registry.js +160 -0
  143. package/dist/reglow/modules/studio/tools/registry.js.map +1 -0
  144. package/dist/reglow/modules/studio/tools/runner.d.ts +18 -0
  145. package/dist/reglow/modules/studio/tools/runner.js +89 -0
  146. package/dist/reglow/modules/studio/tools/runner.js.map +1 -0
  147. package/dist/reglow/modules/user/controller_client.js +1 -1
  148. package/dist/reglow/modules/user/controller_client.js.map +1 -1
  149. package/dist/reglow/modules/video/controller.js +1 -0
  150. package/dist/reglow/modules/video/controller.js.map +1 -1
  151. package/dist/reglow/modules/video/schema.d.ts +2 -0
  152. package/dist/reglow/modules/video/schema.js +2 -0
  153. package/dist/reglow/modules/video/schema.js.map +1 -1
  154. package/dist/reglow/modules/video/service.d.ts +5 -0
  155. package/dist/reglow/modules/video/service.js +26 -1
  156. package/dist/reglow/modules/video/service.js.map +1 -1
  157. package/dist/reglow/scripts/init-data.js +414 -2
  158. package/dist/reglow/scripts/init-data.js.map +1 -1
  159. package/dist/reglow/scripts/schema.d.ts +9 -0
  160. package/dist/reglow/scripts/schema.js +448 -1
  161. package/dist/reglow/scripts/schema.js.map +1 -1
  162. package/package.json +83 -83
package/package.json CHANGED
@@ -1,83 +1,83 @@
1
- {
2
- "name": "@reglow/reglow",
3
- "version": "0.10.0",
4
- "description": "ReglowAdmin 通用后台框架 - Node.js (Fastify + TypeScript) 版",
5
- "type": "module",
6
- "main": "./dist/index.js",
7
- "types": "./dist/index.d.ts",
8
- "exports": {
9
- ".": {
10
- "types": "./dist/index.d.ts",
11
- "import": "./dist/index.js"
12
- },
13
- "./core/*": {
14
- "types": "./dist/reglow/core/*.d.ts",
15
- "import": "./dist/reglow/core/*.js"
16
- },
17
- "./common/*": {
18
- "types": "./dist/reglow/common/*.d.ts",
19
- "import": "./dist/reglow/common/*.js"
20
- },
21
- "./modules/*": {
22
- "types": "./dist/reglow/modules/*.d.ts",
23
- "import": "./dist/reglow/modules/*.js"
24
- },
25
- "./scripts/*": {
26
- "types": "./dist/reglow/scripts/*.d.ts",
27
- "import": "./dist/reglow/scripts/*.js"
28
- }
29
- },
30
- "files": [
31
- "dist"
32
- ],
33
- "scripts": {
34
- "clean": "node --input-type=module -e \"import {rmSync} from 'node:fs'; rmSync('dist',{recursive:true,force:true})\"",
35
- "build": "npm run clean && tsc -p tsconfig.json && node --input-type=module -e \"import {cpSync,mkdirSync} from 'node:fs'; mkdirSync('dist/reglow/modules/customer_service',{recursive:true}); cpSync('reglow/modules/customer_service/sdk_template.html','dist/reglow/modules/customer_service/sdk_template.html'); mkdirSync('dist/reglow/modules/region/data',{recursive:true}); cpSync('reglow/modules/region/data/pcas.json','dist/reglow/modules/region/data/pcas.json')\"",
36
- "dev": "tsx server.ts",
37
- "start": "node dist/server.js",
38
- "type-check": "tsc --noEmit -p tsconfig.json",
39
- "test": "node --import tsx --test tests/sort.test.ts tests/photo_policy.test.ts tests/audit_chain.test.ts tests/tenant_guard.test.ts tests/common_contract.test.ts tests/exception_handler.test.ts tests/middleware.test.ts tests/core_infra.test.ts tests/core_redis.test.ts tests/core_session.test.ts tests/core_auth.test.ts tests/core_payment.test.ts tests/core_storage.test.ts tests/core_email.test.ts tests/core_wechat.test.ts tests/core_sms.test.ts tests/core_database_mysql.test.ts tests/core_plugin.test.ts",
40
- "test:coverage": "c8 --all --src reglow --extension .ts --exclude \"**/dist/**\" --reporter=text-summary --reporter=json-summary --reporter=html --reports-dir coverage node --import tsx --test tests/sort.test.ts tests/photo_policy.test.ts tests/audit_chain.test.ts tests/tenant_guard.test.ts tests/common_contract.test.ts tests/exception_handler.test.ts tests/middleware.test.ts tests/core_infra.test.ts tests/core_redis.test.ts tests/core_session.test.ts tests/core_auth.test.ts tests/core_payment.test.ts tests/core_storage.test.ts tests/core_email.test.ts tests/core_wechat.test.ts tests/core_sms.test.ts tests/core_database_mysql.test.ts tests/core_plugin.test.ts"
41
- },
42
- "peerDependencies": {
43
- "@fastify/cors": "^9.0.1",
44
- "@fastify/multipart": "^8.3.0",
45
- "@fastify/static": "^7.0.4",
46
- "@fastify/swagger": "^8.15.0",
47
- "@fastify/swagger-ui": "^4.1.0",
48
- "@fastify/websocket": "^10.0.1",
49
- "fastify": "^4.28.1",
50
- "knex": "^3.1.0"
51
- },
52
- "dependencies": {
53
- "bcryptjs": "^2.4.3",
54
- "dotenv": "^16.4.5",
55
- "ioredis": "^5.4.1",
56
- "jsonwebtoken": "^9.0.2",
57
- "mysql2": "^3.11.0"
58
- },
59
- "optionalDependencies": {
60
- "better-sqlite3": "^13.0.3"
61
- },
62
- "devDependencies": {
63
- "@fastify/cors": "^9.0.1",
64
- "@fastify/multipart": "^8.3.0",
65
- "@fastify/static": "^7.0.4",
66
- "@fastify/swagger": "^8.15.0",
67
- "@fastify/swagger-ui": "^4.1.0",
68
- "@fastify/websocket": "^10.0.1",
69
- "@scalar/fastify-api-reference": "^1.71.0",
70
- "@sinclair/typebox": "^0.34.0",
71
- "@types/bcryptjs": "^2.4.6",
72
- "@types/jsonwebtoken": "^9.0.7",
73
- "@types/node": "^22.9.0",
74
- "c8": "^9.1.0",
75
- "fastify": "^4.28.1",
76
- "knex": "^3.1.0",
77
- "tsx": "^4.19.0",
78
- "typescript": "^5.6.3"
79
- },
80
- "engines": {
81
- "node": ">=25"
82
- }
83
- }
1
+ {
2
+ "name": "@reglow/reglow",
3
+ "version": "0.12.0",
4
+ "description": "ReglowAdmin 通用后台框架 - Node.js (Fastify + TypeScript) 版",
5
+ "type": "module",
6
+ "main": "./dist/index.js",
7
+ "types": "./dist/index.d.ts",
8
+ "exports": {
9
+ ".": {
10
+ "types": "./dist/index.d.ts",
11
+ "import": "./dist/index.js"
12
+ },
13
+ "./core/*": {
14
+ "types": "./dist/reglow/core/*.d.ts",
15
+ "import": "./dist/reglow/core/*.js"
16
+ },
17
+ "./common/*": {
18
+ "types": "./dist/reglow/common/*.d.ts",
19
+ "import": "./dist/reglow/common/*.js"
20
+ },
21
+ "./modules/*": {
22
+ "types": "./dist/reglow/modules/*.d.ts",
23
+ "import": "./dist/reglow/modules/*.js"
24
+ },
25
+ "./scripts/*": {
26
+ "types": "./dist/reglow/scripts/*.d.ts",
27
+ "import": "./dist/reglow/scripts/*.js"
28
+ }
29
+ },
30
+ "files": [
31
+ "dist"
32
+ ],
33
+ "scripts": {
34
+ "clean": "node --input-type=module -e \"import {rmSync} from 'node:fs'; rmSync('dist',{recursive:true,force:true})\"",
35
+ "build": "npm run clean && tsc -p tsconfig.json && node --input-type=module -e \"import {cpSync,mkdirSync} from 'node:fs'; mkdirSync('dist/reglow/modules/customer_service',{recursive:true}); cpSync('reglow/modules/customer_service/sdk_template.html','dist/reglow/modules/customer_service/sdk_template.html'); mkdirSync('dist/reglow/modules/region/data',{recursive:true}); cpSync('reglow/modules/region/data/pcas.json','dist/reglow/modules/region/data/pcas.json')\"",
36
+ "dev": "tsx server.ts",
37
+ "start": "node dist/server.js",
38
+ "type-check": "tsc --noEmit -p tsconfig.json",
39
+ "test": "node --import tsx --test tests/sort.test.ts tests/photo_policy.test.ts tests/audit_chain.test.ts tests/tenant_guard.test.ts tests/common_contract.test.ts tests/exception_handler.test.ts tests/middleware.test.ts tests/core_infra.test.ts tests/core_redis.test.ts tests/core_session.test.ts tests/core_auth.test.ts tests/core_payment.test.ts tests/core_storage.test.ts tests/core_email.test.ts tests/core_wechat.test.ts tests/core_sms.test.ts tests/core_database_mysql.test.ts tests/core_plugin.test.ts tests/studio_engine.test.ts tests/studio_skill_seed.test.ts tests/studio_tools.test.ts tests/studio_media.test.ts tests/studio_mcp.test.ts tests/studio_foundation.test.ts tests/migrate_studio_p0.test.ts tests/studio_service.test.ts tests/studio_repository.test.ts tests/studio_engine_exec.test.ts tests/skill_service.test.ts tests/studio_media_extra.test.ts tests/studio_tools_extra.test.ts tests/studio_mcp_extra.test.ts tests/studio_llm.test.ts tests/studio_controller.test.ts tests/skill_controller.test.ts tests/cs_service.test.ts tests/cs_controller.test.ts tests/ai.test.ts tests/auth.test.ts tests/material.test.ts tests/photo.test.ts tests/dashboard.test.ts tests/user.test.ts tests/agreement.test.ts tests/message.test.ts tests/video.test.ts tests/article.test.ts tests/config.test.ts tests/employee.test.ts tests/payment.test.ts tests/notice.test.ts tests/post.test.ts tests/dept.test.ts tests/menu.test.ts tests/analytics_cov.test.ts tests/studio_cov_extra.test.ts tests/cs_cov_extra.test.ts tests/ai_cov_extra.test.ts tests/core_cov_extra.test.ts tests/admin_cov_extra.test.ts tests/region_cov.test.ts",
40
+ "test:coverage": "c8 --all --src reglow --extension .ts --exclude \"**/dist/**\" --exclude \"**/reglow/scripts/**\" --reporter=text-summary --reporter=json-summary --reporter=html --reports-dir coverage node --import tsx --test tests/sort.test.ts tests/photo_policy.test.ts tests/audit_chain.test.ts tests/tenant_guard.test.ts tests/common_contract.test.ts tests/exception_handler.test.ts tests/middleware.test.ts tests/core_infra.test.ts tests/core_redis.test.ts tests/core_session.test.ts tests/core_auth.test.ts tests/core_payment.test.ts tests/core_storage.test.ts tests/core_email.test.ts tests/core_wechat.test.ts tests/core_sms.test.ts tests/core_database_mysql.test.ts tests/core_plugin.test.ts tests/studio_engine.test.ts tests/studio_skill_seed.test.ts tests/studio_tools.test.ts tests/studio_media.test.ts tests/studio_mcp.test.ts tests/studio_foundation.test.ts tests/migrate_studio_p0.test.ts tests/studio_service.test.ts tests/studio_repository.test.ts tests/studio_engine_exec.test.ts tests/skill_service.test.ts tests/studio_media_extra.test.ts tests/studio_tools_extra.test.ts tests/studio_mcp_extra.test.ts tests/studio_llm.test.ts tests/studio_controller.test.ts tests/skill_controller.test.ts tests/cs_service.test.ts tests/cs_controller.test.ts tests/ai.test.ts tests/auth.test.ts tests/material.test.ts tests/photo.test.ts tests/dashboard.test.ts tests/user.test.ts tests/agreement.test.ts tests/message.test.ts tests/video.test.ts tests/article.test.ts tests/config.test.ts tests/employee.test.ts tests/payment.test.ts tests/notice.test.ts tests/post.test.ts tests/dept.test.ts tests/menu.test.ts tests/analytics_cov.test.ts tests/studio_cov_extra.test.ts tests/cs_cov_extra.test.ts tests/ai_cov_extra.test.ts tests/core_cov_extra.test.ts tests/admin_cov_extra.test.ts tests/region_cov.test.ts"
41
+ },
42
+ "peerDependencies": {
43
+ "@fastify/cors": "^9.0.1",
44
+ "@fastify/multipart": "^8.3.0",
45
+ "@fastify/static": "^7.0.4",
46
+ "@fastify/swagger": "^8.15.0",
47
+ "@fastify/swagger-ui": "^4.1.0",
48
+ "@fastify/websocket": "^10.0.1",
49
+ "fastify": "^4.28.1",
50
+ "knex": "^3.1.0"
51
+ },
52
+ "dependencies": {
53
+ "bcryptjs": "^2.4.3",
54
+ "dotenv": "^16.4.5",
55
+ "ioredis": "^5.4.1",
56
+ "jsonwebtoken": "^9.0.2",
57
+ "mysql2": "^3.11.0"
58
+ },
59
+ "optionalDependencies": {
60
+ "better-sqlite3": "^13.0.3"
61
+ },
62
+ "devDependencies": {
63
+ "@fastify/cors": "^9.0.1",
64
+ "@fastify/multipart": "^8.3.0",
65
+ "@fastify/static": "^7.0.4",
66
+ "@fastify/swagger": "^8.15.0",
67
+ "@fastify/swagger-ui": "^4.1.0",
68
+ "@fastify/websocket": "^10.0.1",
69
+ "@scalar/fastify-api-reference": "^1.71.0",
70
+ "@sinclair/typebox": "^0.34.0",
71
+ "@types/bcryptjs": "^2.4.6",
72
+ "@types/jsonwebtoken": "^9.0.7",
73
+ "@types/node": "^22.9.0",
74
+ "c8": "^9.1.0",
75
+ "fastify": "^4.28.1",
76
+ "knex": "^3.1.0",
77
+ "tsx": "^4.19.0",
78
+ "typescript": "^5.6.3"
79
+ },
80
+ "engines": {
81
+ "node": ">=25"
82
+ }
83
+ }