@gtkx/native 1.0.0-rc.4 → 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.
- package/README.md +5 -5
- package/index.d.ts +80 -10
- package/index.js +58 -55
- package/package.json +11 -5
package/README.md
CHANGED
|
@@ -108,7 +108,7 @@ React Native and similar frameworks hide the native toolkit so one API can run e
|
|
|
108
108
|
|
|
109
109
|
### Why Node.js, and why generated bindings
|
|
110
110
|
|
|
111
|
-
GTKX runs on Node.js, which puts native modules, the npm ecosystem, and the tooling built for Node.js APIs within reach. GJS is GNOME's own runtime, built on SpiderMonkey rather than V8; node-gtk runs on Node.js but is lightly maintained, on the older nan/V8 ABI rather than N-API, and still centered on GTK3. The [Why GTKX guide](https://gtkx.dev/guide/why-gtkx) covers
|
|
111
|
+
GTKX runs on Node.js, which puts native modules, the npm ecosystem, and the tooling built for Node.js APIs within reach. GJS is GNOME's own runtime, built on SpiderMonkey rather than V8; node-gtk runs on Node.js but is lightly maintained, on the older nan/V8 ABI rather than N-API, and still centered on GTK3. The [Why GTKX guide](https://gtkx.dev/guide/why-gtkx) covers what running on Node.js means day to day.
|
|
112
112
|
|
|
113
113
|
GTKX generates the TypeScript types and the native FFI calls from the same GObject-Introspection data, so the types cannot drift from the calls they back. Codegen covers the whole GTK4 and Adwaita surface.
|
|
114
114
|
|
|
@@ -121,10 +121,10 @@ GTKX is Linux-only and needs Node.js 24 or later. See [Requirements](#requiremen
|
|
|
121
121
|
Scaffold a new app with the `create-gtkx` initializer:
|
|
122
122
|
|
|
123
123
|
```sh
|
|
124
|
-
npm create gtkx
|
|
124
|
+
npm create gtkx
|
|
125
125
|
```
|
|
126
126
|
|
|
127
|
-
The same command works with other package managers: `pnpm create gtkx
|
|
127
|
+
The same command works with other package managers: `pnpm create gtkx` or `yarn create gtkx`.
|
|
128
128
|
|
|
129
129
|
Then run your new app:
|
|
130
130
|
|
|
@@ -145,7 +145,7 @@ The documentation at **[gtkx.dev](https://gtkx.dev)** includes a step-by-step tu
|
|
|
145
145
|
|
|
146
146
|
GTKX is Linux-only. You need:
|
|
147
147
|
|
|
148
|
-
- Linux with the GTK4 (4.20 or later), Adwaita (1.8 or later)
|
|
148
|
+
- Linux with the GTK4 (4.20 or later) and GLib development libraries, plus Adwaita (1.8 or later) once your project binds `Adw-1`
|
|
149
149
|
- Node.js 24 or later
|
|
150
150
|
|
|
151
151
|
The `@gtkx/native` addon ships prebuilt for x64 and arm64 glibc Linux; other targets need to build it from the GTKX repository, which requires a Rust toolchain.
|
|
@@ -161,7 +161,7 @@ Explore the [example apps](https://github.com/gtkx-org/gtkx/tree/main/examples):
|
|
|
161
161
|
|
|
162
162
|
## Status
|
|
163
163
|
|
|
164
|
-
GTKX
|
|
164
|
+
GTKX is stable and ready for production use.
|
|
165
165
|
|
|
166
166
|
## Contributing
|
|
167
167
|
|
package/index.d.ts
CHANGED
|
@@ -16,7 +16,8 @@ export declare function alloc(size: number, gtype?: bigint | undefined | null):
|
|
|
16
16
|
|
|
17
17
|
/**
|
|
18
18
|
* Container layout used to marshal an array: a plain C `array`, a `glist`, `gslist`, `gptrarray`,
|
|
19
|
-
* `garray`, `gbytearray`, a `sized` buffer,
|
|
19
|
+
* `garray`, `gbytearray`, a `sized` buffer, a `fixed`-length buffer, or a `cursor` pointing into
|
|
20
|
+
* the buffer another argument supplied.
|
|
20
21
|
*/
|
|
21
22
|
export type ArrayKind = 'array'|
|
|
22
23
|
'glist'|
|
|
@@ -25,14 +26,58 @@ export type ArrayKind = 'array'|
|
|
|
25
26
|
'garray'|
|
|
26
27
|
'gbytearray'|
|
|
27
28
|
'sized'|
|
|
28
|
-
'fixed'
|
|
29
|
+
'fixed'|
|
|
30
|
+
'cursor';
|
|
29
31
|
|
|
30
32
|
/**
|
|
31
33
|
* Precompiles the argument and return marshalling of `symbolName` in `sharedLibrary` into a
|
|
32
34
|
* reusable call descriptor that `call` can invoke. The symbol itself is resolved on the first
|
|
33
35
|
* call, so binding a symbol the installed library does not export fails only when it is called.
|
|
36
|
+
*
|
|
37
|
+
* `fixedArgCount` marks the callee as variadic, naming how many of `argDescriptors` precede the
|
|
38
|
+
* ellipsis. Omitting it binds a plain fixed-arity call.
|
|
34
39
|
*/
|
|
35
|
-
export declare function bind(sharedLibrary: string, symbolName: string, argDescriptors: Array<Descriptor>, returnDescriptor: Descriptor): ExternalObject<CallDescriptor>
|
|
40
|
+
export declare function bind(sharedLibrary: string, symbolName: string, argDescriptors: Array<Descriptor>, returnDescriptor: Descriptor, fixedArgCount?: number | undefined | null): ExternalObject<CallDescriptor>
|
|
41
|
+
|
|
42
|
+
/**
|
|
43
|
+
* Precompiles a call to the virtual function slot at `byteOffset` of `instanceType`'s class
|
|
44
|
+
* structure, of the `interfaceType` vtable that class carries, or of `interfaceType`'s own default
|
|
45
|
+
* vtable when no `instanceType` is given, into a reusable call descriptor that `call` can invoke.
|
|
46
|
+
* The slot's function pointer is read on the first call, so a slot the type leaves empty fails
|
|
47
|
+
* only when it is called.
|
|
48
|
+
*/
|
|
49
|
+
export declare function bindVfunc(options: BindVfuncOptions): ExternalObject<CallDescriptor>
|
|
50
|
+
|
|
51
|
+
/**
|
|
52
|
+
* A vtable slot to precompile a call to, together with how its arguments and return value are
|
|
53
|
+
* marshalled. Chain-up binds the slot against the parent type, so the call reaches the
|
|
54
|
+
* implementation the parent provides rather than the override installed on the subclass.
|
|
55
|
+
*/
|
|
56
|
+
export interface BindVfuncOptions {
|
|
57
|
+
/**
|
|
58
|
+
* `GType` whose class structure the slot is read from. Omitted to read the slot out of
|
|
59
|
+
* `interfaceType`'s own default vtable instead, which holds what the interface installs by
|
|
60
|
+
* default and is exactly what a class adopting the interface without filling the slot carries.
|
|
61
|
+
*/
|
|
62
|
+
instanceType?: bigint
|
|
63
|
+
/** `GType` of the interface owning the slot, omitted when the slot lives in the class struct. */
|
|
64
|
+
interfaceType?: bigint
|
|
65
|
+
/** Byte offset of the slot within the class (or interface) struct. */
|
|
66
|
+
byteOffset: number
|
|
67
|
+
/**
|
|
68
|
+
* Byte size of the interface's vtable struct, used to bounds-check `byteOffset`. `g_type_query`
|
|
69
|
+
* reports nothing for an interface type, so the size has to come from the same generated
|
|
70
|
+
* metadata the offsets do, and binding an interface slot without it is rejected. A class slot
|
|
71
|
+
* is bounded by the queried class size instead and does not need it.
|
|
72
|
+
*/
|
|
73
|
+
vtableSize?: number
|
|
74
|
+
/** Name the slot is reported under in error messages, such as `WidgetClass.measure`. */
|
|
75
|
+
label: string
|
|
76
|
+
/** Descriptor for each argument the slot receives, starting with the instance. */
|
|
77
|
+
argDescriptors: Array<Descriptor>
|
|
78
|
+
/** Descriptor for the value the slot returns. */
|
|
79
|
+
returnDescriptor: Descriptor
|
|
80
|
+
}
|
|
36
81
|
|
|
37
82
|
/**
|
|
38
83
|
* Invokes a previously bound native function, encoding `values` and decoding the return value
|
|
@@ -49,7 +94,10 @@ export type CallbackScope = 'call'|
|
|
|
49
94
|
'async'|
|
|
50
95
|
'forever';
|
|
51
96
|
|
|
52
|
-
/**
|
|
97
|
+
/**
|
|
98
|
+
* Copies `size` bytes from the `src` handle's memory into the `dest` handle's memory, rejecting
|
|
99
|
+
* either handle when it points at nothing rather than reading or writing at address zero.
|
|
100
|
+
*/
|
|
53
101
|
export declare function copy(dest: ExternalObject<Handle>, src: ExternalObject<Handle>, size: number): unknown
|
|
54
102
|
|
|
55
103
|
/**
|
|
@@ -73,18 +121,26 @@ export type Descriptor =
|
|
|
73
121
|
| { kind: 'flags', sharedLibrary: string, getTypeFnName: string, isSigned: boolean }
|
|
74
122
|
| { kind: 'boolean' }
|
|
75
123
|
| { kind: 'string', ownership: Ownership, length?: number }
|
|
76
|
-
| { kind: 'object', ownership: Ownership }
|
|
124
|
+
| { kind: 'object', ownership: Ownership, isCallScoped?: boolean }
|
|
77
125
|
| { kind: 'unichar' }
|
|
78
126
|
| { kind: 'void' }
|
|
79
127
|
| { kind: 'buffer' }
|
|
80
128
|
| { kind: 'boxed', ownership: Ownership, typeName: string, sharedLibrary?: string, getTypeFnName?: string, freeFnName?: string, isCallerAllocated?: boolean, size?: number, isInline?: boolean }
|
|
81
129
|
| { kind: 'struct', ownership: Ownership, size?: number, isCallerAllocated?: boolean, isInline?: boolean }
|
|
82
130
|
| { kind: 'fundamental', ownership: Ownership, sharedLibrary: string, refFnName: string, unrefFnName: string, typeName?: string, isInline?: boolean }
|
|
83
|
-
| { kind: 'array', itemDescriptor: Descriptor, arrayKind: ArrayKind, ownership: Ownership, sizeParamIndex?: number, fixedSize?: number, elementSize?: number }
|
|
131
|
+
| { kind: 'array', itemDescriptor: Descriptor, arrayKind: ArrayKind, ownership: Ownership, baseParamIndex?: number, sizeParamIndex?: number, fixedSize?: number, elementSize?: number }
|
|
84
132
|
| { kind: 'hashtable', keyDescriptor: Descriptor, valueDescriptor: Descriptor, ownership: Ownership }
|
|
85
|
-
| { kind: 'callback', argDescriptors: Array<Descriptor>, returnDescriptor: Descriptor, hasDestroy?: boolean, userDataIndex?: number, scope?: CallbackScope }
|
|
133
|
+
| { kind: 'callback', argDescriptors: Array<Descriptor>, returnDescriptor: Descriptor, hasDestroy?: boolean, destroyKind?: DestroyNotifyKind, hasUserData?: boolean, userDataIndex?: number, scope?: CallbackScope }
|
|
86
134
|
| { kind: 'ref', innerDescriptor: Descriptor, inout?: boolean }
|
|
87
135
|
|
|
136
|
+
/**
|
|
137
|
+
* Signature of the destroy the callee is handed: `destroyNotify` is a `GDestroyNotify`, taking the
|
|
138
|
+
* user data alone, and `closureNotify` is a `GClosureNotify`, taking the user data and the
|
|
139
|
+
* `GClosure` being finalized.
|
|
140
|
+
*/
|
|
141
|
+
export type DestroyNotifyKind = 'destroyNotify'|
|
|
142
|
+
'closureNotify';
|
|
143
|
+
|
|
88
144
|
/**
|
|
89
145
|
* Returns the `GType` of the `GObject` referenced by `handle`, or 0 when the handle does not
|
|
90
146
|
* reference a `GObject`.
|
|
@@ -109,6 +165,15 @@ export declare function init(): void
|
|
|
109
165
|
*/
|
|
110
166
|
export declare function keepAlive(enable: boolean): void
|
|
111
167
|
|
|
168
|
+
/**
|
|
169
|
+
* Constructs a new instance of `gtype` with the given construct properties and binds `wrapper` to
|
|
170
|
+
* it by calling `associate` with the instance's handle and the wrapper. A type registered through
|
|
171
|
+
* `registerClass` binds them from its `instance_init`, before `constructed` runs, so a
|
|
172
|
+
* `constructed` override already sees a fully usable wrapper; any other type binds them once
|
|
173
|
+
* construction has returned.
|
|
174
|
+
*/
|
|
175
|
+
export declare function newObject(gtype: bigint, names: Array<string>, values: ExternalObject<Handle>[], wrapper: object, associate: (handle: ExternalObject<Handle>, wrapper: object) => void): void
|
|
176
|
+
|
|
112
177
|
/**
|
|
113
178
|
* Ownership transfer mode for a marshalled value: `borrowed` leaves the native side owning it,
|
|
114
179
|
* `full` transfers ownership (and the responsibility to free it) across the FFI boundary.
|
|
@@ -121,7 +186,9 @@ export declare function quit(): void
|
|
|
121
186
|
|
|
122
187
|
/**
|
|
123
188
|
* Reads and decodes a value at `offset` bytes into the handle's memory, using `fieldDescriptor`
|
|
124
|
-
* to interpret the raw bytes
|
|
189
|
+
* to interpret the raw bytes, and rejects a handle that points at nothing rather than reading at
|
|
190
|
+
* the bare offset. A value the descriptor marks as stored inline decodes to a handle aliasing the
|
|
191
|
+
* owner's memory, so writing one of its own fields reaches the owner.
|
|
125
192
|
*/
|
|
126
193
|
export declare function read(handle: ExternalObject<Handle>, fieldDescriptor: Descriptor, offset: number): unknown
|
|
127
194
|
|
|
@@ -138,7 +205,7 @@ export interface RegisterClassInterface {
|
|
|
138
205
|
/**
|
|
139
206
|
* Byte size of the interface's vtable struct, used to bounds-check each vfunc's `byteOffset`.
|
|
140
207
|
* `g_type_query` reports nothing for an interface type, so the size has to come from the same
|
|
141
|
-
* generated metadata the offsets do
|
|
208
|
+
* generated metadata the offsets do, and an interface declaring vfuncs is rejected without it.
|
|
142
209
|
*/
|
|
143
210
|
vtableSize?: number
|
|
144
211
|
/** Interface vfunc implementations to install. */
|
|
@@ -190,5 +257,8 @@ export declare function resolveType(sharedLibrary: string, getTypeFnName: string
|
|
|
190
257
|
*/
|
|
191
258
|
export declare function setWrapper(handle: ExternalObject<Handle>, wrapper: object): void
|
|
192
259
|
|
|
193
|
-
/**
|
|
260
|
+
/**
|
|
261
|
+
* Encodes `value` with `fieldDescriptor` and writes it into the handle's memory at `offset` bytes,
|
|
262
|
+
* rejecting a handle that points at nothing rather than writing at the bare offset.
|
|
263
|
+
*/
|
|
194
264
|
export declare function write(handle: ExternalObject<Handle>, fieldDescriptor: Descriptor, offset: number, value: unknown): unknown
|
package/index.js
CHANGED
|
@@ -81,8 +81,8 @@ function requireNative() {
|
|
|
81
81
|
try {
|
|
82
82
|
const binding = require('@gtkx/native-android-arm64')
|
|
83
83
|
const bindingPackageVersion = require('@gtkx/native-android-arm64/package.json').version
|
|
84
|
-
if (bindingPackageVersion !== '1.
|
|
85
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
84
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
85
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
86
86
|
}
|
|
87
87
|
return binding
|
|
88
88
|
} catch (e) {
|
|
@@ -97,8 +97,8 @@ function requireNative() {
|
|
|
97
97
|
try {
|
|
98
98
|
const binding = require('@gtkx/native-android-arm-eabi')
|
|
99
99
|
const bindingPackageVersion = require('@gtkx/native-android-arm-eabi/package.json').version
|
|
100
|
-
if (bindingPackageVersion !== '1.
|
|
101
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
100
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
101
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
102
102
|
}
|
|
103
103
|
return binding
|
|
104
104
|
} catch (e) {
|
|
@@ -118,8 +118,8 @@ function requireNative() {
|
|
|
118
118
|
try {
|
|
119
119
|
const binding = require('@gtkx/native-win32-x64-gnu')
|
|
120
120
|
const bindingPackageVersion = require('@gtkx/native-win32-x64-gnu/package.json').version
|
|
121
|
-
if (bindingPackageVersion !== '1.
|
|
122
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
121
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
122
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
123
123
|
}
|
|
124
124
|
return binding
|
|
125
125
|
} catch (e) {
|
|
@@ -134,8 +134,8 @@ function requireNative() {
|
|
|
134
134
|
try {
|
|
135
135
|
const binding = require('@gtkx/native-win32-x64-msvc')
|
|
136
136
|
const bindingPackageVersion = require('@gtkx/native-win32-x64-msvc/package.json').version
|
|
137
|
-
if (bindingPackageVersion !== '1.
|
|
138
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
137
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
138
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
139
139
|
}
|
|
140
140
|
return binding
|
|
141
141
|
} catch (e) {
|
|
@@ -151,8 +151,8 @@ function requireNative() {
|
|
|
151
151
|
try {
|
|
152
152
|
const binding = require('@gtkx/native-win32-ia32-msvc')
|
|
153
153
|
const bindingPackageVersion = require('@gtkx/native-win32-ia32-msvc/package.json').version
|
|
154
|
-
if (bindingPackageVersion !== '1.
|
|
155
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
154
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
155
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
156
156
|
}
|
|
157
157
|
return binding
|
|
158
158
|
} catch (e) {
|
|
@@ -167,8 +167,8 @@ function requireNative() {
|
|
|
167
167
|
try {
|
|
168
168
|
const binding = require('@gtkx/native-win32-arm64-msvc')
|
|
169
169
|
const bindingPackageVersion = require('@gtkx/native-win32-arm64-msvc/package.json').version
|
|
170
|
-
if (bindingPackageVersion !== '1.
|
|
171
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
170
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
171
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
172
172
|
}
|
|
173
173
|
return binding
|
|
174
174
|
} catch (e) {
|
|
@@ -186,8 +186,8 @@ function requireNative() {
|
|
|
186
186
|
try {
|
|
187
187
|
const binding = require('@gtkx/native-darwin-universal')
|
|
188
188
|
const bindingPackageVersion = require('@gtkx/native-darwin-universal/package.json').version
|
|
189
|
-
if (bindingPackageVersion !== '1.
|
|
190
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
189
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
190
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
191
191
|
}
|
|
192
192
|
return binding
|
|
193
193
|
} catch (e) {
|
|
@@ -202,8 +202,8 @@ function requireNative() {
|
|
|
202
202
|
try {
|
|
203
203
|
const binding = require('@gtkx/native-darwin-x64')
|
|
204
204
|
const bindingPackageVersion = require('@gtkx/native-darwin-x64/package.json').version
|
|
205
|
-
if (bindingPackageVersion !== '1.
|
|
206
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
205
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
206
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
207
207
|
}
|
|
208
208
|
return binding
|
|
209
209
|
} catch (e) {
|
|
@@ -218,8 +218,8 @@ function requireNative() {
|
|
|
218
218
|
try {
|
|
219
219
|
const binding = require('@gtkx/native-darwin-arm64')
|
|
220
220
|
const bindingPackageVersion = require('@gtkx/native-darwin-arm64/package.json').version
|
|
221
|
-
if (bindingPackageVersion !== '1.
|
|
222
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
221
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
222
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
223
223
|
}
|
|
224
224
|
return binding
|
|
225
225
|
} catch (e) {
|
|
@@ -238,8 +238,8 @@ function requireNative() {
|
|
|
238
238
|
try {
|
|
239
239
|
const binding = require('@gtkx/native-freebsd-x64')
|
|
240
240
|
const bindingPackageVersion = require('@gtkx/native-freebsd-x64/package.json').version
|
|
241
|
-
if (bindingPackageVersion !== '1.
|
|
242
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
241
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
242
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
243
243
|
}
|
|
244
244
|
return binding
|
|
245
245
|
} catch (e) {
|
|
@@ -254,8 +254,8 @@ function requireNative() {
|
|
|
254
254
|
try {
|
|
255
255
|
const binding = require('@gtkx/native-freebsd-arm64')
|
|
256
256
|
const bindingPackageVersion = require('@gtkx/native-freebsd-arm64/package.json').version
|
|
257
|
-
if (bindingPackageVersion !== '1.
|
|
258
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
257
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
258
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
259
259
|
}
|
|
260
260
|
return binding
|
|
261
261
|
} catch (e) {
|
|
@@ -275,8 +275,8 @@ function requireNative() {
|
|
|
275
275
|
try {
|
|
276
276
|
const binding = require('@gtkx/native-linux-x64-musl')
|
|
277
277
|
const bindingPackageVersion = require('@gtkx/native-linux-x64-musl/package.json').version
|
|
278
|
-
if (bindingPackageVersion !== '1.
|
|
279
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
278
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
279
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
280
280
|
}
|
|
281
281
|
return binding
|
|
282
282
|
} catch (e) {
|
|
@@ -291,8 +291,8 @@ function requireNative() {
|
|
|
291
291
|
try {
|
|
292
292
|
const binding = require('@gtkx/native-linux-x64-gnu')
|
|
293
293
|
const bindingPackageVersion = require('@gtkx/native-linux-x64-gnu/package.json').version
|
|
294
|
-
if (bindingPackageVersion !== '1.
|
|
295
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
294
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
295
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
296
296
|
}
|
|
297
297
|
return binding
|
|
298
298
|
} catch (e) {
|
|
@@ -309,8 +309,8 @@ function requireNative() {
|
|
|
309
309
|
try {
|
|
310
310
|
const binding = require('@gtkx/native-linux-arm64-musl')
|
|
311
311
|
const bindingPackageVersion = require('@gtkx/native-linux-arm64-musl/package.json').version
|
|
312
|
-
if (bindingPackageVersion !== '1.
|
|
313
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
312
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
313
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
314
314
|
}
|
|
315
315
|
return binding
|
|
316
316
|
} catch (e) {
|
|
@@ -325,8 +325,8 @@ function requireNative() {
|
|
|
325
325
|
try {
|
|
326
326
|
const binding = require('@gtkx/native-linux-arm64-gnu')
|
|
327
327
|
const bindingPackageVersion = require('@gtkx/native-linux-arm64-gnu/package.json').version
|
|
328
|
-
if (bindingPackageVersion !== '1.
|
|
329
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
328
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
329
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
330
330
|
}
|
|
331
331
|
return binding
|
|
332
332
|
} catch (e) {
|
|
@@ -343,8 +343,8 @@ function requireNative() {
|
|
|
343
343
|
try {
|
|
344
344
|
const binding = require('@gtkx/native-linux-arm-musleabihf')
|
|
345
345
|
const bindingPackageVersion = require('@gtkx/native-linux-arm-musleabihf/package.json').version
|
|
346
|
-
if (bindingPackageVersion !== '1.
|
|
347
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
346
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
347
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
348
348
|
}
|
|
349
349
|
return binding
|
|
350
350
|
} catch (e) {
|
|
@@ -359,8 +359,8 @@ function requireNative() {
|
|
|
359
359
|
try {
|
|
360
360
|
const binding = require('@gtkx/native-linux-arm-gnueabihf')
|
|
361
361
|
const bindingPackageVersion = require('@gtkx/native-linux-arm-gnueabihf/package.json').version
|
|
362
|
-
if (bindingPackageVersion !== '1.
|
|
363
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
362
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
363
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
364
364
|
}
|
|
365
365
|
return binding
|
|
366
366
|
} catch (e) {
|
|
@@ -377,8 +377,8 @@ function requireNative() {
|
|
|
377
377
|
try {
|
|
378
378
|
const binding = require('@gtkx/native-linux-loong64-musl')
|
|
379
379
|
const bindingPackageVersion = require('@gtkx/native-linux-loong64-musl/package.json').version
|
|
380
|
-
if (bindingPackageVersion !== '1.
|
|
381
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
380
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
381
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
382
382
|
}
|
|
383
383
|
return binding
|
|
384
384
|
} catch (e) {
|
|
@@ -393,8 +393,8 @@ function requireNative() {
|
|
|
393
393
|
try {
|
|
394
394
|
const binding = require('@gtkx/native-linux-loong64-gnu')
|
|
395
395
|
const bindingPackageVersion = require('@gtkx/native-linux-loong64-gnu/package.json').version
|
|
396
|
-
if (bindingPackageVersion !== '1.
|
|
397
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
396
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
397
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
398
398
|
}
|
|
399
399
|
return binding
|
|
400
400
|
} catch (e) {
|
|
@@ -411,8 +411,8 @@ function requireNative() {
|
|
|
411
411
|
try {
|
|
412
412
|
const binding = require('@gtkx/native-linux-riscv64-musl')
|
|
413
413
|
const bindingPackageVersion = require('@gtkx/native-linux-riscv64-musl/package.json').version
|
|
414
|
-
if (bindingPackageVersion !== '1.
|
|
415
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
414
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
415
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
416
416
|
}
|
|
417
417
|
return binding
|
|
418
418
|
} catch (e) {
|
|
@@ -427,8 +427,8 @@ function requireNative() {
|
|
|
427
427
|
try {
|
|
428
428
|
const binding = require('@gtkx/native-linux-riscv64-gnu')
|
|
429
429
|
const bindingPackageVersion = require('@gtkx/native-linux-riscv64-gnu/package.json').version
|
|
430
|
-
if (bindingPackageVersion !== '1.
|
|
431
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
430
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
431
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
432
432
|
}
|
|
433
433
|
return binding
|
|
434
434
|
} catch (e) {
|
|
@@ -444,8 +444,8 @@ function requireNative() {
|
|
|
444
444
|
try {
|
|
445
445
|
const binding = require('@gtkx/native-linux-ppc64-gnu')
|
|
446
446
|
const bindingPackageVersion = require('@gtkx/native-linux-ppc64-gnu/package.json').version
|
|
447
|
-
if (bindingPackageVersion !== '1.
|
|
448
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
447
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
448
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
449
449
|
}
|
|
450
450
|
return binding
|
|
451
451
|
} catch (e) {
|
|
@@ -460,8 +460,8 @@ function requireNative() {
|
|
|
460
460
|
try {
|
|
461
461
|
const binding = require('@gtkx/native-linux-s390x-gnu')
|
|
462
462
|
const bindingPackageVersion = require('@gtkx/native-linux-s390x-gnu/package.json').version
|
|
463
|
-
if (bindingPackageVersion !== '1.
|
|
464
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
463
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
464
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
465
465
|
}
|
|
466
466
|
return binding
|
|
467
467
|
} catch (e) {
|
|
@@ -480,8 +480,8 @@ function requireNative() {
|
|
|
480
480
|
try {
|
|
481
481
|
const binding = require('@gtkx/native-openharmony-arm64')
|
|
482
482
|
const bindingPackageVersion = require('@gtkx/native-openharmony-arm64/package.json').version
|
|
483
|
-
if (bindingPackageVersion !== '1.
|
|
484
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
483
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
484
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
485
485
|
}
|
|
486
486
|
return binding
|
|
487
487
|
} catch (e) {
|
|
@@ -496,8 +496,8 @@ function requireNative() {
|
|
|
496
496
|
try {
|
|
497
497
|
const binding = require('@gtkx/native-openharmony-x64')
|
|
498
498
|
const bindingPackageVersion = require('@gtkx/native-openharmony-x64/package.json').version
|
|
499
|
-
if (bindingPackageVersion !== '1.
|
|
500
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
499
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
500
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
501
501
|
}
|
|
502
502
|
return binding
|
|
503
503
|
} catch (e) {
|
|
@@ -512,8 +512,8 @@ function requireNative() {
|
|
|
512
512
|
try {
|
|
513
513
|
const binding = require('@gtkx/native-openharmony-arm')
|
|
514
514
|
const bindingPackageVersion = require('@gtkx/native-openharmony-arm/package.json').version
|
|
515
|
-
if (bindingPackageVersion !== '1.
|
|
516
|
-
throw new Error(`Native binding package version mismatch, expected 1.
|
|
515
|
+
if (bindingPackageVersion !== '1.1.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
516
|
+
throw new Error(`Native binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
517
517
|
}
|
|
518
518
|
return binding
|
|
519
519
|
} catch (e) {
|
|
@@ -652,8 +652,8 @@ if (!nativeBinding || forceWasi) {
|
|
|
652
652
|
if (!candidateFailed) {
|
|
653
653
|
if (process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
654
654
|
const bindingPackageVersion = require('@gtkx/native-wasm32-wasi/package.json').version
|
|
655
|
-
if (bindingPackageVersion !== '1.
|
|
656
|
-
throw new Error(`WASI binding package version mismatch, expected 1.
|
|
655
|
+
if (bindingPackageVersion !== '1.1.0') {
|
|
656
|
+
throw new Error(`WASI binding package version mismatch, expected 1.1.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
657
657
|
}
|
|
658
658
|
}
|
|
659
659
|
wasiBinding = require('@gtkx/native-wasm32-wasi')
|
|
@@ -703,17 +703,20 @@ if (!nativeBinding) {
|
|
|
703
703
|
throw new Error(`Failed to load native binding`)
|
|
704
704
|
}
|
|
705
705
|
|
|
706
|
-
const { alloc, ArrayKind, bind, call, CallbackScope, copy, getType, getWrapper, init, keepAlive, Ownership, quit, read, registerClass, resolveType, setWrapper, write } = nativeBinding
|
|
706
|
+
const { alloc, ArrayKind, bind, bindVfunc, call, CallbackScope, copy, DestroyNotifyKind, getType, getWrapper, init, keepAlive, newObject, Ownership, quit, read, registerClass, resolveType, setWrapper, write } = nativeBinding
|
|
707
707
|
export { alloc }
|
|
708
708
|
export { ArrayKind }
|
|
709
709
|
export { bind }
|
|
710
|
+
export { bindVfunc }
|
|
710
711
|
export { call }
|
|
711
712
|
export { CallbackScope }
|
|
712
713
|
export { copy }
|
|
714
|
+
export { DestroyNotifyKind }
|
|
713
715
|
export { getType }
|
|
714
716
|
export { getWrapper }
|
|
715
717
|
export { init }
|
|
716
718
|
export { keepAlive }
|
|
719
|
+
export { newObject }
|
|
717
720
|
export { Ownership }
|
|
718
721
|
export { quit }
|
|
719
722
|
export { read }
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gtkx/native",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.1.0",
|
|
4
4
|
"description": "Rust addon under GTKX that loads shared libraries, marshals values, and tracks GObject handles",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"gtkx",
|
|
@@ -73,6 +73,12 @@
|
|
|
73
73
|
]
|
|
74
74
|
},
|
|
75
75
|
"targets": {
|
|
76
|
+
"lint": {
|
|
77
|
+
"options": {
|
|
78
|
+
"cwd": ".",
|
|
79
|
+
"command": "eslint {projectRoot}"
|
|
80
|
+
}
|
|
81
|
+
},
|
|
76
82
|
"build": {
|
|
77
83
|
"dependsOn": [],
|
|
78
84
|
"cache": true,
|
|
@@ -168,16 +174,16 @@
|
|
|
168
174
|
"node": ">=24"
|
|
169
175
|
},
|
|
170
176
|
"devDependencies": {
|
|
171
|
-
"@napi-rs/cli": "^3.8.
|
|
177
|
+
"@napi-rs/cli": "^3.8.6"
|
|
172
178
|
},
|
|
173
179
|
"optionalDependencies": {
|
|
174
|
-
"@gtkx/native-linux-arm64-gnu": "1.
|
|
175
|
-
"@gtkx/native-linux-x64-gnu": "1.
|
|
180
|
+
"@gtkx/native-linux-arm64-gnu": "1.1.0",
|
|
181
|
+
"@gtkx/native-linux-x64-gnu": "1.1.0"
|
|
176
182
|
},
|
|
177
183
|
"scripts": {
|
|
178
184
|
"artifacts": "napi artifacts",
|
|
179
185
|
"build": "napi build --platform --release --esm --no-dts-cache --no-const-enum",
|
|
180
|
-
"coverage": "mkdir -p coverage && tsx ../../scripts/run-headless.ts cargo +nightly llvm-cov --lcov --output-path coverage/native.lcov.info --fail-under-lines 70 -- --test-threads=1",
|
|
186
|
+
"coverage": "mkdir -p coverage && tsx ../../scripts/coverage-target.ts && tsx ../../scripts/run-headless.ts cargo +nightly llvm-cov --lcov --output-path coverage/native.lcov.info --fail-under-lines 70 -- --test-threads=1",
|
|
181
187
|
"create-npm-dirs": "napi create-npm-dirs",
|
|
182
188
|
"lint:rust": "tsx ../../scripts/cargo-nightly.ts fmt --check && cargo clippy --all-targets -- -D warnings",
|
|
183
189
|
"test:asan": "RUSTFLAGS=\"-Zsanitizer=address\" ASAN_OPTIONS=\"detect_leaks=1:abort_on_error=1:detect_stack_use_after_return=1\" tsx ../../scripts/run-headless.ts cargo +nightly test --target x86_64-unknown-linux-gnu -- --test-threads=1",
|