@gtkx/codegen 1.0.0 → 1.2.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 (347) hide show
  1. package/README.md +1 -1
  2. package/dist/analysis/descriptor-render.d.ts +12 -15
  3. package/dist/analysis/descriptor-render.d.ts.map +1 -1
  4. package/dist/analysis/descriptor-render.js +59 -38
  5. package/dist/analysis/descriptor-render.js.map +1 -1
  6. package/dist/analysis/descriptor.d.ts +25 -10
  7. package/dist/analysis/descriptor.d.ts.map +1 -1
  8. package/dist/analysis/descriptor.js +37 -9
  9. package/dist/analysis/descriptor.js.map +1 -1
  10. package/dist/analysis/inheritance.d.ts +4 -2
  11. package/dist/analysis/inheritance.d.ts.map +1 -1
  12. package/dist/analysis/inheritance.js +80 -38
  13. package/dist/analysis/inheritance.js.map +1 -1
  14. package/dist/analysis/interface-conflicts.d.ts +25 -0
  15. package/dist/analysis/interface-conflicts.d.ts.map +1 -0
  16. package/dist/analysis/interface-conflicts.js +139 -0
  17. package/dist/analysis/interface-conflicts.js.map +1 -0
  18. package/dist/analysis/param-capability.d.ts.map +1 -1
  19. package/dist/analysis/param-capability.js +3 -4
  20. package/dist/analysis/param-capability.js.map +1 -1
  21. package/dist/analysis/param-structure.js +2 -2
  22. package/dist/analysis/param-structure.js.map +1 -1
  23. package/dist/analysis/ts-type.d.ts +3 -2
  24. package/dist/analysis/ts-type.d.ts.map +1 -1
  25. package/dist/analysis/ts-type.js +26 -26
  26. package/dist/analysis/ts-type.js.map +1 -1
  27. package/dist/analysis/type-key.d.ts +5 -0
  28. package/dist/analysis/type-key.d.ts.map +1 -0
  29. package/dist/analysis/type-key.js +9 -0
  30. package/dist/analysis/type-key.js.map +1 -0
  31. package/dist/analysis/type-shape.d.ts +3 -2
  32. package/dist/analysis/type-shape.d.ts.map +1 -1
  33. package/dist/analysis/type-shape.js +2 -1
  34. package/dist/analysis/type-shape.js.map +1 -1
  35. package/dist/compile.d.ts +14 -6
  36. package/dist/compile.d.ts.map +1 -1
  37. package/dist/compile.js +125 -24
  38. package/dist/compile.js.map +1 -1
  39. package/dist/docs/api-reference.d.ts +2 -0
  40. package/dist/docs/api-reference.d.ts.map +1 -1
  41. package/dist/docs/api-reference.js +11 -10
  42. package/dist/docs/api-reference.js.map +1 -1
  43. package/dist/docs/element-page.d.ts.map +1 -1
  44. package/dist/docs/element-page.js +5 -3
  45. package/dist/docs/element-page.js.map +1 -1
  46. package/dist/docs/pipeline.d.ts +1 -0
  47. package/dist/docs/pipeline.d.ts.map +1 -1
  48. package/dist/docs/pipeline.js +93 -19
  49. package/dist/docs/pipeline.js.map +1 -1
  50. package/dist/docs/render.d.ts +2 -1
  51. package/dist/docs/render.d.ts.map +1 -1
  52. package/dist/docs/render.js +5 -4
  53. package/dist/docs/render.js.map +1 -1
  54. package/dist/docs/symbol-page.d.ts.map +1 -1
  55. package/dist/docs/symbol-page.js +10 -9
  56. package/dist/docs/symbol-page.js.map +1 -1
  57. package/dist/fingerprint.d.ts +20 -3
  58. package/dist/fingerprint.d.ts.map +1 -1
  59. package/dist/fingerprint.js +56 -37
  60. package/dist/fingerprint.js.map +1 -1
  61. package/dist/gi.d.ts +1 -0
  62. package/dist/gi.d.ts.map +1 -1
  63. package/dist/gi.js +8 -2
  64. package/dist/gi.js.map +1 -1
  65. package/dist/gir/ancestry.d.ts +7 -1
  66. package/dist/gir/ancestry.d.ts.map +1 -1
  67. package/dist/gir/ancestry.js +9 -1
  68. package/dist/gir/ancestry.js.map +1 -1
  69. package/dist/gir/annotations.d.ts +1 -2
  70. package/dist/gir/annotations.d.ts.map +1 -1
  71. package/dist/gir/annotations.js +1 -1
  72. package/dist/gir/annotations.js.map +1 -1
  73. package/dist/gir/cursor-overrides.d.ts +8 -0
  74. package/dist/gir/cursor-overrides.d.ts.map +1 -0
  75. package/dist/gir/cursor-overrides.js +6 -0
  76. package/dist/gir/cursor-overrides.js.map +1 -0
  77. package/dist/gir/emittable.d.ts +7 -0
  78. package/dist/gir/emittable.d.ts.map +1 -0
  79. package/dist/gir/emittable.js +3 -0
  80. package/dist/gir/emittable.js.map +1 -0
  81. package/dist/gir/function.d.ts.map +1 -1
  82. package/dist/gir/function.js +28 -2
  83. package/dist/gir/function.js.map +1 -1
  84. package/dist/gir/gir-path.d.ts +1 -1
  85. package/dist/gir/gir-path.js +1 -1
  86. package/dist/gir/gir-path.js.map +1 -1
  87. package/dist/gir/library.d.ts +5 -1
  88. package/dist/gir/library.d.ts.map +1 -1
  89. package/dist/gir/library.js +9 -2
  90. package/dist/gir/library.js.map +1 -1
  91. package/dist/gir/namespace.d.ts +5 -1
  92. package/dist/gir/namespace.d.ts.map +1 -1
  93. package/dist/gir/namespace.js +4 -2
  94. package/dist/gir/namespace.js.map +1 -1
  95. package/dist/gir/parameter.d.ts +13 -1
  96. package/dist/gir/parameter.d.ts.map +1 -1
  97. package/dist/gir/parameter.js +1 -0
  98. package/dist/gir/parameter.js.map +1 -1
  99. package/dist/gir/parse.d.ts.map +1 -1
  100. package/dist/gir/parse.js +6 -6
  101. package/dist/gir/parse.js.map +1 -1
  102. package/dist/gir/primitives.js +1 -1
  103. package/dist/gir/primitives.js.map +1 -1
  104. package/dist/guards.d.ts +16 -0
  105. package/dist/guards.d.ts.map +1 -0
  106. package/dist/guards.js +11 -0
  107. package/dist/guards.js.map +1 -0
  108. package/dist/internal.d.ts +2 -0
  109. package/dist/internal.d.ts.map +1 -1
  110. package/dist/internal.js +2 -0
  111. package/dist/internal.js.map +1 -1
  112. package/dist/json.d.ts +3 -0
  113. package/dist/json.d.ts.map +1 -0
  114. package/dist/json.js +11 -0
  115. package/dist/json.js.map +1 -0
  116. package/dist/khronos/args.d.ts.map +1 -1
  117. package/dist/khronos/args.js +8 -6
  118. package/dist/khronos/args.js.map +1 -1
  119. package/dist/khronos/modules.d.ts.map +1 -1
  120. package/dist/khronos/modules.js +22 -7
  121. package/dist/khronos/modules.js.map +1 -1
  122. package/dist/khronos/parse.d.ts.map +1 -1
  123. package/dist/khronos/parse.js +3 -4
  124. package/dist/khronos/parse.js.map +1 -1
  125. package/dist/khronos/pipeline.d.ts +1 -1
  126. package/dist/khronos/pipeline.d.ts.map +1 -1
  127. package/dist/khronos/pipeline.js.map +1 -1
  128. package/dist/khronos/plan.d.ts +1 -7
  129. package/dist/khronos/plan.d.ts.map +1 -1
  130. package/dist/khronos/plan.js +1 -1
  131. package/dist/khronos/plan.js.map +1 -1
  132. package/dist/khronos/render.d.ts.map +1 -1
  133. package/dist/khronos/render.js +8 -4
  134. package/dist/khronos/render.js.map +1 -1
  135. package/dist/runner.d.ts +7 -1
  136. package/dist/runner.d.ts.map +1 -1
  137. package/dist/runner.js +21 -3
  138. package/dist/runner.js.map +1 -1
  139. package/dist/staging.d.ts +5 -0
  140. package/dist/staging.d.ts.map +1 -0
  141. package/dist/staging.js +57 -0
  142. package/dist/staging.js.map +1 -0
  143. package/dist/store/compile-store.d.ts +0 -1
  144. package/dist/store/compile-store.d.ts.map +1 -1
  145. package/dist/store/compile-store.js +7 -32
  146. package/dist/store/compile-store.js.map +1 -1
  147. package/dist/store/gi/callables.d.ts +6 -3
  148. package/dist/store/gi/callables.d.ts.map +1 -1
  149. package/dist/store/gi/callables.js +40 -30
  150. package/dist/store/gi/callables.js.map +1 -1
  151. package/dist/store/gi/callback.d.ts.map +1 -1
  152. package/dist/store/gi/callback.js +9 -5
  153. package/dist/store/gi/callback.js.map +1 -1
  154. package/dist/store/gi/class.d.ts.map +1 -1
  155. package/dist/store/gi/class.js +104 -44
  156. package/dist/store/gi/class.js.map +1 -1
  157. package/dist/store/gi/companion.d.ts.map +1 -1
  158. package/dist/store/gi/companion.js +6 -6
  159. package/dist/store/gi/companion.js.map +1 -1
  160. package/dist/store/gi/constant.d.ts.map +1 -1
  161. package/dist/store/gi/constant.js +11 -3
  162. package/dist/store/gi/constant.js.map +1 -1
  163. package/dist/store/gi/constructor-props.js +1 -1
  164. package/dist/store/gi/constructor-props.js.map +1 -1
  165. package/dist/store/gi/enum.d.ts.map +1 -1
  166. package/dist/store/gi/enum.js +29 -12
  167. package/dist/store/gi/enum.js.map +1 -1
  168. package/dist/store/gi/function.d.ts +1 -3
  169. package/dist/store/gi/function.d.ts.map +1 -1
  170. package/dist/store/gi/function.js +24 -18
  171. package/dist/store/gi/function.js.map +1 -1
  172. package/dist/store/gi/gtype-binding.d.ts.map +1 -1
  173. package/dist/store/gi/gtype-binding.js +4 -1
  174. package/dist/store/gi/gtype-binding.js.map +1 -1
  175. package/dist/store/gi/interface.d.ts.map +1 -1
  176. package/dist/store/gi/interface.js +34 -19
  177. package/dist/store/gi/interface.js.map +1 -1
  178. package/dist/store/gi/method.d.ts +7 -6
  179. package/dist/store/gi/method.d.ts.map +1 -1
  180. package/dist/store/gi/method.js +13 -24
  181. package/dist/store/gi/method.js.map +1 -1
  182. package/dist/store/gi/param-marshal.d.ts +3 -2
  183. package/dist/store/gi/param-marshal.d.ts.map +1 -1
  184. package/dist/store/gi/param-marshal.js +50 -5
  185. package/dist/store/gi/param-marshal.js.map +1 -1
  186. package/dist/store/gi/pipeline.d.ts.map +1 -1
  187. package/dist/store/gi/pipeline.js +21 -10
  188. package/dist/store/gi/pipeline.js.map +1 -1
  189. package/dist/store/gi/properties.d.ts +2 -1
  190. package/dist/store/gi/properties.d.ts.map +1 -1
  191. package/dist/store/gi/properties.js +6 -3
  192. package/dist/store/gi/properties.js.map +1 -1
  193. package/dist/store/gi/property-accessor.d.ts +10 -8
  194. package/dist/store/gi/property-accessor.d.ts.map +1 -1
  195. package/dist/store/gi/property-accessor.js +49 -91
  196. package/dist/store/gi/property-accessor.js.map +1 -1
  197. package/dist/store/gi/record-constructor.d.ts +8 -1
  198. package/dist/store/gi/record-constructor.d.ts.map +1 -1
  199. package/dist/store/gi/record-constructor.js +34 -13
  200. package/dist/store/gi/record-constructor.js.map +1 -1
  201. package/dist/store/gi/record-field-accessor.d.ts.map +1 -1
  202. package/dist/store/gi/record-field-accessor.js +20 -4
  203. package/dist/store/gi/record-field-accessor.js.map +1 -1
  204. package/dist/store/gi/record-layout.d.ts +6 -1
  205. package/dist/store/gi/record-layout.d.ts.map +1 -1
  206. package/dist/store/gi/record-layout.js +8 -1
  207. package/dist/store/gi/record-layout.js.map +1 -1
  208. package/dist/store/gi/record.d.ts.map +1 -1
  209. package/dist/store/gi/record.js +19 -8
  210. package/dist/store/gi/record.js.map +1 -1
  211. package/dist/store/gi/registration.js +2 -2
  212. package/dist/store/gi/registration.js.map +1 -1
  213. package/dist/store/gi/return-wrap.js +1 -1
  214. package/dist/store/gi/return-wrap.js.map +1 -1
  215. package/dist/store/gi/signal.d.ts +2 -1
  216. package/dist/store/gi/signal.d.ts.map +1 -1
  217. package/dist/store/gi/signal.js +55 -28
  218. package/dist/store/gi/signal.js.map +1 -1
  219. package/dist/store/gi/value-marshalable.d.ts.map +1 -1
  220. package/dist/store/gi/value-marshalable.js +2 -1
  221. package/dist/store/gi/value-marshalable.js.map +1 -1
  222. package/dist/store/gi/vtable.d.ts +4 -1
  223. package/dist/store/gi/vtable.d.ts.map +1 -1
  224. package/dist/store/gi/vtable.js +60 -17
  225. package/dist/store/gi/vtable.js.map +1 -1
  226. package/dist/store/gi-store.d.ts +1 -0
  227. package/dist/store/gi-store.d.ts.map +1 -1
  228. package/dist/store/gi-store.js +15 -20
  229. package/dist/store/gi-store.js.map +1 -1
  230. package/dist/store/jsx/generated-elements.d.ts +2 -1
  231. package/dist/store/jsx/generated-elements.d.ts.map +1 -1
  232. package/dist/store/jsx/generated-elements.js +13 -7
  233. package/dist/store/jsx/generated-elements.js.map +1 -1
  234. package/dist/store/jsx/jsx.js +3 -3
  235. package/dist/store/jsx/jsx.js.map +1 -1
  236. package/dist/store/jsx/metadata.d.ts.map +1 -1
  237. package/dist/store/jsx/metadata.js +3 -1
  238. package/dist/store/jsx/metadata.js.map +1 -1
  239. package/dist/store/jsx-store.d.ts.map +1 -1
  240. package/dist/store/jsx-store.js +3 -4
  241. package/dist/store/jsx-store.js.map +1 -1
  242. package/dist/store/resolve-store.d.ts +14 -3
  243. package/dist/store/resolve-store.d.ts.map +1 -1
  244. package/dist/store/resolve-store.js +98 -15
  245. package/dist/store/resolve-store.js.map +1 -1
  246. package/dist/store/store-fs.d.ts +9 -7
  247. package/dist/store/store-fs.d.ts.map +1 -1
  248. package/dist/store/store-fs.js +54 -25
  249. package/dist/store/store-fs.js.map +1 -1
  250. package/dist/store/store-links.d.ts +3 -0
  251. package/dist/store/store-links.d.ts.map +1 -0
  252. package/dist/store/store-links.js +39 -0
  253. package/dist/store/store-links.js.map +1 -0
  254. package/dist/writer/comparison-context.d.ts +4 -0
  255. package/dist/writer/comparison-context.d.ts.map +1 -0
  256. package/dist/writer/comparison-context.js +13 -0
  257. package/dist/writer/comparison-context.js.map +1 -0
  258. package/dist/writer/context.d.ts +3 -3
  259. package/dist/writer/context.d.ts.map +1 -1
  260. package/dist/writer/context.js +11 -6
  261. package/dist/writer/context.js.map +1 -1
  262. package/dist/writer/module.d.ts +13 -5
  263. package/dist/writer/module.d.ts.map +1 -1
  264. package/dist/writer/module.js +68 -11
  265. package/dist/writer/module.js.map +1 -1
  266. package/dist/xml.d.ts +8 -1
  267. package/dist/xml.d.ts.map +1 -1
  268. package/dist/xml.js +70 -1
  269. package/dist/xml.js.map +1 -1
  270. package/overrides/gobject/object.ts.ejs +2 -0
  271. package/package.json +14 -3
  272. package/src/analysis/descriptor-render.ts +106 -52
  273. package/src/analysis/descriptor.ts +76 -15
  274. package/src/analysis/inheritance.ts +134 -44
  275. package/src/analysis/interface-conflicts.ts +235 -0
  276. package/src/analysis/param-capability.ts +3 -6
  277. package/src/analysis/param-structure.ts +2 -2
  278. package/src/analysis/ts-type.ts +43 -28
  279. package/src/analysis/type-key.ts +14 -0
  280. package/src/analysis/type-shape.ts +5 -2
  281. package/src/compile.ts +192 -27
  282. package/src/docs/api-reference.ts +13 -10
  283. package/src/docs/element-page.ts +5 -2
  284. package/src/docs/pipeline.ts +140 -24
  285. package/src/docs/render.ts +7 -3
  286. package/src/docs/symbol-page.ts +12 -11
  287. package/src/fingerprint.ts +95 -47
  288. package/src/gi.ts +10 -2
  289. package/src/gir/ancestry.ts +17 -1
  290. package/src/gir/annotations.ts +1 -1
  291. package/src/gir/cursor-overrides.ts +12 -0
  292. package/src/gir/emittable.ts +8 -0
  293. package/src/gir/function.ts +45 -9
  294. package/src/gir/gir-path.ts +1 -1
  295. package/src/gir/library.ts +10 -2
  296. package/src/gir/namespace.ts +8 -2
  297. package/src/gir/parameter.ts +15 -0
  298. package/src/gir/parse.ts +10 -7
  299. package/src/gir/primitives.ts +1 -1
  300. package/src/guards.ts +23 -0
  301. package/src/internal.ts +2 -0
  302. package/src/json.ts +11 -0
  303. package/src/khronos/args.ts +9 -6
  304. package/src/khronos/modules.ts +25 -9
  305. package/src/khronos/parse.ts +3 -4
  306. package/src/khronos/pipeline.ts +1 -1
  307. package/src/khronos/plan.ts +0 -1
  308. package/src/khronos/render.ts +8 -6
  309. package/src/runner.ts +26 -4
  310. package/src/staging.ts +67 -0
  311. package/src/store/compile-store.ts +7 -38
  312. package/src/store/gi/callables.ts +60 -33
  313. package/src/store/gi/callback.ts +9 -9
  314. package/src/store/gi/class.ts +140 -53
  315. package/src/store/gi/companion.ts +7 -6
  316. package/src/store/gi/constant.ts +13 -3
  317. package/src/store/gi/constructor-props.ts +1 -1
  318. package/src/store/gi/enum.ts +36 -26
  319. package/src/store/gi/function.ts +30 -24
  320. package/src/store/gi/gtype-binding.ts +7 -2
  321. package/src/store/gi/interface.ts +39 -20
  322. package/src/store/gi/method.ts +26 -32
  323. package/src/store/gi/param-marshal.ts +77 -6
  324. package/src/store/gi/pipeline.ts +25 -15
  325. package/src/store/gi/properties.ts +8 -4
  326. package/src/store/gi/property-accessor.ts +73 -161
  327. package/src/store/gi/record-constructor.ts +53 -21
  328. package/src/store/gi/record-field-accessor.ts +26 -4
  329. package/src/store/gi/record-layout.ts +11 -1
  330. package/src/store/gi/record.ts +20 -12
  331. package/src/store/gi/registration.ts +2 -2
  332. package/src/store/gi/return-wrap.ts +1 -1
  333. package/src/store/gi/signal.ts +66 -42
  334. package/src/store/gi/value-marshalable.ts +3 -1
  335. package/src/store/gi/vtable.ts +97 -20
  336. package/src/store/gi-store.ts +26 -31
  337. package/src/store/jsx/generated-elements.ts +17 -8
  338. package/src/store/jsx/jsx.ts +3 -3
  339. package/src/store/jsx/metadata.ts +4 -1
  340. package/src/store/jsx-store.ts +3 -4
  341. package/src/store/resolve-store.ts +133 -18
  342. package/src/store/store-fs.ts +82 -35
  343. package/src/store/store-links.ts +49 -0
  344. package/src/writer/comparison-context.ts +18 -0
  345. package/src/writer/context.ts +12 -6
  346. package/src/writer/module.ts +101 -14
  347. package/src/xml.ts +103 -1
@@ -1,5 +1,6 @@
1
1
  import { sourceStringLiteral } from "@gtkx/utils";
2
2
  import { joinArgs } from "../writer/emit.js";
3
+ const SKIPPED_RETURN_ENTRY = "isReturnSkipped: true";
3
4
  const T = {
4
5
  bind: "t.bind",
5
6
  int8: "t.int8",
@@ -36,6 +37,7 @@ const T = {
36
37
  byteArray: "t.byteArray",
37
38
  sizedArray: "t.sizedArray",
38
39
  fixedArray: "t.fixedArray",
40
+ cursorArray: "t.cursorArray",
39
41
  callback: "t.callback",
40
42
  fn: "t.fn",
41
43
  };
@@ -45,6 +47,7 @@ const tUint8 = T.uint8;
45
47
  const tUint32 = T.uint32;
46
48
  const tInt32 = T.int32;
47
49
  const tUint64 = T.uint64;
50
+ const tBiguint64 = T.biguint64;
48
51
  const tGtype = T.gtype;
49
52
  const tBuffer = T.buffer;
50
53
  const call = (name, args) => `${T[name]}(${joinArgs(args)})`;
@@ -94,34 +97,59 @@ const tHashTable = (key, value, ownership) => call("hashTable", [key, value, sou
94
97
  const tEnum = (lib, typeFnName, isSigned) => call("enum", [sourceStringLiteral(lib), sourceStringLiteral(typeFnName), String(isSigned)]);
95
98
  const tFlags = (lib, typeFnName, isSigned) => call("flags", [sourceStringLiteral(lib), sourceStringLiteral(typeFnName), String(isSigned)]);
96
99
  const tByteArray = (ownership) => call("byteArray", [sourceStringLiteral(ownership)]);
100
+ const tNumericByteArray = (ownership) => call("array", [
101
+ tUint8,
102
+ sourceStringLiteral("gbytearray"),
103
+ sourceStringLiteral(ownership),
104
+ ]);
97
105
  const tList = (name, element, ownership) => call(name, [element, sourceStringLiteral(ownership)]);
98
- const tArray = (element, ownership, elementSize) => call("array", [
106
+ const arrayLayoutArg = (ownership, layout) => {
107
+ if (ownership === undefined) {
108
+ return undefined;
109
+ }
110
+ const entries = [
111
+ layout.elementSize === undefined ? undefined : `elementSize: ${String(layout.elementSize)}`,
112
+ layout.isBytes ? "isBytes: true" : undefined,
113
+ ].filter((entry) => entry !== undefined);
114
+ return entries.length === 0 ? undefined : `{ ${entries.join(", ")} }`;
115
+ };
116
+ const tArray = (element, ownership, layout) => call("array", [
99
117
  element,
100
118
  ownership === undefined ? undefined : sourceStringLiteral("array"),
101
119
  ownership === undefined ? undefined : sourceStringLiteral(ownership),
102
- elementSize === undefined ? undefined : `{ elementSize: ${String(elementSize)} }`,
120
+ arrayLayoutArg(ownership, layout),
103
121
  ]);
104
- const tSizedArray = (element, lengthIndex, ownership, elementSize) => call("sizedArray", [
122
+ const tSizedArray = (element, lengthIndex, ownership, layout) => call("sizedArray", [
105
123
  element,
106
124
  String(lengthIndex),
107
125
  ownership === undefined ? undefined : sourceStringLiteral(ownership),
108
- elementSize === undefined ? undefined : String(elementSize),
126
+ arrayLayoutArg(ownership, layout),
109
127
  ]);
110
- const tFixedArray = (element, length, ownership, elementSize) => call("fixedArray", [
128
+ const tCursorArray = (element, bounds, ownership, layout) => call("cursorArray", [
129
+ element,
130
+ `{ baseParamIndex: ${String(bounds.baseIndex)}, sizeParamIndex: ${String(bounds.lengthIndex)} }`,
131
+ ownership === undefined ? undefined : sourceStringLiteral(ownership),
132
+ arrayLayoutArg(ownership, layout),
133
+ ]);
134
+ const tFixedArray = (element, length, ownership, layout) => call("fixedArray", [
111
135
  element,
112
136
  String(length),
113
137
  ownership === undefined ? undefined : sourceStringLiteral(ownership),
114
- elementSize === undefined ? undefined : String(elementSize),
138
+ arrayLayoutArg(ownership, layout),
115
139
  ]);
116
- const tCallback = (argTypes, returnType, options) => call("callback", [`[${argTypes.join(", ")}]`, returnType, options]);
140
+ const tCallback = (spec) => {
141
+ const optionsArg = spec.options.length > 0 ? `{ ${spec.options.join(", ")} }` : undefined;
142
+ return call("callback", [`[${spec.argTypes.join(", ")}]`, spec.returns, optionsArg]);
143
+ };
117
144
  const tBind = (args) => call("bind", [args.libExpr, args.symbolExpr, args.argList, args.returnType]);
118
145
  const tFn = (lib, cIdentifier, spec) => {
146
+ const skipEntry = spec.isReturnSkipped ? `, ${SKIPPED_RETURN_ENTRY}` : "";
119
147
  const throwsEntry = spec.canThrow ? ", canThrow: true" : "";
120
148
  return call("fn", [
121
149
  sourceStringLiteral(lib),
122
150
  sourceStringLiteral(cIdentifier),
123
- `{ args: ${spec.args}, returns: ${spec.returns}${throwsEntry} }`,
151
+ `{ args: ${spec.args}, returns: ${spec.returns}${skipEntry}${throwsEntry} }`,
124
152
  ]);
125
153
  };
126
- export { tVoid, tBoolean, tUint8, tUint32, tInt32, tUint64, tGtype, tBuffer, tScalar, tString, tObject, tBoxed, tStruct, tInlineStruct, tFundamental, tRef, tHashTable, tEnum, tFlags, tByteArray, tList, tArray, tSizedArray, tFixedArray, tCallback, tBind, tFn, };
154
+ export { tVoid, tBoolean, tUint8, tUint32, tInt32, tUint64, tBiguint64, tGtype, tBuffer, tScalar, tString, tObject, tBoxed, tStruct, tInlineStruct, tFundamental, tRef, tHashTable, tEnum, tFlags, tByteArray, tNumericByteArray, tList, tArray, tSizedArray, tFixedArray, tCursorArray, tCallback, tBind, tFn, };
127
155
  //# sourceMappingURL=descriptor.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"descriptor.js","sourceRoot":"","sources":["../../src/analysis/descriptor.ts"],"names":[],"mappings":"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","sourcesContent":["import { sourceStringLiteral } from \"@gtkx/utils\";\nimport { joinArgs } from \"../writer/emit.js\";\n\ntype Ownership = \"borrowed\" | \"full\";\n\ntype DescriptorName =\n | \"bind\" |\n \"int8\" |\n \"uint8\" |\n \"int16\" |\n \"uint16\" |\n \"int32\" |\n \"uint32\" |\n \"int64\" |\n \"uint64\" |\n \"bigint64\" |\n \"biguint64\" |\n \"gtype\" |\n \"float32\" |\n \"float64\" |\n \"boolean\" |\n \"void\" |\n \"unichar\" |\n \"buffer\" |\n \"string\" |\n \"object\" |\n \"boxed\" |\n \"struct\" |\n \"fundamental\" |\n \"ref\" |\n \"hashTable\" |\n \"enum\" |\n \"flags\" |\n \"array\" |\n \"list\" |\n \"slist\" |\n \"ptrArray\" |\n \"gArray\" |\n \"byteArray\" |\n \"sizedArray\" |\n \"fixedArray\" |\n \"callback\" |\n \"fn\";\n\ntype DescriptorNames = { [K in DescriptorName]: `t.${K}` };\n\ntype ScalarDescriptorName =\n | \"boolean\" |\n \"int8\" |\n \"uint8\" |\n \"int16\" |\n \"uint16\" |\n \"int32\" |\n \"uint32\" |\n \"int64\" |\n \"uint64\" |\n \"bigint64\" |\n \"biguint64\" |\n \"float32\" |\n \"float64\" |\n \"unichar\";\n\ntype BoxedOptions = {\n ownership: Ownership;\n sharedLibrary: string | undefined;\n getTypeFnName: string;\n isCallerAllocated: boolean;\n isInline?: boolean;\n size: number | undefined;\n};\n\ntype StructOptions = {\n size: number | string | undefined;\n wrapperClass: string | undefined;\n isCallerAllocated: boolean;\n isInline?: boolean;\n};\n\ntype FundamentalOptions = {\n ownership: Ownership;\n typeName: string | undefined;\n wrapperClass: string | undefined;\n isInline?: boolean | undefined;\n};\n\ntype ListDescriptorName = \"list\" | \"slist\" | \"ptrArray\" | \"gArray\";\n\ntype BindArgs = {\n libExpr: string;\n symbolExpr: string;\n argList: string;\n returnType: string;\n};\n\nconst T: DescriptorNames = {\n bind: \"t.bind\",\n int8: \"t.int8\",\n uint8: \"t.uint8\",\n int16: \"t.int16\",\n uint16: \"t.uint16\",\n int32: \"t.int32\",\n uint32: \"t.uint32\",\n int64: \"t.int64\",\n uint64: \"t.uint64\",\n bigint64: \"t.bigint64\",\n biguint64: \"t.biguint64\",\n gtype: \"t.gtype\",\n float32: \"t.float32\",\n float64: \"t.float64\",\n boolean: \"t.boolean\",\n void: \"t.void\",\n unichar: \"t.unichar\",\n buffer: \"t.buffer\",\n string: \"t.string\",\n object: \"t.object\",\n boxed: \"t.boxed\",\n struct: \"t.struct\",\n fundamental: \"t.fundamental\",\n ref: \"t.ref\",\n hashTable: \"t.hashTable\",\n enum: \"t.enum\",\n flags: \"t.flags\",\n array: \"t.array\",\n list: \"t.list\",\n slist: \"t.slist\",\n ptrArray: \"t.ptrArray\",\n gArray: \"t.gArray\",\n byteArray: \"t.byteArray\",\n sizedArray: \"t.sizedArray\",\n fixedArray: \"t.fixedArray\",\n callback: \"t.callback\",\n fn: \"t.fn\",\n};\n\nconst tVoid: string = T.void;\nconst tBoolean: string = T.boolean;\nconst tUint8: string = T.uint8;\nconst tUint32: string = T.uint32;\nconst tInt32: string = T.int32;\nconst tUint64: string = T.uint64;\nconst tGtype: string = T.gtype;\nconst tBuffer: string = T.buffer;\n\nconst call = (name: DescriptorName, args: (string | undefined)[]): string => `${T[name]}(${joinArgs(args)})`;\n\nconst optionsObject = (parts: (string | undefined)[]): string | undefined => {\n const present = parts.filter((part): part is string => part !== undefined);\n\n return present.length === 0 ? undefined : `{ ${present.join(\", \")} }`;\n};\n\nconst tScalar = (name: ScalarDescriptorName): string => T[name];\n\nconst tString = (ownership: Ownership, length?: string): string =>\n call(\"string\", [sourceStringLiteral(ownership), length]);\n\nconst tObject = (ownership: Ownership): string => call(\"object\", [sourceStringLiteral(ownership)]);\n\nconst tBoxed = (glibName: string, options: BoxedOptions): string =>\n call(\"boxed\", [\n sourceStringLiteral(glibName),\n optionsObject([\n `ownership: ${sourceStringLiteral(options.ownership)}`,\n options.sharedLibrary === undefined\n ? undefined\n : `sharedLibrary: ${sourceStringLiteral(options.sharedLibrary)}`,\n `getTypeFnName: ${sourceStringLiteral(options.getTypeFnName)}`,\n options.isCallerAllocated ? \"isCallerAllocated: true\" : undefined,\n options.isInline === true ? \"isInline: true\" : undefined,\n options.size === undefined ? undefined : `size: ${String(options.size)}`,\n ]),\n ]);\n\nconst tStruct = (ownership: Ownership, options: StructOptions): string =>\n call(\"struct\", [\n sourceStringLiteral(ownership),\n optionsObject([\n options.size === undefined ? undefined : `size: ${String(options.size)}`,\n options.wrapperClass === undefined ? undefined : `wrapperClass: ${options.wrapperClass}`,\n options.isCallerAllocated ? \"isCallerAllocated: true\" : undefined,\n options.isInline === true ? \"isInline: true\" : undefined,\n ]),\n ]);\n\nconst tInlineStruct = (): string =>\n tStruct(\"borrowed\", { size: undefined, wrapperClass: undefined, isCallerAllocated: false });\n\nconst tFundamental = (lib: string, refFunc: string, unrefFunc: string, options: FundamentalOptions): string =>\n call(\"fundamental\", [\n sourceStringLiteral(lib),\n sourceStringLiteral(refFunc),\n sourceStringLiteral(unrefFunc),\n optionsObject([\n `ownership: ${sourceStringLiteral(options.ownership)}`,\n options.typeName === undefined ? undefined : `typeName: ${sourceStringLiteral(options.typeName)}`,\n options.wrapperClass === undefined ? undefined : `wrapperClass: ${options.wrapperClass}`,\n options.isInline === true ? \"isInline: true\" : undefined,\n ]),\n ]);\n\nconst tRef = (inner: string, isInout = false): string => call(\"ref\", [inner, isInout ? \"true\" : undefined]);\n\nconst tHashTable = (key: string, value: string, ownership: Ownership): string =>\n call(\"hashTable\", [key, value, sourceStringLiteral(ownership)]);\n\nconst tEnum = (lib: string, typeFnName: string, isSigned: boolean): string =>\n call(\"enum\", [sourceStringLiteral(lib), sourceStringLiteral(typeFnName), String(isSigned)]);\n\nconst tFlags = (lib: string, typeFnName: string, isSigned: boolean): string =>\n call(\"flags\", [sourceStringLiteral(lib), sourceStringLiteral(typeFnName), String(isSigned)]);\n\nconst tByteArray = (ownership: Ownership): string => call(\"byteArray\", [sourceStringLiteral(ownership)]);\n\nconst tList = (name: ListDescriptorName, element: string, ownership: Ownership): string =>\n call(name, [element, sourceStringLiteral(ownership)]);\n\nconst tArray = (element: string, ownership?: Ownership, elementSize?: number): string =>\n call(\"array\", [\n element,\n ownership === undefined ? undefined : sourceStringLiteral(\"array\"),\n ownership === undefined ? undefined : sourceStringLiteral(ownership),\n elementSize === undefined ? undefined : `{ elementSize: ${String(elementSize)} }`,\n ]);\n\nconst tSizedArray = (\n element: string,\n lengthIndex: number,\n ownership?: Ownership,\n elementSize?: number,\n): string =>\n call(\"sizedArray\", [\n element,\n String(lengthIndex),\n ownership === undefined ? undefined : sourceStringLiteral(ownership),\n elementSize === undefined ? undefined : String(elementSize),\n ]);\n\nconst tFixedArray = (element: string, length: number, ownership?: Ownership, elementSize?: number): string =>\n call(\"fixedArray\", [\n element,\n String(length),\n ownership === undefined ? undefined : sourceStringLiteral(ownership),\n elementSize === undefined ? undefined : String(elementSize),\n ]);\n\nconst tCallback = (argTypes: string[], returnType: string, options?: string): string =>\n call(\"callback\", [`[${argTypes.join(\", \")}]`, returnType, options]);\n\nconst tBind = (args: BindArgs): string =>\n call(\"bind\", [args.libExpr, args.symbolExpr, args.argList, args.returnType]);\n\nconst tFn = (\n lib: string,\n cIdentifier: string,\n spec: { args: string; returns: string; canThrow: boolean },\n): string => {\n const throwsEntry = spec.canThrow ? \", canThrow: true\" : \"\";\n\n return call(\"fn\", [\n sourceStringLiteral(lib),\n sourceStringLiteral(cIdentifier),\n `{ args: ${spec.args}, returns: ${spec.returns}${throwsEntry} }`,\n ]);\n};\n\nexport {\n tVoid,\n tBoolean,\n tUint8,\n tUint32,\n tInt32,\n tUint64,\n tGtype,\n tBuffer,\n tScalar,\n tString,\n tObject,\n tBoxed,\n tStruct,\n tInlineStruct,\n tFundamental,\n tRef,\n tHashTable,\n tEnum,\n tFlags,\n tByteArray,\n tList,\n tArray,\n tSizedArray,\n tFixedArray,\n tCallback,\n tBind,\n tFn,\n type Ownership,\n type ScalarDescriptorName,\n type ListDescriptorName,\n};\n"]}
1
+ {"version":3,"file":"descriptor.js","sourceRoot":"","sources":["../../src/analysis/descriptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAgH7C,MAAM,oBAAoB,GAAG,uBAAuB,CAAC;AAErD,MAAM,CAAC,GAAoB;IACvB,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,SAAS;IAChB,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE,UAAU;IAClB,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE,UAAU;IAClB,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE,UAAU;IAClB,QAAQ,EAAE,YAAY;IACtB,SAAS,EAAE,aAAa;IACxB,KAAK,EAAE,SAAS;IAChB,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,WAAW;IACpB,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,WAAW;IACpB,MAAM,EAAE,UAAU;IAClB,MAAM,EAAE,UAAU;IAClB,MAAM,EAAE,UAAU;IAClB,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE,UAAU;IAClB,WAAW,EAAE,eAAe;IAC5B,GAAG,EAAE,OAAO;IACZ,SAAS,EAAE,aAAa;IACxB,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,SAAS;IAChB,KAAK,EAAE,SAAS;IAChB,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,SAAS;IAChB,QAAQ,EAAE,YAAY;IACtB,MAAM,EAAE,UAAU;IAClB,SAAS,EAAE,aAAa;IACxB,UAAU,EAAE,cAAc;IAC1B,UAAU,EAAE,cAAc;IAC1B,WAAW,EAAE,eAAe;IAC5B,QAAQ,EAAE,YAAY;IACtB,EAAE,EAAE,MAAM;CACb,CAAC;AAEF,MAAM,KAAK,GAAW,CAAC,CAAC,IAAI,CAAC;AAC7B,MAAM,QAAQ,GAAW,CAAC,CAAC,OAAO,CAAC;AACnC,MAAM,MAAM,GAAW,CAAC,CAAC,KAAK,CAAC;AAC/B,MAAM,OAAO,GAAW,CAAC,CAAC,MAAM,CAAC;AACjC,MAAM,MAAM,GAAW,CAAC,CAAC,KAAK,CAAC;AAC/B,MAAM,OAAO,GAAW,CAAC,CAAC,MAAM,CAAC;AACjC,MAAM,UAAU,GAAW,CAAC,CAAC,SAAS,CAAC;AACvC,MAAM,MAAM,GAAW,CAAC,CAAC,KAAK,CAAC;AAC/B,MAAM,OAAO,GAAW,CAAC,CAAC,MAAM,CAAC;AAEjC,MAAM,IAAI,GAAG,CAAC,IAAoB,EAAE,IAA4B,EAAU,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC;AAE7G,MAAM,aAAa,GAAG,CAAC,KAA6B,EAAsB,EAAE;IACxE,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;IAE3E,OAAO,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;AAC1E,CAAC,CAAC;AAEF,MAAM,OAAO,GAAG,CAAC,IAA0B,EAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAEhE,MAAM,OAAO,GAAG,CAAC,SAAoB,EAAE,MAAe,EAAU,EAAE,CAC9D,IAAI,CAAC,QAAQ,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;AAE7D,MAAM,OAAO,GAAG,CAAC,SAAoB,EAAU,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AAEnG,MAAM,MAAM,GAAG,CAAC,QAAgB,EAAE,OAAqB,EAAU,EAAE,CAC/D,IAAI,CAAC,OAAO,EAAE;IACV,mBAAmB,CAAC,QAAQ,CAAC;IAC7B,aAAa,CAAC;QACV,cAAc,mBAAmB,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QACtD,OAAO,CAAC,aAAa,KAAK,SAAS;YAC/B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,kBAAkB,mBAAmB,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;QACpE,kBAAkB,mBAAmB,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;QAC9D,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,SAAS;QACjE,OAAO,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS;QACxD,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;KAC3E,CAAC;CACL,CAAC,CAAC;AAEP,MAAM,OAAO,GAAG,CAAC,SAAoB,EAAE,OAAsB,EAAU,EAAE,CACrE,IAAI,CAAC,QAAQ,EAAE;IACX,mBAAmB,CAAC,SAAS,CAAC;IAC9B,aAAa,CAAC;QACV,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACxE,OAAO,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,iBAAiB,OAAO,CAAC,YAAY,EAAE;QACxF,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,SAAS;QACjE,OAAO,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS;KAC3D,CAAC;CACL,CAAC,CAAC;AAEP,MAAM,aAAa,GAAG,GAAW,EAAE,CAC/B,OAAO,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CAAC;AAEhG,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,OAAe,EAAE,SAAiB,EAAE,OAA2B,EAAU,EAAE,CAC1G,IAAI,CAAC,aAAa,EAAE;IAChB,mBAAmB,CAAC,GAAG,CAAC;IACxB,mBAAmB,CAAC,OAAO,CAAC;IAC5B,mBAAmB,CAAC,SAAS,CAAC;IAC9B,aAAa,CAAC;QACV,cAAc,mBAAmB,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QACtD,OAAO,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,mBAAmB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QACjG,OAAO,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,iBAAiB,OAAO,CAAC,YAAY,EAAE;QACxF,OAAO,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS;KAC3D,CAAC;CACL,CAAC,CAAC;AAEP,MAAM,IAAI,GAAG,CAAC,KAAa,EAAE,OAAO,GAAG,KAAK,EAAU,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;AAE5G,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,KAAa,EAAE,SAAoB,EAAU,EAAE,CAC5E,IAAI,CAAC,WAAW,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AAEpE,MAAM,KAAK,GAAG,CAAC,GAAW,EAAE,UAAkB,EAAE,QAAiB,EAAU,EAAE,CACzE,IAAI,CAAC,MAAM,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,EAAE,mBAAmB,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AAEhG,MAAM,MAAM,GAAG,CAAC,GAAW,EAAE,UAAkB,EAAE,QAAiB,EAAU,EAAE,CAC1E,IAAI,CAAC,OAAO,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,EAAE,mBAAmB,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AAEjG,MAAM,UAAU,GAAG,CAAC,SAAoB,EAAU,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AAEzG,MAAM,iBAAiB,GAAG,CAAC,SAAoB,EAAU,EAAE,CACvD,IAAI,CAAC,OAAO,EAAE;IACV,MAAM;IACN,mBAAmB,CAAC,YAAY,CAAC;IACjC,mBAAmB,CAAC,SAAS,CAAC;CACjC,CAAC,CAAC;AAEP,MAAM,KAAK,GAAG,CAAC,IAAwB,EAAE,OAAe,EAAE,SAAoB,EAAU,EAAE,CACtF,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AAE1D,MAAM,cAAc,GAAG,CAAC,SAAgC,EAAE,MAAmB,EAAsB,EAAE;IACjG,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,OAAO,GAAG;QACZ,MAAM,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,gBAAgB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;QAC3F,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS;KAC/C,CAAC,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;IAE1D,OAAO,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;AAC1E,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,CAAC,OAAe,EAAE,SAAgC,EAAE,MAAmB,EAAU,EAAE,CAC9F,IAAI,CAAC,OAAO,EAAE;IACV,OAAO;IACP,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,OAAO,CAAC;IAClE,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,SAAS,CAAC;IACpE,cAAc,CAAC,SAAS,EAAE,MAAM,CAAC;CACpC,CAAC,CAAC;AAEP,MAAM,WAAW,GAAG,CAChB,OAAe,EACf,WAAmB,EACnB,SAAgC,EAChC,MAAmB,EACb,EAAE,CACR,IAAI,CAAC,YAAY,EAAE;IACf,OAAO;IACP,MAAM,CAAC,WAAW,CAAC;IACnB,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,SAAS,CAAC;IACpE,cAAc,CAAC,SAAS,EAAE,MAAM,CAAC;CACpC,CAAC,CAAC;AAEP,MAAM,YAAY,GAAG,CACjB,OAAe,EACf,MAAuB,EACvB,SAAgC,EAChC,MAAmB,EACb,EAAE,CACR,IAAI,CAAC,aAAa,EAAE;IAChB,OAAO;IACP,qBAAqB,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,qBAAqB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI;IAChG,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,SAAS,CAAC;IACpE,cAAc,CAAC,SAAS,EAAE,MAAM,CAAC;CACpC,CAAC,CAAC;AAEP,MAAM,WAAW,GAAG,CAAC,OAAe,EAAE,MAAc,EAAE,SAAgC,EAAE,MAAmB,EAAU,EAAE,CACnH,IAAI,CAAC,YAAY,EAAE;IACf,OAAO;IACP,MAAM,CAAC,MAAM,CAAC;IACd,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,SAAS,CAAC;IACpE,cAAc,CAAC,SAAS,EAAE,MAAM,CAAC;CACpC,CAAC,CAAC;AAEP,MAAM,SAAS,GAAG,CAAC,IAAuB,EAAU,EAAE;IAClD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAE1F,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;AACzF,CAAC,CAAC;AAEF,MAAM,KAAK,GAAG,CAAC,IAAc,EAAU,EAAE,CACrC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;AAEjF,MAAM,GAAG,GAAG,CAAC,GAAW,EAAE,WAAmB,EAAE,IAAiB,EAAU,EAAE;IACxE,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,oBAAoB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1E,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC;IAE5D,OAAO,IAAI,CAAC,IAAI,EAAE;QACd,mBAAmB,CAAC,GAAG,CAAC;QACxB,mBAAmB,CAAC,WAAW,CAAC;QAChC,WAAW,IAAI,CAAC,IAAI,cAAc,IAAI,CAAC,OAAO,GAAG,SAAS,GAAG,WAAW,IAAI;KAC/E,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,OAAO,EACH,KAAK,EACL,QAAQ,EACR,MAAM,EACN,OAAO,EACP,MAAM,EACN,OAAO,EACP,UAAU,EACV,MAAM,EACN,OAAO,EACP,OAAO,EACP,OAAO,EACP,OAAO,EACP,MAAM,EACN,OAAO,EACP,aAAa,EACb,YAAY,EACZ,IAAI,EACJ,UAAU,EACV,KAAK,EACL,MAAM,EACN,UAAU,EACV,iBAAiB,EACjB,KAAK,EACL,MAAM,EACN,WAAW,EACX,WAAW,EACX,YAAY,EACZ,SAAS,EACT,KAAK,EACL,GAAG,GAKN,CAAC","sourcesContent":["import { sourceStringLiteral } from \"@gtkx/utils\";\nimport type { GirCursorBounds } from \"../gir/parameter.js\";\nimport { joinArgs } from \"../writer/emit.js\";\n\ntype Ownership = \"borrowed\" | \"full\";\n\ntype DescriptorName =\n | \"bind\" |\n \"int8\" |\n \"uint8\" |\n \"int16\" |\n \"uint16\" |\n \"int32\" |\n \"uint32\" |\n \"int64\" |\n \"uint64\" |\n \"bigint64\" |\n \"biguint64\" |\n \"gtype\" |\n \"float32\" |\n \"float64\" |\n \"boolean\" |\n \"void\" |\n \"unichar\" |\n \"buffer\" |\n \"string\" |\n \"object\" |\n \"boxed\" |\n \"struct\" |\n \"fundamental\" |\n \"ref\" |\n \"hashTable\" |\n \"enum\" |\n \"flags\" |\n \"array\" |\n \"list\" |\n \"slist\" |\n \"ptrArray\" |\n \"gArray\" |\n \"byteArray\" |\n \"sizedArray\" |\n \"fixedArray\" |\n \"cursorArray\" |\n \"callback\" |\n \"fn\";\n\ntype DescriptorNames = { [K in DescriptorName]: `t.${K}` };\n\ntype ScalarDescriptorName =\n | \"boolean\" |\n \"int8\" |\n \"uint8\" |\n \"int16\" |\n \"uint16\" |\n \"int32\" |\n \"uint32\" |\n \"int64\" |\n \"uint64\" |\n \"bigint64\" |\n \"biguint64\" |\n \"float32\" |\n \"float64\" |\n \"unichar\";\n\ntype BoxedOptions = {\n ownership: Ownership;\n sharedLibrary: string | undefined;\n getTypeFnName: string;\n isCallerAllocated: boolean;\n isInline?: boolean;\n size: number | undefined;\n};\n\ntype StructOptions = {\n size: number | string | undefined;\n wrapperClass: string | undefined;\n isCallerAllocated: boolean;\n isInline?: boolean;\n};\n\ntype FundamentalOptions = {\n ownership: Ownership;\n typeName: string | undefined;\n wrapperClass: string | undefined;\n isInline?: boolean | undefined;\n};\n\ntype ListDescriptorName = \"list\" | \"slist\" | \"ptrArray\" | \"gArray\";\n\ntype ArrayLayout = {\n elementSize?: number | undefined;\n isBytes: boolean;\n};\n\ntype BindArgs = {\n libExpr: string;\n symbolExpr: string;\n argList: string;\n returnType: string;\n};\n\ntype FnSpecParts = {\n args: string;\n returns: string;\n isReturnSkipped: boolean;\n canThrow: boolean;\n};\n\ntype CallbackSpecParts = {\n argTypes: string[];\n returns: string;\n options: string[];\n};\n\nconst SKIPPED_RETURN_ENTRY = \"isReturnSkipped: true\";\n\nconst T: DescriptorNames = {\n bind: \"t.bind\",\n int8: \"t.int8\",\n uint8: \"t.uint8\",\n int16: \"t.int16\",\n uint16: \"t.uint16\",\n int32: \"t.int32\",\n uint32: \"t.uint32\",\n int64: \"t.int64\",\n uint64: \"t.uint64\",\n bigint64: \"t.bigint64\",\n biguint64: \"t.biguint64\",\n gtype: \"t.gtype\",\n float32: \"t.float32\",\n float64: \"t.float64\",\n boolean: \"t.boolean\",\n void: \"t.void\",\n unichar: \"t.unichar\",\n buffer: \"t.buffer\",\n string: \"t.string\",\n object: \"t.object\",\n boxed: \"t.boxed\",\n struct: \"t.struct\",\n fundamental: \"t.fundamental\",\n ref: \"t.ref\",\n hashTable: \"t.hashTable\",\n enum: \"t.enum\",\n flags: \"t.flags\",\n array: \"t.array\",\n list: \"t.list\",\n slist: \"t.slist\",\n ptrArray: \"t.ptrArray\",\n gArray: \"t.gArray\",\n byteArray: \"t.byteArray\",\n sizedArray: \"t.sizedArray\",\n fixedArray: \"t.fixedArray\",\n cursorArray: \"t.cursorArray\",\n callback: \"t.callback\",\n fn: \"t.fn\",\n};\n\nconst tVoid: string = T.void;\nconst tBoolean: string = T.boolean;\nconst tUint8: string = T.uint8;\nconst tUint32: string = T.uint32;\nconst tInt32: string = T.int32;\nconst tUint64: string = T.uint64;\nconst tBiguint64: string = T.biguint64;\nconst tGtype: string = T.gtype;\nconst tBuffer: string = T.buffer;\n\nconst call = (name: DescriptorName, args: (string | undefined)[]): string => `${T[name]}(${joinArgs(args)})`;\n\nconst optionsObject = (parts: (string | undefined)[]): string | undefined => {\n const present = parts.filter((part): part is string => part !== undefined);\n\n return present.length === 0 ? undefined : `{ ${present.join(\", \")} }`;\n};\n\nconst tScalar = (name: ScalarDescriptorName): string => T[name];\n\nconst tString = (ownership: Ownership, length?: string): string =>\n call(\"string\", [sourceStringLiteral(ownership), length]);\n\nconst tObject = (ownership: Ownership): string => call(\"object\", [sourceStringLiteral(ownership)]);\n\nconst tBoxed = (glibName: string, options: BoxedOptions): string =>\n call(\"boxed\", [\n sourceStringLiteral(glibName),\n optionsObject([\n `ownership: ${sourceStringLiteral(options.ownership)}`,\n options.sharedLibrary === undefined\n ? undefined\n : `sharedLibrary: ${sourceStringLiteral(options.sharedLibrary)}`,\n `getTypeFnName: ${sourceStringLiteral(options.getTypeFnName)}`,\n options.isCallerAllocated ? \"isCallerAllocated: true\" : undefined,\n options.isInline === true ? \"isInline: true\" : undefined,\n options.size === undefined ? undefined : `size: ${String(options.size)}`,\n ]),\n ]);\n\nconst tStruct = (ownership: Ownership, options: StructOptions): string =>\n call(\"struct\", [\n sourceStringLiteral(ownership),\n optionsObject([\n options.size === undefined ? undefined : `size: ${String(options.size)}`,\n options.wrapperClass === undefined ? undefined : `wrapperClass: ${options.wrapperClass}`,\n options.isCallerAllocated ? \"isCallerAllocated: true\" : undefined,\n options.isInline === true ? \"isInline: true\" : undefined,\n ]),\n ]);\n\nconst tInlineStruct = (): string =>\n tStruct(\"borrowed\", { size: undefined, wrapperClass: undefined, isCallerAllocated: false });\n\nconst tFundamental = (lib: string, refFunc: string, unrefFunc: string, options: FundamentalOptions): string =>\n call(\"fundamental\", [\n sourceStringLiteral(lib),\n sourceStringLiteral(refFunc),\n sourceStringLiteral(unrefFunc),\n optionsObject([\n `ownership: ${sourceStringLiteral(options.ownership)}`,\n options.typeName === undefined ? undefined : `typeName: ${sourceStringLiteral(options.typeName)}`,\n options.wrapperClass === undefined ? undefined : `wrapperClass: ${options.wrapperClass}`,\n options.isInline === true ? \"isInline: true\" : undefined,\n ]),\n ]);\n\nconst tRef = (inner: string, isInout = false): string => call(\"ref\", [inner, isInout ? \"true\" : undefined]);\n\nconst tHashTable = (key: string, value: string, ownership: Ownership): string =>\n call(\"hashTable\", [key, value, sourceStringLiteral(ownership)]);\n\nconst tEnum = (lib: string, typeFnName: string, isSigned: boolean): string =>\n call(\"enum\", [sourceStringLiteral(lib), sourceStringLiteral(typeFnName), String(isSigned)]);\n\nconst tFlags = (lib: string, typeFnName: string, isSigned: boolean): string =>\n call(\"flags\", [sourceStringLiteral(lib), sourceStringLiteral(typeFnName), String(isSigned)]);\n\nconst tByteArray = (ownership: Ownership): string => call(\"byteArray\", [sourceStringLiteral(ownership)]);\n\nconst tNumericByteArray = (ownership: Ownership): string =>\n call(\"array\", [\n tUint8,\n sourceStringLiteral(\"gbytearray\"),\n sourceStringLiteral(ownership),\n ]);\n\nconst tList = (name: ListDescriptorName, element: string, ownership: Ownership): string =>\n call(name, [element, sourceStringLiteral(ownership)]);\n\nconst arrayLayoutArg = (ownership: Ownership | undefined, layout: ArrayLayout): string | undefined => {\n if (ownership === undefined) {\n return undefined;\n }\n\n const entries = [\n layout.elementSize === undefined ? undefined : `elementSize: ${String(layout.elementSize)}`,\n layout.isBytes ? \"isBytes: true\" : undefined,\n ].filter((entry): entry is string => entry !== undefined);\n\n return entries.length === 0 ? undefined : `{ ${entries.join(\", \")} }`;\n};\n\nconst tArray = (element: string, ownership: Ownership | undefined, layout: ArrayLayout): string =>\n call(\"array\", [\n element,\n ownership === undefined ? undefined : sourceStringLiteral(\"array\"),\n ownership === undefined ? undefined : sourceStringLiteral(ownership),\n arrayLayoutArg(ownership, layout),\n ]);\n\nconst tSizedArray = (\n element: string,\n lengthIndex: number,\n ownership: Ownership | undefined,\n layout: ArrayLayout,\n): string =>\n call(\"sizedArray\", [\n element,\n String(lengthIndex),\n ownership === undefined ? undefined : sourceStringLiteral(ownership),\n arrayLayoutArg(ownership, layout),\n ]);\n\nconst tCursorArray = (\n element: string,\n bounds: GirCursorBounds,\n ownership: Ownership | undefined,\n layout: ArrayLayout,\n): string =>\n call(\"cursorArray\", [\n element,\n `{ baseParamIndex: ${String(bounds.baseIndex)}, sizeParamIndex: ${String(bounds.lengthIndex)} }`,\n ownership === undefined ? undefined : sourceStringLiteral(ownership),\n arrayLayoutArg(ownership, layout),\n ]);\n\nconst tFixedArray = (element: string, length: number, ownership: Ownership | undefined, layout: ArrayLayout): string =>\n call(\"fixedArray\", [\n element,\n String(length),\n ownership === undefined ? undefined : sourceStringLiteral(ownership),\n arrayLayoutArg(ownership, layout),\n ]);\n\nconst tCallback = (spec: CallbackSpecParts): string => {\n const optionsArg = spec.options.length > 0 ? `{ ${spec.options.join(\", \")} }` : undefined;\n\n return call(\"callback\", [`[${spec.argTypes.join(\", \")}]`, spec.returns, optionsArg]);\n};\n\nconst tBind = (args: BindArgs): string =>\n call(\"bind\", [args.libExpr, args.symbolExpr, args.argList, args.returnType]);\n\nconst tFn = (lib: string, cIdentifier: string, spec: FnSpecParts): string => {\n const skipEntry = spec.isReturnSkipped ? `, ${SKIPPED_RETURN_ENTRY}` : \"\";\n const throwsEntry = spec.canThrow ? \", canThrow: true\" : \"\";\n\n return call(\"fn\", [\n sourceStringLiteral(lib),\n sourceStringLiteral(cIdentifier),\n `{ args: ${spec.args}, returns: ${spec.returns}${skipEntry}${throwsEntry} }`,\n ]);\n};\n\nexport {\n tVoid,\n tBoolean,\n tUint8,\n tUint32,\n tInt32,\n tUint64,\n tBiguint64,\n tGtype,\n tBuffer,\n tScalar,\n tString,\n tObject,\n tBoxed,\n tStruct,\n tInlineStruct,\n tFundamental,\n tRef,\n tHashTable,\n tEnum,\n tFlags,\n tByteArray,\n tNumericByteArray,\n tList,\n tArray,\n tSizedArray,\n tFixedArray,\n tCursorArray,\n tCallback,\n tBind,\n tFn,\n type ArrayLayout,\n type Ownership,\n type ScalarDescriptorName,\n type ListDescriptorName,\n};\n"]}
@@ -4,6 +4,7 @@ import type { Library } from "../gir/library.js";
4
4
  import type { GirProperty } from "../gir/property.js";
5
5
  import type { ModuleContext } from "../writer/context.js";
6
6
  import { type ResolvedAncestor } from "../gir/ancestry.js";
7
+ import { type InheritedAccessorTypes } from "../store/gi/property-accessor.js";
7
8
  type AncestryContext = {
8
9
  library: Library;
9
10
  namespace: {
@@ -25,13 +26,14 @@ type InheritedMethods = {
25
26
  declare const resolvePrerequisiteReference: (context: ModuleContext, name: string) => string | undefined;
26
27
  declare const forEachAncestor: (context: AncestryContext, klass: GirClass, visit: (ancestor: ResolvedAncestor, interfaces: ResolvedAncestor[]) => void, shouldStop?: (ancestor: GirClass) => boolean) => void;
27
28
  declare const collectInterfaceProperties: (context: ModuleContext, klass: GirClass) => OwnedProperty[];
29
+ declare const ancestorClassMethodNames: (context: ModuleContext, klass: GirClass) => Set<string>;
28
30
  declare const collectInterfaceMergeOmissions: (context: ModuleContext, klass: GirClass, iface: {
29
31
  klass: GirClass;
30
32
  namespaceName: string;
31
33
  }) => string[];
32
- declare const collectInheritedPropertyTypes: (context: ModuleContext, klass: GirClass) => Map<string, string>;
34
+ declare const collectInheritedPropertyTypes: (context: ModuleContext, klass: GirClass) => Map<string, InheritedAccessorTypes>;
33
35
  declare const collectInheritedMethods: (context: ModuleContext, klass: GirClass) => InheritedMethods;
34
36
  declare const conflictRename: (context: ModuleContext, callable: GirFunction, inherited: InheritedMethods, className: string) => string | undefined;
35
37
  declare const reservedSignalMemberRename: (className: string, callable: GirFunction) => string | undefined;
36
- export { resolvePrerequisiteReference, forEachAncestor, collectInterfaceProperties, collectInterfaceMergeOmissions, collectInheritedPropertyTypes, collectInheritedMethods, conflictRename, reservedSignalMemberRename, type InheritedMethods, };
38
+ export { ancestorClassMethodNames, resolvePrerequisiteReference, forEachAncestor, collectInterfaceProperties, collectInterfaceMergeOmissions, collectInheritedPropertyTypes, collectInheritedMethods, conflictRename, reservedSignalMemberRename, type InheritedMethods, };
37
39
  //# sourceMappingURL=inheritance.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"inheritance.d.ts","sourceRoot":"","sources":["../../src/analysis/inheritance.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAiB,KAAK,gBAAgB,EAAqB,MAAM,oBAAoB,CAAC;AAO7F,KAAK,eAAe,GAAG;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAC/B,CAAC;AAEF,KAAK,aAAa,GAAG;IAAE,KAAK,EAAE,QAAQ,CAAC;IAAC,QAAQ,EAAE,WAAW,CAAA;CAAE,CAAC;AAGhE,KAAK,eAAe,GAAG;IACnB,MAAM,EAAE,WAAW,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACpB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;CAC7C,CAAC;AAwBF,QAAA,MAAM,4BAA4B,GAAI,SAAS,aAAa,EAAE,MAAM,MAAM,KAAG,MAAM,GAAG,SAYrF,CAAC;AAEF,QAAA,MAAM,eAAe,GACjB,SAAS,eAAe,EACxB,OAAO,QAAQ,EACf,OAAO,CAAC,QAAQ,EAAE,gBAAgB,EAAE,UAAU,EAAE,gBAAgB,EAAE,KAAK,IAAI,EAC3E,aAAY,CAAC,QAAQ,EAAE,QAAQ,KAAK,OAAqB,KAC1D,IAeF,CAAC;AAwDF,QAAA,MAAM,0BAA0B,GAAI,SAAS,aAAa,EAAE,OAAO,QAAQ,KAAG,aAAa,EAS1F,CAAC;AAmFF,QAAA,MAAM,8BAA8B,GAChC,SAAS,aAAa,EACtB,OAAO,QAAQ,EACf,OAAO;IAAE,KAAK,EAAE,QAAQ,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,KAClD,MAAM,EAGR,CAAC;AAEF,QAAA,MAAM,6BAA6B,GAAI,SAAS,aAAa,EAAE,OAAO,QAAQ,KAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAoBlG,CAAC;AAEF,QAAA,MAAM,uBAAuB,GAAI,SAAS,aAAa,EAAE,OAAO,QAAQ,KAAG,gBAmB1E,CAAC;AAqDF,QAAA,MAAM,cAAc,GAChB,SAAS,aAAa,EACtB,UAAU,WAAW,EACrB,WAAW,gBAAgB,EAC3B,WAAW,MAAM,KAClB,MAAM,GAAG,SAoBX,CAAC;AAKF,QAAA,MAAM,0BAA0B,GAAI,WAAW,MAAM,EAAE,UAAU,WAAW,KAAG,MAAM,GAAG,SAGrE,CAAC;AAgDpB,OAAO,EACH,4BAA4B,EAC5B,eAAe,EACf,0BAA0B,EAC1B,8BAA8B,EAC9B,6BAA6B,EAC7B,uBAAuB,EACvB,cAAc,EACd,0BAA0B,EAC1B,KAAK,gBAAgB,GACxB,CAAC"}
1
+ {"version":3,"file":"inheritance.d.ts","sourceRoot":"","sources":["../../src/analysis/inheritance.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAiB,KAAK,gBAAgB,EAAqB,MAAM,oBAAoB,CAAC;AAG7F,OAAO,EAAE,KAAK,sBAAsB,EAAwB,MAAM,kCAAkC,CAAC;AAMrG,KAAK,eAAe,GAAG;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAC/B,CAAC;AAEF,KAAK,aAAa,GAAG;IAAE,KAAK,EAAE,QAAQ,CAAC;IAAC,QAAQ,EAAE,WAAW,CAAA;CAAE,CAAC;AAKhE,KAAK,eAAe,GAAG;IACnB,MAAM,EAAE,WAAW,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACpB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;CAC7C,CAAC;AA6BF,QAAA,MAAM,4BAA4B,GAAI,SAAS,aAAa,EAAE,MAAM,MAAM,KAAG,MAAM,GAAG,SAgBrF,CAAC;AAEF,QAAA,MAAM,eAAe,GACjB,SAAS,eAAe,EACxB,OAAO,QAAQ,EACf,OAAO,CAAC,QAAQ,EAAE,gBAAgB,EAAE,UAAU,EAAE,gBAAgB,EAAE,KAAK,IAAI,EAC3E,aAAY,CAAC,QAAQ,EAAE,QAAQ,KAAK,OAAqB,KAC1D,IAeF,CAAC;AAiEF,QAAA,MAAM,0BAA0B,GAAI,SAAS,aAAa,EAAE,OAAO,QAAQ,KAAG,aAAa,EAS1F,CAAC;AA+BF,QAAA,MAAM,wBAAwB,GAAI,SAAS,aAAa,EAAE,OAAO,QAAQ,KAAG,GAAG,CAAC,MAAM,CACrB,CAAC;AAsDlE,QAAA,MAAM,8BAA8B,GAChC,SAAS,aAAa,EACtB,OAAO,QAAQ,EACf,OAAO;IAAE,KAAK,EAAE,QAAQ,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,KAClD,MAAM,EAGR,CAAC;AA+CF,QAAA,MAAM,6BAA6B,GAC/B,SAAS,aAAa,EACtB,OAAO,QAAQ,KAChB,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAcpC,CAAC;AAEF,QAAA,MAAM,uBAAuB,GAAI,SAAS,aAAa,EAAE,OAAO,QAAQ,KAAG,gBAmB1E,CAAC;AA2FF,QAAA,MAAM,cAAc,GAChB,SAAS,aAAa,EACtB,UAAU,WAAW,EACrB,WAAW,gBAAgB,EAC3B,WAAW,MAAM,KAClB,MAAM,GAAG,SAoBX,CAAC;AAKF,QAAA,MAAM,0BAA0B,GAAI,WAAW,MAAM,EAAE,UAAU,WAAW,KAAG,MAAM,GAAG,SAGrE,CAAC;AA+BpB,OAAO,EACH,wBAAwB,EACxB,4BAA4B,EAC5B,eAAe,EACf,0BAA0B,EAC1B,8BAA8B,EAC9B,6BAA6B,EAC7B,uBAAuB,EACvB,cAAc,EACd,0BAA0B,EAC1B,KAAK,gBAAgB,GACxB,CAAC"}
@@ -1,8 +1,10 @@
1
- import { camelCase, lowerFirst, pascalCase, toCamelIdentifier } from "@gtkx/utils";
1
+ import { lowerFirst, pascalCase, sanitizeTypeIdentifier, toCamelIdentifier } from "@gtkx/utils";
2
2
  import { ancestorChain, resolveInterfaces } from "../gir/ancestry.js";
3
- import { methodExportName } from "../store/gi/method.js";
4
- import { resolveAccessorType } from "../store/gi/property-accessor.js";
3
+ import { isEmittableEntity } from "../gir/emittable.js";
4
+ import { memberName, methodExportName } from "../store/gi/method.js";
5
+ import { resolveAccessorTypes } from "../store/gi/property-accessor.js";
5
6
  import { vfuncMemberNames } from "../store/gi/vtable.js";
7
+ import { comparisonContextFor } from "../writer/comparison-context.js";
6
8
  import { inputParameters } from "./param-structure.js";
7
9
  import { renderTsType } from "./ts-type.js";
8
10
  const RESERVED_SIGNAL_MEMBERS = new Set([
@@ -24,7 +26,10 @@ const resolvePrerequisiteReference = (context, name) => {
24
26
  if (resolved.kind !== "interface" && resolved.kind !== "class") {
25
27
  return undefined;
26
28
  }
27
- return context.qualify(resolved.namespace.name, pascalCase(resolved.value.name));
29
+ if (!isEmittableEntity(resolved.value)) {
30
+ return undefined;
31
+ }
32
+ return context.qualify(resolved.namespace.name, sanitizeTypeIdentifier(resolved.value.name));
28
33
  };
29
34
  const forEachAncestor = (context, klass, visit, shouldStop = () => false) => {
30
35
  let isFirst = true;
@@ -46,7 +51,7 @@ const visitInterfaceProperties = (interfaces, visit) => {
46
51
  }
47
52
  }
48
53
  };
49
- const forEachInheritedProperty = (context, klass, visit) => {
54
+ const forEachAncestorProperty = (context, klass, visit) => {
50
55
  forEachAncestor(context, klass, (ancestor, interfaces) => {
51
56
  for (const property of ancestor.klass.properties) {
52
57
  visit(ancestor.klass, property);
@@ -54,12 +59,16 @@ const forEachInheritedProperty = (context, klass, visit) => {
54
59
  visitInterfaceProperties(interfaces, visit);
55
60
  });
56
61
  };
62
+ const forEachInheritedProperty = (context, klass, visit) => {
63
+ visitInterfaceProperties(resolveDirectInterfaces(context, klass, context.namespace.name), visit);
64
+ forEachAncestorProperty(context, klass, visit);
65
+ };
57
66
  const collectSeenPropertyNames = (context, klass) => {
58
67
  const seen = new Set();
59
68
  for (const property of klass.properties) {
60
69
  seen.add(toCamelIdentifier(property.name));
61
70
  }
62
- forEachInheritedProperty(context, klass, (_owner, property) => seen.add(toCamelIdentifier(property.name)));
71
+ forEachAncestorProperty(context, klass, (_owner, property) => seen.add(toCamelIdentifier(property.name)));
63
72
  return seen;
64
73
  };
65
74
  const collectNewInterfaceProperties = (iface, seen) => {
@@ -84,7 +93,7 @@ const collectInterfaceProperties = (context, klass) => {
84
93
  };
85
94
  const recordAncestorSignatures = (context, klass, signatures) => {
86
95
  for (const method of klass.methods) {
87
- const name = camelCase(method.name);
96
+ const name = memberName(method.name);
88
97
  if (!method.introspectable || signatures.has(name)) {
89
98
  continue;
90
99
  }
@@ -101,11 +110,12 @@ const ancestorClassMethodSignatures = (context, klass) => {
101
110
  });
102
111
  return signatures;
103
112
  };
113
+ const ancestorClassMethodNames = (context, klass) => new Set(ancestorClassMethodSignatures(context, klass).keys());
104
114
  const mergeOmissionName = (context, method, ancestors) => {
105
115
  if (!method.introspectable) {
106
116
  return undefined;
107
117
  }
108
- const name = camelCase(method.name);
118
+ const name = memberName(method.name);
109
119
  const ancestor = ancestors.get(name);
110
120
  if (ancestor === undefined) {
111
121
  return undefined;
@@ -137,19 +147,39 @@ const collectInterfaceMergeOmissions = (context, klass, iface) => [
137
147
  ...methodMergeOmissions(context, klass, iface.klass),
138
148
  ...vfuncMergeOmissions(context, klass, iface),
139
149
  ];
150
+ const declaredBy = (type, owner) => type === undefined ? undefined : { type, owner };
151
+ const reconcileAccessorType = (jsName, direction, declared, candidate) => {
152
+ if (candidate === undefined) {
153
+ return declared;
154
+ }
155
+ if (declared === undefined || declared.type === candidate.type) {
156
+ return declared ?? candidate;
157
+ }
158
+ throw new Error(`Cannot type the ${direction} accessor of ${jsName}: ${declared.owner} declares it as ${declared.type} ` +
159
+ `and ${candidate.owner} declares it as ${candidate.type}. Both are bases of the same class, so no single ` +
160
+ "member satisfies them; correct the GIR the disagreeing base comes from.");
161
+ };
162
+ const recordInheritedPropertyType = (context, types, owner, property) => {
163
+ const accessorTypes = resolveAccessorTypes(context, property, owner.methods);
164
+ if (accessorTypes === undefined) {
165
+ return;
166
+ }
167
+ const jsName = toCamelIdentifier(property.name);
168
+ const declared = types.get(jsName);
169
+ types.set(jsName, {
170
+ read: reconcileAccessorType(jsName, "read", declared?.read, declaredBy(accessorTypes.readType, owner.name)),
171
+ write: reconcileAccessorType(jsName, "write", declared?.write, declaredBy(accessorTypes.writeType, owner.name)),
172
+ });
173
+ };
140
174
  const collectInheritedPropertyTypes = (context, klass) => {
175
+ const declared = new Map();
176
+ forEachInheritedProperty(context, klass, (owner, property) => {
177
+ recordInheritedPropertyType(context, declared, owner, property);
178
+ });
141
179
  const types = new Map();
142
- const record = (owner, property) => {
143
- const jsName = toCamelIdentifier(property.name);
144
- if (types.has(jsName)) {
145
- return;
146
- }
147
- const tsType = resolveAccessorType(context, property, owner.methods);
148
- if (tsType !== undefined) {
149
- types.set(jsName, tsType);
150
- }
151
- };
152
- forEachInheritedProperty(context, klass, record);
180
+ for (const [jsName, entry] of declared) {
181
+ types.set(jsName, { readType: entry.read?.type, writeType: entry.write?.type });
182
+ }
153
183
  return types;
154
184
  };
155
185
  const collectInheritedMethods = (context, klass) => {
@@ -174,7 +204,7 @@ const absorbInheritedMethods = (context, resolved, accumulator) => {
174
204
  if (!method.introspectable) {
175
205
  continue;
176
206
  }
177
- const name = camelCase(method.name);
207
+ const name = memberName(method.name);
178
208
  if (returnTypes.has(name)) {
179
209
  continue;
180
210
  }
@@ -195,8 +225,34 @@ const hasMethodConflict = (options) => {
195
225
  const ownReturn = renderTsType(context, callable.returnValue.type, callable.returnValue.nullable);
196
226
  return (inheritedReturn !== ownReturn ||
197
227
  hasParameterEnumConflict(context, callable, inheritedMethod) ||
198
- inputParameters(context.library, callable).length !==
199
- inputParameters(context.library, inheritedMethod.method).length);
228
+ hasParameterTypeConflict(context, callable, inheritedMethod.method));
229
+ };
230
+ const isCallbackType = (context, ref) => ref !== undefined && context.library.typeFor(ref)?.kind === "callback";
231
+ const areParametersComparable = (context, pair) => {
232
+ if (isCallbackType(context, pair.own.type) && isCallbackType(context, pair.inherited.type)) {
233
+ return true;
234
+ }
235
+ const scratch = comparisonContextFor(context);
236
+ return renderTsType(scratch, pair.own.type, false) === renderTsType(scratch, pair.inherited.type, false);
237
+ };
238
+ const inputParameterPairs = (context, own, inherited) => {
239
+ const ownParams = inputParameters(context.library, own);
240
+ const inheritedParams = inputParameters(context.library, inherited);
241
+ const pairs = [];
242
+ for (const [index, entry] of ownParams.entries()) {
243
+ const other = inheritedParams[index];
244
+ if (other !== undefined) {
245
+ pairs.push({ own: entry.parameter, inherited: other.parameter });
246
+ }
247
+ }
248
+ return pairs;
249
+ };
250
+ const hasParameterTypeConflict = (context, own, inherited) => {
251
+ const ownCount = inputParameters(context.library, own).length;
252
+ if (ownCount !== inputParameters(context.library, inherited).length) {
253
+ return true;
254
+ }
255
+ return inputParameterPairs(context, own, inherited).some((pair) => !areParametersComparable(context, pair));
200
256
  };
201
257
  const conflictRename = (context, callable, inherited, className) => {
202
258
  if (!callable.introspectable) {
@@ -222,21 +278,7 @@ const hasEnumConflict = (context, ownRef, inheritedRef) => {
222
278
  const inheritedEnum = enumIdentity(context, inheritedRef);
223
279
  return ownEnum !== undefined && inheritedEnum !== undefined && ownEnum !== inheritedEnum;
224
280
  };
225
- const hasParameterEnumConflict = (context, own, inherited) => {
226
- const ownParams = inputParameters(context.library, own);
227
- const inheritedParams = inputParameters(context.library, inherited.method);
228
- const count = Math.min(ownParams.length, inheritedParams.length);
229
- for (let index = 0; index < count; index += 1) {
230
- const ownParam = ownParams[index];
231
- const inheritedParam = inheritedParams[index];
232
- if (ownParam !== undefined &&
233
- inheritedParam !== undefined &&
234
- hasEnumConflict(context, ownParam.parameter.type, inheritedParam.parameter.type)) {
235
- return true;
236
- }
237
- }
238
- return false;
239
- };
281
+ const hasParameterEnumConflict = (context, own, inherited) => inputParameterPairs(context, own, inherited.method).some((pair) => hasEnumConflict(context, pair.own.type, pair.inherited.type));
240
282
  const enumIdentity = (context, ref) => {
241
283
  if (ref === undefined) {
242
284
  return undefined;
@@ -247,5 +289,5 @@ const enumIdentity = (context, ref) => {
247
289
  }
248
290
  return `${resolved.namespace.name}.${resolved.value.name}`;
249
291
  };
250
- export { resolvePrerequisiteReference, forEachAncestor, collectInterfaceProperties, collectInterfaceMergeOmissions, collectInheritedPropertyTypes, collectInheritedMethods, conflictRename, reservedSignalMemberRename, };
292
+ export { ancestorClassMethodNames, resolvePrerequisiteReference, forEachAncestor, collectInterfaceProperties, collectInterfaceMergeOmissions, collectInheritedPropertyTypes, collectInheritedMethods, conflictRename, reservedSignalMemberRename, };
251
293
  //# sourceMappingURL=inheritance.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"inheritance.js","sourceRoot":"","sources":["../../src/analysis/inheritance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAOnF,OAAO,EAAE,aAAa,EAAyB,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC7F,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAyB5C,MAAM,uBAAuB,GAAG,IAAI,GAAG,CAAC;IACpC,SAAS;IACT,YAAY;IACZ,MAAM;IACN,IAAI;IACJ,MAAM;IACN,KAAK;IACL,kBAAkB;IAClB,qBAAqB;CACxB,CAAC,CAAC;AAEH,MAAM,uBAAuB,GAAG,CAC5B,OAAwB,EACxB,KAAe,EACf,gBAAwB,EACN,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,OAAO,EAAE,gBAAgB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;AAEhG,MAAM,4BAA4B,GAAG,CAAC,OAAsB,EAAE,IAAY,EAAsB,EAAE;IAC9F,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAE3E,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,QAAQ,CAAC,IAAI,KAAK,WAAW,IAAI,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC7D,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;AACrF,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CACpB,OAAwB,EACxB,KAAe,EACf,KAA2E,EAC3E,aAA8C,GAAG,EAAE,CAAC,KAAK,EACrD,EAAE;IACN,IAAI,OAAO,GAAG,IAAI,CAAC;IAEnB,KAAK,MAAM,QAAQ,IAAI,aAAa,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;QACnF,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,GAAG,KAAK,CAAC;YAChB,SAAS;QACb,CAAC;QAED,IAAI,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC7B,MAAM;QACV,CAAC;QAED,KAAK,CAAC,QAAQ,EAAE,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC;IAC9F,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAC7B,UAA8B,EAC9B,KAAuD,EACnD,EAAE;IACN,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;QAC7B,KAAK,MAAM,QAAQ,IAAI,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;YAC5C,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACjC,CAAC;IACL,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAC7B,OAAsB,EACtB,KAAe,EACf,KAAuD,EACnD,EAAE;IACN,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE;QACrD,KAAK,MAAM,QAAQ,IAAI,QAAQ,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;YAC/C,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACpC,CAAC;QAED,wBAAwB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAAC,OAAsB,EAAE,KAAe,EAAe,EAAE;IACtF,MAAM,IAAI,GAAgB,IAAI,GAAG,EAAE,CAAC;IAEpC,KAAK,MAAM,QAAQ,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;QACtC,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,wBAAwB,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAE3G,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,6BAA6B,GAAG,CAAC,KAAuB,EAAE,IAAiB,EAAmB,EAAE;IAClG,MAAM,MAAM,GAAoB,EAAE,CAAC;IAEnC,KAAK,MAAM,QAAQ,IAAI,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QAC5C,MAAM,IAAI,GAAG,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAE9C,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACjB,SAAS;QACb,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACf,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;IAClD,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG,CAAC,OAAsB,EAAE,KAAe,EAAmB,EAAE;IAC5F,MAAM,IAAI,GAAG,wBAAwB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACtD,MAAM,MAAM,GAAoB,EAAE,CAAC;IAEnC,KAAK,MAAM,KAAK,IAAI,uBAAuB,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;QAClF,MAAM,CAAC,IAAI,CAAC,GAAG,6BAA6B,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAC7B,OAAsB,EACtB,KAAe,EACf,UAAwC,EACpC,EAAE;IACN,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QACjC,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEpC,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACjD,SAAS;QACb,CAAC;QAED,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE;YACjB,UAAU,EAAE,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC;YACvF,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,MAAM;SACzD,CAAC,CAAC;IACP,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,6BAA6B,GAAG,CAAC,OAAsB,EAAE,KAAe,EAAgC,EAAE;IAC5G,MAAM,UAAU,GAAiC,IAAI,GAAG,EAAE,CAAC;IAE3D,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,EAAE;QACzC,wBAAwB,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CACtB,OAAsB,EACtB,MAAmB,EACnB,SAAuC,EACrB,EAAE;IACpB,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;QACzB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAErC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC/F,MAAM,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC;IAE9D,OAAO,QAAQ,CAAC,UAAU,KAAK,UAAU,IAAI,QAAQ,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7F,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,OAAsB,EAAE,KAAe,EAAe,EAAE;IAClF,MAAM,KAAK,GAAgB,IAAI,GAAG,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;IAE7F,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,EAAE;QACzC,KAAK,MAAM,IAAI,IAAI,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,aAAa,EAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACnF,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,OAAsB,EAAE,KAAe,EAAE,KAAe,EAAY,EAAE;IAChG,MAAM,SAAS,GAAG,6BAA6B,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAEhE,OAAO,KAAK,CAAC,OAAO;SACf,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;SAC9D,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;AAC9D,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CACxB,OAAsB,EACtB,KAAe,EACf,KAAiD,EACzC,EAAE;IACV,MAAM,OAAO,GAAG,oBAAoB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAErD,OAAO,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;AAC3G,CAAC,CAAC;AAEF,MAAM,8BAA8B,GAAG,CACnC,OAAsB,EACtB,KAAe,EACf,KAAiD,EACzC,EAAE,CAAC;IACX,GAAG,oBAAoB,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC;IACpD,GAAG,mBAAmB,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC;CAChD,CAAC;AAEF,MAAM,6BAA6B,GAAG,CAAC,OAAsB,EAAE,KAAe,EAAuB,EAAE;IACnG,MAAM,KAAK,GAAwB,IAAI,GAAG,EAAE,CAAC;IAE7C,MAAM,MAAM,GAAG,CAAC,KAAe,EAAE,QAAqB,EAAQ,EAAE;QAC5D,MAAM,MAAM,GAAG,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEhD,IAAI,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YACpB,OAAO;QACX,CAAC;QAED,MAAM,MAAM,GAAG,mBAAmB,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAErE,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACvB,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9B,CAAC;IACL,CAAC,CAAC;IAEF,wBAAwB,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAEjD,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,OAAsB,EAAE,KAAe,EAAoB,EAAE;IAC1F,MAAM,WAAW,GAAqB;QAClC,WAAW,EAAE,IAAI,GAAG,EAAkB;QACtC,WAAW,EAAE,IAAI,GAAG,EAA2B;KAClD,CAAC;IAEF,KAAK,MAAM,KAAK,IAAI,uBAAuB,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;QAClF,sBAAsB,CAAC,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;IACxD,CAAC;IAED,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE;QACrD,sBAAsB,CAAC,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QAEvD,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;YAC7B,sBAAsB,CAAC,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;QACxD,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC;AACvB,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAC3B,OAAsB,EACtB,QAAoD,EACpD,WAA6B,EACzB,EAAE;IACN,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,WAAW,CAAC;IAEjD,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QAC1C,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;YACzB,SAAS;QACb,CAAC;QAED,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEpC,IAAI,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,SAAS;QACb,CAAC;QAED,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,CAAC,aAAa,EAAE,CAAC,CAAC;QACzE,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC;IACvG,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,SAA2B,EAAE,IAAY,EAA8B,EAAE;IAC7F,MAAM,eAAe,GAAG,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACxD,MAAM,eAAe,GAAG,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAExD,IAAI,eAAe,KAAK,SAAS,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;QACjE,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,CAAC;AAChD,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,OAK1B,EAAW,EAAE;IACV,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;IACxE,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAElG,OAAO,CACH,eAAe,KAAK,SAAS;QAC7B,wBAAwB,CAAC,OAAO,EAAE,QAAQ,EAAE,eAAe,CAAC;QAC5D,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,MAAM;YACjD,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC,MAAM,CAClE,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CACnB,OAAsB,EACtB,QAAqB,EACrB,SAA2B,EAC3B,SAAiB,EACC,EAAE;IACpB,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC;QAC3B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,IAAI,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAExC,IAAI,uBAAuB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QACpC,OAAO,qBAAqB,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,KAAK,GAAG,cAAc,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAE9C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACtB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,WAAW,GAAG,iBAAiB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;IAEvE,OAAO,WAAW,CAAC,CAAC,CAAC,qBAAqB,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACrF,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAAC,SAAiB,EAAE,UAAkB,EAAU,EAAE,CAC5E,GAAG,UAAU,CAAC,SAAS,CAAC,GAAG,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;AAExD,MAAM,0BAA0B,GAAG,CAAC,SAAiB,EAAE,QAAqB,EAAsB,EAAE,CAChG,uBAAuB,CAAC,GAAG,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IACnD,CAAC,CAAC,qBAAqB,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC;IACjD,CAAC,CAAC,SAAS,CAAC;AAEpB,MAAM,eAAe,GAAG,CACpB,OAAsB,EACtB,MAA0B,EAC1B,YAAgC,EACzB,EAAE;IACT,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC9C,MAAM,aAAa,GAAG,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAE1D,OAAO,OAAO,KAAK,SAAS,IAAI,aAAa,KAAK,SAAS,IAAI,OAAO,KAAK,aAAa,CAAC;AAC7F,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAAC,OAAsB,EAAE,GAAgB,EAAE,SAA0B,EAAW,EAAE;IAC/G,MAAM,SAAS,GAAG,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACxD,MAAM,eAAe,GAAG,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IAC3E,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;IAEjE,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QAC5C,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QAClC,MAAM,cAAc,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;QAE9C,IACI,QAAQ,KAAK,SAAS;YACtB,cAAc,KAAK,SAAS;YAC5B,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,EAClF,CAAC;YACC,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,OAAsB,EAAE,GAAuB,EAAsB,EAAE;IACzF,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACpB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAE9C,IAAI,QAAQ,EAAE,IAAI,KAAK,MAAM,EAAE,CAAC;QAC5B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;AAC/D,CAAC,CAAC;AAEF,OAAO,EACH,4BAA4B,EAC5B,eAAe,EACf,0BAA0B,EAC1B,8BAA8B,EAC9B,6BAA6B,EAC7B,uBAAuB,EACvB,cAAc,EACd,0BAA0B,GAE7B,CAAC","sourcesContent":["import { camelCase, lowerFirst, pascalCase, toCamelIdentifier } from \"@gtkx/utils\";\nimport type { GirClass } from \"../gir/class.js\";\nimport type { GirFunction } from \"../gir/function.js\";\nimport type { Library } from \"../gir/library.js\";\nimport type { GirProperty } from \"../gir/property.js\";\nimport type { TypeId } from \"../gir/type-id.js\";\nimport type { ModuleContext } from \"../writer/context.js\";\nimport { ancestorChain, type ResolvedAncestor, resolveInterfaces } from \"../gir/ancestry.js\";\nimport { methodExportName } from \"../store/gi/method.js\";\nimport { resolveAccessorType } from \"../store/gi/property-accessor.js\";\nimport { vfuncMemberNames } from \"../store/gi/vtable.js\";\nimport { inputParameters } from \"./param-structure.js\";\nimport { renderTsType } from \"./ts-type.js\";\n\ntype AncestryContext = {\n library: Library;\n namespace: { name: string };\n};\n\ntype OwnedProperty = { owner: GirClass; property: GirProperty };\ntype MethodSignature = { returnType: string; arity: number };\n\ntype InheritedMethod = {\n method: GirFunction;\n namespaceName: string;\n};\n\ntype InheritedMethods = {\n returnTypes: Map<string, string>;\n definitions: Map<string, InheritedMethod>;\n};\n\ntype InheritedMatch = {\n inheritedReturn: string;\n inheritedMethod: InheritedMethod;\n};\n\nconst RESERVED_SIGNAL_MEMBERS = new Set([\n \"connect\",\n \"disconnect\",\n \"emit\",\n \"on\",\n \"once\",\n \"off\",\n \"addEventListener\",\n \"removeEventListener\",\n]);\n\nconst resolveDirectInterfaces = (\n context: AncestryContext,\n klass: GirClass,\n defaultNamespace: string,\n): ResolvedAncestor[] => resolveInterfaces(context.library, defaultNamespace, klass.implements);\n\nconst resolvePrerequisiteReference = (context: ModuleContext, name: string): string | undefined => {\n const resolved = context.library.resolveType(context.namespace.name, name);\n\n if (resolved === undefined) {\n return undefined;\n }\n\n if (resolved.kind !== \"interface\" && resolved.kind !== \"class\") {\n return undefined;\n }\n\n return context.qualify(resolved.namespace.name, pascalCase(resolved.value.name));\n};\n\nconst forEachAncestor = (\n context: AncestryContext,\n klass: GirClass,\n visit: (ancestor: ResolvedAncestor, interfaces: ResolvedAncestor[]) => void,\n shouldStop: (ancestor: GirClass) => boolean = () => false,\n): void => {\n let isFirst = true;\n\n for (const ancestor of ancestorChain(context.library, klass, context.namespace.name)) {\n if (isFirst) {\n isFirst = false;\n continue;\n }\n\n if (shouldStop(ancestor.klass)) {\n break;\n }\n\n visit(ancestor, resolveDirectInterfaces(context, ancestor.klass, ancestor.namespaceName));\n }\n};\n\nconst visitInterfaceProperties = (\n interfaces: ResolvedAncestor[],\n visit: (owner: GirClass, property: GirProperty) => void,\n): void => {\n for (const iface of interfaces) {\n for (const property of iface.klass.properties) {\n visit(iface.klass, property);\n }\n }\n};\n\nconst forEachInheritedProperty = (\n context: ModuleContext,\n klass: GirClass,\n visit: (owner: GirClass, property: GirProperty) => void,\n): void => {\n forEachAncestor(context, klass, (ancestor, interfaces) => {\n for (const property of ancestor.klass.properties) {\n visit(ancestor.klass, property);\n }\n\n visitInterfaceProperties(interfaces, visit);\n });\n};\n\nconst collectSeenPropertyNames = (context: ModuleContext, klass: GirClass): Set<string> => {\n const seen: Set<string> = new Set();\n\n for (const property of klass.properties) {\n seen.add(toCamelIdentifier(property.name));\n }\n\n forEachInheritedProperty(context, klass, (_owner, property) => seen.add(toCamelIdentifier(property.name)));\n\n return seen;\n};\n\nconst collectNewInterfaceProperties = (iface: ResolvedAncestor, seen: Set<string>): OwnedProperty[] => {\n const result: OwnedProperty[] = [];\n\n for (const property of iface.klass.properties) {\n const name = toCamelIdentifier(property.name);\n\n if (seen.has(name)) {\n continue;\n }\n\n seen.add(name);\n result.push({ owner: iface.klass, property });\n }\n\n return result;\n};\n\nconst collectInterfaceProperties = (context: ModuleContext, klass: GirClass): OwnedProperty[] => {\n const seen = collectSeenPropertyNames(context, klass);\n const result: OwnedProperty[] = [];\n\n for (const iface of resolveDirectInterfaces(context, klass, context.namespace.name)) {\n result.push(...collectNewInterfaceProperties(iface, seen));\n }\n\n return result;\n};\n\nconst recordAncestorSignatures = (\n context: ModuleContext,\n klass: GirClass,\n signatures: Map<string, MethodSignature>,\n): void => {\n for (const method of klass.methods) {\n const name = camelCase(method.name);\n\n if (!method.introspectable || signatures.has(name)) {\n continue;\n }\n\n signatures.set(name, {\n returnType: renderTsType(context, method.returnValue.type, method.returnValue.nullable),\n arity: inputParameters(context.library, method).length,\n });\n }\n};\n\nconst ancestorClassMethodSignatures = (context: ModuleContext, klass: GirClass): Map<string, MethodSignature> => {\n const signatures: Map<string, MethodSignature> = new Map();\n\n forEachAncestor(context, klass, (ancestor) => {\n recordAncestorSignatures(context, ancestor.klass, signatures);\n });\n\n return signatures;\n};\n\nconst mergeOmissionName = (\n context: ModuleContext,\n method: GirFunction,\n ancestors: Map<string, MethodSignature>,\n): string | undefined => {\n if (!method.introspectable) {\n return undefined;\n }\n\n const name = camelCase(method.name);\n const ancestor = ancestors.get(name);\n\n if (ancestor === undefined) {\n return undefined;\n }\n\n const returnType = renderTsType(context, method.returnValue.type, method.returnValue.nullable);\n const arity = inputParameters(context.library, method).length;\n\n return ancestor.returnType !== returnType || ancestor.arity !== arity ? name : undefined;\n};\n\nconst classChainVfuncNames = (context: ModuleContext, klass: GirClass): Set<string> => {\n const names: Set<string> = new Set(vfuncMemberNames(context, context.namespace.name, klass));\n\n forEachAncestor(context, klass, (ancestor) => {\n for (const name of vfuncMemberNames(context, ancestor.namespaceName, ancestor.klass)) {\n names.add(name);\n }\n });\n\n return names;\n};\n\nconst methodMergeOmissions = (context: ModuleContext, klass: GirClass, iface: GirClass): string[] => {\n const ancestors = ancestorClassMethodSignatures(context, klass);\n\n return iface.methods\n .map((method) => mergeOmissionName(context, method, ancestors))\n .filter((name): name is string => name !== undefined);\n};\n\nconst vfuncMergeOmissions = (\n context: ModuleContext,\n klass: GirClass,\n iface: { klass: GirClass; namespaceName: string },\n): string[] => {\n const claimed = classChainVfuncNames(context, klass);\n\n return vfuncMemberNames(context, iface.namespaceName, iface.klass).filter((name) => claimed.has(name));\n};\n\nconst collectInterfaceMergeOmissions = (\n context: ModuleContext,\n klass: GirClass,\n iface: { klass: GirClass; namespaceName: string },\n): string[] => [\n ...methodMergeOmissions(context, klass, iface.klass),\n ...vfuncMergeOmissions(context, klass, iface),\n];\n\nconst collectInheritedPropertyTypes = (context: ModuleContext, klass: GirClass): Map<string, string> => {\n const types: Map<string, string> = new Map();\n\n const record = (owner: GirClass, property: GirProperty): void => {\n const jsName = toCamelIdentifier(property.name);\n\n if (types.has(jsName)) {\n return;\n }\n\n const tsType = resolveAccessorType(context, property, owner.methods);\n\n if (tsType !== undefined) {\n types.set(jsName, tsType);\n }\n };\n\n forEachInheritedProperty(context, klass, record);\n\n return types;\n};\n\nconst collectInheritedMethods = (context: ModuleContext, klass: GirClass): InheritedMethods => {\n const accumulator: InheritedMethods = {\n returnTypes: new Map<string, string>(),\n definitions: new Map<string, InheritedMethod>(),\n };\n\n for (const iface of resolveDirectInterfaces(context, klass, context.namespace.name)) {\n absorbInheritedMethods(context, iface, accumulator);\n }\n\n forEachAncestor(context, klass, (ancestor, interfaces) => {\n absorbInheritedMethods(context, ancestor, accumulator);\n\n for (const iface of interfaces) {\n absorbInheritedMethods(context, iface, accumulator);\n }\n });\n\n return accumulator;\n};\n\nconst absorbInheritedMethods = (\n context: ModuleContext,\n resolved: { klass: GirClass; namespaceName: string },\n accumulator: InheritedMethods,\n): void => {\n const { returnTypes, definitions } = accumulator;\n\n for (const method of resolved.klass.methods) {\n if (!method.introspectable) {\n continue;\n }\n\n const name = camelCase(method.name);\n\n if (returnTypes.has(name)) {\n continue;\n }\n\n definitions.set(name, { method, namespaceName: resolved.namespaceName });\n returnTypes.set(name, renderTsType(context, method.returnValue.type, method.returnValue.nullable));\n }\n};\n\nconst inheritedMatch = (inherited: InheritedMethods, name: string): InheritedMatch | undefined => {\n const inheritedReturn = inherited.returnTypes.get(name);\n const inheritedMethod = inherited.definitions.get(name);\n\n if (inheritedReturn === undefined || inheritedMethod === undefined) {\n return undefined;\n }\n\n return { inheritedReturn, inheritedMethod };\n};\n\nconst hasMethodConflict = (options: {\n context: ModuleContext;\n callable: GirFunction;\n inheritedReturn: string;\n inheritedMethod: InheritedMethod;\n}): boolean => {\n const { context, callable, inheritedReturn, inheritedMethod } = options;\n const ownReturn = renderTsType(context, callable.returnValue.type, callable.returnValue.nullable);\n\n return (\n inheritedReturn !== ownReturn ||\n hasParameterEnumConflict(context, callable, inheritedMethod) ||\n inputParameters(context.library, callable).length !==\n inputParameters(context.library, inheritedMethod.method).length\n );\n};\n\nconst conflictRename = (\n context: ModuleContext,\n callable: GirFunction,\n inherited: InheritedMethods,\n className: string,\n): string | undefined => {\n if (!callable.introspectable) {\n return undefined;\n }\n\n const name = methodExportName(callable);\n\n if (RESERVED_SIGNAL_MEMBERS.has(name)) {\n return conflictingMethodName(className, callable.name);\n }\n\n const match = inheritedMatch(inherited, name);\n\n if (match === undefined) {\n return undefined;\n }\n\n const hasConflict = hasMethodConflict({ context, callable, ...match });\n\n return hasConflict ? conflictingMethodName(className, callable.name) : undefined;\n};\n\nconst conflictingMethodName = (className: string, methodName: string): string =>\n `${lowerFirst(className)}${pascalCase(methodName)}`;\n\nconst reservedSignalMemberRename = (className: string, callable: GirFunction): string | undefined =>\n RESERVED_SIGNAL_MEMBERS.has(methodExportName(callable))\n ? conflictingMethodName(className, callable.name)\n : undefined;\n\nconst hasEnumConflict = (\n context: ModuleContext,\n ownRef: TypeId | undefined,\n inheritedRef: TypeId | undefined,\n): boolean => {\n const ownEnum = enumIdentity(context, ownRef);\n const inheritedEnum = enumIdentity(context, inheritedRef);\n\n return ownEnum !== undefined && inheritedEnum !== undefined && ownEnum !== inheritedEnum;\n};\n\nconst hasParameterEnumConflict = (context: ModuleContext, own: GirFunction, inherited: InheritedMethod): boolean => {\n const ownParams = inputParameters(context.library, own);\n const inheritedParams = inputParameters(context.library, inherited.method);\n const count = Math.min(ownParams.length, inheritedParams.length);\n\n for (let index = 0; index < count; index += 1) {\n const ownParam = ownParams[index];\n const inheritedParam = inheritedParams[index];\n\n if (\n ownParam !== undefined &&\n inheritedParam !== undefined &&\n hasEnumConflict(context, ownParam.parameter.type, inheritedParam.parameter.type)\n ) {\n return true;\n }\n }\n\n return false;\n};\n\nconst enumIdentity = (context: ModuleContext, ref: TypeId | undefined): string | undefined => {\n if (ref === undefined) {\n return undefined;\n }\n\n const resolved = context.library.typeFor(ref);\n\n if (resolved?.kind !== \"enum\") {\n return undefined;\n }\n\n return `${resolved.namespace.name}.${resolved.value.name}`;\n};\n\nexport {\n resolvePrerequisiteReference,\n forEachAncestor,\n collectInterfaceProperties,\n collectInterfaceMergeOmissions,\n collectInheritedPropertyTypes,\n collectInheritedMethods,\n conflictRename,\n reservedSignalMemberRename,\n type InheritedMethods,\n};\n"]}
1
+ {"version":3,"file":"inheritance.js","sourceRoot":"","sources":["../../src/analysis/inheritance.ts"],"names":[],"mappings":"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","sourcesContent":["import { lowerFirst, pascalCase, sanitizeTypeIdentifier, toCamelIdentifier } from \"@gtkx/utils\";\nimport type { GirClass } from \"../gir/class.js\";\nimport type { GirFunction } from \"../gir/function.js\";\nimport type { Library } from \"../gir/library.js\";\nimport type { GirParameter } from \"../gir/parameter.js\";\nimport type { GirProperty } from \"../gir/property.js\";\nimport type { TypeId } from \"../gir/type-id.js\";\nimport type { ModuleContext } from \"../writer/context.js\";\nimport { ancestorChain, type ResolvedAncestor, resolveInterfaces } from \"../gir/ancestry.js\";\nimport { isEmittableEntity } from \"../gir/emittable.js\";\nimport { memberName, methodExportName } from \"../store/gi/method.js\";\nimport { type InheritedAccessorTypes, resolveAccessorTypes } from \"../store/gi/property-accessor.js\";\nimport { vfuncMemberNames } from \"../store/gi/vtable.js\";\nimport { comparisonContextFor } from \"../writer/comparison-context.js\";\nimport { inputParameters } from \"./param-structure.js\";\nimport { renderTsType } from \"./ts-type.js\";\n\ntype AncestryContext = {\n library: Library;\n namespace: { name: string };\n};\n\ntype OwnedProperty = { owner: GirClass; property: GirProperty };\ntype DeclaredAccessorType = { type: string; owner: string };\ntype DeclaredAccessorTypes = { read: DeclaredAccessorType | undefined; write: DeclaredAccessorType | undefined };\ntype MethodSignature = { returnType: string; arity: number };\n\ntype InheritedMethod = {\n method: GirFunction;\n namespaceName: string;\n};\n\ntype InheritedMethods = {\n returnTypes: Map<string, string>;\n definitions: Map<string, InheritedMethod>;\n};\n\ntype ParameterPair = {\n own: GirParameter;\n inherited: GirParameter;\n};\n\ntype InheritedMatch = {\n inheritedReturn: string;\n inheritedMethod: InheritedMethod;\n};\n\nconst RESERVED_SIGNAL_MEMBERS = new Set([\n \"connect\",\n \"disconnect\",\n \"emit\",\n \"on\",\n \"once\",\n \"off\",\n \"addEventListener\",\n \"removeEventListener\",\n]);\n\nconst resolveDirectInterfaces = (\n context: AncestryContext,\n klass: GirClass,\n defaultNamespace: string,\n): ResolvedAncestor[] => resolveInterfaces(context.library, defaultNamespace, klass.implements);\n\nconst resolvePrerequisiteReference = (context: ModuleContext, name: string): string | undefined => {\n const resolved = context.library.resolveType(context.namespace.name, name);\n\n if (resolved === undefined) {\n return undefined;\n }\n\n if (resolved.kind !== \"interface\" && resolved.kind !== \"class\") {\n return undefined;\n }\n\n if (!isEmittableEntity(resolved.value)) {\n return undefined;\n }\n\n return context.qualify(resolved.namespace.name, sanitizeTypeIdentifier(resolved.value.name));\n};\n\nconst forEachAncestor = (\n context: AncestryContext,\n klass: GirClass,\n visit: (ancestor: ResolvedAncestor, interfaces: ResolvedAncestor[]) => void,\n shouldStop: (ancestor: GirClass) => boolean = () => false,\n): void => {\n let isFirst = true;\n\n for (const ancestor of ancestorChain(context.library, klass, context.namespace.name)) {\n if (isFirst) {\n isFirst = false;\n continue;\n }\n\n if (shouldStop(ancestor.klass)) {\n break;\n }\n\n visit(ancestor, resolveDirectInterfaces(context, ancestor.klass, ancestor.namespaceName));\n }\n};\n\nconst visitInterfaceProperties = (\n interfaces: ResolvedAncestor[],\n visit: (owner: GirClass, property: GirProperty) => void,\n): void => {\n for (const iface of interfaces) {\n for (const property of iface.klass.properties) {\n visit(iface.klass, property);\n }\n }\n};\n\nconst forEachAncestorProperty = (\n context: ModuleContext,\n klass: GirClass,\n visit: (owner: GirClass, property: GirProperty) => void,\n): void => {\n forEachAncestor(context, klass, (ancestor, interfaces) => {\n for (const property of ancestor.klass.properties) {\n visit(ancestor.klass, property);\n }\n\n visitInterfaceProperties(interfaces, visit);\n });\n};\n\nconst forEachInheritedProperty = (\n context: ModuleContext,\n klass: GirClass,\n visit: (owner: GirClass, property: GirProperty) => void,\n): void => {\n visitInterfaceProperties(resolveDirectInterfaces(context, klass, context.namespace.name), visit);\n forEachAncestorProperty(context, klass, visit);\n};\n\nconst collectSeenPropertyNames = (context: ModuleContext, klass: GirClass): Set<string> => {\n const seen: Set<string> = new Set();\n\n for (const property of klass.properties) {\n seen.add(toCamelIdentifier(property.name));\n }\n\n forEachAncestorProperty(context, klass, (_owner, property) => seen.add(toCamelIdentifier(property.name)));\n\n return seen;\n};\n\nconst collectNewInterfaceProperties = (iface: ResolvedAncestor, seen: Set<string>): OwnedProperty[] => {\n const result: OwnedProperty[] = [];\n\n for (const property of iface.klass.properties) {\n const name = toCamelIdentifier(property.name);\n\n if (seen.has(name)) {\n continue;\n }\n\n seen.add(name);\n result.push({ owner: iface.klass, property });\n }\n\n return result;\n};\n\nconst collectInterfaceProperties = (context: ModuleContext, klass: GirClass): OwnedProperty[] => {\n const seen = collectSeenPropertyNames(context, klass);\n const result: OwnedProperty[] = [];\n\n for (const iface of resolveDirectInterfaces(context, klass, context.namespace.name)) {\n result.push(...collectNewInterfaceProperties(iface, seen));\n }\n\n return result;\n};\n\nconst recordAncestorSignatures = (\n context: ModuleContext,\n klass: GirClass,\n signatures: Map<string, MethodSignature>,\n): void => {\n for (const method of klass.methods) {\n const name = memberName(method.name);\n\n if (!method.introspectable || signatures.has(name)) {\n continue;\n }\n\n signatures.set(name, {\n returnType: renderTsType(context, method.returnValue.type, method.returnValue.nullable),\n arity: inputParameters(context.library, method).length,\n });\n }\n};\n\nconst ancestorClassMethodSignatures = (context: ModuleContext, klass: GirClass): Map<string, MethodSignature> => {\n const signatures: Map<string, MethodSignature> = new Map();\n\n forEachAncestor(context, klass, (ancestor) => {\n recordAncestorSignatures(context, ancestor.klass, signatures);\n });\n\n return signatures;\n};\n\nconst ancestorClassMethodNames = (context: ModuleContext, klass: GirClass): Set<string> =>\n new Set(ancestorClassMethodSignatures(context, klass).keys());\n\nconst mergeOmissionName = (\n context: ModuleContext,\n method: GirFunction,\n ancestors: Map<string, MethodSignature>,\n): string | undefined => {\n if (!method.introspectable) {\n return undefined;\n }\n\n const name = memberName(method.name);\n const ancestor = ancestors.get(name);\n\n if (ancestor === undefined) {\n return undefined;\n }\n\n const returnType = renderTsType(context, method.returnValue.type, method.returnValue.nullable);\n const arity = inputParameters(context.library, method).length;\n\n return ancestor.returnType !== returnType || ancestor.arity !== arity ? name : undefined;\n};\n\nconst classChainVfuncNames = (context: ModuleContext, klass: GirClass): Set<string> => {\n const names: Set<string> = new Set(vfuncMemberNames(context, context.namespace.name, klass));\n\n forEachAncestor(context, klass, (ancestor) => {\n for (const name of vfuncMemberNames(context, ancestor.namespaceName, ancestor.klass)) {\n names.add(name);\n }\n });\n\n return names;\n};\n\nconst methodMergeOmissions = (context: ModuleContext, klass: GirClass, iface: GirClass): string[] => {\n const ancestors = ancestorClassMethodSignatures(context, klass);\n\n return iface.methods\n .map((method) => mergeOmissionName(context, method, ancestors))\n .filter((name): name is string => name !== undefined);\n};\n\nconst vfuncMergeOmissions = (\n context: ModuleContext,\n klass: GirClass,\n iface: { klass: GirClass; namespaceName: string },\n): string[] => {\n const claimed = classChainVfuncNames(context, klass);\n\n return vfuncMemberNames(context, iface.namespaceName, iface.klass).filter((name) => claimed.has(name));\n};\n\nconst collectInterfaceMergeOmissions = (\n context: ModuleContext,\n klass: GirClass,\n iface: { klass: GirClass; namespaceName: string },\n): string[] => [\n ...methodMergeOmissions(context, klass, iface.klass),\n ...vfuncMergeOmissions(context, klass, iface),\n];\n\nconst declaredBy = (type: string | undefined, owner: string): DeclaredAccessorType | undefined =>\n type === undefined ? undefined : { type, owner };\n\nconst reconcileAccessorType = (\n jsName: string,\n direction: string,\n declared: DeclaredAccessorType | undefined,\n candidate: DeclaredAccessorType | undefined,\n): DeclaredAccessorType | undefined => {\n if (candidate === undefined) {\n return declared;\n }\n\n if (declared === undefined || declared.type === candidate.type) {\n return declared ?? candidate;\n }\n\n throw new Error(\n `Cannot type the ${direction} accessor of ${jsName}: ${declared.owner} declares it as ${declared.type} ` +\n `and ${candidate.owner} declares it as ${candidate.type}. Both are bases of the same class, so no single ` +\n \"member satisfies them; correct the GIR the disagreeing base comes from.\",\n );\n};\n\nconst recordInheritedPropertyType = (\n context: ModuleContext,\n types: Map<string, DeclaredAccessorTypes>,\n owner: GirClass,\n property: GirProperty,\n): void => {\n const accessorTypes = resolveAccessorTypes(context, property, owner.methods);\n\n if (accessorTypes === undefined) {\n return;\n }\n\n const jsName = toCamelIdentifier(property.name);\n const declared = types.get(jsName);\n\n types.set(jsName, {\n read: reconcileAccessorType(jsName, \"read\", declared?.read, declaredBy(accessorTypes.readType, owner.name)),\n write: reconcileAccessorType(jsName, \"write\", declared?.write, declaredBy(accessorTypes.writeType, owner.name)),\n });\n};\n\nconst collectInheritedPropertyTypes = (\n context: ModuleContext,\n klass: GirClass,\n): Map<string, InheritedAccessorTypes> => {\n const declared: Map<string, DeclaredAccessorTypes> = new Map();\n\n forEachInheritedProperty(context, klass, (owner, property) => {\n recordInheritedPropertyType(context, declared, owner, property);\n });\n\n const types: Map<string, InheritedAccessorTypes> = new Map();\n\n for (const [jsName, entry] of declared) {\n types.set(jsName, { readType: entry.read?.type, writeType: entry.write?.type });\n }\n\n return types;\n};\n\nconst collectInheritedMethods = (context: ModuleContext, klass: GirClass): InheritedMethods => {\n const accumulator: InheritedMethods = {\n returnTypes: new Map<string, string>(),\n definitions: new Map<string, InheritedMethod>(),\n };\n\n for (const iface of resolveDirectInterfaces(context, klass, context.namespace.name)) {\n absorbInheritedMethods(context, iface, accumulator);\n }\n\n forEachAncestor(context, klass, (ancestor, interfaces) => {\n absorbInheritedMethods(context, ancestor, accumulator);\n\n for (const iface of interfaces) {\n absorbInheritedMethods(context, iface, accumulator);\n }\n });\n\n return accumulator;\n};\n\nconst absorbInheritedMethods = (\n context: ModuleContext,\n resolved: { klass: GirClass; namespaceName: string },\n accumulator: InheritedMethods,\n): void => {\n const { returnTypes, definitions } = accumulator;\n\n for (const method of resolved.klass.methods) {\n if (!method.introspectable) {\n continue;\n }\n\n const name = memberName(method.name);\n\n if (returnTypes.has(name)) {\n continue;\n }\n\n definitions.set(name, { method, namespaceName: resolved.namespaceName });\n returnTypes.set(name, renderTsType(context, method.returnValue.type, method.returnValue.nullable));\n }\n};\n\nconst inheritedMatch = (inherited: InheritedMethods, name: string): InheritedMatch | undefined => {\n const inheritedReturn = inherited.returnTypes.get(name);\n const inheritedMethod = inherited.definitions.get(name);\n\n if (inheritedReturn === undefined || inheritedMethod === undefined) {\n return undefined;\n }\n\n return { inheritedReturn, inheritedMethod };\n};\n\nconst hasMethodConflict = (options: {\n context: ModuleContext;\n callable: GirFunction;\n inheritedReturn: string;\n inheritedMethod: InheritedMethod;\n}): boolean => {\n const { context, callable, inheritedReturn, inheritedMethod } = options;\n const ownReturn = renderTsType(context, callable.returnValue.type, callable.returnValue.nullable);\n\n return (\n inheritedReturn !== ownReturn ||\n hasParameterEnumConflict(context, callable, inheritedMethod) ||\n hasParameterTypeConflict(context, callable, inheritedMethod.method)\n );\n};\n\nconst isCallbackType = (context: ModuleContext, ref: TypeId | undefined): boolean =>\n ref !== undefined && context.library.typeFor(ref)?.kind === \"callback\";\n\nconst areParametersComparable = (context: ModuleContext, pair: ParameterPair): boolean => {\n if (isCallbackType(context, pair.own.type) && isCallbackType(context, pair.inherited.type)) {\n return true;\n }\n\n const scratch = comparisonContextFor(context);\n\n return renderTsType(scratch, pair.own.type, false) === renderTsType(scratch, pair.inherited.type, false);\n};\n\nconst inputParameterPairs = (context: ModuleContext, own: GirFunction, inherited: GirFunction): ParameterPair[] => {\n const ownParams = inputParameters(context.library, own);\n const inheritedParams = inputParameters(context.library, inherited);\n const pairs: ParameterPair[] = [];\n\n for (const [index, entry] of ownParams.entries()) {\n const other = inheritedParams[index];\n\n if (other !== undefined) {\n pairs.push({ own: entry.parameter, inherited: other.parameter });\n }\n }\n\n return pairs;\n};\n\nconst hasParameterTypeConflict = (context: ModuleContext, own: GirFunction, inherited: GirFunction): boolean => {\n const ownCount = inputParameters(context.library, own).length;\n\n if (ownCount !== inputParameters(context.library, inherited).length) {\n return true;\n }\n\n return inputParameterPairs(context, own, inherited).some((pair) => !areParametersComparable(context, pair));\n};\n\nconst conflictRename = (\n context: ModuleContext,\n callable: GirFunction,\n inherited: InheritedMethods,\n className: string,\n): string | undefined => {\n if (!callable.introspectable) {\n return undefined;\n }\n\n const name = methodExportName(callable);\n\n if (RESERVED_SIGNAL_MEMBERS.has(name)) {\n return conflictingMethodName(className, callable.name);\n }\n\n const match = inheritedMatch(inherited, name);\n\n if (match === undefined) {\n return undefined;\n }\n\n const hasConflict = hasMethodConflict({ context, callable, ...match });\n\n return hasConflict ? conflictingMethodName(className, callable.name) : undefined;\n};\n\nconst conflictingMethodName = (className: string, methodName: string): string =>\n `${lowerFirst(className)}${pascalCase(methodName)}`;\n\nconst reservedSignalMemberRename = (className: string, callable: GirFunction): string | undefined =>\n RESERVED_SIGNAL_MEMBERS.has(methodExportName(callable))\n ? conflictingMethodName(className, callable.name)\n : undefined;\n\nconst hasEnumConflict = (\n context: ModuleContext,\n ownRef: TypeId | undefined,\n inheritedRef: TypeId | undefined,\n): boolean => {\n const ownEnum = enumIdentity(context, ownRef);\n const inheritedEnum = enumIdentity(context, inheritedRef);\n\n return ownEnum !== undefined && inheritedEnum !== undefined && ownEnum !== inheritedEnum;\n};\n\nconst hasParameterEnumConflict = (context: ModuleContext, own: GirFunction, inherited: InheritedMethod): boolean =>\n inputParameterPairs(context, own, inherited.method).some(\n (pair) => hasEnumConflict(context, pair.own.type, pair.inherited.type));\n\nconst enumIdentity = (context: ModuleContext, ref: TypeId | undefined): string | undefined => {\n if (ref === undefined) {\n return undefined;\n }\n\n const resolved = context.library.typeFor(ref);\n\n if (resolved?.kind !== \"enum\") {\n return undefined;\n }\n\n return `${resolved.namespace.name}.${resolved.value.name}`;\n};\n\nexport {\n ancestorClassMethodNames,\n resolvePrerequisiteReference,\n forEachAncestor,\n collectInterfaceProperties,\n collectInterfaceMergeOmissions,\n collectInheritedPropertyTypes,\n collectInheritedMethods,\n conflictRename,\n reservedSignalMemberRename,\n type InheritedMethods,\n};\n"]}
@@ -0,0 +1,25 @@
1
+ import type { GirClass } from "../gir/class.js";
2
+ import type { GirFunction } from "../gir/function.js";
3
+ import type { Library } from "../gir/library.js";
4
+ import type { ModuleContext } from "../writer/context.js";
5
+ import { type ResolvedAncestor } from "../gir/ancestry.js";
6
+ type MemberTable = Map<string, GirFunction>;
7
+ type ClaimedMembers = {
8
+ inherited: MemberTable;
9
+ interfaces: MemberTable;
10
+ };
11
+ type InterfaceConflictOptions = {
12
+ context: ModuleContext;
13
+ klass: GirClass;
14
+ iface: GirClass;
15
+ ifaceNamespace: string;
16
+ };
17
+ declare const areCallablesAssignable: (library: Library, own: GirFunction, other: GirFunction) => boolean;
18
+ declare const inheritedMembers: (context: ModuleContext, klass: GirClass) => ClaimedMembers;
19
+ declare const claimInterfaceMembers: (options: InterfaceConflictOptions, claimed: ClaimedMembers) => void;
20
+ declare const interfaceConflicts: (options: InterfaceConflictOptions, claimed: ClaimedMembers) => string[];
21
+ declare const prerequisiteConflicts: (library: Library, iface: GirClass, base: ResolvedAncestor) => string[];
22
+ declare const omittedKeys: (omissions: string[]) => string;
23
+ declare const omittedTypeRef: (typeRef: string, omissions: string[]) => string;
24
+ export { areCallablesAssignable, type ClaimedMembers, claimInterfaceMembers, inheritedMembers, interfaceConflicts, omittedKeys, omittedTypeRef, prerequisiteConflicts, };
25
+ //# sourceMappingURL=interface-conflicts.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"interface-conflicts.d.ts","sourceRoot":"","sources":["../../src/analysis/interface-conflicts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAA2B,KAAK,gBAAgB,EAAqB,MAAM,oBAAoB,CAAC;AAQvG,KAAK,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAE5C,KAAK,cAAc,GAAG;IAClB,SAAS,EAAE,WAAW,CAAC;IACvB,UAAU,EAAE,WAAW,CAAC;CAC3B,CAAC;AAEF,KAAK,wBAAwB,GAAG;IAC5B,OAAO,EAAE,aAAa,CAAC;IACvB,KAAK,EAAE,QAAQ,CAAC;IAChB,KAAK,EAAE,QAAQ,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;CAC1B,CAAC;AAsCF,QAAA,MAAM,sBAAsB,GAAI,SAAS,OAAO,EAAE,KAAK,WAAW,EAAE,OAAO,WAAW,KAAG,OAYxF,CAAC;AAYF,QAAA,MAAM,gBAAgB,GAAI,SAAS,aAAa,EAAE,OAAO,QAAQ,KAAG,cAQnE,CAAC;AAaF,QAAA,MAAM,qBAAqB,GAAI,SAAS,wBAAwB,EAAE,SAAS,cAAc,KAAG,IAM3F,CAAC;AA2BF,QAAA,MAAM,kBAAkB,GAAI,SAAS,wBAAwB,EAAE,SAAS,cAAc,KAAG,MAAM,EAI9F,CAAC;AA0DF,QAAA,MAAM,qBAAqB,GAAI,SAAS,OAAO,EAAE,OAAO,QAAQ,EAAE,MAAM,gBAAgB,KAAG,MAAM,EAehG,CAAC;AAEF,QAAA,MAAM,WAAW,GAAI,WAAW,MAAM,EAAE,KAAG,MACgC,CAAC;AAE5E,QAAA,MAAM,cAAc,GAAI,SAAS,MAAM,EAAE,WAAW,MAAM,EAAE,KAAG,MACqB,CAAC;AAErF,OAAO,EACH,sBAAsB,EACtB,KAAK,cAAc,EACnB,qBAAqB,EACrB,gBAAgB,EAChB,kBAAkB,EAClB,WAAW,EACX,cAAc,EACd,qBAAqB,GACxB,CAAC"}