@ts-for-gir/lib 4.0.0-beta.9 → 4.0.0-rc.10

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 (560) hide show
  1. package/README.md +13 -1
  2. package/package.json +18 -31
  3. package/src/constants.ts +125 -0
  4. package/src/dependency-manager.ts +463 -0
  5. package/src/formatters/default.ts +7 -0
  6. package/src/formatters/formatter.ts +3 -0
  7. package/src/formatters/index.ts +3 -0
  8. package/src/formatters/json.ts +7 -0
  9. package/src/generators/generator.ts +65 -0
  10. package/src/generators/index.ts +2 -0
  11. package/src/generics/clutter.ts +81 -0
  12. package/src/generics/generify.ts +101 -0
  13. package/src/generics/gio.ts +91 -0
  14. package/src/generics/glib.ts +31 -0
  15. package/src/generics/gtk.ts +99 -0
  16. package/src/generics/meta.ts +51 -0
  17. package/src/generics/st.ts +207 -0
  18. package/src/generics/visitor.ts +484 -0
  19. package/src/gir/alias.ts +73 -0
  20. package/src/gir/callback.ts +79 -0
  21. package/src/gir/const.ts +73 -0
  22. package/src/gir/constructor.ts +91 -0
  23. package/src/gir/data.ts +12 -0
  24. package/src/gir/dependency-resolver.ts +81 -0
  25. package/src/gir/direct-allocation-constructor.ts +65 -0
  26. package/src/gir/enum-member.ts +51 -0
  27. package/src/gir/enum.ts +129 -0
  28. package/src/gir/error.ts +89 -0
  29. package/src/gir/function.ts +297 -0
  30. package/src/gir/generics.ts +66 -0
  31. package/src/gir/gir-complex-record.ts +7 -0
  32. package/src/gir/index.ts +25 -0
  33. package/src/gir/introspected-base.ts +104 -0
  34. package/src/gir/introspected-class-member.ts +15 -0
  35. package/src/gir/introspected-classes.ts +1566 -0
  36. package/src/gir/introspected-namespace-member.ts +24 -0
  37. package/src/gir/namespace.ts +76 -0
  38. package/src/gir/parameter.ts +199 -0
  39. package/src/gir/promisify.ts +214 -0
  40. package/src/gir/property.ts +218 -0
  41. package/src/gir/record.ts +488 -0
  42. package/src/gir/registry.ts +187 -0
  43. package/src/gir/signal.ts +279 -0
  44. package/src/gir-module.ts +719 -0
  45. package/src/gir.ts +879 -0
  46. package/src/index.ts +16 -0
  47. package/src/injections/gee08.ts +89 -0
  48. package/src/injections/gee1.ts +35 -0
  49. package/src/injections/gio.ts +720 -0
  50. package/src/injections/glib.ts +280 -0
  51. package/src/injections/gobject.ts +906 -0
  52. package/src/injections/gtk4.ts +23 -0
  53. package/src/injections/inject.ts +49 -0
  54. package/src/injections/shell.ts +50 -0
  55. package/src/injections/tracker1.ts +42 -0
  56. package/src/library-version.ts +50 -0
  57. package/src/logger.ts +104 -0
  58. package/src/messages.ts +57 -0
  59. package/src/templates/index.ts +1 -0
  60. package/src/templates/template-engine.ts +178 -0
  61. package/src/types/answer-version.ts +4 -0
  62. package/src/types/any-introspected-type.ts +5 -0
  63. package/src/types/class-function-types.ts +57 -0
  64. package/src/types/class-member.ts +5 -0
  65. package/src/types/class-parent.ts +14 -0
  66. package/src/types/class.ts +43 -0
  67. package/src/types/config-flags.ts +5 -0
  68. package/src/types/construct-name.ts +13 -0
  69. package/src/types/dependency-map.ts +4 -0
  70. package/src/types/dependency.ts +49 -0
  71. package/src/types/file-info.ts +14 -0
  72. package/src/types/format.ts +1 -0
  73. package/src/types/generator-constructor.ts +7 -0
  74. package/src/types/generics-config.ts +90 -0
  75. package/src/types/gir-any-element.ts +35 -0
  76. package/src/types/gir-module-interface.ts +22 -0
  77. package/src/types/gir-module-resolved.ts +32 -0
  78. package/src/types/gir-type-name.ts +20 -0
  79. package/src/types/index.ts +92 -0
  80. package/{lib/types/inheritance-table.d.ts → src/types/inheritance-table.ts} +1 -1
  81. package/src/types/introspected.ts +18 -0
  82. package/src/types/local-name-check.ts +5 -0
  83. package/src/types/local-name-type.ts +1 -0
  84. package/src/types/local-name.ts +8 -0
  85. package/src/types/local-names.ts +5 -0
  86. package/src/types/metadata.ts +6 -0
  87. package/src/types/ns-loader.ts +6 -0
  88. package/src/types/options-base.ts +8 -0
  89. package/src/types/options-generation.ts +88 -0
  90. package/src/types/options-load.ts +6 -0
  91. package/src/types/options-transform.ts +5 -0
  92. package/src/types/output-format.ts +1 -0
  93. package/src/types/package-data-parsed.ts +28 -0
  94. package/src/types/package-data.ts +24 -0
  95. package/src/types/package-section-parsed.ts +9 -0
  96. package/src/types/parsed-gir.ts +5 -0
  97. package/src/types/parsed-package-data.ts +7 -0
  98. package/src/types/property-case.ts +1 -0
  99. package/src/types/resolve-type.ts +4 -0
  100. package/src/types/template-data.ts +8 -0
  101. package/src/types/template-options.ts +33 -0
  102. package/src/types/transformation-case.ts +9 -0
  103. package/src/types/transformations.ts +5 -0
  104. package/{lib/types/ts-doc-tag.d.ts → src/types/ts-doc-tag.ts} +14 -12
  105. package/src/types/ts-doc.ts +18 -0
  106. package/{lib/types/type-gir-alias.d.ts → src/types/type-gir-alias.ts} +1 -1
  107. package/src/types/type-gir-class.ts +2 -0
  108. package/src/types/type-gir-element.ts +25 -0
  109. package/src/types/type-gir-enumeration-member.ts +2 -0
  110. package/{lib/types/type-gir-enumeration.d.ts → src/types/type-gir-enumeration.ts} +1 -1
  111. package/src/types/type-gir-function.ts +8 -0
  112. package/{lib/types/type-gir-interface.d.ts → src/types/type-gir-interface.ts} +1 -1
  113. package/src/types/type-gir-method.ts +2 -0
  114. package/src/types/type-gir-parameter.ts +1 -0
  115. package/{lib/types/type-gir-property.d.ts → src/types/type-gir-property.ts} +1 -1
  116. package/src/types/type-gir-variable.ts +1 -0
  117. package/src/types/type-ts-element.ts +13 -0
  118. package/{lib/types/type-ts-enumeration-member.d.ts → src/types/type-ts-enumeration-member.ts} +1 -1
  119. package/src/types/type-ts-function.ts +1 -0
  120. package/src/types/type-ts-property.ts +1 -0
  121. package/src/types/user-config-load-result.ts +6 -0
  122. package/src/types/user-config.ts +100 -0
  123. package/src/util.ts +84 -0
  124. package/src/utils/conflicts/conflict-resolver.ts +122 -0
  125. package/src/utils/conflicts/function-conflict-detector.ts +139 -0
  126. package/src/utils/conflicts/index.ts +2 -0
  127. package/src/utils/conflicts.ts +598 -0
  128. package/src/utils/documentation.ts +471 -0
  129. package/src/utils/files.ts +71 -0
  130. package/src/utils/function-type-guards.ts +61 -0
  131. package/src/utils/generation.ts +71 -0
  132. package/src/utils/gir-defaults.ts +66 -0
  133. package/src/utils/gir-parsing.ts +264 -0
  134. package/src/utils/girs.ts +112 -0
  135. package/src/utils/index.ts +15 -0
  136. package/src/utils/naming.ts +188 -0
  137. package/{lib/utils/numbers.d.ts → src/utils/numbers.ts} +3 -1
  138. package/{lib/utils/objects.js → src/utils/objects.ts} +15 -8
  139. package/src/utils/path.ts +15 -0
  140. package/src/utils/registry.ts +5 -0
  141. package/src/utils/strings.ts +134 -0
  142. package/src/utils/type-resolution.ts +116 -0
  143. package/src/utils/types.ts +285 -0
  144. package/src/validators/class.ts +347 -0
  145. package/src/validators/interface.ts +20 -0
  146. package/src/visitor.ts +58 -0
  147. package/lib/constants.d.ts +0 -25
  148. package/lib/constants.js +0 -93
  149. package/lib/constants.js.map +0 -1
  150. package/lib/dependency-manager.d.ts +0 -150
  151. package/lib/dependency-manager.js +0 -324
  152. package/lib/dependency-manager.js.map +0 -1
  153. package/lib/formatters/default.d.ts +0 -4
  154. package/lib/formatters/default.js +0 -7
  155. package/lib/formatters/default.js.map +0 -1
  156. package/lib/formatters/formatter.d.ts +0 -3
  157. package/lib/formatters/formatter.js +0 -3
  158. package/lib/formatters/formatter.js.map +0 -1
  159. package/lib/formatters/json.d.ts +0 -4
  160. package/lib/formatters/json.js +0 -7
  161. package/lib/formatters/json.js.map +0 -1
  162. package/lib/generators/dts/glib.d.ts +0 -2
  163. package/lib/generators/dts/glib.js +0 -514
  164. package/lib/generators/dts/glib.js.map +0 -1
  165. package/lib/generators/dts/gobject.d.ts +0 -2
  166. package/lib/generators/dts/gobject.js +0 -117
  167. package/lib/generators/dts/gobject.js.map +0 -1
  168. package/lib/generators/dts-inline.d.ts +0 -10
  169. package/lib/generators/dts-inline.js +0 -57
  170. package/lib/generators/dts-inline.js.map +0 -1
  171. package/lib/generators/dts-modules.d.ts +0 -10
  172. package/lib/generators/dts-modules.js +0 -98
  173. package/lib/generators/dts-modules.js.map +0 -1
  174. package/lib/generators/dts.d.ts +0 -45
  175. package/lib/generators/dts.js +0 -682
  176. package/lib/generators/dts.js.map +0 -1
  177. package/lib/generators/generator.d.ts +0 -45
  178. package/lib/generators/generator.js +0 -9
  179. package/lib/generators/generator.js.map +0 -1
  180. package/lib/generators/index.d.ts +0 -5
  181. package/lib/generators/index.js +0 -6
  182. package/lib/generators/index.js.map +0 -1
  183. package/lib/generators/json.d.ts +0 -258
  184. package/lib/generators/json.js +0 -867
  185. package/lib/generators/json.js.map +0 -1
  186. package/lib/generics/clutter.d.ts +0 -26
  187. package/lib/generics/clutter.js +0 -49
  188. package/lib/generics/clutter.js.map +0 -1
  189. package/lib/generics/generify.d.ts +0 -2
  190. package/lib/generics/generify.js +0 -39
  191. package/lib/generics/generify.js.map +0 -1
  192. package/lib/generics/gio.d.ts +0 -7
  193. package/lib/generics/gio.js +0 -51
  194. package/lib/generics/gio.js.map +0 -1
  195. package/lib/generics/glib.d.ts +0 -7
  196. package/lib/generics/glib.js +0 -18
  197. package/lib/generics/glib.js.map +0 -1
  198. package/lib/generics/meta.d.ts +0 -21
  199. package/lib/generics/meta.js +0 -26
  200. package/lib/generics/meta.js.map +0 -1
  201. package/lib/generics/st.d.ts +0 -16
  202. package/lib/generics/st.js +0 -92
  203. package/lib/generics/st.js.map +0 -1
  204. package/lib/generics/visitor.d.ts +0 -20
  205. package/lib/generics/visitor.js +0 -255
  206. package/lib/generics/visitor.js.map +0 -1
  207. package/lib/gir/alias.d.ts +0 -24
  208. package/lib/gir/alias.js +0 -43
  209. package/lib/gir/alias.js.map +0 -1
  210. package/lib/gir/base.d.ts +0 -62
  211. package/lib/gir/base.js +0 -95
  212. package/lib/gir/base.js.map +0 -1
  213. package/lib/gir/class.d.ts +0 -189
  214. package/lib/gir/class.js +0 -1131
  215. package/lib/gir/class.js.map +0 -1
  216. package/lib/gir/const.d.ts +0 -25
  217. package/lib/gir/const.js +0 -43
  218. package/lib/gir/const.js.map +0 -1
  219. package/lib/gir/enum.d.ts +0 -45
  220. package/lib/gir/enum.js +0 -164
  221. package/lib/gir/enum.js.map +0 -1
  222. package/lib/gir/function.d.ts +0 -199
  223. package/lib/gir/function.js +0 -683
  224. package/lib/gir/function.js.map +0 -1
  225. package/lib/gir/generics.d.ts +0 -5
  226. package/lib/gir/generics.js +0 -57
  227. package/lib/gir/generics.js.map +0 -1
  228. package/lib/gir/namespace.d.ts +0 -21
  229. package/lib/gir/namespace.js +0 -57
  230. package/lib/gir/namespace.js.map +0 -1
  231. package/lib/gir/nodes.d.ts +0 -11
  232. package/lib/gir/nodes.js +0 -12
  233. package/lib/gir/nodes.js.map +0 -1
  234. package/lib/gir/property.d.ts +0 -60
  235. package/lib/gir/property.js +0 -128
  236. package/lib/gir/property.js.map +0 -1
  237. package/lib/gir/registry.d.ts +0 -51
  238. package/lib/gir/registry.js +0 -144
  239. package/lib/gir/registry.js.map +0 -1
  240. package/lib/gir/signal.d.ts +0 -33
  241. package/lib/gir/signal.js +0 -165
  242. package/lib/gir/signal.js.map +0 -1
  243. package/lib/gir/util.d.ts +0 -49
  244. package/lib/gir/util.js +0 -559
  245. package/lib/gir/util.js.map +0 -1
  246. package/lib/gir-module.d.ts +0 -106
  247. package/lib/gir-module.js +0 -572
  248. package/lib/gir-module.js.map +0 -1
  249. package/lib/gir.d.ts +0 -253
  250. package/lib/gir.js +0 -642
  251. package/lib/gir.js.map +0 -1
  252. package/lib/index.d.ts +0 -14
  253. package/lib/index.js +0 -17
  254. package/lib/index.js.map +0 -1
  255. package/lib/injections/gee08.d.ts +0 -7
  256. package/lib/injections/gee08.js +0 -68
  257. package/lib/injections/gee08.js.map +0 -1
  258. package/lib/injections/gee1.d.ts +0 -7
  259. package/lib/injections/gee1.js +0 -28
  260. package/lib/injections/gee1.js.map +0 -1
  261. package/lib/injections/gio.d.ts +0 -7
  262. package/lib/injections/gio.js +0 -431
  263. package/lib/injections/gio.js.map +0 -1
  264. package/lib/injections/glib.d.ts +0 -7
  265. package/lib/injections/glib.js +0 -204
  266. package/lib/injections/glib.js.map +0 -1
  267. package/lib/injections/gobject.d.ts +0 -7
  268. package/lib/injections/gobject.js +0 -479
  269. package/lib/injections/gobject.js.map +0 -1
  270. package/lib/injections/inject.d.ts +0 -4
  271. package/lib/injections/inject.js +0 -28
  272. package/lib/injections/inject.js.map +0 -1
  273. package/lib/injections/tracker1.d.ts +0 -7
  274. package/lib/injections/tracker1.js +0 -30
  275. package/lib/injections/tracker1.js.map +0 -1
  276. package/lib/library-version.d.ts +0 -10
  277. package/lib/library-version.js +0 -45
  278. package/lib/library-version.js.map +0 -1
  279. package/lib/logger.d.ts +0 -36
  280. package/lib/logger.js +0 -134
  281. package/lib/logger.js.map +0 -1
  282. package/lib/messages.d.ts +0 -23
  283. package/lib/messages.js +0 -39
  284. package/lib/messages.js.map +0 -1
  285. package/lib/registry.d.ts +0 -8
  286. package/lib/registry.js +0 -12
  287. package/lib/registry.js.map +0 -1
  288. package/lib/transformation.d.ts +0 -169
  289. package/lib/transformation.js +0 -393
  290. package/lib/transformation.js.map +0 -1
  291. package/lib/types/answer-version.d.ts +0 -4
  292. package/lib/types/answer-version.js +0 -2
  293. package/lib/types/answer-version.js.map +0 -1
  294. package/lib/types/class-parent.d.ts +0 -13
  295. package/lib/types/class-parent.js +0 -2
  296. package/lib/types/class-parent.js.map +0 -1
  297. package/lib/types/config-flags.d.ts +0 -4
  298. package/lib/types/config-flags.js +0 -2
  299. package/lib/types/config-flags.js.map +0 -1
  300. package/lib/types/construct-name.d.ts +0 -1
  301. package/lib/types/construct-name.js +0 -2
  302. package/lib/types/construct-name.js.map +0 -1
  303. package/lib/types/dependency-map.d.ts +0 -4
  304. package/lib/types/dependency-map.js +0 -2
  305. package/lib/types/dependency-map.js.map +0 -1
  306. package/lib/types/dependency.d.ts +0 -42
  307. package/lib/types/dependency.js +0 -2
  308. package/lib/types/dependency.js.map +0 -1
  309. package/lib/types/file-info.d.ts +0 -14
  310. package/lib/types/file-info.js +0 -2
  311. package/lib/types/file-info.js.map +0 -1
  312. package/lib/types/format.d.ts +0 -1
  313. package/lib/types/format.js +0 -2
  314. package/lib/types/format.js.map +0 -1
  315. package/lib/types/gir-alias-element.d.ts +0 -4
  316. package/lib/types/gir-alias-element.js +0 -2
  317. package/lib/types/gir-alias-element.js.map +0 -1
  318. package/lib/types/gir-annotation.d.ts +0 -9
  319. package/lib/types/gir-annotation.js +0 -2
  320. package/lib/types/gir-annotation.js.map +0 -1
  321. package/lib/types/gir-any-element.d.ts +0 -2
  322. package/lib/types/gir-any-element.js +0 -2
  323. package/lib/types/gir-any-element.js.map +0 -1
  324. package/lib/types/gir-bitfield-element.d.ts +0 -6
  325. package/lib/types/gir-bitfield-element.js +0 -2
  326. package/lib/types/gir-bitfield-element.js.map +0 -1
  327. package/lib/types/gir-callable-param-element.d.ts +0 -4
  328. package/lib/types/gir-callable-param-element.js +0 -2
  329. package/lib/types/gir-callable-param-element.js.map +0 -1
  330. package/lib/types/gir-callable-params.d.ts +0 -7
  331. package/lib/types/gir-callable-params.js +0 -2
  332. package/lib/types/gir-callable-params.js.map +0 -1
  333. package/lib/types/gir-callable-return.d.ts +0 -5
  334. package/lib/types/gir-callable-return.js +0 -2
  335. package/lib/types/gir-callable-return.js.map +0 -1
  336. package/lib/types/gir-callback-element.d.ts +0 -6
  337. package/lib/types/gir-callback-element.js +0 -2
  338. package/lib/types/gir-callback-element.js.map +0 -1
  339. package/lib/types/gir-class-element.d.ts +0 -17
  340. package/lib/types/gir-class-element.js +0 -2
  341. package/lib/types/gir-class-element.js.map +0 -1
  342. package/lib/types/gir-constant-element.d.ts +0 -4
  343. package/lib/types/gir-constant-element.js +0 -2
  344. package/lib/types/gir-constant-element.js.map +0 -1
  345. package/lib/types/gir-constructor-element.d.ts +0 -6
  346. package/lib/types/gir-constructor-element.js +0 -2
  347. package/lib/types/gir-constructor-element.js.map +0 -1
  348. package/lib/types/gir-enum-element.d.ts +0 -6
  349. package/lib/types/gir-enum-element.js +0 -2
  350. package/lib/types/gir-enum-element.js.map +0 -1
  351. package/lib/types/gir-field-element.d.ts +0 -5
  352. package/lib/types/gir-field-element.js +0 -2
  353. package/lib/types/gir-field-element.js.map +0 -1
  354. package/lib/types/gir-function-element.d.ts +0 -6
  355. package/lib/types/gir-function-element.js +0 -2
  356. package/lib/types/gir-function-element.js.map +0 -1
  357. package/lib/types/gir-instance-parameter.d.ts +0 -8
  358. package/lib/types/gir-instance-parameter.js +0 -2
  359. package/lib/types/gir-instance-parameter.js.map +0 -1
  360. package/lib/types/gir-interface-element.d.ts +0 -16
  361. package/lib/types/gir-interface-element.js +0 -2
  362. package/lib/types/gir-interface-element.js.map +0 -1
  363. package/lib/types/gir-member-element.d.ts +0 -5
  364. package/lib/types/gir-member-element.js +0 -2
  365. package/lib/types/gir-member-element.js.map +0 -1
  366. package/lib/types/gir-method-element.d.ts +0 -7
  367. package/lib/types/gir-method-element.js +0 -2
  368. package/lib/types/gir-method-element.js.map +0 -1
  369. package/lib/types/gir-module-resolved-by.d.ts +0 -15
  370. package/lib/types/gir-module-resolved-by.js +0 -2
  371. package/lib/types/gir-module-resolved-by.js.map +0 -1
  372. package/lib/types/gir-modules-grouped-map.d.ts +0 -4
  373. package/lib/types/gir-modules-grouped-map.js +0 -2
  374. package/lib/types/gir-modules-grouped-map.js.map +0 -1
  375. package/lib/types/gir-modules-grouped.d.ts +0 -12
  376. package/lib/types/gir-modules-grouped.js +0 -2
  377. package/lib/types/gir-modules-grouped.js.map +0 -1
  378. package/lib/types/gir-namespace.d.ts +0 -27
  379. package/lib/types/gir-namespace.js +0 -2
  380. package/lib/types/gir-namespace.js.map +0 -1
  381. package/lib/types/gir-property-element.d.ts +0 -4
  382. package/lib/types/gir-property-element.js +0 -2
  383. package/lib/types/gir-property-element.js.map +0 -1
  384. package/lib/types/gir-record-element.d.ts +0 -10
  385. package/lib/types/gir-record-element.js +0 -2
  386. package/lib/types/gir-record-element.js.map +0 -1
  387. package/lib/types/gir-repository.d.ts +0 -5
  388. package/lib/types/gir-repository.js +0 -2
  389. package/lib/types/gir-repository.js.map +0 -1
  390. package/lib/types/gir-signal.d.ts +0 -10
  391. package/lib/types/gir-signal.js +0 -2
  392. package/lib/types/gir-signal.js.map +0 -1
  393. package/lib/types/gir-type-name.d.ts +0 -2
  394. package/lib/types/gir-type-name.js +0 -2
  395. package/lib/types/gir-type-name.js.map +0 -1
  396. package/lib/types/gir-union-element.d.ts +0 -9
  397. package/lib/types/gir-union-element.js +0 -2
  398. package/lib/types/gir-union-element.js.map +0 -1
  399. package/lib/types/gir-unparsed-number.d.ts +0 -2
  400. package/lib/types/gir-unparsed-number.js +0 -2
  401. package/lib/types/gir-unparsed-number.js.map +0 -1
  402. package/lib/types/gir-virtual-method.d.ts +0 -6
  403. package/lib/types/gir-virtual-method.js +0 -2
  404. package/lib/types/gir-virtual-method.js.map +0 -1
  405. package/lib/types/index.d.ts +0 -79
  406. package/lib/types/index.js +0 -80
  407. package/lib/types/index.js.map +0 -1
  408. package/lib/types/inheritance-table.js +0 -2
  409. package/lib/types/inheritance-table.js.map +0 -1
  410. package/lib/types/local-name-check.d.ts +0 -4
  411. package/lib/types/local-name-check.js +0 -2
  412. package/lib/types/local-name-check.js.map +0 -1
  413. package/lib/types/local-name-type.d.ts +0 -1
  414. package/lib/types/local-name-type.js +0 -2
  415. package/lib/types/local-name-type.js.map +0 -1
  416. package/lib/types/local-name.d.ts +0 -7
  417. package/lib/types/local-name.js +0 -2
  418. package/lib/types/local-name.js.map +0 -1
  419. package/lib/types/local-names.d.ts +0 -4
  420. package/lib/types/local-names.js +0 -2
  421. package/lib/types/local-names.js.map +0 -1
  422. package/lib/types/metadata.d.ts +0 -8
  423. package/lib/types/metadata.js +0 -2
  424. package/lib/types/metadata.js.map +0 -1
  425. package/lib/types/options-base.d.ts +0 -4
  426. package/lib/types/options-base.js +0 -2
  427. package/lib/types/options-base.js.map +0 -1
  428. package/lib/types/options-generation.d.ts +0 -44
  429. package/lib/types/options-generation.js +0 -2
  430. package/lib/types/options-generation.js.map +0 -1
  431. package/lib/types/options-load.d.ts +0 -5
  432. package/lib/types/options-load.js +0 -2
  433. package/lib/types/options-load.js.map +0 -1
  434. package/lib/types/options-transform.d.ts +0 -4
  435. package/lib/types/options-transform.js +0 -2
  436. package/lib/types/options-transform.js.map +0 -1
  437. package/lib/types/output-format.d.ts +0 -1
  438. package/lib/types/output-format.js +0 -2
  439. package/lib/types/output-format.js.map +0 -1
  440. package/lib/types/package-data-parsed.d.ts +0 -28
  441. package/lib/types/package-data-parsed.js +0 -2
  442. package/lib/types/package-data-parsed.js.map +0 -1
  443. package/lib/types/package-data.d.ts +0 -23
  444. package/lib/types/package-data.js +0 -2
  445. package/lib/types/package-data.js.map +0 -1
  446. package/lib/types/package-section-parsed.d.ts +0 -8
  447. package/lib/types/package-section-parsed.js +0 -2
  448. package/lib/types/package-section-parsed.js.map +0 -1
  449. package/lib/types/parsed-gir.d.ts +0 -5
  450. package/lib/types/parsed-gir.js +0 -2
  451. package/lib/types/parsed-gir.js.map +0 -1
  452. package/lib/types/parsed-package-data.d.ts +0 -6
  453. package/lib/types/parsed-package-data.js +0 -2
  454. package/lib/types/parsed-package-data.js.map +0 -1
  455. package/lib/types/part-of-class.d.ts +0 -7
  456. package/lib/types/part-of-class.js +0 -2
  457. package/lib/types/part-of-class.js.map +0 -1
  458. package/lib/types/part-of-module.d.ts +0 -6
  459. package/lib/types/part-of-module.js +0 -2
  460. package/lib/types/part-of-module.js.map +0 -1
  461. package/lib/types/property-case.d.ts +0 -1
  462. package/lib/types/property-case.js +0 -2
  463. package/lib/types/property-case.js.map +0 -1
  464. package/lib/types/resolve-type.d.ts +0 -4
  465. package/lib/types/resolve-type.js +0 -6
  466. package/lib/types/resolve-type.js.map +0 -1
  467. package/lib/types/template-data.d.ts +0 -7
  468. package/lib/types/template-data.js +0 -2
  469. package/lib/types/template-data.js.map +0 -1
  470. package/lib/types/transformation-case.d.ts +0 -1
  471. package/lib/types/transformation-case.js +0 -2
  472. package/lib/types/transformation-case.js.map +0 -1
  473. package/lib/types/transformations.d.ts +0 -4
  474. package/lib/types/transformations.js +0 -2
  475. package/lib/types/transformations.js.map +0 -1
  476. package/lib/types/ts-doc-tag.js +0 -2
  477. package/lib/types/ts-doc-tag.js.map +0 -1
  478. package/lib/types/ts-doc.d.ts +0 -16
  479. package/lib/types/ts-doc.js +0 -2
  480. package/lib/types/ts-doc.js.map +0 -1
  481. package/lib/types/type-gir-alias.js +0 -2
  482. package/lib/types/type-gir-alias.js.map +0 -1
  483. package/lib/types/type-gir-class.d.ts +0 -2
  484. package/lib/types/type-gir-class.js +0 -2
  485. package/lib/types/type-gir-class.js.map +0 -1
  486. package/lib/types/type-gir-element.d.ts +0 -3
  487. package/lib/types/type-gir-element.js +0 -2
  488. package/lib/types/type-gir-element.js.map +0 -1
  489. package/lib/types/type-gir-enumeration-member.d.ts +0 -2
  490. package/lib/types/type-gir-enumeration-member.js +0 -2
  491. package/lib/types/type-gir-enumeration-member.js.map +0 -1
  492. package/lib/types/type-gir-enumeration.js +0 -2
  493. package/lib/types/type-gir-enumeration.js.map +0 -1
  494. package/lib/types/type-gir-function.d.ts +0 -1
  495. package/lib/types/type-gir-function.js +0 -2
  496. package/lib/types/type-gir-function.js.map +0 -1
  497. package/lib/types/type-gir-interface.js +0 -2
  498. package/lib/types/type-gir-interface.js.map +0 -1
  499. package/lib/types/type-gir-method.d.ts +0 -2
  500. package/lib/types/type-gir-method.js +0 -2
  501. package/lib/types/type-gir-method.js.map +0 -1
  502. package/lib/types/type-gir-parameter.d.ts +0 -1
  503. package/lib/types/type-gir-parameter.js +0 -2
  504. package/lib/types/type-gir-parameter.js.map +0 -1
  505. package/lib/types/type-gir-property.js +0 -2
  506. package/lib/types/type-gir-property.js.map +0 -1
  507. package/lib/types/type-gir-variable.d.ts +0 -1
  508. package/lib/types/type-gir-variable.js +0 -2
  509. package/lib/types/type-gir-variable.js.map +0 -1
  510. package/lib/types/type-ts-element.d.ts +0 -3
  511. package/lib/types/type-ts-element.js +0 -2
  512. package/lib/types/type-ts-element.js.map +0 -1
  513. package/lib/types/type-ts-enumeration-member.js +0 -2
  514. package/lib/types/type-ts-enumeration-member.js.map +0 -1
  515. package/lib/types/type-ts-function.d.ts +0 -1
  516. package/lib/types/type-ts-function.js +0 -2
  517. package/lib/types/type-ts-function.js.map +0 -1
  518. package/lib/types/type-ts-property.d.ts +0 -1
  519. package/lib/types/type-ts-property.js +0 -2
  520. package/lib/types/type-ts-property.js.map +0 -1
  521. package/lib/types/user-config-load-result.d.ts +0 -6
  522. package/lib/types/user-config-load-result.js +0 -2
  523. package/lib/types/user-config-load-result.js.map +0 -1
  524. package/lib/types/user-config.d.ts +0 -50
  525. package/lib/types/user-config.js +0 -2
  526. package/lib/types/user-config.js.map +0 -1
  527. package/lib/util.d.ts +0 -20
  528. package/lib/util.js +0 -67
  529. package/lib/util.js.map +0 -1
  530. package/lib/utils/files.d.ts +0 -21
  531. package/lib/utils/files.js +0 -62
  532. package/lib/utils/files.js.map +0 -1
  533. package/lib/utils/girs.d.ts +0 -45
  534. package/lib/utils/girs.js +0 -101
  535. package/lib/utils/girs.js.map +0 -1
  536. package/lib/utils/index.d.ts +0 -6
  537. package/lib/utils/index.js +0 -7
  538. package/lib/utils/index.js.map +0 -1
  539. package/lib/utils/numbers.js +0 -10
  540. package/lib/utils/numbers.js.map +0 -1
  541. package/lib/utils/objects.d.ts +0 -135
  542. package/lib/utils/objects.js.map +0 -1
  543. package/lib/utils/path.d.ts +0 -1
  544. package/lib/utils/path.js +0 -7
  545. package/lib/utils/path.js.map +0 -1
  546. package/lib/utils/strings.d.ts +0 -74
  547. package/lib/utils/strings.js +0 -121
  548. package/lib/utils/strings.js.map +0 -1
  549. package/lib/utils.d.ts +0 -267
  550. package/lib/utils.js +0 -417
  551. package/lib/utils.js.map +0 -1
  552. package/lib/validators/class.d.ts +0 -7
  553. package/lib/validators/class.js +0 -217
  554. package/lib/validators/class.js.map +0 -1
  555. package/lib/validators/interface.d.ts +0 -5
  556. package/lib/validators/interface.js +0 -16
  557. package/lib/validators/interface.js.map +0 -1
  558. package/lib/visitor.d.ts +0 -35
  559. package/lib/visitor.js +0 -29
  560. package/lib/visitor.js.map +0 -1
@@ -0,0 +1,187 @@
1
+ import { DefaultFormatter } from "../formatters/default.ts";
2
+ import type { Formatter } from "../formatters/formatter.ts";
3
+ import { JSONFormatter } from "../formatters/json.ts";
4
+ import type { FormatGenerator } from "../generators/generator.ts";
5
+ import { generify } from "../generics/generify.ts";
6
+ import type { GirModule } from "../index.ts";
7
+ import { inject } from "../injections/inject.ts";
8
+ import type { GeneratorConstructor, OptionsGeneration, OptionsTransform } from "../types/index.ts";
9
+ import { TwoKeyMap } from "../util.ts";
10
+ import { ClassVisitor } from "../validators/class.ts";
11
+ import { InterfaceVisitor } from "../validators/interface.ts";
12
+ import type { GirVisitor } from "../visitor.ts";
13
+ import type { IntrospectedNamespace } from "./namespace.ts";
14
+
15
+ export class NSRegistry {
16
+ mapping: TwoKeyMap<string, string, IntrospectedNamespace> = new TwoKeyMap();
17
+ private formatters: Map<string, Formatter> = new Map();
18
+ private generators: Map<string, GeneratorConstructor<unknown>> = new Map();
19
+ c_mapping: Map<string, { version: string; name: string }[]> = new Map();
20
+ transformations: GirVisitor[] = [];
21
+ subtypes = new TwoKeyMap<string, string, TwoKeyMap<string, string, boolean>>();
22
+
23
+ constructor() {
24
+ this.formatters.set("json", new JSONFormatter());
25
+ }
26
+
27
+ registerTransformation(visitor: GirVisitor) {
28
+ this.transformations.push(visitor);
29
+
30
+ // Apply transformations to already built namespaces.
31
+ this.mapping.forEach((n) => {
32
+ n.accept(visitor);
33
+ });
34
+ }
35
+
36
+ registerFormatter(output: string, formatter: Formatter) {
37
+ this.formatters.set(output, formatter);
38
+ }
39
+
40
+ getFormatter(output: string) {
41
+ return this.formatters.get(output) ?? new DefaultFormatter();
42
+ }
43
+
44
+ registerGenerator<T>(
45
+ output: string,
46
+ generator: { new (namespace: IntrospectedNamespace, options: OptionsGeneration): FormatGenerator<T> },
47
+ ) {
48
+ this.generators.set(output, generator);
49
+ }
50
+
51
+ async getGenerator<T>(output: string): Promise<GeneratorConstructor<T> | undefined> {
52
+ // Handle loading external generators...
53
+ if (!this.generators.has(output)) {
54
+ let Generator: { default: GeneratorConstructor<unknown> };
55
+ try {
56
+ Generator = (await import(`@gi.ts/generator-${output}`)) as { default: GeneratorConstructor<unknown> };
57
+
58
+ if (Generator) {
59
+ console.log(`Loading generator "@gi.ts/generator-${output}"...`);
60
+ this.generators.set(output, Generator.default);
61
+ return Generator.default as GeneratorConstructor<T>;
62
+ }
63
+ } catch {
64
+ try {
65
+ Generator = (await import(`gi-ts-generator-${output}`)) as {
66
+ default: GeneratorConstructor<unknown>;
67
+ };
68
+
69
+ console.log(`Loading generator "gi-ts-generator-${output}"...`);
70
+ this.generators.set(output, Generator.default);
71
+ return Generator.default as GeneratorConstructor<T>;
72
+ } catch {
73
+ try {
74
+ Generator = (await import(`${output}`)) as { default: GeneratorConstructor<unknown> };
75
+
76
+ console.log(`Loading generator "${output}"...`);
77
+ this.generators.set(output, Generator.default);
78
+ return Generator.default as GeneratorConstructor<T>;
79
+ } catch {}
80
+ }
81
+ }
82
+ }
83
+
84
+ return this.generators.get(output) as GeneratorConstructor<T> | undefined;
85
+ }
86
+
87
+ private _transformNamespace(namespace: IntrospectedNamespace) {
88
+ this.transformations.forEach((t) => {
89
+ namespace.accept(t);
90
+ });
91
+ }
92
+
93
+ namespace(name: string, version: string): IntrospectedNamespace | null {
94
+ const namespace = this.mapping.get(name, version);
95
+
96
+ return namespace ?? null;
97
+ }
98
+
99
+ namespacesForPrefix(c_prefix: string): IntrospectedNamespace[] {
100
+ return (this.c_mapping.get(c_prefix) ?? []).map((c_mapping) =>
101
+ this.assertNamespace(c_mapping.name, c_mapping.version),
102
+ );
103
+ }
104
+
105
+ transform(options: OptionsTransform) {
106
+ // In tolerant external-deps mode (with --allow-missing-deps) the core namespaces
107
+ // may not be loaded. Sync their package_version only when actually present;
108
+ // generify/inject still run on whatever IS loaded (other modules' transformations
109
+ // don't depend on GLib being in the registry).
110
+ const GLib = this.namespace("GLib", "2.0");
111
+ const Gio = this.namespace("Gio", "2.0");
112
+ const GObject = this.namespace("GObject", "2.0");
113
+
114
+ // These follow the GLib version.
115
+ if (GLib && Gio) Gio.package_version = [...GLib.package_version];
116
+ if (GLib && GObject) GObject.package_version = [...GLib.package_version];
117
+
118
+ const interfaceVisitor = new InterfaceVisitor();
119
+
120
+ this.registerTransformation(interfaceVisitor);
121
+
122
+ const classVisitor = new ClassVisitor();
123
+
124
+ this.registerTransformation(classVisitor);
125
+
126
+ if (GLib && Gio) {
127
+ console.log("Adding generics...");
128
+ generify(this, options.inferGenerics);
129
+
130
+ console.log("Injecting types...");
131
+ inject(this);
132
+ }
133
+ }
134
+
135
+ defaultVersionOf(name: string): string | null {
136
+ // GJS has a hard dependency on these versions.
137
+ if (name === "GLib" || name === "Gio" || name === "GObject") {
138
+ return "2.0";
139
+ }
140
+
141
+ const meta = this.mapping.getIfOnly(name);
142
+
143
+ if (meta) {
144
+ return meta[0];
145
+ }
146
+
147
+ return null;
148
+ }
149
+
150
+ assertDefaultVersionOf(name: string): string {
151
+ const version = this.defaultVersionOf(name);
152
+
153
+ if (version) {
154
+ return version;
155
+ }
156
+
157
+ // This mirrors GJS' and GI's default behavior.
158
+ // If we can't find a single version of an unspecified dependency, we throw an error.
159
+ throw new Error(`No single version found for unspecified dependency: ${JSON.stringify(name)}.`);
160
+ }
161
+
162
+ assertNamespace(name: string, version: string): IntrospectedNamespace {
163
+ const namespace = this.mapping.get(name, version) ?? null;
164
+
165
+ if (!namespace) {
166
+ throw new Error(`Namespace '${name}' not found.`);
167
+ }
168
+
169
+ return namespace;
170
+ }
171
+
172
+ register(namespace: GirModule): IntrospectedNamespace {
173
+ this.mapping.set(namespace.namespace, namespace.version, namespace);
174
+
175
+ namespace.c_prefixes.forEach((c_prefix) => {
176
+ const c_map = this.c_mapping.get(c_prefix) || [];
177
+
178
+ c_map.push({ name: namespace.namespace, version: namespace.version });
179
+
180
+ this.c_mapping.set(c_prefix, c_map);
181
+ });
182
+
183
+ this._transformNamespace(namespace);
184
+
185
+ return namespace;
186
+ }
187
+ }
@@ -0,0 +1,279 @@
1
+ import type { GirCallableParamElement, GirSignalElement } from "@gi.ts/parser";
2
+ import { GirDirection } from "@gi.ts/parser";
3
+ import type { FormatGenerator } from "../generators/generator.ts";
4
+ import {
5
+ ArrayType,
6
+ makeNullable,
7
+ NativeType,
8
+ NullableType,
9
+ NumberType,
10
+ ThisType,
11
+ type TypeExpression,
12
+ UnknownType,
13
+ VoidType,
14
+ } from "../gir.ts";
15
+ import type { OptionsLoad } from "../types/index.ts";
16
+ import type { Options } from "../types/introspected.ts";
17
+ import { getType, parseDoc, parseMetadata } from "../utils/gir-parsing.ts";
18
+ import { isIntrospectable } from "../utils/girs.ts";
19
+ import type { GirVisitor } from "../visitor.ts";
20
+ import { IntrospectedClassMember } from "./introspected-class-member.ts";
21
+ import {
22
+ type IntrospectedClass,
23
+ IntrospectedClassCallback,
24
+ IntrospectedClassFunction,
25
+ } from "./introspected-classes.ts";
26
+ import { IntrospectedFunctionParameter } from "./parameter.ts";
27
+
28
+ export enum IntrospectedSignalType {
29
+ CONNECT,
30
+ CONNECT_AFTER,
31
+ EMIT,
32
+ }
33
+
34
+ export class IntrospectedSignal extends IntrospectedClassMember<IntrospectedClass> {
35
+ parameters: IntrospectedFunctionParameter[];
36
+ return_type: TypeExpression;
37
+ detailed: boolean;
38
+ action: boolean;
39
+ noRecurse: boolean;
40
+ noHooks: boolean;
41
+ when?: "first" | "last" | "cleanup";
42
+
43
+ constructor({
44
+ name,
45
+ parameters = [],
46
+ return_type = UnknownType,
47
+ detailed = false,
48
+ action = false,
49
+ noRecurse = false,
50
+ noHooks = false,
51
+ when,
52
+ parent,
53
+ ...args
54
+ }: Options<{
55
+ name: string;
56
+ parameters?: IntrospectedFunctionParameter[];
57
+ return_type?: TypeExpression;
58
+ detailed?: boolean;
59
+ action?: boolean;
60
+ noRecurse?: boolean;
61
+ noHooks?: boolean;
62
+ when?: "first" | "last" | "cleanup";
63
+ parent: IntrospectedClass;
64
+ }>) {
65
+ super(name, parent, { ...args });
66
+
67
+ this.parameters = parameters.map((p) => p.copy({ parent: this }));
68
+ this.return_type = return_type;
69
+ this.detailed = detailed;
70
+ this.action = action;
71
+ this.noRecurse = noRecurse;
72
+ this.noHooks = noHooks;
73
+ this.when = when;
74
+ }
75
+
76
+ accept(visitor: GirVisitor): IntrospectedSignal {
77
+ const node = this.copy({
78
+ parameters: this.parameters.map((p) => {
79
+ return p.accept(visitor);
80
+ }),
81
+ returnType: visitor.visitType?.(this.return_type),
82
+ });
83
+
84
+ return visitor.visitSignal?.(node) ?? node;
85
+ }
86
+
87
+ copy({
88
+ parent = this.parent,
89
+ parameters,
90
+ returnType,
91
+ detailed,
92
+ action,
93
+ noRecurse,
94
+ noHooks,
95
+ when,
96
+ }: {
97
+ parent?: IntrospectedClass;
98
+ parameters?: IntrospectedFunctionParameter[];
99
+ returnType?: TypeExpression;
100
+ detailed?: boolean;
101
+ action?: boolean;
102
+ noRecurse?: boolean;
103
+ noHooks?: boolean;
104
+ when?: "first" | "last" | "cleanup";
105
+ } = {}): IntrospectedSignal {
106
+ return new IntrospectedSignal({
107
+ name: this.name,
108
+ parent,
109
+ parameters: parameters ?? this.parameters,
110
+ return_type: returnType ?? this.return_type,
111
+ detailed: detailed ?? this.detailed,
112
+ action: action ?? this.action,
113
+ noRecurse: noRecurse ?? this.noRecurse,
114
+ noHooks: noHooks ?? this.noHooks,
115
+ when: when ?? this.when,
116
+ })._copyBaseProperties(this);
117
+ }
118
+
119
+ static fromXML(element: GirSignalElement, parent: IntrospectedClass, options: OptionsLoad): IntrospectedSignal {
120
+ const ns = parent.namespace;
121
+ const signal = new IntrospectedSignal({
122
+ name: element.$.name,
123
+ parent,
124
+ detailed: element.$.detailed === "1",
125
+ action: element.$.action === "1",
126
+ noRecurse: element.$["no-recurse"] === "1",
127
+ noHooks: element.$["no-hooks"] === "1",
128
+ when: element.$.when as "first" | "last" | "cleanup" | undefined,
129
+ isIntrospectable: isIntrospectable(element),
130
+ });
131
+
132
+ if (element.parameters?.[0].parameter) {
133
+ signal.parameters.push(
134
+ ...element.parameters[0].parameter
135
+ .filter((p): p is GirCallableParamElement & { $: { name: string } } => !!p.$.name)
136
+ .map((p) => IntrospectedFunctionParameter.fromXML(p, signal, options)),
137
+ );
138
+ }
139
+
140
+ const length_params = [] as number[];
141
+
142
+ signal.parameters = signal.parameters
143
+ .map((p) => {
144
+ const unwrapped_type = p.type.unwrap();
145
+
146
+ if (unwrapped_type instanceof ArrayType && unwrapped_type.length != null) {
147
+ length_params.push(unwrapped_type.length);
148
+
149
+ return p;
150
+ }
151
+
152
+ return p;
153
+ })
154
+ .filter((_, i) => {
155
+ // We remove any length parameters.
156
+ return !length_params.includes(i);
157
+ })
158
+
159
+ .reverse()
160
+ .reduce(
161
+ ({ allowOptions, params }, p) => {
162
+ const { type, isOptional } = p;
163
+
164
+ if (allowOptions) {
165
+ if (type instanceof NullableType) {
166
+ params.push(p.copy({ isOptional: true }));
167
+ } else if (!isOptional) {
168
+ params.push(p);
169
+ return { allowOptions: false, params };
170
+ } else {
171
+ params.push(p);
172
+ }
173
+ } else {
174
+ if (isOptional) {
175
+ params.push(p.copy({ type: makeNullable(type), isOptional: false }));
176
+ } else {
177
+ params.push(p);
178
+ }
179
+ }
180
+
181
+ return { allowOptions, params };
182
+ },
183
+ {
184
+ allowOptions: true,
185
+ params: [] as IntrospectedFunctionParameter[],
186
+ },
187
+ )
188
+ .params.reverse()
189
+ .filter((p): p is IntrospectedFunctionParameter => p != null);
190
+
191
+ signal.return_type = getType(ns, element["return-value"]?.[0]);
192
+
193
+ if (options.loadDocs) {
194
+ signal.doc = parseDoc(element);
195
+ signal.metadata = parseMetadata(element);
196
+ }
197
+
198
+ return signal;
199
+ }
200
+
201
+ asEmit() {
202
+ const emit = this.copy();
203
+
204
+ const parent = this.parent;
205
+
206
+ const prefix_signal = emit.parameters.some((p) => {
207
+ return p.name === "signal";
208
+ });
209
+
210
+ const parameters = [
211
+ new IntrospectedFunctionParameter({
212
+ name: prefix_signal ? "$signal" : "signal",
213
+ type: NativeType.of(`'${this.name}'`),
214
+ direction: GirDirection.In,
215
+ }),
216
+ ...emit.parameters,
217
+ ];
218
+
219
+ const return_type = VoidType;
220
+
221
+ return new IntrospectedClassFunction({
222
+ return_type,
223
+ parameters,
224
+ name: "emit",
225
+ parent,
226
+ });
227
+ }
228
+
229
+ asConnect(after = false) {
230
+ const connect = this.copy();
231
+
232
+ const name = after ? "connect_after" : "connect";
233
+
234
+ const parent = this.parent;
235
+ const cb = new IntrospectedClassCallback({
236
+ parent,
237
+ name: "callback",
238
+ output_parameters: [],
239
+ parameters: [
240
+ new IntrospectedFunctionParameter({
241
+ name: "_source",
242
+ type: ThisType,
243
+ direction: GirDirection.In,
244
+ }),
245
+ ...connect.parameters.map((p) => p.copy()),
246
+ ],
247
+ return_type: connect.return_type,
248
+ });
249
+
250
+ const parameters = [
251
+ new IntrospectedFunctionParameter({
252
+ name: "signal",
253
+ type: NativeType.of(`'${this.name}'`),
254
+ direction: GirDirection.In,
255
+ }),
256
+ new IntrospectedFunctionParameter({
257
+ name: "callback",
258
+ type: cb.asFunctionType(),
259
+ direction: GirDirection.In,
260
+ }),
261
+ ];
262
+
263
+ const return_type = NumberType;
264
+
265
+ return new IntrospectedClassFunction({
266
+ return_type,
267
+ parameters,
268
+ name,
269
+ parent: this.parent,
270
+ });
271
+ }
272
+
273
+ asString<T extends FormatGenerator<unknown>>(
274
+ generator: T,
275
+ type?: IntrospectedSignalType,
276
+ ): ReturnType<T["generateSignal"]> {
277
+ return generator.generateSignal(this, type) as ReturnType<T["generateSignal"]>;
278
+ }
279
+ }