methods which take a (sqlite3_vtab_cursor*) _except_ for
xClose(), in which case use...
- - wrapCursor(pCursor, true) will remove the m apping of pCursor to a
+ - wrapCursor(pCursor, true) will remove the mapping of pCursor to a
capi.sqlite3_vtab_cursor object and return that object. The
caller must call dispose() on the returned object. This is
- intended to be called form xClose() or in error handling of a
+ intended to be called from xClose() or in error handling of a
failed xOpen().
*/
vt.xWrapCursor = __xWrapFactory(capi.sqlite3_vtab_cursor);
***********************************************************************
- The Jaccwabyt API is documented in detail in an external file.
+ The Jaccwabyt API is documented in detail in an external file,
+ _possibly_ called jaccwabyt.md in the same directory as this file.
- Project home: https://fossil.wanderinghorse.net/r/jaccwabyt
+ Project homes:
+ - https://fossil.wanderinghorse.net/r/jaccwabyt
+ - https://sqlite.org/src/dir/ext/wasm/jaccwabyt
*/
'use strict';
const __freeStruct = function(ctor, obj, m){
if(!m) m = __instancePointerMap.get(obj);
if(m) {
- if(obj.ondispose instanceof Function){
- try{obj.ondispose()}
- catch(e){
- /*do not rethrow: destructors must not throw*/
- console.warn("ondispose() for",ctor.structName,'@',
- m,'threw. NOT propagating it.',e);
- }
- }else if(Array.isArray(obj.ondispose)){
- obj.ondispose.forEach(function(x){
+ if(Array.isArray(obj.ondispose)){
+ let x;
+ while((x = obj.ondispose.shift())){
try{
if(x instanceof Function) x.call(obj);
else if(x instanceof StructType) x.dispose();
console.warn("ondispose() for",ctor.structName,'@',
m,'threw. NOT propagating it.',e);
}
- });
+ }
+ }else if(obj.ondispose instanceof Function){
+ try{obj.ondispose()}
+ catch(e){
+ /*do not rethrow: destructors must not throw*/
+ console.warn("ondispose() for",ctor.structName,'@',
+ m,'threw. NOT propagating it.',e);
+ }
}
delete obj.ondispose;
__instancePointerMap.delete(obj);
/** Impl of X.memberKeys() for StructType and struct ctors. */
const __structMemberKeys = rop(function(){
const a = [];
- Object.keys(this.structInfo.members).forEach((k)=>a.push(this.memberKey(k)));
+ for(const k of Object.keys(this.structInfo.members)){
+ a.push(this.memberKey(k));
+ }
return a;
});
Adds value v to obj.ondispose, creating ondispose,
or converting it to an array, if needed.
*/
- const __addOnDispose = function(obj, v){
+ const __addOnDispose = function(obj, ...v){
if(obj.ondispose){
- if(obj.ondispose instanceof Function){
+ if(!Array.isArray(obj.ondispose)){
obj.ondispose = [obj.ondispose];
- }/*else assume it's an array*/
+ }
}else{
obj.ondispose = [];
}
- obj.ondispose.push(v);
+ obj.ondispose.push(...v);
};
/**
return __setMemberCString(this, memberName, str);
})
});
+ // Function-type non-Property inherited members
+ Object.assign(StructType.prototype,{
+ addOnDispose: function(...v){
+ __addOnDispose(this,...v);
+ return this;
+ }
+ });
/**
"Static" properties for StructType.
**Jaccwabyt**: _JavaScript ⇄ C Struct Communication via WASM Byte
Arrays_
-
Welcome to Jaccwabyt, a JavaScript API which creates bindings for
WASM-compiled C structs, defining them in such a way that changes to
their state in JS are visible in C/WASM, and vice versa, permitting
**Formalities:**
- Author: [Stephan Beal][sgb]
-- License: Public Domain
-- Project Home: <https://fossil.wanderinghorse.net/r/jaccwabyt>
+- Project Homes:
+ - <https://fossil.wanderinghorse.net/r/jaccwabyt>\
+ Is the primary home but...
+ - <https://sqlite.org/src/dir/ext/wasm/jaccwabyt>\
+ ... most development happens here.
+
+The license for both this documentation and the software it documents
+is the same as [sqlite3][], the project from which this spinoff
+project was spawned:
+
+-----
+
+> 2022-06-30:
+>
+> The author disclaims copyright to this source code. In place of a
+> legal notice, here is a blessing:
+>
+> May you do good and not evil.
+> May you find forgiveness for yourself and forgive others.
+> May you share freely, never taking more than you give.
+
+-----
<a name='overview'></a>
Table of Contents
has the following "static" properties (^Which are accessible from
individual instances via `theInstance.constructor`.):
+- `addOnDispose(...value)`\
+ If this object has no `ondispose` property, this function creates it
+ as an array and pushes the given value(s) onto it. If the object has
+ a function-typed `ondispose` property, this call replaces it with an
+ array and moves that function into the array. In all other cases,
+ `ondispose` is assumed to be an array and the argument(s) is/are
+ appended to it. Returns `this`.
+
- `allocCString(str)`
Identical to the [StructBinder][] method of the same name.
}/*WhWasmUtil*/)
////////////////////////////////////////////////////////////////////
- .t('sqlite3.StructBinder (jaccwabyt)', function(sqlite3){
+ .t('sqlite3.StructBinder (jaccwabyt🐇)', function(sqlite3){
const S = sqlite3, W = S.wasm;
const MyStructDef = {
sizeof: 16,
}finally{
wts.dispose();
}
+
+ if(1){ // ondispose of other struct instances
+ const s1 = new WTStruct, s2 = new WTStruct, s3 = new WTStruct;
+ T.assert(s1.lookupMember instanceof Function)
+ .assert(s1.addOnDispose instanceof Function);
+ s1.addOnDispose(s2,"testing variadic args");
+ T.assert(2===s1.ondispose.length);
+ s2.addOnDispose(s3);
+ s1.dispose();
+ T.assert(!s2.pointer,"Expecting s2 to be ondispose'd by s1.");
+ T.assert(!s3.pointer,"Expecting s3 to be ondispose'd by s2.");
+ }
}/*StructBinder*/)
////////////////////////////////////////////////////////////////////
.assert(args[0] === 'testvtab')
.assert(args[1] === 'main')
.assert(args[2] === 'testvtab');
+ console.debug("xConnect() args =",args);
const rc = capi.sqlite3_declare_vtab(
pDb, "CREATE TABLE ignored(a,b)"
);
xOpen: function(pVtab, ppCursor){
try{
const t = vth.xWrapVtab(pVtab), c = vth.xWrapCursor();
- T.assert(t instanceof capi.sqlite3_vtab);
- T.assert(c instanceof capi.sqlite3_vtab_cursor);
+ T.assert(t instanceof capi.sqlite3_vtab)
+ .assert(c instanceof capi.sqlite3_vtab_cursor);
wasm.setPtrValue(ppCursor, c.pointer);
c._rowId = 0;
return 0;
-C JS\svtables:\sadd\sinfrastructure\srelated\sto\saccessing\sand\smodifying\ssqlite3_index_info.
-D 2022-12-06T11:21:46.303
+C Add\saddOnDispose()\smethod\sto\sJaccwabyt\sand\scode-adjacent\sminor\sinternal\scleanups.
+D 2022-12-07T03:42:39.134
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
F ext/wasm/api/sqlite3-api-worker1.js e94ba98e44afccfa482874cd9acb325883ade50ed1f9f9526beb9de1711f182f
F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
F ext/wasm/api/sqlite3-opfs-async-proxy.js f79dd8d98ef3e0b55c10bb2bee7a3840fa967318e1f577c156aafc34664271d1
-F ext/wasm/api/sqlite3-v-helper.js 6b408ee4e926cb0f7fe41a63a1205049283af301fe3f5de3c038845ccf9106df
+F ext/wasm/api/sqlite3-v-helper.js 2125255f102ab07a2653d74d4931d716b0d27c5a89bebc188ad828de0dd1dcef
F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 8ec510fee735c646fb18a3b99f0ca5ca461f9e066c43cdc404d7144f12ae6ed6
F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
F ext/wasm/api/sqlite3-wasm.c 723522a6c2a2463884a83fa1cc7ae5770deaaf0856a1058cc1023b2bfa1c898b
F ext/wasm/fiddle/index.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
F ext/wasm/index-dist.html c806b6005145b71d64240606e9c6e0bf56878ee8829c66fe7486cebf34b0e6b1
F ext/wasm/index.html f151b7c7b5cfdc066567d556acd168e769efd4e982286dc5f849a5ee69ecd0ff
-F ext/wasm/jaccwabyt/jaccwabyt.js 35c7eaa61ba4b875cd49da5a06a35d9935fd19121de65dd5f467cbe376359782
-F ext/wasm/jaccwabyt/jaccwabyt.md 888aff20e486abb6c955d432f9a3af271e2cdd2cd99a92c6f87077116ca57091
+F ext/wasm/jaccwabyt/jaccwabyt.js b7efd07ea3927e9d0bc75b3819c6d40bdfb0a03cbc8d93331be16799f35261c3
+F ext/wasm/jaccwabyt/jaccwabyt.md 37911f00db12cbcca73aa1ed72594430365f30aafae2fa9c886961de74e5e0eb
F ext/wasm/module-symbols.html 980680c8acfa3c8ae6a5aa223512d1b8e78040ced20f8ba2c382129bc73ec028
F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
F ext/wasm/scratchpad-wasmfs-main.js 4c140457f4d6da9d646a49addd91edb6e9ad1643c6c48e3258b5bce24725dc18
F ext/wasm/test-opfs-vfs.js 44363db07b2a20e73b0eb1808de4400ca71b703af718d0fa6d962f15e73bf2ac
F ext/wasm/tester1-worker.html d43f3c131d88f10d00aff3e328fed13c858d674ea2ff1ff90225506137f85aa9
F ext/wasm/tester1.c-pp.html d34bef3d48e5cbc1c7c06882ad240fec49bf88f5f65696cc2c72c416933aa406
-F ext/wasm/tester1.c-pp.js c5679da7895377df03e6075fc0e9dff8b5f570bd4edb63f714154d3030279fce
+F ext/wasm/tester1.c-pp.js 8144e0e0f76b14fcd5223fad190bd94a50caf19b2419848b782448cda3ccbc78
F ext/wasm/tests/opfs/concurrency/index.html 86d8ac435074d1e7007b91105f4897f368c165e8cecb6a9aa3d81f5cf5dcbe70
F ext/wasm/tests/opfs/concurrency/test.js a98016113eaf71e81ddbf71655aa29b0fed9a8b79a3cdd3620d1658eb1cc9a5d
F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 0ce51bed65d5e430364f74bf959fb76c42ac5eec0769490231d8c8110a1f388c
-R a1b37a98bcb406acaf386e5a65bbf6e3
+P 0d77c348039926c24e0fb50a7dc7e4b62895cd201c021f8e29832917e4b8b09f
+R c60d510be7a6225cada64eb18dd4b778
U stephan
-Z 3e0a3245949f854c4eed760afd40e3ce
+Z 9a43ff51fca7fb341935fe3d300c9a6e
# Remove this line to create a well-formed Fossil manifest.
-0d77c348039926c24e0fb50a7dc7e4b62895cd201c021f8e29832917e4b8b09f
\ No newline at end of file
+6a2723fe3f28dd94328d901e64e1e9ee9a1b2e9eeaed6c54038a5b83c914db78
\ No newline at end of file
projects / thirdparty / sqlite.git / commitdiff
