node-firebird-native-api 3.1.0 → 3.1.2

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 CHANGED
@@ -3,8 +3,7 @@
3
3
 
4
4
  # Firebird low-level API for Node.js / TypeScript
5
5
 
6
- This project currently is a working in progress to have full Firebird API definitions for Node.js. It's currently not recommended to be used
7
- directly.
6
+ This project maps the Firebird low-level OO-API to Node.js and it's not recommended to be used directly.
8
7
 
9
8
  ## High-level native client
10
9
 
@@ -14,12 +13,15 @@ https://github.com/asfernandes/node-firebird-drivers/tree/master/packages/node-f
14
13
 
15
14
  ## Installation
16
15
 
16
+ ```sh
17
17
  yarn add node-firebird-native-api
18
+ ```
18
19
 
19
20
  # Donation
20
21
 
21
22
  If this project help you reduce time to develop, you can show your appreciation with a donation.
22
23
 
23
- [![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=X3JMTGW92LQEL)
24
-
25
- BTC: 1Q1W3tLD1xbk81kTeFqobiyrEXcKN1GfHG
24
+ - GitHub Sponsor: https://github.com/sponsors/asfernandes
25
+ - Pix (Brazil): 278dd4e5-8226-494d-93a9-f3fb8a027a99
26
+ - BTC: 1Q1W3tLD1xbk81kTeFqobiyrEXcKN1GfHG
27
+ - [![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=X3JMTGW92LQEL)
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.patch = void 0;
3
+ exports.patch = patch;
4
4
  const interfaceConfig = {
5
5
  Util: {
6
6
  deleteMethods: [
@@ -181,5 +181,4 @@ function patch(library) {
181
181
  library.interfacesByName.Util.methodsByName.encodeDate.returnType.name = 'int';
182
182
  library.interfacesByName.Util.methodsByName.encodeTime.returnType.name = 'int';
183
183
  }
184
- exports.patch = patch;
185
184
  //# sourceMappingURL=patch.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"patch.js","sourceRoot":"","sources":["../../src/generate-files/patch.ts"],"names":[],"mappings":";;;AAUA,MAAM,eAAe,GAAoB;IACxC,IAAI,EAAE;QACL,aAAa,EAAE;YACd,UAAU;YACV,UAAU;YACV,iBAAiB;YACjB,cAAc;SACd;KACD;IAED,SAAS,EAAE,EACV;IAED,MAAM,EAAE;QACP,aAAa,EAAE;YACd,WAAW;YACX,aAAa;YACb,WAAW;YACX,YAAY;YACZ,aAAa;YACb,cAAc;SACd;KACD;IAED,UAAU,EAAE;QACX,aAAa,EAAE;YACd,UAAU;YACV,UAAU;SACV;KACD;IAED,WAAW,EAAE,EACZ;IAED,QAAQ,EAAE,EACT;IAED,QAAQ,EAAE;QACT,aAAa,EAAE;YACd,GAAG;SACH;KACD;IAED,aAAa,EAAE;QACd,aAAa,EAAE;YACd,GAAG;SACH;KACD;IAED,cAAc,EAAE;QACf,aAAa,EAAE;YACd,GAAG;SACH;KACD;IAED,eAAe,EAAE;QAChB,aAAa,EAAE;YACd,GAAG;SACH;KACD;IAED,gBAAgB,EAAE;QACjB,aAAa,EAAE;YACd,GAAG;SACH;KACD;IAED,iBAAiB,EAAE;QAClB,aAAa,EAAE;YACd,GAAG;SACH;KACD;IAED,eAAe,EAAE;QAChB,aAAa,EAAE;YACd,GAAG;SACH;KACD;IAED,gBAAgB,EAAE;QACjB,aAAa,EAAE;YACd,GAAG;SACH;KACD;IAED,WAAW,EAAE;QACZ,aAAa,EAAE;YACd,GAAG;SACH;KACD;IAED,cAAc,EAAE;QACf,aAAa,EAAE;YACd,GAAG;SACH;KACD;IAED,iBAAiB,EAAE;QAClB,aAAa,EAAE;YACd,GAAG;SACH;KACD;IAED,iBAAiB,EAAE;QAClB,aAAa,EAAE;YACd,GAAG;SACH;KACD;IAED,eAAe,EAAE;QAChB,aAAa,EAAE;YACd,GAAG;SACH;KACD;IAED,oBAAoB,EAAE;QACrB,aAAa,EAAE;YACd,GAAG;SACH;KACD;IAED,cAAc,EAAE;QACf,aAAa,EAAE;YACd,GAAG;SACH;KACD;IAED,aAAa,EAAE;QACd,aAAa,EAAE;YACd,GAAG;SACH;KACD;IAED,YAAY,EAAE;QACb,aAAa,EAAE;YACd,GAAG;SACH;KACD;IAED,sBAAsB,EAAE;QACvB,aAAa,EAAE;YACd,GAAG;SACH;KACD;IAED,iBAAiB,EAAE;QAClB,aAAa,EAAE;YACd,GAAG;SACH;KACD;IAED,cAAc,EAAE;QACf,aAAa,EAAE;YACd,GAAG;SACH;KACD;IAED,cAAc,EAAE;QACf,aAAa,EAAE;YACd,GAAG;SACH;KACD;IAED,aAAa,EAAE;QACd,aAAa,EAAE;YACd,GAAG;SACH;KACD;IAED,WAAW,EAAE;QACZ,aAAa,EAAE;YACd,GAAG;SACH;KACD;IAED,YAAY,EAAE;QACb,aAAa,EAAE;YACd,GAAG;SACH;KACD;CACD,CAAC;AAGF,SAAgB,KAAK,CAAC,OAAgB;IACrC,KAAK,MAAM,QAAQ,IAAI,eAAe,EAAE,CAAC;QACxC,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,QAAQ,CAAC;YAC5C,SAAS;QAEV,MAAM,IAAI,GAAG,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;QAEzC,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,aAAa,IAAI,EAAE,EAAE,CAAC;YACvD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;YAC7B,IAAI,KAAK,GAAG,KAAK,CAAC;YAElB,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;gBACjD,IAAI,YAAY,IAAI,GAAG,EAAE,CAAC;oBACzB,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;oBAClB,KAAK,GAAG,IAAI,CAAC;gBACd,CAAC;qBACI,IAAI,MAAM,CAAC,IAAI,IAAI,YAAY,EAAE,CAAC;oBACtC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;oBACzB,KAAK,GAAG,IAAI,CAAC;oBACb,MAAM;gBACP,CAAC;YACF,CAAC;YAED,IAAI,CAAC,KAAK,EAAE,CAAC;gBACZ,OAAO,CAAC,KAAK,CAAC,WAAW,QAAQ,IAAI,YAAY,2BAA2B,CAAC,CAAC;gBAC9E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACjB,CAAC;QACF,CAAC;IACF,CAAC;IAED,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;IACvF,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;IACvF,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,GAAG,KAAK,CAAC;IAC/E,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,GAAG,KAAK,CAAC;AAChF,CAAC;AAnCD,sBAmCC"}
1
+ {"version":3,"file":"patch.js","sourceRoot":"","sources":["../../src/generate-files/patch.ts"],"names":[],"mappings":"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"}
package/dist/lib/index.js CHANGED
@@ -14,7 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
14
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
- exports.cancelEvent = exports.queueEvent = exports.disposeMaster = exports.getMaster = exports.getDefaultLibraryFilename = void 0;
17
+ exports.cancelEvent = exports.queueEvent = exports.disposeMaster = exports.getMaster = void 0;
18
+ exports.getDefaultLibraryFilename = getDefaultLibraryFilename;
18
19
  const os = require("os");
19
20
  /** Gets the default platform Firebird client library filename. */
20
21
  function getDefaultLibraryFilename() {
@@ -27,7 +28,6 @@ function getDefaultLibraryFilename() {
27
28
  return 'libfbclient.so';
28
29
  }
29
30
  }
30
- exports.getDefaultLibraryFilename = getDefaultLibraryFilename;
31
31
  const native = require('bindings')('addon');
32
32
  exports.getMaster = native.getMaster;
33
33
  exports.disposeMaster = native.disposeMaster;
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAEA,yBAAyB;AAGzB,kEAAkE;AAClE,SAAgB,yBAAyB;IACxC,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC;QACvB,KAAK,OAAO;YACX,OAAO,cAAc,CAAC;QACvB,KAAK,QAAQ;YACZ,OAAO,oEAAoE,CAAC;QAC7E;YACC,OAAO,gBAAgB,CAAC;IAC1B,CAAC;AACF,CAAC;AATD,8DASC;AAED,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC;AAE/B,QAAA,SAAS,GAAgC,MAAM,CAAC,SAAS,CAAC;AAC1D,QAAA,aAAa,GAAgC,MAAM,CAAC,aAAa,CAAC;AAElE,QAAA,UAAU,GAKO,MAAM,CAAC,UAAU,CAAC;AAEnC,QAAA,WAAW,GAAoD,MAAM,CAAC,WAAW,CAAC;AAE/F,8CAA4B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAMA,8DASC;AAbD,yBAAyB;AAGzB,kEAAkE;AAClE,SAAgB,yBAAyB;IACxC,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC;QACvB,KAAK,OAAO;YACX,OAAO,cAAc,CAAC;QACvB,KAAK,QAAQ;YACZ,OAAO,oEAAoE,CAAC;QAC7E;YACC,OAAO,gBAAgB,CAAC;IAC1B,CAAC;AACF,CAAC;AAED,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC;AAE/B,QAAA,SAAS,GAAgC,MAAM,CAAC,SAAS,CAAC;AAC1D,QAAA,aAAa,GAAgC,MAAM,CAAC,aAAa,CAAC;AAElE,QAAA,UAAU,GAKO,MAAM,CAAC,UAAU,CAAC;AAEnC,QAAA,WAAW,GAAoD,MAAM,CAAC,WAAW,CAAC;AAE/F,8CAA4B"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "node-firebird-native-api",
3
- "version": "3.1.0",
3
+ "version": "3.1.2",
4
4
  "description": "Firebird native API for Node.js",
5
5
  "gypfile": true,
6
6
  "engines": {
@@ -56,13 +56,13 @@
56
56
  ]
57
57
  },
58
58
  "dependencies": {
59
- "@types/node": "^20.14.2",
59
+ "@types/node": "^22.7.5",
60
60
  "bindings": "^1.5.0",
61
- "node-addon-api": "^8.0.0",
62
- "node-gyp": "^10.1.0"
61
+ "node-addon-api": "^8.3.0",
62
+ "node-gyp": "^10.2.0"
63
63
  },
64
64
  "devDependencies": {
65
65
  "node-cloop-gen": "1.0.1"
66
66
  },
67
- "gitHead": "40da0795a0803319f35a161553f522e3395cf32e"
67
+ "gitHead": "20e22c67b13e0d5ddf6667aa005d65949f5961db"
68
68
  }
@@ -14,157 +14,6 @@
14
14
  //----------------------------------------------------------------------------
15
15
 
16
16
 
17
- namespace Napi
18
- {
19
- // Customize N-API AsyncWorker as the original API is very ugly and
20
- // with slower unused things.
21
- class CustomAsyncWorker
22
- {
23
- protected:
24
- explicit CustomAsyncWorker(Env env);
25
- explicit CustomAsyncWorker(Env env, const char* resource_name);
26
-
27
- public:
28
- // An async worker can be moved but cannot be copied.
29
- CustomAsyncWorker(const CustomAsyncWorker&) = delete;
30
- CustomAsyncWorker& operator=(CustomAsyncWorker&) = delete;
31
-
32
- CustomAsyncWorker(CustomAsyncWorker&& other);
33
- CustomAsyncWorker& operator=(CustomAsyncWorker&& other);
34
-
35
- virtual ~CustomAsyncWorker();
36
-
37
- operator napi_async_work() const
38
- {
39
- return _work;
40
- }
41
-
42
- void Queue();
43
- void Cancel();
44
-
45
- protected:
46
- virtual void Execute() = 0;
47
- virtual void OnOK(Env env) = 0;
48
- virtual void OnError(Env env, const Error& e) = 0;
49
-
50
- void SetError(const std::string& error);
51
-
52
- private:
53
- static void OnExecute(napi_env env, void* this_pointer);
54
- static void OnWorkComplete(napi_env env, napi_status status, void* this_pointer);
55
-
56
- napi_env _env;
57
- napi_async_work _work;
58
- std::string _error;
59
- };
60
-
61
- inline CustomAsyncWorker::CustomAsyncWorker(Env env)
62
- : CustomAsyncWorker(env, "generic")
63
- {
64
- }
65
-
66
- inline CustomAsyncWorker::CustomAsyncWorker(Env env, const char* resource_name)
67
- : _env(env)
68
- {
69
- napi_value resource_id;
70
- napi_status status = napi_create_string_latin1(
71
- _env, resource_name, NAPI_AUTO_LENGTH, &resource_id);
72
- NAPI_THROW_IF_FAILED_VOID(_env, status);
73
-
74
- status = napi_create_async_work(_env, nullptr, resource_id,
75
- OnExecute, OnWorkComplete, this, &_work);
76
- NAPI_THROW_IF_FAILED_VOID(_env, status);
77
- }
78
-
79
- inline CustomAsyncWorker::CustomAsyncWorker(CustomAsyncWorker&& other)
80
- {
81
- _env = other._env;
82
- other._env = nullptr;
83
- _work = other._work;
84
- other._work = nullptr;
85
- _error = std::move(other._error);
86
- }
87
-
88
- inline CustomAsyncWorker& CustomAsyncWorker::operator=(CustomAsyncWorker&& other)
89
- {
90
- _env = other._env;
91
- other._env = nullptr;
92
- _work = other._work;
93
- other._work = nullptr;
94
- _error = std::move(other._error);
95
- return *this;
96
- }
97
-
98
- inline CustomAsyncWorker::~CustomAsyncWorker()
99
- {
100
- if (_work != nullptr)
101
- {
102
- napi_delete_async_work(_env, _work);
103
- _work = nullptr;
104
- }
105
- }
106
-
107
- inline void CustomAsyncWorker::Queue()
108
- {
109
- napi_status status = napi_queue_async_work(_env, _work);
110
- NAPI_THROW_IF_FAILED_VOID(_env, status);
111
- }
112
-
113
- inline void CustomAsyncWorker::Cancel()
114
- {
115
- napi_status status = napi_cancel_async_work(_env, _work);
116
- NAPI_THROW_IF_FAILED_VOID(_env, status);
117
- }
118
-
119
- inline void CustomAsyncWorker::SetError(const std::string& error)
120
- {
121
- _error = error;
122
- }
123
-
124
- inline void CustomAsyncWorker::OnExecute(napi_env /*env*/, void* this_pointer)
125
- {
126
- CustomAsyncWorker* self = static_cast<CustomAsyncWorker*>(this_pointer);
127
- #ifdef NAPI_CPP_EXCEPTIONS
128
- try
129
- {
130
- self->Execute();
131
- }
132
- catch (const std::exception& e)
133
- {
134
- self->SetError(e.what());
135
- }
136
- #else // NAPI_CPP_EXCEPTIONS
137
- self->Execute();
138
- #endif // NAPI_CPP_EXCEPTIONS
139
- }
140
-
141
- inline void CustomAsyncWorker::OnWorkComplete(
142
- napi_env env, napi_status status, void* this_pointer)
143
- {
144
- CustomAsyncWorker* self = static_cast<CustomAsyncWorker*>(this_pointer);
145
-
146
- if (status != napi_cancelled)
147
- {
148
- HandleScope scope(self->_env);
149
-
150
- details::WrapCallback([&] {
151
- if (self->_error.size() == 0)
152
- self->OnOK(env);
153
- else
154
- self->OnError(env, Error::New(self->_env, self->_error));
155
-
156
- return nullptr;
157
- });
158
- }
159
-
160
- delete self;
161
- }
162
- }
163
-
164
-
165
- //----------------------------------------------------------------------------
166
-
167
-
168
17
  namespace fb = Firebird;
169
18
 
170
19
 
@@ -206,13 +55,13 @@ using MethodStart = std::function<T ()>;
206
55
 
207
56
 
208
57
  template <typename T>
209
- class PromiseWorker : public Napi::CustomAsyncWorker
58
+ class PromiseWorker : public Napi::AsyncWorker
210
59
  {
211
60
  protected:
212
61
  PromiseWorker(const Napi::Env env,
213
62
  MethodStart<T> executeLambda,
214
63
  std::function<Napi::Value (const Napi::Env, T)> returnLambda)
215
- : CustomAsyncWorker(env),
64
+ : AsyncWorker(env),
216
65
  executeLambda(executeLambda),
217
66
  returnLambda(returnLambda),
218
67
  deferred(env)
@@ -246,15 +95,15 @@ protected:
246
95
  }
247
96
  }
248
97
 
249
- void OnOK(Napi::Env env) override
98
+ void OnOK() override
250
99
  {
251
100
  if (!error)
252
- deferred.Resolve(returnLambda(env, ret));
101
+ deferred.Resolve(returnLambda(Env(), ret));
253
102
  else
254
- deferred.Reject(Napi::Error::New(env, errorMsg.c_str()).Value());
103
+ deferred.Reject(Napi::Error::New(Env(), errorMsg.c_str()).Value());
255
104
  }
256
105
 
257
- void OnError(Napi::Env env, const Napi::Error& e) override
106
+ void OnError(const Napi::Error& e) override
258
107
  {
259
108
  assert(false);
260
109
  }