@gtkx/codegen 1.0.0 → 1.1.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 (316) 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 +48 -31
  5. package/dist/analysis/descriptor-render.js.map +1 -1
  6. package/dist/analysis/descriptor.d.ts +16 -7
  7. package/dist/analysis/descriptor.d.ts.map +1 -1
  8. package/dist/analysis/descriptor.js +15 -3
  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 +23 -0
  15. package/dist/analysis/interface-conflicts.d.ts.map +1 -0
  16. package/dist/analysis/interface-conflicts.js +144 -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.map +1 -1
  24. package/dist/analysis/ts-type.js +10 -17
  25. package/dist/analysis/ts-type.js.map +1 -1
  26. package/dist/analysis/type-key.d.ts +5 -0
  27. package/dist/analysis/type-key.d.ts.map +1 -0
  28. package/dist/analysis/type-key.js +9 -0
  29. package/dist/analysis/type-key.js.map +1 -0
  30. package/dist/compile.d.ts +12 -3
  31. package/dist/compile.d.ts.map +1 -1
  32. package/dist/compile.js +73 -24
  33. package/dist/compile.js.map +1 -1
  34. package/dist/docs/api-reference.d.ts.map +1 -1
  35. package/dist/docs/api-reference.js +10 -9
  36. package/dist/docs/api-reference.js.map +1 -1
  37. package/dist/docs/element-page.d.ts.map +1 -1
  38. package/dist/docs/element-page.js +5 -3
  39. package/dist/docs/element-page.js.map +1 -1
  40. package/dist/docs/pipeline.d.ts.map +1 -1
  41. package/dist/docs/pipeline.js +85 -18
  42. package/dist/docs/pipeline.js.map +1 -1
  43. package/dist/docs/render.d.ts +2 -1
  44. package/dist/docs/render.d.ts.map +1 -1
  45. package/dist/docs/render.js +5 -4
  46. package/dist/docs/render.js.map +1 -1
  47. package/dist/docs/symbol-page.d.ts.map +1 -1
  48. package/dist/docs/symbol-page.js +9 -6
  49. package/dist/docs/symbol-page.js.map +1 -1
  50. package/dist/fingerprint.d.ts +12 -1
  51. package/dist/fingerprint.d.ts.map +1 -1
  52. package/dist/fingerprint.js +44 -28
  53. package/dist/fingerprint.js.map +1 -1
  54. package/dist/gi.d.ts.map +1 -1
  55. package/dist/gi.js +1 -0
  56. package/dist/gi.js.map +1 -1
  57. package/dist/gir/ancestry.d.ts +7 -1
  58. package/dist/gir/ancestry.d.ts.map +1 -1
  59. package/dist/gir/ancestry.js +9 -1
  60. package/dist/gir/ancestry.js.map +1 -1
  61. package/dist/gir/annotations.d.ts +1 -2
  62. package/dist/gir/annotations.d.ts.map +1 -1
  63. package/dist/gir/annotations.js +1 -1
  64. package/dist/gir/annotations.js.map +1 -1
  65. package/dist/gir/cursor-overrides.d.ts +8 -0
  66. package/dist/gir/cursor-overrides.d.ts.map +1 -0
  67. package/dist/gir/cursor-overrides.js +6 -0
  68. package/dist/gir/cursor-overrides.js.map +1 -0
  69. package/dist/gir/emittable.d.ts +7 -0
  70. package/dist/gir/emittable.d.ts.map +1 -0
  71. package/dist/gir/emittable.js +3 -0
  72. package/dist/gir/emittable.js.map +1 -0
  73. package/dist/gir/function.d.ts.map +1 -1
  74. package/dist/gir/function.js +28 -2
  75. package/dist/gir/function.js.map +1 -1
  76. package/dist/gir/library.js +1 -1
  77. package/dist/gir/library.js.map +1 -1
  78. package/dist/gir/namespace.d.ts +5 -1
  79. package/dist/gir/namespace.d.ts.map +1 -1
  80. package/dist/gir/namespace.js +4 -2
  81. package/dist/gir/namespace.js.map +1 -1
  82. package/dist/gir/parameter.d.ts +13 -1
  83. package/dist/gir/parameter.d.ts.map +1 -1
  84. package/dist/gir/parameter.js +1 -0
  85. package/dist/gir/parameter.js.map +1 -1
  86. package/dist/gir/parse.d.ts.map +1 -1
  87. package/dist/gir/parse.js +3 -6
  88. package/dist/gir/parse.js.map +1 -1
  89. package/dist/guards.d.ts +16 -0
  90. package/dist/guards.d.ts.map +1 -0
  91. package/dist/guards.js +11 -0
  92. package/dist/guards.js.map +1 -0
  93. package/dist/internal.d.ts +2 -0
  94. package/dist/internal.d.ts.map +1 -1
  95. package/dist/internal.js +2 -0
  96. package/dist/internal.js.map +1 -1
  97. package/dist/json.d.ts +3 -0
  98. package/dist/json.d.ts.map +1 -0
  99. package/dist/json.js +11 -0
  100. package/dist/json.js.map +1 -0
  101. package/dist/khronos/modules.d.ts.map +1 -1
  102. package/dist/khronos/modules.js +22 -7
  103. package/dist/khronos/modules.js.map +1 -1
  104. package/dist/khronos/parse.d.ts.map +1 -1
  105. package/dist/khronos/parse.js +3 -4
  106. package/dist/khronos/parse.js.map +1 -1
  107. package/dist/khronos/pipeline.d.ts +1 -1
  108. package/dist/khronos/pipeline.d.ts.map +1 -1
  109. package/dist/khronos/pipeline.js.map +1 -1
  110. package/dist/khronos/plan.d.ts +1 -7
  111. package/dist/khronos/plan.d.ts.map +1 -1
  112. package/dist/khronos/plan.js +1 -1
  113. package/dist/khronos/plan.js.map +1 -1
  114. package/dist/runner.d.ts +5 -1
  115. package/dist/runner.d.ts.map +1 -1
  116. package/dist/runner.js +16 -0
  117. package/dist/runner.js.map +1 -1
  118. package/dist/staging.d.ts +5 -0
  119. package/dist/staging.d.ts.map +1 -0
  120. package/dist/staging.js +57 -0
  121. package/dist/staging.js.map +1 -0
  122. package/dist/store/compile-store.d.ts.map +1 -1
  123. package/dist/store/compile-store.js +4 -2
  124. package/dist/store/compile-store.js.map +1 -1
  125. package/dist/store/gi/callables.d.ts +7 -2
  126. package/dist/store/gi/callables.d.ts.map +1 -1
  127. package/dist/store/gi/callables.js +25 -30
  128. package/dist/store/gi/callables.js.map +1 -1
  129. package/dist/store/gi/callback.d.ts.map +1 -1
  130. package/dist/store/gi/callback.js +9 -5
  131. package/dist/store/gi/callback.js.map +1 -1
  132. package/dist/store/gi/class.d.ts.map +1 -1
  133. package/dist/store/gi/class.js +59 -38
  134. package/dist/store/gi/class.js.map +1 -1
  135. package/dist/store/gi/companion.d.ts.map +1 -1
  136. package/dist/store/gi/companion.js +6 -6
  137. package/dist/store/gi/companion.js.map +1 -1
  138. package/dist/store/gi/constant.d.ts.map +1 -1
  139. package/dist/store/gi/constant.js +10 -2
  140. package/dist/store/gi/constant.js.map +1 -1
  141. package/dist/store/gi/constructor-props.js +1 -1
  142. package/dist/store/gi/constructor-props.js.map +1 -1
  143. package/dist/store/gi/enum.d.ts.map +1 -1
  144. package/dist/store/gi/enum.js +28 -8
  145. package/dist/store/gi/enum.js.map +1 -1
  146. package/dist/store/gi/function.d.ts +1 -3
  147. package/dist/store/gi/function.d.ts.map +1 -1
  148. package/dist/store/gi/function.js +24 -18
  149. package/dist/store/gi/function.js.map +1 -1
  150. package/dist/store/gi/gtype-binding.d.ts.map +1 -1
  151. package/dist/store/gi/gtype-binding.js +4 -1
  152. package/dist/store/gi/gtype-binding.js.map +1 -1
  153. package/dist/store/gi/interface.d.ts.map +1 -1
  154. package/dist/store/gi/interface.js +32 -17
  155. package/dist/store/gi/interface.js.map +1 -1
  156. package/dist/store/gi/method.d.ts +7 -6
  157. package/dist/store/gi/method.d.ts.map +1 -1
  158. package/dist/store/gi/method.js +13 -21
  159. package/dist/store/gi/method.js.map +1 -1
  160. package/dist/store/gi/param-marshal.d.ts +3 -2
  161. package/dist/store/gi/param-marshal.d.ts.map +1 -1
  162. package/dist/store/gi/param-marshal.js +50 -5
  163. package/dist/store/gi/param-marshal.js.map +1 -1
  164. package/dist/store/gi/pipeline.d.ts.map +1 -1
  165. package/dist/store/gi/pipeline.js +21 -10
  166. package/dist/store/gi/pipeline.js.map +1 -1
  167. package/dist/store/gi/properties.d.ts +2 -1
  168. package/dist/store/gi/properties.d.ts.map +1 -1
  169. package/dist/store/gi/properties.js +6 -3
  170. package/dist/store/gi/properties.js.map +1 -1
  171. package/dist/store/gi/property-accessor.d.ts +10 -5
  172. package/dist/store/gi/property-accessor.d.ts.map +1 -1
  173. package/dist/store/gi/property-accessor.js +95 -44
  174. package/dist/store/gi/property-accessor.js.map +1 -1
  175. package/dist/store/gi/record-constructor.d.ts +8 -1
  176. package/dist/store/gi/record-constructor.d.ts.map +1 -1
  177. package/dist/store/gi/record-constructor.js +31 -10
  178. package/dist/store/gi/record-constructor.js.map +1 -1
  179. package/dist/store/gi/record-field-accessor.d.ts.map +1 -1
  180. package/dist/store/gi/record-field-accessor.js +5 -1
  181. package/dist/store/gi/record-field-accessor.js.map +1 -1
  182. package/dist/store/gi/record-layout.d.ts +6 -1
  183. package/dist/store/gi/record-layout.d.ts.map +1 -1
  184. package/dist/store/gi/record-layout.js +8 -1
  185. package/dist/store/gi/record-layout.js.map +1 -1
  186. package/dist/store/gi/record.d.ts.map +1 -1
  187. package/dist/store/gi/record.js +19 -8
  188. package/dist/store/gi/record.js.map +1 -1
  189. package/dist/store/gi/registration.js +2 -2
  190. package/dist/store/gi/registration.js.map +1 -1
  191. package/dist/store/gi/signal.d.ts +2 -1
  192. package/dist/store/gi/signal.d.ts.map +1 -1
  193. package/dist/store/gi/signal.js +30 -24
  194. package/dist/store/gi/signal.js.map +1 -1
  195. package/dist/store/gi/value-marshalable.d.ts.map +1 -1
  196. package/dist/store/gi/value-marshalable.js +2 -1
  197. package/dist/store/gi/value-marshalable.js.map +1 -1
  198. package/dist/store/gi/vtable.d.ts +4 -1
  199. package/dist/store/gi/vtable.d.ts.map +1 -1
  200. package/dist/store/gi/vtable.js +60 -17
  201. package/dist/store/gi/vtable.js.map +1 -1
  202. package/dist/store/gi-store.d.ts +1 -0
  203. package/dist/store/gi-store.d.ts.map +1 -1
  204. package/dist/store/gi-store.js +15 -20
  205. package/dist/store/gi-store.js.map +1 -1
  206. package/dist/store/jsx/generated-elements.d.ts +2 -1
  207. package/dist/store/jsx/generated-elements.d.ts.map +1 -1
  208. package/dist/store/jsx/generated-elements.js +13 -7
  209. package/dist/store/jsx/generated-elements.js.map +1 -1
  210. package/dist/store/jsx/jsx.js +3 -3
  211. package/dist/store/jsx/jsx.js.map +1 -1
  212. package/dist/store/jsx/metadata.d.ts.map +1 -1
  213. package/dist/store/jsx/metadata.js +3 -1
  214. package/dist/store/jsx/metadata.js.map +1 -1
  215. package/dist/store/jsx-store.d.ts.map +1 -1
  216. package/dist/store/jsx-store.js +3 -3
  217. package/dist/store/jsx-store.js.map +1 -1
  218. package/dist/store/resolve-store.d.ts +14 -3
  219. package/dist/store/resolve-store.d.ts.map +1 -1
  220. package/dist/store/resolve-store.js +98 -15
  221. package/dist/store/resolve-store.js.map +1 -1
  222. package/dist/store/store-fs.d.ts +9 -6
  223. package/dist/store/store-fs.d.ts.map +1 -1
  224. package/dist/store/store-fs.js +59 -25
  225. package/dist/store/store-fs.js.map +1 -1
  226. package/dist/store/store-links.d.ts +3 -0
  227. package/dist/store/store-links.d.ts.map +1 -0
  228. package/dist/store/store-links.js +39 -0
  229. package/dist/store/store-links.js.map +1 -0
  230. package/dist/writer/comparison-context.d.ts +4 -0
  231. package/dist/writer/comparison-context.d.ts.map +1 -0
  232. package/dist/writer/comparison-context.js +13 -0
  233. package/dist/writer/comparison-context.js.map +1 -0
  234. package/dist/writer/context.d.ts +3 -3
  235. package/dist/writer/context.d.ts.map +1 -1
  236. package/dist/writer/context.js +11 -6
  237. package/dist/writer/context.js.map +1 -1
  238. package/dist/writer/module.d.ts +13 -5
  239. package/dist/writer/module.d.ts.map +1 -1
  240. package/dist/writer/module.js +68 -11
  241. package/dist/writer/module.js.map +1 -1
  242. package/dist/xml.d.ts +7 -1
  243. package/dist/xml.d.ts.map +1 -1
  244. package/dist/xml.js +43 -1
  245. package/dist/xml.js.map +1 -1
  246. package/package.json +14 -3
  247. package/src/analysis/descriptor-render.ts +90 -45
  248. package/src/analysis/descriptor.ts +35 -8
  249. package/src/analysis/inheritance.ts +134 -44
  250. package/src/analysis/interface-conflicts.ts +237 -0
  251. package/src/analysis/param-capability.ts +3 -6
  252. package/src/analysis/param-structure.ts +2 -2
  253. package/src/analysis/ts-type.ts +13 -17
  254. package/src/analysis/type-key.ts +14 -0
  255. package/src/compile.ts +110 -26
  256. package/src/docs/api-reference.ts +10 -9
  257. package/src/docs/element-page.ts +5 -2
  258. package/src/docs/pipeline.ts +129 -19
  259. package/src/docs/render.ts +7 -3
  260. package/src/docs/symbol-page.ts +12 -7
  261. package/src/fingerprint.ts +86 -31
  262. package/src/gi.ts +1 -0
  263. package/src/gir/ancestry.ts +17 -1
  264. package/src/gir/annotations.ts +1 -1
  265. package/src/gir/cursor-overrides.ts +12 -0
  266. package/src/gir/emittable.ts +8 -0
  267. package/src/gir/function.ts +45 -9
  268. package/src/gir/library.ts +1 -1
  269. package/src/gir/namespace.ts +8 -2
  270. package/src/gir/parameter.ts +15 -0
  271. package/src/gir/parse.ts +5 -7
  272. package/src/guards.ts +23 -0
  273. package/src/internal.ts +2 -0
  274. package/src/json.ts +11 -0
  275. package/src/khronos/modules.ts +25 -9
  276. package/src/khronos/parse.ts +3 -4
  277. package/src/khronos/pipeline.ts +1 -1
  278. package/src/khronos/plan.ts +0 -1
  279. package/src/runner.ts +19 -1
  280. package/src/staging.ts +69 -0
  281. package/src/store/compile-store.ts +6 -4
  282. package/src/store/gi/callables.ts +41 -33
  283. package/src/store/gi/callback.ts +9 -9
  284. package/src/store/gi/class.ts +79 -48
  285. package/src/store/gi/companion.ts +7 -6
  286. package/src/store/gi/constant.ts +12 -2
  287. package/src/store/gi/constructor-props.ts +1 -1
  288. package/src/store/gi/enum.ts +35 -21
  289. package/src/store/gi/function.ts +30 -24
  290. package/src/store/gi/gtype-binding.ts +7 -2
  291. package/src/store/gi/interface.ts +37 -18
  292. package/src/store/gi/method.ts +28 -29
  293. package/src/store/gi/param-marshal.ts +77 -6
  294. package/src/store/gi/pipeline.ts +25 -15
  295. package/src/store/gi/properties.ts +8 -4
  296. package/src/store/gi/property-accessor.ts +156 -73
  297. package/src/store/gi/record-constructor.ts +50 -18
  298. package/src/store/gi/record-field-accessor.ts +8 -1
  299. package/src/store/gi/record-layout.ts +11 -1
  300. package/src/store/gi/record.ts +20 -12
  301. package/src/store/gi/registration.ts +2 -2
  302. package/src/store/gi/signal.ts +36 -38
  303. package/src/store/gi/value-marshalable.ts +3 -1
  304. package/src/store/gi/vtable.ts +97 -20
  305. package/src/store/gi-store.ts +26 -31
  306. package/src/store/jsx/generated-elements.ts +17 -8
  307. package/src/store/jsx/jsx.ts +3 -3
  308. package/src/store/jsx/metadata.ts +4 -1
  309. package/src/store/jsx-store.ts +3 -3
  310. package/src/store/resolve-store.ts +133 -18
  311. package/src/store/store-fs.ts +87 -34
  312. package/src/store/store-links.ts +49 -0
  313. package/src/writer/comparison-context.ts +18 -0
  314. package/src/writer/context.ts +12 -6
  315. package/src/writer/module.ts +101 -14
  316. package/src/xml.ts +61 -1
@@ -1,9 +1,10 @@
1
- import { pascalCase, toCamelIdentifier } from "@gtkx/utils";
2
- import { collectInheritedMethods, collectInheritedPropertyTypes, collectInterfaceMergeOmissions, conflictRename, } from "../../analysis/inheritance.js";
3
- import { ancestorChain } from "../../gir/ancestry.js";
4
- import { splitOptionalNamespace } from "../../gir/type-ref.js";
1
+ import { sanitizeTypeIdentifier, toCamelIdentifier } from "@gtkx/utils";
2
+ import { ancestorClassMethodNames, collectInheritedMethods, collectInheritedPropertyTypes, collectInterfaceMergeOmissions, conflictRename, } from "../../analysis/inheritance.js";
3
+ import { claimInterfaceMembers, inheritedMembers, interfaceConflicts, omittedTypeRef, } from "../../analysis/interface-conflicts.js";
4
+ import { ancestorChain, getParentRef } from "../../gir/ancestry.js";
5
+ import { isEmittableEntity } from "../../gir/emittable.js";
5
6
  import { indentMembers } from "../../writer/emit.js";
6
- import { classConstructorMemberNames, dedupeCallables, generateBindings, instanceScope, renderClassInstanceMember, renderStaticHead, } from "./callables.js";
7
+ import { constructorMemberNames, dedupeCallables, generateBindings, instanceScope, renderClassInstanceMember, renderStaticHead, } from "./callables.js";
7
8
  import { renderClassConstructor, renderConstructorPropsInterface } from "./constructor-props.js";
8
9
  import { getDoc } from "./doc-spec.js";
9
10
  import { gtypeMemberDeclaration, renderSourceGtype } from "./gtype-binding.js";
@@ -14,13 +15,10 @@ import { appendWrapperClassRegistration } from "./registration.js";
14
15
  import { renderSignalDeclarations, renderSignalMembers } from "./signal.js";
15
16
  import { renderVfuncMembers, renderVfuncMetadata } from "./vtable.js";
16
17
  const generateClass = (context, klass) => {
17
- if (!klass.introspectable) {
18
+ if (!isEmittableEntity(klass)) {
18
19
  return;
19
20
  }
20
- if (klass.name.length === 0) {
21
- return;
22
- }
23
- const className = pascalCase(klass.name);
21
+ const className = sanitizeTypeIdentifier(klass.name);
24
22
  const callables = {
25
23
  constructors: dedupeCallables(klass.constructors),
26
24
  functions: dedupeCallables(klass.functions),
@@ -30,13 +28,21 @@ const generateClass = (context, klass) => {
30
28
  const parentExpression = resolveParent(context, klass);
31
29
  const extendsClause = renderExtendsClause(context, parentExpression, callables);
32
30
  const implemented = resolveImplementedRefs(context, klass);
33
- const typeRefs = implemented.map((ref) => ref.typeRef);
31
+ const typeRefs = implemented.map((ref) => omittedTypeRef(ref.typeRef, ref.conflicts));
34
32
  const implementsClause = typeRefs.length === 0 ? "" : ` implements ${typeRefs.join(", ")}`;
35
33
  const { members, accessors } = renderClassMembers(context, klass, callables, parentExpression !== undefined);
36
34
  const body = indentMembers(members);
37
35
  const doc = getDoc(klass);
38
- context.module.appendDeclaration(`${doc}export class ${className}${extendsClause}${implementsClause} {\n${body}\n}`, context.declaredType(className));
39
- context.module.appendDeclaration(renderConstructorPropsInterface(context, klass, className));
36
+ const modifier = klass.isAbstract ? "abstract " : "";
37
+ context.declare({
38
+ name: className,
39
+ code: `${doc}export ${modifier}class ${className}${extendsClause}${implementsClause} {\n${body}\n}`,
40
+ owner: klass.name,
41
+ });
42
+ context.declare({
43
+ name: `${className}ConstructorProps`,
44
+ code: renderConstructorPropsInterface(context, klass, className),
45
+ });
40
46
  appendMemberDeclarations({ context, klass, className, accessors, implemented });
41
47
  appendInstallMixins(context, className, implemented);
42
48
  appendClassRegistrations(context, klass, className);
@@ -44,10 +50,10 @@ const generateClass = (context, klass) => {
44
50
  const appendMemberDeclarations = (options) => {
45
51
  const { context, klass, className, accessors, implemented } = options;
46
52
  for (const declaration of renderPropertyDeclarations(context, klass, className, accessors)) {
47
- context.module.appendDeclaration(declaration);
53
+ context.declare(declaration);
48
54
  }
49
55
  for (const declaration of renderSignalDeclarations(context, klass, className, false)) {
50
- context.module.appendDeclaration(declaration);
56
+ context.declare(declaration);
51
57
  }
52
58
  appendInterfaceMerge(context, klass, className, implemented);
53
59
  };
@@ -56,10 +62,13 @@ const appendInterfaceMerge = (context, klass, className, implemented) => {
56
62
  return;
57
63
  }
58
64
  const mergeRefs = implemented.map((ref) => interfaceMergeRef(context, klass, ref));
59
- context.module.appendDeclaration(`export interface ${className} extends ${mergeRefs.join(", ")} {}`);
65
+ context.declare({
66
+ name: className,
67
+ code: `export interface ${className} extends ${mergeRefs.join(", ")} {}`,
68
+ });
60
69
  };
61
70
  const renderClassMembers = (context, klass, callables, hasParent) => {
62
- const className = pascalCase(klass.name);
71
+ const className = sanitizeTypeIdentifier(klass.name);
63
72
  const members = [gtypeMemberDeclaration(context)];
64
73
  const constructorBlock = renderClassConstructor(context, klass, className, hasParent);
65
74
  if (constructorBlock !== undefined) {
@@ -80,15 +89,17 @@ const renderClassMembers = (context, klass, callables, hasParent) => {
80
89
  });
81
90
  members.push(...renderVfuncMembers({ context, klass, mode: "implementation" }));
82
91
  const inheritedPropertyTypes = collectInheritedPropertyTypes(context, klass);
92
+ const inheritedNames = ancestorClassMethodNames(context, klass);
83
93
  const accessors = [];
84
94
  for (const property of klass.properties) {
85
- const inheritedType = inheritedPropertyTypes.get(toCamelIdentifier(property.name));
95
+ const inheritedTypes = inheritedPropertyTypes.get(toCamelIdentifier(property.name));
86
96
  const accessor = resolveAccessor({
87
97
  context,
88
98
  property,
89
99
  claimedNames,
90
100
  methodByName: scope.methodByName,
91
- inheritedType,
101
+ inheritedTypes,
102
+ inheritedNames,
92
103
  });
93
104
  if (accessor === undefined) {
94
105
  continue;
@@ -116,8 +127,12 @@ const appendInstallMixins = (context, className, implemented) => {
116
127
  return;
117
128
  }
118
129
  context.addRuntimeImport("installMixins");
119
- const makers = implemented.map((ref) => ref.makerRef).join(", ");
120
- context.module.appendRegistration(`installMixins(${className}, [${makers}]);`);
130
+ const makerRefs = implemented.map((ref) => ref.makerRef);
131
+ const localRefs = makerRefs.filter((ref) => !ref.includes("."));
132
+ context.module.appendRegistration(`installMixins(${className}, [${makerRefs.join(", ")}]);`, [
133
+ className,
134
+ ...localRefs,
135
+ ]);
121
136
  };
122
137
  const appendClassRegistrations = (context, klass, className) => {
123
138
  const gtypeExpr = renderSourceGtype(context, klass);
@@ -154,33 +169,40 @@ const interfaceMergeRef = (context, klass, ref) => {
154
169
  klass: ref.interfaceKlass,
155
170
  namespaceName: ref.interfaceNamespace,
156
171
  });
157
- if (omissions.length === 0) {
158
- return ref.typeRef;
159
- }
160
- const keys = omissions.map((name) => JSON.stringify(name)).join(" | ");
161
- return `Omit<${ref.typeRef}, ${keys}>`;
172
+ return omittedTypeRef(ref.typeRef, [...omissions, ...ref.conflicts]);
162
173
  };
163
- const implementedRefFor = (context, name, inherited) => {
174
+ const implementedRefFor = (options) => {
175
+ const { context, klass, name, inherited } = options;
164
176
  const resolved = context.library.resolveType(context.namespace.name, name);
165
- if (resolved?.kind !== "interface") {
177
+ if (resolved?.kind !== "interface" || !isEmittableEntity(resolved.value)) {
166
178
  return undefined;
167
179
  }
168
180
  if (inherited.has(`${resolved.namespace.name}.${resolved.value.name}`)) {
169
181
  return undefined;
170
182
  }
171
- const pascal = pascalCase(resolved.value.name);
183
+ const typeName = sanitizeTypeIdentifier(resolved.value.name);
184
+ const conflictOptions = {
185
+ context,
186
+ klass,
187
+ iface: resolved.value,
188
+ ifaceNamespace: resolved.namespace.name,
189
+ };
190
+ const conflicts = interfaceConflicts(conflictOptions, options.claimed);
191
+ claimInterfaceMembers(conflictOptions, options.claimed);
172
192
  return {
173
- typeRef: context.qualify(resolved.namespace.name, pascal),
174
- makerRef: context.qualify(resolved.namespace.name, `make${pascal}`),
193
+ typeRef: context.qualify(resolved.namespace.name, typeName),
194
+ makerRef: context.qualify(resolved.namespace.name, `make${typeName}`),
175
195
  interfaceKlass: resolved.value,
176
196
  interfaceNamespace: resolved.namespace.name,
197
+ conflicts,
177
198
  };
178
199
  };
179
200
  const resolveImplementedRefs = (context, klass) => {
180
201
  const inherited = inheritedInterfaceKeys(context, klass);
202
+ const claimed = inheritedMembers(context, klass);
181
203
  const refs = [];
182
204
  for (const name of klass.implements) {
183
- const ref = implementedRefFor(context, name, inherited);
205
+ const ref = implementedRefFor({ context, klass, name, inherited, claimed });
184
206
  if (ref !== undefined) {
185
207
  refs.push(ref);
186
208
  }
@@ -191,7 +213,7 @@ const renderExtendsClause = (context, parentExpression, callables) => {
191
213
  if (parentExpression === undefined) {
192
214
  return "";
193
215
  }
194
- const constructorNames = classConstructorMemberNames(context, callables);
216
+ const constructorNames = constructorMemberNames(context, callables.constructors);
195
217
  if (constructorNames.length === 0) {
196
218
  return ` extends ${parentExpression}`;
197
219
  }
@@ -200,11 +222,10 @@ const renderExtendsClause = (context, parentExpression, callables) => {
200
222
  return ` extends (${parentExpression} as StaticBase<typeof ${parentExpression}, ${omitted}>)`;
201
223
  };
202
224
  const resolveParent = (context, klass) => {
203
- if (klass.parent === undefined) {
204
- return undefined;
205
- }
206
- const [namespace, typeName] = splitOptionalNamespace(klass.parent);
207
- return context.qualify(namespace ?? context.namespace.name, pascalCase(typeName));
225
+ const parent = getParentRef(klass);
226
+ return parent === undefined
227
+ ? undefined
228
+ : context.qualify(parent.namespaceName ?? context.namespace.name, sanitizeTypeIdentifier(parent.typeName));
208
229
  };
209
230
  export { generateClass };
210
231
  //# sourceMappingURL=class.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"class.js","sourceRoot":"","sources":["../../../src/store/gi/class.ts"],"names":[],"mappings":"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","sourcesContent":["import { pascalCase, toCamelIdentifier } from \"@gtkx/utils\";\nimport type { GirClass } from \"../../gir/class.js\";\nimport type { GirFunction } from \"../../gir/function.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport {\n collectInheritedMethods,\n collectInheritedPropertyTypes,\n collectInterfaceMergeOmissions,\n conflictRename,\n type InheritedMethods,\n} from \"../../analysis/inheritance.js\";\nimport { ancestorChain, type ResolvedAncestor } from \"../../gir/ancestry.js\";\nimport { splitOptionalNamespace } from \"../../gir/type-ref.js\";\nimport { indentMembers } from \"../../writer/emit.js\";\nimport {\n type Callables,\n classConstructorMemberNames,\n dedupeCallables,\n generateBindings,\n type InstanceScope,\n instanceScope,\n renderClassInstanceMember,\n renderStaticHead,\n} from \"./callables.js\";\nimport { renderClassConstructor, renderConstructorPropsInterface } from \"./constructor-props.js\";\nimport { getDoc } from \"./doc-spec.js\";\nimport { gtypeMemberDeclaration, renderSourceGtype } from \"./gtype-binding.js\";\nimport { methodExportName } from \"./method.js\";\nimport { renderPropertyDeclarations } from \"./properties.js\";\nimport { renderResolvedPropertyAccessor, resolveAccessor, type ResolvedAccessor } from \"./property-accessor.js\";\nimport { appendWrapperClassRegistration } from \"./registration.js\";\nimport { renderSignalDeclarations, renderSignalMembers } from \"./signal.js\";\nimport { renderVfuncMembers, renderVfuncMetadata } from \"./vtable.js\";\n\ntype ImplementedRef = {\n typeRef: string;\n makerRef: string;\n interfaceKlass: GirClass;\n interfaceNamespace: string;\n};\n\ntype MemberDeclarationsOptions = {\n context: ModuleContext;\n klass: GirClass;\n className: string;\n accessors: ResolvedAccessor[];\n implemented: ImplementedRef[];\n};\n\ntype ClassMembers = { members: string[]; accessors: ResolvedAccessor[] };\n\ntype AppendInstanceMethodsOptions = {\n context: ModuleContext;\n methods: GirFunction[];\n scope: InstanceScope;\n inherited: InheritedMethods;\n members: string[];\n claimedNames: Set<string>;\n className: string;\n};\n\nconst generateClass = (context: ModuleContext, klass: GirClass): void => {\n if (!klass.introspectable) {\n return;\n }\n\n if (klass.name.length === 0) {\n return;\n }\n\n const className = pascalCase(klass.name);\n\n const callables: Callables = {\n constructors: dedupeCallables(klass.constructors),\n functions: dedupeCallables(klass.functions),\n methods: dedupeCallables(klass.methods),\n };\n\n generateBindings(context, callables);\n const parentExpression = resolveParent(context, klass);\n const extendsClause = renderExtendsClause(context, parentExpression, callables);\n const implemented = resolveImplementedRefs(context, klass);\n const typeRefs = implemented.map((ref) => ref.typeRef);\n const implementsClause = typeRefs.length === 0 ? \"\" : ` implements ${typeRefs.join(\", \")}`;\n const { members, accessors } = renderClassMembers(context, klass, callables, parentExpression !== undefined);\n const body = indentMembers(members);\n const doc = getDoc(klass);\n\n context.module.appendDeclaration(\n `${doc}export class ${className}${extendsClause}${implementsClause} {\\n${body}\\n}`,\n context.declaredType(className),\n );\n\n context.module.appendDeclaration(renderConstructorPropsInterface(context, klass, className));\n appendMemberDeclarations({ context, klass, className, accessors, implemented });\n appendInstallMixins(context, className, implemented);\n appendClassRegistrations(context, klass, className);\n};\n\nconst appendMemberDeclarations = (options: MemberDeclarationsOptions): void => {\n const { context, klass, className, accessors, implemented } = options;\n\n for (const declaration of renderPropertyDeclarations(context, klass, className, accessors)) {\n context.module.appendDeclaration(declaration);\n }\n\n for (const declaration of renderSignalDeclarations(context, klass, className, false)) {\n context.module.appendDeclaration(declaration);\n }\n\n appendInterfaceMerge(context, klass, className, implemented);\n};\n\nconst appendInterfaceMerge = (\n context: ModuleContext,\n klass: GirClass,\n className: string,\n implemented: ImplementedRef[],\n): void => {\n if (implemented.length === 0) {\n return;\n }\n\n const mergeRefs = implemented.map((ref) => interfaceMergeRef(context, klass, ref));\n context.module.appendDeclaration(`export interface ${className} extends ${mergeRefs.join(\", \")} {}`);\n};\n\nconst renderClassMembers = (\n context: ModuleContext,\n klass: GirClass,\n callables: Callables,\n hasParent: boolean,\n): ClassMembers => {\n const className = pascalCase(klass.name);\n const members: string[] = [gtypeMemberDeclaration(context)];\n const constructorBlock = renderClassConstructor(context, klass, className, hasParent);\n\n if (constructorBlock !== undefined) {\n members.push(constructorBlock);\n }\n\n const claimedNames: Set<string> = new Set();\n members.push(...renderStaticHead(context, callables, className));\n const inherited = collectInheritedMethods(context, klass);\n const scope = instanceScope(className, callables);\n\n appendInstanceMethods({\n context,\n methods: callables.methods,\n scope,\n inherited,\n members,\n claimedNames,\n className,\n });\n\n members.push(...renderVfuncMembers({ context, klass, mode: \"implementation\" }));\n const inheritedPropertyTypes = collectInheritedPropertyTypes(context, klass);\n const accessors: ResolvedAccessor[] = [];\n\n for (const property of klass.properties) {\n const inheritedType = inheritedPropertyTypes.get(toCamelIdentifier(property.name));\n\n const accessor = resolveAccessor({\n context,\n property,\n claimedNames,\n methodByName: scope.methodByName,\n inheritedType,\n });\n\n if (accessor === undefined) {\n continue;\n }\n\n accessors.push(accessor);\n members.push(renderResolvedPropertyAccessor(context, property, accessor));\n }\n\n members.push(...renderSignalMembers(context, klass));\n\n return { members, accessors };\n};\n\nconst appendInstanceMethods = (options: AppendInstanceMethodsOptions): void => {\n const { context, methods, scope, inherited, members, claimedNames, className } = options;\n\n for (const callable of methods) {\n const rename = conflictRename(context, callable, inherited, className);\n const block = renderClassInstanceMember(context, callable, scope, rename);\n\n if (block === undefined) {\n continue;\n }\n\n members.push(block);\n claimedNames.add(rename ?? methodExportName(callable));\n }\n};\n\nconst appendInstallMixins = (context: ModuleContext, className: string, implemented: ImplementedRef[]): void => {\n if (implemented.length === 0) {\n return;\n }\n\n context.addRuntimeImport(\"installMixins\");\n const makers = implemented.map((ref) => ref.makerRef).join(\", \");\n context.module.appendRegistration(`installMixins(${className}, [${makers}]);`);\n};\n\nconst appendClassRegistrations = (context: ModuleContext, klass: GirClass, className: string): void => {\n const gtypeExpr = renderSourceGtype(context, klass);\n\n appendWrapperClassRegistration(context, {\n className,\n gtypeExpr,\n vfuncs: renderVfuncMetadata(context, klass),\n });\n};\n\nconst addAncestorInterfaceKeys = (context: ModuleContext, ancestor: ResolvedAncestor, keys: Set<string>): void => {\n for (const name of ancestor.klass.implements) {\n const resolved = context.library.resolveType(ancestor.namespaceName, name);\n\n if (resolved?.kind === \"interface\") {\n keys.add(`${resolved.namespace.name}.${resolved.value.name}`);\n }\n }\n};\n\nconst inheritedInterfaceKeys = (context: ModuleContext, klass: GirClass): Set<string> => {\n const keys: Set<string> = new Set();\n\n if (klass.parent === undefined) {\n return keys;\n }\n\n const parent = context.library.resolveType(context.namespace.name, klass.parent);\n\n if (parent?.kind !== \"class\") {\n return keys;\n }\n\n for (const ancestor of ancestorChain(context.library, parent.value, parent.namespace.name)) {\n addAncestorInterfaceKeys(context, ancestor, keys);\n }\n\n return keys;\n};\n\nconst interfaceMergeRef = (context: ModuleContext, klass: GirClass, ref: ImplementedRef): string => {\n const omissions = collectInterfaceMergeOmissions(context, klass, {\n klass: ref.interfaceKlass,\n namespaceName: ref.interfaceNamespace,\n });\n\n if (omissions.length === 0) {\n return ref.typeRef;\n }\n\n const keys = omissions.map((name) => JSON.stringify(name)).join(\" | \");\n\n return `Omit<${ref.typeRef}, ${keys}>`;\n};\n\nconst implementedRefFor = (\n context: ModuleContext,\n name: string,\n inherited: Set<string>,\n): ImplementedRef | undefined => {\n const resolved = context.library.resolveType(context.namespace.name, name);\n\n if (resolved?.kind !== \"interface\") {\n return undefined;\n }\n\n if (inherited.has(`${resolved.namespace.name}.${resolved.value.name}`)) {\n return undefined;\n }\n\n const pascal = pascalCase(resolved.value.name);\n\n return {\n typeRef: context.qualify(resolved.namespace.name, pascal),\n makerRef: context.qualify(resolved.namespace.name, `make${pascal}`),\n interfaceKlass: resolved.value,\n interfaceNamespace: resolved.namespace.name,\n };\n};\n\nconst resolveImplementedRefs = (context: ModuleContext, klass: GirClass): ImplementedRef[] => {\n const inherited = inheritedInterfaceKeys(context, klass);\n const refs: ImplementedRef[] = [];\n\n for (const name of klass.implements) {\n const ref = implementedRefFor(context, name, inherited);\n\n if (ref !== undefined) {\n refs.push(ref);\n }\n }\n\n return refs;\n};\n\nconst renderExtendsClause = (\n context: ModuleContext,\n parentExpression: string | undefined,\n callables: Callables,\n): string => {\n if (parentExpression === undefined) {\n return \"\";\n }\n\n const constructorNames = classConstructorMemberNames(context, callables);\n\n if (constructorNames.length === 0) {\n return ` extends ${parentExpression}`;\n }\n\n context.addRuntimeTypeImport(\"StaticBase\");\n const omitted = constructorNames.map((name) => JSON.stringify(name)).join(\" | \");\n\n return ` extends (${parentExpression} as StaticBase<typeof ${parentExpression}, ${omitted}>)`;\n};\n\nconst resolveParent = (context: ModuleContext, klass: GirClass): string | undefined => {\n if (klass.parent === undefined) {\n return undefined;\n }\n\n const [namespace, typeName] = splitOptionalNamespace(klass.parent);\n\n return context.qualify(namespace ?? context.namespace.name, pascalCase(typeName));\n};\n\nexport { generateClass };\n"]}
1
+ {"version":3,"file":"class.js","sourceRoot":"","sources":["../../../src/store/gi/class.ts"],"names":[],"mappings":"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","sourcesContent":["import { sanitizeTypeIdentifier, toCamelIdentifier } from \"@gtkx/utils\";\nimport type { GirClass } from \"../../gir/class.js\";\nimport type { GirFunction } from \"../../gir/function.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport {\n ancestorClassMethodNames,\n collectInheritedMethods,\n collectInheritedPropertyTypes,\n collectInterfaceMergeOmissions,\n conflictRename,\n type InheritedMethods,\n} from \"../../analysis/inheritance.js\";\nimport {\n type ClaimedMembers,\n claimInterfaceMembers,\n inheritedMembers,\n interfaceConflicts,\n omittedTypeRef,\n} from \"../../analysis/interface-conflicts.js\";\nimport { ancestorChain, getParentRef, type ResolvedAncestor } from \"../../gir/ancestry.js\";\nimport { isEmittableEntity } from \"../../gir/emittable.js\";\nimport { indentMembers } from \"../../writer/emit.js\";\nimport {\n type Callables,\n constructorMemberNames,\n dedupeCallables,\n generateBindings,\n type InstanceScope,\n instanceScope,\n renderClassInstanceMember,\n renderStaticHead,\n} from \"./callables.js\";\nimport { renderClassConstructor, renderConstructorPropsInterface } from \"./constructor-props.js\";\nimport { getDoc } from \"./doc-spec.js\";\nimport { gtypeMemberDeclaration, renderSourceGtype } from \"./gtype-binding.js\";\nimport { methodExportName } from \"./method.js\";\nimport { renderPropertyDeclarations } from \"./properties.js\";\nimport { renderResolvedPropertyAccessor, resolveAccessor, type ResolvedAccessor } from \"./property-accessor.js\";\nimport { appendWrapperClassRegistration } from \"./registration.js\";\nimport { renderSignalDeclarations, renderSignalMembers } from \"./signal.js\";\nimport { renderVfuncMembers, renderVfuncMetadata } from \"./vtable.js\";\n\ntype ImplementedRef = {\n typeRef: string;\n makerRef: string;\n interfaceKlass: GirClass;\n interfaceNamespace: string;\n conflicts: string[];\n};\n\ntype MemberDeclarationsOptions = {\n context: ModuleContext;\n klass: GirClass;\n className: string;\n accessors: ResolvedAccessor[];\n implemented: ImplementedRef[];\n};\n\ntype ClassMembers = { members: string[]; accessors: ResolvedAccessor[] };\n\ntype ImplementedRefOptions = {\n context: ModuleContext;\n klass: GirClass;\n name: string;\n inherited: Set<string>;\n claimed: ClaimedMembers;\n};\n\ntype AppendInstanceMethodsOptions = {\n context: ModuleContext;\n methods: GirFunction[];\n scope: InstanceScope;\n inherited: InheritedMethods;\n members: string[];\n claimedNames: Set<string>;\n className: string;\n};\n\nconst generateClass = (context: ModuleContext, klass: GirClass): void => {\n if (!isEmittableEntity(klass)) {\n return;\n }\n\n const className = sanitizeTypeIdentifier(klass.name);\n\n const callables: Callables = {\n constructors: dedupeCallables(klass.constructors),\n functions: dedupeCallables(klass.functions),\n methods: dedupeCallables(klass.methods),\n };\n\n generateBindings(context, callables);\n const parentExpression = resolveParent(context, klass);\n const extendsClause = renderExtendsClause(context, parentExpression, callables);\n const implemented = resolveImplementedRefs(context, klass);\n const typeRefs = implemented.map((ref) => omittedTypeRef(ref.typeRef, ref.conflicts));\n const implementsClause = typeRefs.length === 0 ? \"\" : ` implements ${typeRefs.join(\", \")}`;\n const { members, accessors } = renderClassMembers(context, klass, callables, parentExpression !== undefined);\n const body = indentMembers(members);\n const doc = getDoc(klass);\n const modifier = klass.isAbstract ? \"abstract \" : \"\";\n\n context.declare({\n name: className,\n code: `${doc}export ${modifier}class ${className}${extendsClause}${implementsClause} {\\n${body}\\n}`,\n owner: klass.name,\n });\n\n context.declare({\n name: `${className}ConstructorProps`,\n code: renderConstructorPropsInterface(context, klass, className),\n });\n\n appendMemberDeclarations({ context, klass, className, accessors, implemented });\n appendInstallMixins(context, className, implemented);\n appendClassRegistrations(context, klass, className);\n};\n\nconst appendMemberDeclarations = (options: MemberDeclarationsOptions): void => {\n const { context, klass, className, accessors, implemented } = options;\n\n for (const declaration of renderPropertyDeclarations(context, klass, className, accessors)) {\n context.declare(declaration);\n }\n\n for (const declaration of renderSignalDeclarations(context, klass, className, false)) {\n context.declare(declaration);\n }\n\n appendInterfaceMerge(context, klass, className, implemented);\n};\n\nconst appendInterfaceMerge = (\n context: ModuleContext,\n klass: GirClass,\n className: string,\n implemented: ImplementedRef[],\n): void => {\n if (implemented.length === 0) {\n return;\n }\n\n const mergeRefs = implemented.map((ref) => interfaceMergeRef(context, klass, ref));\n\n context.declare({\n name: className,\n code: `export interface ${className} extends ${mergeRefs.join(\", \")} {}`,\n });\n};\n\nconst renderClassMembers = (\n context: ModuleContext,\n klass: GirClass,\n callables: Callables,\n hasParent: boolean,\n): ClassMembers => {\n const className = sanitizeTypeIdentifier(klass.name);\n const members: string[] = [gtypeMemberDeclaration(context)];\n const constructorBlock = renderClassConstructor(context, klass, className, hasParent);\n\n if (constructorBlock !== undefined) {\n members.push(constructorBlock);\n }\n\n const claimedNames: Set<string> = new Set();\n members.push(...renderStaticHead(context, callables, className));\n const inherited = collectInheritedMethods(context, klass);\n const scope = instanceScope(className, callables);\n\n appendInstanceMethods({\n context,\n methods: callables.methods,\n scope,\n inherited,\n members,\n claimedNames,\n className,\n });\n\n members.push(...renderVfuncMembers({ context, klass, mode: \"implementation\" }));\n const inheritedPropertyTypes = collectInheritedPropertyTypes(context, klass);\n const inheritedNames = ancestorClassMethodNames(context, klass);\n const accessors: ResolvedAccessor[] = [];\n\n for (const property of klass.properties) {\n const inheritedTypes = inheritedPropertyTypes.get(toCamelIdentifier(property.name));\n\n const accessor = resolveAccessor({\n context,\n property,\n claimedNames,\n methodByName: scope.methodByName,\n inheritedTypes,\n inheritedNames,\n });\n\n if (accessor === undefined) {\n continue;\n }\n\n accessors.push(accessor);\n members.push(renderResolvedPropertyAccessor(context, property, accessor));\n }\n\n members.push(...renderSignalMembers(context, klass));\n\n return { members, accessors };\n};\n\nconst appendInstanceMethods = (options: AppendInstanceMethodsOptions): void => {\n const { context, methods, scope, inherited, members, claimedNames, className } = options;\n\n for (const callable of methods) {\n const rename = conflictRename(context, callable, inherited, className);\n const block = renderClassInstanceMember(context, callable, scope, rename);\n\n if (block === undefined) {\n continue;\n }\n\n members.push(block);\n claimedNames.add(rename ?? methodExportName(callable));\n }\n};\n\nconst appendInstallMixins = (context: ModuleContext, className: string, implemented: ImplementedRef[]): void => {\n if (implemented.length === 0) {\n return;\n }\n\n context.addRuntimeImport(\"installMixins\");\n const makerRefs = implemented.map((ref) => ref.makerRef);\n const localRefs = makerRefs.filter((ref) => !ref.includes(\".\"));\n\n context.module.appendRegistration(`installMixins(${className}, [${makerRefs.join(\", \")}]);`, [\n className,\n ...localRefs,\n ]);\n};\n\nconst appendClassRegistrations = (context: ModuleContext, klass: GirClass, className: string): void => {\n const gtypeExpr = renderSourceGtype(context, klass);\n\n appendWrapperClassRegistration(context, {\n className,\n gtypeExpr,\n vfuncs: renderVfuncMetadata(context, klass),\n });\n};\n\nconst addAncestorInterfaceKeys = (context: ModuleContext, ancestor: ResolvedAncestor, keys: Set<string>): void => {\n for (const name of ancestor.klass.implements) {\n const resolved = context.library.resolveType(ancestor.namespaceName, name);\n\n if (resolved?.kind === \"interface\") {\n keys.add(`${resolved.namespace.name}.${resolved.value.name}`);\n }\n }\n};\n\nconst inheritedInterfaceKeys = (context: ModuleContext, klass: GirClass): Set<string> => {\n const keys: Set<string> = new Set();\n\n if (klass.parent === undefined) {\n return keys;\n }\n\n const parent = context.library.resolveType(context.namespace.name, klass.parent);\n\n if (parent?.kind !== \"class\") {\n return keys;\n }\n\n for (const ancestor of ancestorChain(context.library, parent.value, parent.namespace.name)) {\n addAncestorInterfaceKeys(context, ancestor, keys);\n }\n\n return keys;\n};\n\nconst interfaceMergeRef = (context: ModuleContext, klass: GirClass, ref: ImplementedRef): string => {\n const omissions = collectInterfaceMergeOmissions(context, klass, {\n klass: ref.interfaceKlass,\n namespaceName: ref.interfaceNamespace,\n });\n\n return omittedTypeRef(ref.typeRef, [...omissions, ...ref.conflicts]);\n};\n\nconst implementedRefFor = (options: ImplementedRefOptions): ImplementedRef | undefined => {\n const { context, klass, name, inherited } = options;\n const resolved = context.library.resolveType(context.namespace.name, name);\n\n if (resolved?.kind !== \"interface\" || !isEmittableEntity(resolved.value)) {\n return undefined;\n }\n\n if (inherited.has(`${resolved.namespace.name}.${resolved.value.name}`)) {\n return undefined;\n }\n\n const typeName = sanitizeTypeIdentifier(resolved.value.name);\n\n const conflictOptions = {\n context,\n klass,\n iface: resolved.value,\n ifaceNamespace: resolved.namespace.name,\n };\n\n const conflicts = interfaceConflicts(conflictOptions, options.claimed);\n claimInterfaceMembers(conflictOptions, options.claimed);\n\n return {\n typeRef: context.qualify(resolved.namespace.name, typeName),\n makerRef: context.qualify(resolved.namespace.name, `make${typeName}`),\n interfaceKlass: resolved.value,\n interfaceNamespace: resolved.namespace.name,\n conflicts,\n };\n};\n\nconst resolveImplementedRefs = (context: ModuleContext, klass: GirClass): ImplementedRef[] => {\n const inherited = inheritedInterfaceKeys(context, klass);\n const claimed = inheritedMembers(context, klass);\n const refs: ImplementedRef[] = [];\n\n for (const name of klass.implements) {\n const ref = implementedRefFor({ context, klass, name, inherited, claimed });\n\n if (ref !== undefined) {\n refs.push(ref);\n }\n }\n\n return refs;\n};\n\nconst renderExtendsClause = (\n context: ModuleContext,\n parentExpression: string | undefined,\n callables: Callables,\n): string => {\n if (parentExpression === undefined) {\n return \"\";\n }\n\n const constructorNames = constructorMemberNames(context, callables.constructors);\n\n if (constructorNames.length === 0) {\n return ` extends ${parentExpression}`;\n }\n\n context.addRuntimeTypeImport(\"StaticBase\");\n const omitted = constructorNames.map((name) => JSON.stringify(name)).join(\" | \");\n\n return ` extends (${parentExpression} as StaticBase<typeof ${parentExpression}, ${omitted}>)`;\n};\n\nconst resolveParent = (context: ModuleContext, klass: GirClass): string | undefined => {\n const parent = getParentRef(klass);\n\n return parent === undefined\n ? undefined\n : context.qualify(parent.namespaceName ?? context.namespace.name, sanitizeTypeIdentifier(parent.typeName));\n};\n\nexport { generateClass };\n"]}
@@ -1 +1 @@
1
- {"version":3,"file":"companion.d.ts","sourceRoot":"","sources":["../../../src/store/gi/companion.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAG7D,QAAA,MAAM,kBAAkB,GAAI,SAAS,aAAa,EAAE,OAAO,QAAQ,EAAE,QAAQ,MAAM,KAAG,MAAM,GAAG,SAc9F,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
1
+ {"version":3,"file":"companion.d.ts","sourceRoot":"","sources":["../../../src/store/gi/companion.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAG7D,QAAA,MAAM,kBAAkB,GAAI,SAAS,aAAa,EAAE,OAAO,QAAQ,EAAE,QAAQ,MAAM,KAAG,MAAM,GAAG,SAe9F,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
@@ -1,12 +1,12 @@
1
- import { pascalCase } from "@gtkx/utils";
2
- import { splitOptionalNamespace } from "../../gir/type-ref.js";
1
+ import { sanitizeTypeIdentifier } from "@gtkx/utils";
2
+ import { getParentRef } from "../../gir/ancestry.js";
3
3
  const parentCompanionRef = (context, klass, suffix) => {
4
- if (klass.parent === undefined) {
4
+ const parent = getParentRef(klass);
5
+ if (parent === undefined) {
5
6
  return undefined;
6
7
  }
7
- const [parentNamespace, typeName] = splitOptionalNamespace(klass.parent);
8
- const namespaceName = parentNamespace ?? context.namespace.name;
9
- const name = `${pascalCase(typeName)}${suffix}`;
8
+ const namespaceName = parent.namespaceName ?? context.namespace.name;
9
+ const name = `${sanitizeTypeIdentifier(parent.typeName)}${suffix}`;
10
10
  if (namespaceName === context.namespace.name) {
11
11
  return name;
12
12
  }
@@ -1 +1 @@
1
- {"version":3,"file":"companion.js","sourceRoot":"","sources":["../../../src/store/gi/companion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAE/D,MAAM,kBAAkB,GAAG,CAAC,OAAsB,EAAE,KAAe,EAAE,MAAc,EAAsB,EAAE;IACvG,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,GAAG,sBAAsB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACzE,MAAM,aAAa,GAAG,eAAe,IAAI,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;IAChE,MAAM,IAAI,GAAG,GAAG,UAAU,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,CAAC;IAEhD,IAAI,aAAa,KAAK,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,GAAG,OAAO,CAAC,uBAAuB,CAAC,aAAa,CAAC,IAAI,IAAI,EAAE,CAAC;AACvE,CAAC,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,CAAC","sourcesContent":["import { pascalCase } from \"@gtkx/utils\";\nimport type { GirClass } from \"../../gir/class.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { splitOptionalNamespace } from \"../../gir/type-ref.js\";\n\nconst parentCompanionRef = (context: ModuleContext, klass: GirClass, suffix: string): string | undefined => {\n if (klass.parent === undefined) {\n return undefined;\n }\n\n const [parentNamespace, typeName] = splitOptionalNamespace(klass.parent);\n const namespaceName = parentNamespace ?? context.namespace.name;\n const name = `${pascalCase(typeName)}${suffix}`;\n\n if (namespaceName === context.namespace.name) {\n return name;\n }\n\n return `${context.addCrossNamespaceImport(namespaceName)}.${name}`;\n};\n\nexport { parentCompanionRef };\n"]}
1
+ {"version":3,"file":"companion.js","sourceRoot":"","sources":["../../../src/store/gi/companion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAGrD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,kBAAkB,GAAG,CAAC,OAAsB,EAAE,KAAe,EAAE,MAAc,EAAsB,EAAE;IACvG,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;IAEnC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,IAAI,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;IACrE,MAAM,IAAI,GAAG,GAAG,sBAAsB,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,CAAC;IAEnE,IAAI,aAAa,KAAK,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,GAAG,OAAO,CAAC,uBAAuB,CAAC,aAAa,CAAC,IAAI,IAAI,EAAE,CAAC;AACvE,CAAC,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,CAAC","sourcesContent":["import { sanitizeTypeIdentifier } from \"@gtkx/utils\";\nimport type { GirClass } from \"../../gir/class.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { getParentRef } from \"../../gir/ancestry.js\";\n\nconst parentCompanionRef = (context: ModuleContext, klass: GirClass, suffix: string): string | undefined => {\n const parent = getParentRef(klass);\n\n if (parent === undefined) {\n return undefined;\n }\n\n const namespaceName = parent.namespaceName ?? context.namespace.name;\n const name = `${sanitizeTypeIdentifier(parent.typeName)}${suffix}`;\n\n if (namespaceName === context.namespace.name) {\n return name;\n }\n\n return `${context.addCrossNamespaceImport(namespaceName)}.${name}`;\n};\n\nexport { parentCompanionRef };\n"]}
@@ -1 +1 @@
1
- {"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../../src/store/gi/constant.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAG1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAM7D,QAAA,MAAM,gBAAgB,GAAI,SAAS,aAAa,EAAE,UAAU,WAAW,KAAG,IAGzE,CAAC;AAEF,QAAA,MAAM,eAAe,GAAI,SAAS,aAAa,EAAE,UAAU,WAAW,KAAG,MAUxE,CAAC;AA6BF,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,CAAC"}
1
+ {"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../../src/store/gi/constant.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAG1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAO7D,QAAA,MAAM,gBAAgB,GAAI,SAAS,aAAa,EAAE,UAAU,WAAW,KAAG,IAYzE,CAAC;AAEF,QAAA,MAAM,eAAe,GAAI,SAAS,aAAa,EAAE,UAAU,WAAW,KAAG,MAUxE,CAAC;AA6BF,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,CAAC"}
@@ -1,10 +1,18 @@
1
- import { sourceStringLiteral } from "@gtkx/utils";
1
+ import { sanitizeIdentifier, sourceStringLiteral } from "@gtkx/utils";
2
+ import { isEmittableEntity } from "../../gir/emittable.js";
2
3
  import { getDoc } from "./doc-spec.js";
3
4
  const TRUE_VALUES = new Set(["true", "1"]);
4
5
  const BIGINT_CATEGORIES = new Set(["bigint64", "biguint64", "gtype"]);
5
6
  const generateConstant = (context, constant) => {
7
+ if (!isEmittableEntity(constant)) {
8
+ return;
9
+ }
6
10
  const doc = getDoc(constant);
7
- context.module.appendDeclaration(`${doc}export const ${constant.name} = ${constantLiteral(context, constant)};`);
11
+ const name = sanitizeIdentifier(constant.name);
12
+ context.declare({
13
+ name,
14
+ code: `${doc}export const ${name} = ${constantLiteral(context, constant)};`,
15
+ });
8
16
  };
9
17
  const constantLiteral = (context, constant) => {
10
18
  if (hasPrimitiveCategory(context, constant.type, "string")) {
@@ -1 +1 @@
1
- {"version":3,"file":"constant.js","sourceRoot":"","sources":["../../../src/store/gi/constant.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAKlD,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,MAAM,WAAW,GAAgB,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;AACxD,MAAM,iBAAiB,GAA2B,IAAI,GAAG,CAAC,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;AAE9F,MAAM,gBAAgB,GAAG,CAAC,OAAsB,EAAE,QAAqB,EAAQ,EAAE;IAC7E,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC7B,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,GAAG,gBAAgB,QAAQ,CAAC,IAAI,MAAM,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;AACrH,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,OAAsB,EAAE,QAAqB,EAAU,EAAE;IAC9E,IAAI,oBAAoB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC;QACzD,OAAO,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,oBAAoB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,CAAC;QAC1D,OAAO,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IAC9D,CAAC;IAED,OAAO,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AACrD,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,OAAsB,EAAE,QAAqB,EAAU,EAAE;IACrF,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACpC,OAAO,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;AAC5F,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,OAAsB,EAAE,IAAwB,EAAW,EAAE,CACnF,CAAC,GAAG,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,oBAAoB,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;AAE7F,MAAM,oBAAoB,GAAG,CACzB,OAAsB,EACtB,IAAwB,EACxB,QAA2B,EACpB,EAAE;IACT,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACrB,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/C,OAAO,QAAQ,EAAE,IAAI,KAAK,WAAW,IAAI,QAAQ,CAAC,QAAQ,KAAK,QAAQ,CAAC;AAC5E,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAW,EAAE,CAAC,sBAAsB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAExF,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,CAAC","sourcesContent":["import { sourceStringLiteral } from \"@gtkx/utils\";\nimport type { GirConstant } from \"../../gir/namespace.js\";\nimport type { PrimitiveCategory } from \"../../gir/primitives.js\";\nimport type { TypeId } from \"../../gir/type-id.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { getDoc } from \"./doc-spec.js\";\n\nconst TRUE_VALUES: Set<string> = new Set([\"true\", \"1\"]);\nconst BIGINT_CATEGORIES: Set<PrimitiveCategory> = new Set([\"bigint64\", \"biguint64\", \"gtype\"]);\n\nconst generateConstant = (context: ModuleContext, constant: GirConstant): void => {\n const doc = getDoc(constant);\n context.module.appendDeclaration(`${doc}export const ${constant.name} = ${constantLiteral(context, constant)};`);\n};\n\nconst constantLiteral = (context: ModuleContext, constant: GirConstant): string => {\n if (hasPrimitiveCategory(context, constant.type, \"string\")) {\n return sourceStringLiteral(constant.value);\n }\n\n if (hasPrimitiveCategory(context, constant.type, \"boolean\")) {\n return TRUE_VALUES.has(constant.value) ? \"true\" : \"false\";\n }\n\n return numericConstantLiteral(context, constant);\n};\n\nconst numericConstantLiteral = (context: ModuleContext, constant: GirConstant): string => {\n if (!isNumericLiteral(constant.value)) {\n return sourceStringLiteral(constant.value);\n }\n\n return isBigIntConstant(context, constant.type) ? `${constant.value}n` : constant.value;\n};\n\nconst isBigIntConstant = (context: ModuleContext, type: TypeId | undefined): boolean =>\n [...BIGINT_CATEGORIES].some((category) => hasPrimitiveCategory(context, type, category));\n\nconst hasPrimitiveCategory = (\n context: ModuleContext,\n type: TypeId | undefined,\n category: PrimitiveCategory,\n): boolean => {\n if (type === undefined) {\n return false;\n }\n\n const resolved = context.library.typeFor(type);\n\n return resolved?.kind === \"primitive\" && resolved.category === category;\n};\n\nconst isNumericLiteral = (value: string): boolean => /^-?(?:\\d+|\\d*\\.\\d+)$/.test(value);\n\nexport { generateConstant, constantLiteral };\n"]}
1
+ {"version":3,"file":"constant.js","sourceRoot":"","sources":["../../../src/store/gi/constant.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAKtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,MAAM,WAAW,GAAgB,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;AACxD,MAAM,iBAAiB,GAA2B,IAAI,GAAG,CAAC,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;AAE9F,MAAM,gBAAgB,GAAG,CAAC,OAAsB,EAAE,QAAqB,EAAQ,EAAE;IAC7E,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC/B,OAAO;IACX,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC7B,MAAM,IAAI,GAAG,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE/C,OAAO,CAAC,OAAO,CAAC;QACZ,IAAI;QACJ,IAAI,EAAE,GAAG,GAAG,gBAAgB,IAAI,MAAM,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG;KAC9E,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,OAAsB,EAAE,QAAqB,EAAU,EAAE;IAC9E,IAAI,oBAAoB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC;QACzD,OAAO,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,oBAAoB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,CAAC;QAC1D,OAAO,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IAC9D,CAAC;IAED,OAAO,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AACrD,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,OAAsB,EAAE,QAAqB,EAAU,EAAE;IACrF,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACpC,OAAO,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;AAC5F,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,OAAsB,EAAE,IAAwB,EAAW,EAAE,CACnF,CAAC,GAAG,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,oBAAoB,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;AAE7F,MAAM,oBAAoB,GAAG,CACzB,OAAsB,EACtB,IAAwB,EACxB,QAA2B,EACpB,EAAE;IACT,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACrB,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/C,OAAO,QAAQ,EAAE,IAAI,KAAK,WAAW,IAAI,QAAQ,CAAC,QAAQ,KAAK,QAAQ,CAAC;AAC5E,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAW,EAAE,CAAC,sBAAsB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAExF,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,CAAC","sourcesContent":["import { sanitizeIdentifier, sourceStringLiteral } from \"@gtkx/utils\";\nimport type { GirConstant } from \"../../gir/namespace.js\";\nimport type { PrimitiveCategory } from \"../../gir/primitives.js\";\nimport type { TypeId } from \"../../gir/type-id.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { isEmittableEntity } from \"../../gir/emittable.js\";\nimport { getDoc } from \"./doc-spec.js\";\n\nconst TRUE_VALUES: Set<string> = new Set([\"true\", \"1\"]);\nconst BIGINT_CATEGORIES: Set<PrimitiveCategory> = new Set([\"bigint64\", \"biguint64\", \"gtype\"]);\n\nconst generateConstant = (context: ModuleContext, constant: GirConstant): void => {\n if (!isEmittableEntity(constant)) {\n return;\n }\n\n const doc = getDoc(constant);\n const name = sanitizeIdentifier(constant.name);\n\n context.declare({\n name,\n code: `${doc}export const ${name} = ${constantLiteral(context, constant)};`,\n });\n};\n\nconst constantLiteral = (context: ModuleContext, constant: GirConstant): string => {\n if (hasPrimitiveCategory(context, constant.type, \"string\")) {\n return sourceStringLiteral(constant.value);\n }\n\n if (hasPrimitiveCategory(context, constant.type, \"boolean\")) {\n return TRUE_VALUES.has(constant.value) ? \"true\" : \"false\";\n }\n\n return numericConstantLiteral(context, constant);\n};\n\nconst numericConstantLiteral = (context: ModuleContext, constant: GirConstant): string => {\n if (!isNumericLiteral(constant.value)) {\n return sourceStringLiteral(constant.value);\n }\n\n return isBigIntConstant(context, constant.type) ? `${constant.value}n` : constant.value;\n};\n\nconst isBigIntConstant = (context: ModuleContext, type: TypeId | undefined): boolean =>\n [...BIGINT_CATEGORIES].some((category) => hasPrimitiveCategory(context, type, category));\n\nconst hasPrimitiveCategory = (\n context: ModuleContext,\n type: TypeId | undefined,\n category: PrimitiveCategory,\n): boolean => {\n if (type === undefined) {\n return false;\n }\n\n const resolved = context.library.typeFor(type);\n\n return resolved?.kind === \"primitive\" && resolved.category === category;\n};\n\nconst isNumericLiteral = (value: string): boolean => /^-?(?:\\d+|\\d*\\.\\d+)$/.test(value);\n\nexport { generateConstant, constantLiteral };\n"]}
@@ -62,7 +62,7 @@ const renderTranslatingConstructor = (context, props, className) => {
62
62
  context.addRuntimeImport("t");
63
63
  context.addRuntimeImport("registerConstructProperties");
64
64
  const bindings = renderConstructBindings(context, props);
65
- context.module.appendRegistration(`registerConstructProperties(${className}, ${bindings});`);
65
+ context.module.appendRegistration(`registerConstructProperties(${className}, ${bindings});`, [className]);
66
66
  return renderBlock(`constructor(props: ${className}ConstructorProps = {})`, "super(props);");
67
67
  };
68
68
  export { renderConstructorPropsInterface, renderClassConstructor };
@@ -1 +1 @@
1
- {"version":3,"file":"constructor-props.js","sourceRoot":"","sources":["../../../src/store/gi/constructor-props.ts"],"names":[],"mappings":"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","sourcesContent":["import { sourceStringLiteral, toCamelIdentifier, uniqBy } from \"@gtkx/utils\";\nimport type { GirClass } from \"../../gir/class.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { renderDescriptor } from \"../../analysis/descriptor-render.js\";\nimport { collectInterfaceProperties } from \"../../analysis/inheritance.js\";\nimport { renderTsType } from \"../../analysis/ts-type.js\";\nimport { ancestorChain } from \"../../gir/ancestry.js\";\nimport { type GirProperty, isConstructableProperty } from \"../../gir/property.js\";\nimport { renderBlock, renderBraced, renderBracedOrEmpty } from \"../../writer/emit.js\";\nimport { parentCompanionRef } from \"./companion.js\";\nimport { propertyDoc } from \"./property-accessor.js\";\n\nconst constructablePropNames = (klass: GirClass): string[] =>\n klass.properties.filter(isConstructableProperty).map((property) => toCamelIdentifier(property.name));\n\nconst ancestorConstructablePropNames = (context: ModuleContext, klass: GirClass): Set<string> => {\n const names: Set<string> = new Set();\n\n for (const { klass: ancestor } of ancestorChain(context.library, klass, context.namespace.name)) {\n if (ancestor === klass) {\n continue;\n }\n\n for (const name of constructablePropNames(ancestor)) {\n names.add(name);\n }\n }\n\n return names;\n};\n\nconst collectConstructableProps = (context: ModuleContext, klass: GirClass): GirProperty[] => {\n const inherited = ancestorConstructablePropNames(context, klass);\n\n return uniqBy(\n [...klass.properties, ...collectInterfaceProperties(context, klass).map((entry) => entry.property)]\n .filter(isConstructableProperty)\n .filter((property) => !inherited.has(toCamelIdentifier(property.name))),\n (property) => toCamelIdentifier(property.name),\n );\n};\n\nconst renderConstructorPropsInterface = (context: ModuleContext, klass: GirClass, className: string): string => {\n const parentRef = parentCompanionRef(context, klass, \"ConstructorProps\");\n const extendsClause = parentRef === undefined ? \"\" : ` extends ${parentRef}`;\n\n const lines = collectConstructableProps(context, klass).map(\n (property) =>\n `${propertyDoc(property)}${toCamelIdentifier(property.name)}?: ` +\n `${renderTsType(context, property.type, true)} | undefined;`,\n );\n\n return renderBracedOrEmpty(`export interface ${className}ConstructorProps${extendsClause}`, lines.join(\"\\n\"));\n};\n\nconst renderClassConstructor = (\n context: ModuleContext,\n klass: GirClass,\n className: string,\n hasParent: boolean,\n): string | undefined => {\n if (!hasParent) {\n return renderRootConstructor(context);\n }\n\n const props = collectConstructableProps(context, klass);\n\n if (props.length === 0) {\n return undefined;\n }\n\n return renderTranslatingConstructor(context, props, className);\n};\n\nconst renderRootConstructor = (context: ModuleContext): string => {\n context.addRuntimeTypeImport(\"AnyClass\");\n context.addRuntimeImport(\"getClassType\");\n context.addRuntimeImport(\"newObjectWithProperties\");\n const body = \"newObjectWithProperties(getClassType(this.constructor as AnyClass), props, this);\";\n\n return renderBlock(\"constructor(props: object = {})\", body);\n};\n\nconst renderConstructBindings = (context: ModuleContext, props: GirProperty[]): string => {\n const entries = props.map((property) => {\n const descriptor = renderDescriptor(context, property.type, property.transferOwnership);\n const key = sourceStringLiteral(toCamelIdentifier(property.name));\n\n return `${key}: [${sourceStringLiteral(property.name)}, ${descriptor}],`;\n });\n\n return renderBraced(entries.join(\"\\n\"));\n};\n\nconst renderTranslatingConstructor = (context: ModuleContext, props: GirProperty[], className: string): string => {\n context.addRuntimeImport(\"t\");\n context.addRuntimeImport(\"registerConstructProperties\");\n const bindings = renderConstructBindings(context, props);\n context.module.appendRegistration(`registerConstructProperties(${className}, ${bindings});`);\n\n return renderBlock(`constructor(props: ${className}ConstructorProps = {})`, \"super(props);\");\n};\n\nexport { renderConstructorPropsInterface, renderClassConstructor };\n"]}
1
+ {"version":3,"file":"constructor-props.js","sourceRoot":"","sources":["../../../src/store/gi/constructor-props.ts"],"names":[],"mappings":"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","sourcesContent":["import { sourceStringLiteral, toCamelIdentifier, uniqBy } from \"@gtkx/utils\";\nimport type { GirClass } from \"../../gir/class.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { renderDescriptor } from \"../../analysis/descriptor-render.js\";\nimport { collectInterfaceProperties } from \"../../analysis/inheritance.js\";\nimport { renderTsType } from \"../../analysis/ts-type.js\";\nimport { ancestorChain } from \"../../gir/ancestry.js\";\nimport { type GirProperty, isConstructableProperty } from \"../../gir/property.js\";\nimport { renderBlock, renderBraced, renderBracedOrEmpty } from \"../../writer/emit.js\";\nimport { parentCompanionRef } from \"./companion.js\";\nimport { propertyDoc } from \"./property-accessor.js\";\n\nconst constructablePropNames = (klass: GirClass): string[] =>\n klass.properties.filter(isConstructableProperty).map((property) => toCamelIdentifier(property.name));\n\nconst ancestorConstructablePropNames = (context: ModuleContext, klass: GirClass): Set<string> => {\n const names: Set<string> = new Set();\n\n for (const { klass: ancestor } of ancestorChain(context.library, klass, context.namespace.name)) {\n if (ancestor === klass) {\n continue;\n }\n\n for (const name of constructablePropNames(ancestor)) {\n names.add(name);\n }\n }\n\n return names;\n};\n\nconst collectConstructableProps = (context: ModuleContext, klass: GirClass): GirProperty[] => {\n const inherited = ancestorConstructablePropNames(context, klass);\n\n return uniqBy(\n [...klass.properties, ...collectInterfaceProperties(context, klass).map((entry) => entry.property)]\n .filter(isConstructableProperty)\n .filter((property) => !inherited.has(toCamelIdentifier(property.name))),\n (property) => toCamelIdentifier(property.name),\n );\n};\n\nconst renderConstructorPropsInterface = (context: ModuleContext, klass: GirClass, className: string): string => {\n const parentRef = parentCompanionRef(context, klass, \"ConstructorProps\");\n const extendsClause = parentRef === undefined ? \"\" : ` extends ${parentRef}`;\n\n const lines = collectConstructableProps(context, klass).map(\n (property) =>\n `${propertyDoc(property)}${toCamelIdentifier(property.name)}?: ` +\n `${renderTsType(context, property.type, true)} | undefined;`,\n );\n\n return renderBracedOrEmpty(`export interface ${className}ConstructorProps${extendsClause}`, lines.join(\"\\n\"));\n};\n\nconst renderClassConstructor = (\n context: ModuleContext,\n klass: GirClass,\n className: string,\n hasParent: boolean,\n): string | undefined => {\n if (!hasParent) {\n return renderRootConstructor(context);\n }\n\n const props = collectConstructableProps(context, klass);\n\n if (props.length === 0) {\n return undefined;\n }\n\n return renderTranslatingConstructor(context, props, className);\n};\n\nconst renderRootConstructor = (context: ModuleContext): string => {\n context.addRuntimeTypeImport(\"AnyClass\");\n context.addRuntimeImport(\"getClassType\");\n context.addRuntimeImport(\"newObjectWithProperties\");\n const body = \"newObjectWithProperties(getClassType(this.constructor as AnyClass), props, this);\";\n\n return renderBlock(\"constructor(props: object = {})\", body);\n};\n\nconst renderConstructBindings = (context: ModuleContext, props: GirProperty[]): string => {\n const entries = props.map((property) => {\n const descriptor = renderDescriptor(context, property.type, property.transferOwnership);\n const key = sourceStringLiteral(toCamelIdentifier(property.name));\n\n return `${key}: [${sourceStringLiteral(property.name)}, ${descriptor}],`;\n });\n\n return renderBraced(entries.join(\"\\n\"));\n};\n\nconst renderTranslatingConstructor = (context: ModuleContext, props: GirProperty[], className: string): string => {\n context.addRuntimeImport(\"t\");\n context.addRuntimeImport(\"registerConstructProperties\");\n const bindings = renderConstructBindings(context, props);\n context.module.appendRegistration(`registerConstructProperties(${className}, ${bindings});`, [className]);\n\n return renderBlock(`constructor(props: ${className}ConstructorProps = {})`, \"super(props);\");\n};\n\nexport { renderConstructorPropsInterface, renderClassConstructor };\n"]}
@@ -1 +1 @@
1
- {"version":3,"file":"enum.d.ts","sourceRoot":"","sources":["../../../src/store/gi/enum.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAc,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAa7D,QAAA,MAAM,YAAY,GAAI,SAAS,aAAa,EAAE,aAAa,OAAO,KAAG,IAepE,CAAC;AAoDF,QAAA,MAAM,aAAa,GAAI,MAAM,MAAM,KAAG,MAIrC,CAAC;AAYF,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC"}
1
+ {"version":3,"file":"enum.d.ts","sourceRoot":"","sources":["../../../src/store/gi/enum.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAc,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAc7D,QAAA,MAAM,YAAY,GAAI,SAAS,aAAa,EAAE,aAAa,OAAO,KAAG,IAqBpE,CAAC;AA2DF,QAAA,MAAM,aAAa,GAAI,MAAM,MAAM,KAAG,MAIrC,CAAC;AAYF,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC"}
@@ -1,14 +1,17 @@
1
- import { sourceStringLiteral } from "@gtkx/utils";
1
+ import { sanitizeTypeIdentifier, sourceStringLiteral, uniqBy } from "@gtkx/utils";
2
2
  import { hasAnnotations } from "../../gir/annotations.js";
3
+ import { isEmittableEntity } from "../../gir/emittable.js";
3
4
  import { indent } from "../../writer/emit.js";
4
5
  import { getDoc } from "./doc-spec.js";
5
6
  const memberDoc = (member) => getDoc(member);
6
7
  const enumDoc = (enumeration) => getDoc(enumeration);
7
8
  const generateEnum = (context, enumeration) => {
8
- if (!enumeration.introspectable) {
9
+ if (!isEmittableEntity(enumeration)) {
9
10
  return;
10
11
  }
11
- const members = enumeration.members.map((member) => ({ ...member, key: enumMemberKey(member.name) }));
12
+ const members = uniqBy(enumeration.members
13
+ .map((member) => ({ ...member, key: enumMemberKey(member.name) }))
14
+ .filter((member) => member.key.length > 0), (member) => member.key);
12
15
  const errorDomain = enumeration.errorDomain;
13
16
  if (errorDomain !== undefined) {
14
17
  appendErrorDomain(context, enumeration, members, errorDomain);
@@ -24,20 +27,37 @@ const appendErrorDomain = (context, enumeration, members, errorDomain) => {
24
27
  const quarkExpression = renderQuarkExpression(context, errorDomain);
25
28
  const doc = enumDoc(enumeration);
26
29
  const shape = typeFields.length === 0 ? "{}" : `{\n${indent(typeFields.join("\n"), 1)}\n}`;
27
- context.module.appendDeclaration(`${doc}export type ${enumeration.name} = number;`, context.declaredType(enumeration.name));
28
- context.module.appendDeclaration(`${doc}export const ${enumeration.name}: ErrorDomain<${shape}> = ` +
29
- `createErrorDomain(${quarkExpression}, { ${memberEntries.join(", ")} });`);
30
+ const name = sanitizeTypeIdentifier(enumeration.name);
31
+ context.declare({
32
+ name,
33
+ code: `${doc}export type ${name} = number;`,
34
+ owner: enumeration.name,
35
+ });
36
+ context.declare({
37
+ name,
38
+ code: `${doc}export const ${name}: ErrorDomain<${shape}> = ` +
39
+ `createErrorDomain(${quarkExpression}, { ${memberEntries.join(", ")} });`,
40
+ });
30
41
  };
31
42
  const isMemberDocumented = (member) => member.doc !== undefined || hasAnnotations(member.annotations);
32
43
  const appendEnumDeclaration = (context, enumeration, members) => {
33
44
  const doc = enumDoc(enumeration);
45
+ const name = sanitizeTypeIdentifier(enumeration.name);
34
46
  if (members.some((member) => isMemberDocumented(member))) {
35
47
  const blocks = members.map((member) => `${memberDoc(member)}${member.key} = ${member.value},`);
36
- context.module.appendDeclaration(`${doc}export enum ${enumeration.name} {\n${indent(blocks.join("\n"), 1)}\n}`, context.declaredType(enumeration.name));
48
+ context.declare({
49
+ name,
50
+ code: `${doc}export enum ${name} {\n${indent(blocks.join("\n"), 1)}\n}`,
51
+ owner: enumeration.name,
52
+ });
37
53
  return;
38
54
  }
39
55
  const declarations = members.map((member) => `${member.key} = ${member.value}`);
40
- context.module.appendDeclaration(`${doc}export enum ${enumeration.name} { ${declarations.join(", ")} }`, context.declaredType(enumeration.name));
56
+ context.declare({
57
+ name,
58
+ code: `${doc}export enum ${name} { ${declarations.join(", ")} }`,
59
+ owner: enumeration.name,
60
+ });
41
61
  };
42
62
  const enumMemberKey = (name) => {
43
63
  const upper = name.toUpperCase().replaceAll("-", "_");
@@ -1 +1 @@
1
- {"version":3,"file":"enum.js","sourceRoot":"","sources":["../../../src/store/gi/enum.ts"],"names":[],"mappings":"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","sourcesContent":["import { sourceStringLiteral } from \"@gtkx/utils\";\nimport type { EnumMember, GirEnum } from \"../../gir/enum.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { hasAnnotations } from \"../../gir/annotations.js\";\nimport { indent } from \"../../writer/emit.js\";\nimport { getDoc } from \"./doc-spec.js\";\n\ntype KeyedMember = EnumMember & { key: string };\n\nconst memberDoc = (member: KeyedMember): string =>\n getDoc(member);\n\nconst enumDoc = (enumeration: GirEnum): string =>\n getDoc(enumeration);\n\nconst generateEnum = (context: ModuleContext, enumeration: GirEnum): void => {\n if (!enumeration.introspectable) {\n return;\n }\n\n const members = enumeration.members.map((member) => ({ ...member, key: enumMemberKey(member.name) }));\n const errorDomain = enumeration.errorDomain;\n\n if (errorDomain !== undefined) {\n appendErrorDomain(context, enumeration, members, errorDomain);\n\n return;\n }\n\n appendEnumDeclaration(context, enumeration, members);\n};\n\nconst appendErrorDomain = (\n context: ModuleContext,\n enumeration: GirEnum,\n members: KeyedMember[],\n errorDomain: string,\n): void => {\n const memberEntries = members.map((member) => `${member.key}: ${member.value}`);\n const typeFields = members.map((member) => `${memberDoc(member)}${member.key}: number;`);\n context.addRuntimeImport(\"createErrorDomain\");\n context.addRuntimeImport(\"ErrorDomain\");\n const quarkExpression = renderQuarkExpression(context, errorDomain);\n const doc = enumDoc(enumeration);\n const shape = typeFields.length === 0 ? \"{}\" : `{\\n${indent(typeFields.join(\"\\n\"), 1)}\\n}`;\n\n context.module.appendDeclaration(\n `${doc}export type ${enumeration.name} = number;`,\n context.declaredType(enumeration.name),\n );\n\n context.module.appendDeclaration(\n `${doc}export const ${enumeration.name}: ErrorDomain<${shape}> = ` +\n `createErrorDomain(${quarkExpression}, { ${memberEntries.join(\", \")} });`,\n );\n};\n\nconst isMemberDocumented = (member: KeyedMember): boolean =>\n member.doc !== undefined || hasAnnotations(member.annotations);\n\nconst appendEnumDeclaration = (context: ModuleContext, enumeration: GirEnum, members: KeyedMember[]): void => {\n const doc = enumDoc(enumeration);\n\n if (members.some((member) => isMemberDocumented(member))) {\n const blocks = members.map((member) => `${memberDoc(member)}${member.key} = ${member.value},`);\n\n context.module.appendDeclaration(\n `${doc}export enum ${enumeration.name} {\\n${indent(blocks.join(\"\\n\"), 1)}\\n}`,\n context.declaredType(enumeration.name),\n );\n\n return;\n }\n\n const declarations = members.map((member) => `${member.key} = ${member.value}`);\n\n context.module.appendDeclaration(\n `${doc}export enum ${enumeration.name} { ${declarations.join(\", \")} }`,\n context.declaredType(enumeration.name),\n );\n};\n\nconst enumMemberKey = (name: string): string => {\n const upper = name.toUpperCase().replaceAll(\"-\", \"_\");\n\n return /^\\d/.test(upper) ? `_${upper}` : upper;\n};\n\nconst renderQuarkExpression = (context: ModuleContext, errorDomain: string): string => {\n if (context.namespace.name === \"GLib\") {\n return `() => quarkFromString(${sourceStringLiteral(errorDomain)})`;\n }\n\n const alias = context.addCrossNamespaceImport(\"GLib\");\n\n return `() => ${alias}.quarkFromString(${sourceStringLiteral(errorDomain)})`;\n};\n\nexport { generateEnum, enumMemberKey };\n"]}
1
+ {"version":3,"file":"enum.js","sourceRoot":"","sources":["../../../src/store/gi/enum.ts"],"names":[],"mappings":"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","sourcesContent":["import { sanitizeTypeIdentifier, sourceStringLiteral, uniqBy } from \"@gtkx/utils\";\nimport type { EnumMember, GirEnum } from \"../../gir/enum.js\";\nimport type { ModuleContext } from \"../../writer/context.js\";\nimport { hasAnnotations } from \"../../gir/annotations.js\";\nimport { isEmittableEntity } from \"../../gir/emittable.js\";\nimport { indent } from \"../../writer/emit.js\";\nimport { getDoc } from \"./doc-spec.js\";\n\ntype KeyedMember = EnumMember & { key: string };\n\nconst memberDoc = (member: KeyedMember): string =>\n getDoc(member);\n\nconst enumDoc = (enumeration: GirEnum): string =>\n getDoc(enumeration);\n\nconst generateEnum = (context: ModuleContext, enumeration: GirEnum): void => {\n if (!isEmittableEntity(enumeration)) {\n return;\n }\n\n const members = uniqBy(\n enumeration.members\n .map((member) => ({ ...member, key: enumMemberKey(member.name) }))\n .filter((member) => member.key.length > 0),\n (member) => member.key,\n );\n\n const errorDomain = enumeration.errorDomain;\n\n if (errorDomain !== undefined) {\n appendErrorDomain(context, enumeration, members, errorDomain);\n\n return;\n }\n\n appendEnumDeclaration(context, enumeration, members);\n};\n\nconst appendErrorDomain = (\n context: ModuleContext,\n enumeration: GirEnum,\n members: KeyedMember[],\n errorDomain: string,\n): void => {\n const memberEntries = members.map((member) => `${member.key}: ${member.value}`);\n const typeFields = members.map((member) => `${memberDoc(member)}${member.key}: number;`);\n context.addRuntimeImport(\"createErrorDomain\");\n context.addRuntimeImport(\"ErrorDomain\");\n const quarkExpression = renderQuarkExpression(context, errorDomain);\n const doc = enumDoc(enumeration);\n const shape = typeFields.length === 0 ? \"{}\" : `{\\n${indent(typeFields.join(\"\\n\"), 1)}\\n}`;\n const name = sanitizeTypeIdentifier(enumeration.name);\n\n context.declare({\n name,\n code: `${doc}export type ${name} = number;`,\n owner: enumeration.name,\n });\n\n context.declare({\n name,\n code:\n `${doc}export const ${name}: ErrorDomain<${shape}> = ` +\n `createErrorDomain(${quarkExpression}, { ${memberEntries.join(\", \")} });`,\n });\n};\n\nconst isMemberDocumented = (member: KeyedMember): boolean =>\n member.doc !== undefined || hasAnnotations(member.annotations);\n\nconst appendEnumDeclaration = (context: ModuleContext, enumeration: GirEnum, members: KeyedMember[]): void => {\n const doc = enumDoc(enumeration);\n const name = sanitizeTypeIdentifier(enumeration.name);\n\n if (members.some((member) => isMemberDocumented(member))) {\n const blocks = members.map((member) => `${memberDoc(member)}${member.key} = ${member.value},`);\n\n context.declare({\n name,\n code: `${doc}export enum ${name} {\\n${indent(blocks.join(\"\\n\"), 1)}\\n}`,\n owner: enumeration.name,\n });\n\n return;\n }\n\n const declarations = members.map((member) => `${member.key} = ${member.value}`);\n\n context.declare({\n name,\n code: `${doc}export enum ${name} { ${declarations.join(\", \")} }`,\n owner: enumeration.name,\n });\n};\n\nconst enumMemberKey = (name: string): string => {\n const upper = name.toUpperCase().replaceAll(\"-\", \"_\");\n\n return /^\\d/.test(upper) ? `_${upper}` : upper;\n};\n\nconst renderQuarkExpression = (context: ModuleContext, errorDomain: string): string => {\n if (context.namespace.name === \"GLib\") {\n return `() => quarkFromString(${sourceStringLiteral(errorDomain)})`;\n }\n\n const alias = context.addCrossNamespaceImport(\"GLib\");\n\n return `() => ${alias}.quarkFromString(${sourceStringLiteral(errorDomain)})`;\n};\n\nexport { generateEnum, enumMemberKey };\n"]}
@@ -1,9 +1,7 @@
1
1
  import type { GirFunction } from "../../gir/function.js";
2
- import type { GirNamespace } from "../../gir/namespace.js";
3
2
  import type { ModuleContext } from "../../writer/context.js";
4
3
  declare const renderFnExpression: (context: ModuleContext, fn: GirFunction) => string | undefined;
5
4
  declare const generateNamespaceFunction: (context: ModuleContext, fn: GirFunction) => void;
6
5
  declare const namespaceFunctionExportName: (cIdentifier: string, girName: string, symbolPrefixes: string[]) => string;
7
- declare const generateNamespaceBootstrap: (context: ModuleContext, namespace: GirNamespace) => void;
8
- export { renderFnExpression, generateNamespaceFunction, namespaceFunctionExportName, generateNamespaceBootstrap };
6
+ export { renderFnExpression, generateNamespaceFunction, namespaceFunctionExportName };
9
7
  //# sourceMappingURL=function.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"function.d.ts","sourceRoot":"","sources":["../../../src/store/gi/function.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AA6B7D,QAAA,MAAM,kBAAkB,GAAI,SAAS,aAAa,EAAE,IAAI,WAAW,KAAG,MAAM,GAAG,SAgB9E,CAAC;AA2BF,QAAA,MAAM,yBAAyB,GAAI,SAAS,aAAa,EAAE,IAAI,WAAW,KAAG,IAwB5E,CAAC;AAsCF,QAAA,MAAM,2BAA2B,GAAI,aAAa,MAAM,EAAE,SAAS,MAAM,EAAE,gBAAgB,MAAM,EAAE,KAAG,MAQrG,CAAC;AAgCF,QAAA,MAAM,0BAA0B,GAAI,SAAS,aAAa,EAAE,WAAW,YAAY,KAAG,IASrF,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,2BAA2B,EAAE,0BAA0B,EAAE,CAAC"}
1
+ {"version":3,"file":"function.d.ts","sourceRoot":"","sources":["../../../src/store/gi/function.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AA6B7D,QAAA,MAAM,kBAAkB,GAAI,SAAS,aAAa,EAAE,IAAI,WAAW,KAAG,MAAM,GAAG,SAqB9E,CAAC;AA2BF,QAAA,MAAM,yBAAyB,GAAI,SAAS,aAAa,EAAE,IAAI,WAAW,KAAG,IA8B5E,CAAC;AA4CF,QAAA,MAAM,2BAA2B,GAAI,aAAa,MAAM,EAAE,SAAS,MAAM,EAAE,gBAAgB,MAAM,EAAE,KAAG,MAQrG,CAAC;AAiCF,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,2BAA2B,EAAE,CAAC"}