Minor cleanups in the ESM-related preprocessor filtering.

FossilOrigin-Name: 205884a273128bb666b496b659b4fa9f031ebdbbc1aa704fdeb4b7e015740098

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 3d952c2615662d181e721fcb29c0b74ec14f1092..1c74531403aea854aa341440f50247e08eaff4d5 100644 (file)
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -226,17 +226,17 @@ DISTCLEAN_FILES += $(bin.stripccomments)
 bin.c-pp := ./c-pp
 $(bin.c-pp): c-pp.c $(sqlite3.c) $(MAKEFILE)
        $(CC) -O0 -o $@ c-pp.c $(sqlite3.c) '-DCMPP_DEFAULT_DELIM="//#"' -I$(dir.top)
-define C-PP.JS
+define C-PP.FILTER
 # Create $2 from $1 using $(bin.c-pp)
-# $1 = Input file: c-pp -f X.js
-# $2 = Output file: c-pp -o X.js
+# $1 = Input file: c-pp -f $(1).js
+# $2 = Output file: c-pp -o $(2).js
 # $3 = optional c-pp -D... flags
 $(2): $(1) $$(MAKEFILE) $$(bin.c-pp)
        $$(bin.c-pp) -f $(1) -o $$@ $(3)
 CLEAN_FILES += $(2)
 endef
 c-pp.D.vanilla ?=
-c-pp.D.esm ?= -Dsqlite3-es6-module-build
+c-pp.D.esm ?= -Dtarget=es6-module
 # /end CPP-of-JS bits
 ########################################################################
 
@@ -301,8 +301,8 @@ $(sqlite3-api-build-version.js): $(bin.version-info) $(MAKEFILE)
 pre-js.js.in := $(dir.api)/pre-js.js
 pre-js.js.esm := $(dir.tmp)/pre-js.esm.js
 pre-js.js.vanilla := $(dir.tmp)/pre-js.vanilla.js
-$(eval $(call C-PP.JS,$(pre-js.js.in),$(pre-js.js.vanilla),$(c-pp.D.vanilla)))
-$(eval $(call C-PP.JS,$(pre-js.js.in),$(pre-js.js.esm),$(c-pp.D.esm)))
+$(eval $(call C-PP.FILTER,$(pre-js.js.in),$(pre-js.js.vanilla),$(c-pp.D.vanilla)))
+$(eval $(call C-PP.FILTER,$(pre-js.js.in),$(pre-js.js.esm),$(c-pp.D.esm)))
 post-js.js.in := $(dir.tmp)/post-js.js
 post-js.js.vanilla := $(dir.tmp)/post-js.vanilla.js
 post-js.js.esm := $(dir.tmp)/post-js.esm.js
@@ -317,14 +317,14 @@ $(post-js.js.in): $(post-jses.js) $(MAKEFILE)
                cat $$i; \
                echo "/* END FILE: $$i */"; \
        done > $@
-$(eval $(call C-PP.JS,$(post-js.js.in),$(post-js.js.vanilla),$(c-pp.D.vanilla)))
-$(eval $(call C-PP.JS,$(post-js.js.in),$(post-js.js.esm),$(c-pp.D.esm)))
+$(eval $(call C-PP.FILTER,$(post-js.js.in),$(post-js.js.vanilla),$(c-pp.D.vanilla)))
+$(eval $(call C-PP.FILTER,$(post-js.js.in),$(post-js.js.esm),$(c-pp.D.esm)))
 
 extern-post-js.js.in := $(dir.api)/extern-post-js.js
 extern-post-js.js.vanilla := $(dir.tmp)/extern-post-js.vanilla.js
 extern-post-js.js.esm := $(dir.tmp)/extern-post-js.esm.js
-$(eval $(call C-PP.JS,$(extern-post-js.js.in),$(extern-post-js.js.vanilla),$(c-pp.D.vanilla)))
-$(eval $(call C-PP.JS,$(extern-post-js.js.in),$(extern-post-js.js.esm),$(c-pp.D.esm)))
+$(eval $(call C-PP.FILTER,$(extern-post-js.js.in),$(extern-post-js.js.vanilla),$(c-pp.D.vanilla)))
+$(eval $(call C-PP.FILTER,$(extern-post-js.js.in),$(extern-post-js.js.esm),$(c-pp.D.esm)))
 extern-pre-js.js := $(dir.api)/extern-pre-js.js
 
 # Emscripten flags for --[extern-][pre|post]-js=...
@@ -644,13 +644,22 @@ CLEAN_FILES += $(speedtest1.js) $(speedtest1.wasm)
 ########################################################################
 
 ########################################################################
-# tester1 code:
-#  tester1.js: for main thread and worker thread
-#  tester1-esm.js: to be loaded from an ES6 Worker Module thread
-$(eval $(call C-PP.JS,tester1.c-pp.js,tester1.js))
-$(eval $(call C-PP.JS,tester1.c-pp.js,tester1-esm.js,-Dtester1-esm-worker))
-tester1.js: $(sqlite3.js)
-tester1-esm.js: $(sqlite3.mjs)
+# tester1 is the main unit and regression test application and needs to
+# be able to run in 4 separate modes to cover the primary use cases:
+#
+# 1) Load sqlite3 in the main UI thread of a conventional script.
+# 2) Load sqlite3 in a conventional Worker thread.
+# 3) Load sqlite3 as an ES6 module (ESM) in the main thread.
+# 4) Load sqlite3 as an ESM worker. (Not all browsers support this.)
+#
+# To that end, we require two separate builds of tester1.js:
+# 
+#  tester1.js: cases 1 and 2
+#  tester1-esm.js: cases 3 and 4
+#
+# To create those, we filter tester1.c-pp.js with $(bin.c-pp)...
+$(eval $(call C-PP.FILTER,tester1.c-pp.js,tester1.js))
+$(eval $(call C-PP.FILTER,tester1.c-pp.js,tester1-esm.js,$(c-pp.D.esm)))
 tester1: tester1.js tester1-esm.js
 all: tester1
 

diff --git a/ext/wasm/api/extern-post-js.js b/ext/wasm/api/extern-post-js.js
index 3dc61ae050ade2836609a6d25ed5e103d8ab980e..acf7068fefb8c9eccb9549ba0a4f5d875fd85991 100644 (file)
--- a/ext/wasm/api/extern-post-js.js
+++ b/ext/wasm/api/extern-post-js.js
@@ -8,7 +8,7 @@
    most of the associated JS code, runs outside of the
    Emscripten-generated module init scope, in the current
    global scope. */
-//#if sqlite3-es6-module-build
+//#if target=es6-module
 const toExportForES6 =
 //#endif
 (function(){
@@ -110,10 +110,8 @@ const toExportForES6 =
     exports["sqlite3InitModule"] = sqlite3InitModule;
   /* AMD modules get injected in a way we cannot override,
      so we can't handle those here. */
-//#if sqlite3-es6-module-build
-  return self.sqlite3InitModule;
-//#endif
+  return self.sqlite3InitModule /* required for ESM */;
 })();
-//#if sqlite3-es6-module-build
+//#if target=es6-module
 export default toExportForES6;
 //#endif

diff --git a/ext/wasm/api/pre-js.js b/ext/wasm/api/pre-js.js
index 41d13d6853725d28199033ef9a11a872cb519079..2e2fe66bc9c623ea81884e256e3ad4ac0699336b 100644 (file)
--- a/ext/wasm/api/pre-js.js
+++ b/ext/wasm/api/pre-js.js
@@ -29,7 +29,7 @@ sqlite3InitModuleState.debugModule('self.location =',self.location);
    4) If none of the above apply, (prefix+path) is returned.
 */
 Module['locateFile'] = function(path, prefix) {
-//#if sqlite3-es6-module-build
+//#if target=es6-module
   return new URL(path, import.meta.url).href;
 //#else
   'use strict';

diff --git a/ext/wasm/api/sqlite3-api-opfs.js b/ext/wasm/api/sqlite3-api-opfs.js
index 31fe45eda006c3bdd0452f5189d493ac9fac0b18..a3f73cc7b21a3381751355c8f6c700d010c41877 100644 (file)
--- a/ext/wasm/api/sqlite3-api-opfs.js
+++ b/ext/wasm/api/sqlite3-api-opfs.js
@@ -167,7 +167,7 @@ const installOpfsVfs = function callee(options){
       return promiseReject_(err);
     };
     const W =
-//#if sqlite3-es6-module-build
+//#if target=es6-module
     new Worker(new URL(options.proxyUri, import.meta.url));
 //#else
     new Worker(options.proxyUri);

diff --git a/ext/wasm/tester1-esm.html b/ext/wasm/tester1-esm.html
index 118ab676bde26b348738a3862b1f774f04f53c48..498a1ab6a7e0c957237d1506c9c8caa1cc53dd49 100644 (file)
--- a/ext/wasm/tester1-esm.html
+++ b/ext/wasm/tester1-esm.html
@@ -20,11 +20,6 @@
       <label for='cb-log-reverse'>Reverse log order?</label>
     </div>
     <div id='test-output'></div>
-    <script type="module" defer>
-      import {default as sqlite3InitModule} from "./jswasm/sqlite3.mjs";
-      self.sqlite3InitModule = sqlite3InitModule;
-      console.log("Loaded sqlite3InitModule() via an ES6 module.");
-    </script>
-    <script src="tester1.js" defer></script>
+    <script src="tester1-esm.js" type="module"></script>
   </body>
 </html>

diff --git a/ext/wasm/tester1.c-pp.js b/ext/wasm/tester1.c-pp.js
index 7aa8ba4a65985ed4d75593bcb65e169cc0f94ede..2a5da8407cb2a2b9c58df9c92f84c7facc6611f7 100644 (file)
--- a/ext/wasm/tester1.c-pp.js
+++ b/ext/wasm/tester1.c-pp.js
@@ -39,9 +39,9 @@
 
    ES6 worker module build:
 
-     ./c-pp -f tester1.c-pp.js -o tester1-esm.js -Dtester1-esm-worker
+     ./c-pp -f tester1.c-pp.js -o tester1-esm.js -Dtarget=es6-module
 */
-//#if tester1-esm-worker
+//#if target=es6-module
 import {default as sqlite3InitModule} from './jswasm/sqlite3.mjs';
 self.sqlite3InitModule = sqlite3InitModule;
 //#else

diff --git a/manifest b/manifest
index d9beffb9d96394a336302afd7ae92e5c5e58b94f..ae619fc5168e91b2465cbf9b60763d091f535632 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C New\sassert()s\sconfirm\sthat\sBTREE_PREFORMAT\smust\sbe\sthe\ssame\svalue\sas\nOPFLAG_PREFORMAT.
-D 2022-11-19T20:10:55.364
+C Minor\scleanups\sin\sthe\sESM-related\spreprocessor\sfiltering.
+D 2022-11-20T01:15:22.201
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -488,21 +488,21 @@ F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
-F ext/wasm/GNUmakefile 616c2a3e944483f6f5f66a6f77885eb7a7d3fef1a599014d746a792b6ef7b6b6
+F ext/wasm/GNUmakefile 3de890d61bccab21dce204848a9aaa4b009acee6e399604a1c9ecc5d1b418e7b
 F ext/wasm/README-dist.txt 2d670b426fc7c613b90a7d2f2b05b433088fe65181abead970980f0a4a75ea20
 F ext/wasm/README.md ef39861aa21632fdbca0bdd469f78f0096f6449a720f3f39642594af503030e9
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 9120c2f8f51fa85f46dcf4dcb6b12f4a807d428f6089b99cdb08d8ddfcfd88b2
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
 F ext/wasm/api/README.md 29276a845e57004e82efba61fa5866fd05f9137380a1dc26dc4c6d65264cd81c
-F ext/wasm/api/extern-post-js.js 015121df2c903cf12d51507227b756ab3626036d8e9d610a2a2c15b3f54afe4d
+F ext/wasm/api/extern-post-js.js 5a92c0afe8edbdfffc6831e60d7fd108594e37c4a364507035e7d3296589b153
 F ext/wasm/api/extern-pre-js.js cc61c09c7a24a07dbecb4c352453c3985170cec12b4e7e7e7a4d11d43c5c8f41
 F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08902f15c34720ee4a1
 F ext/wasm/api/post-js-header.js d6ab3dfef4a06960d28a7eaa338d4e2a1a5981e9b38718168bbde8fdb2a439b8
-F ext/wasm/api/pre-js.js 1156a7fb9de817bb1cb39ad90b76aa93fbb9dcf950a1f2d6f547e5976872be36
+F ext/wasm/api/pre-js.js b88499dc303c21fc3f55f2c364a0f814f587b60a95784303881169f9e91c1d5f
 F ext/wasm/api/sqlite3-api-cleanup.js ecdc69dbfccfe26146f04799fcfd4a6f5790d46e7e3b9b6e9b0491f92ed8ae34
 F ext/wasm/api/sqlite3-api-glue.js 056f44b82c126358a0175e08a892d56fadfce177b0d7a0012502a6acf67ea6d5
 F ext/wasm/api/sqlite3-api-oo1.js e9a83489bbb4838ce0aee46eaaa9350e0e25a5b926b565e4f5ae8e840e4fbaed
-F ext/wasm/api/sqlite3-api-opfs.js 9f115a37dafe8067bce8812996d2deff45741c6e39f7aad7b48f5fbbd822dba5
+F ext/wasm/api/sqlite3-api-opfs.js b4ece97f94aacd408b37fbe5f6d6bb2cbfbed484ce700b17d1d446a55e6b7e81
 F ext/wasm/api/sqlite3-api-prologue.js fd526fa017fa2578673ca18158354515c719e719a5d93f2f6d0e43f39170430e
 F ext/wasm/api/sqlite3-api-worker1.js e94ba98e44afccfa482874cd9acb325883ade50ed1f9f9526beb9de1711f182f
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
@@ -549,9 +549,9 @@ F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d826
 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
 F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555e685bce3da8c3f
 F ext/wasm/test-opfs-vfs.js 44363db07b2a20e73b0eb1808de4400ca71b703af718d0fa6d962f15e73bf2ac
-F ext/wasm/tester1-esm.html 821c7a38b4eb753f6f3d7b5cbfda5b36f85466763977f96bff8372621b6b9eb2
+F ext/wasm/tester1-esm.html aef2e711655660ece4f726ff88332238da2811b9fe7e4987d621f35f9f41d6b6
 F ext/wasm/tester1-worker.html 84d56db05bcea2b294a89ca13c21b76fa0521ca4ac240f0055f1819934c713fc
-F ext/wasm/tester1.c-pp.js f4b96977a48cdfc13d477ede6d2f754865e9bcd1a23ce09359c31de41b24ba0d
+F ext/wasm/tester1.c-pp.js 0c129495d057c77788b59715152d51f9bf9002ebbcce759ef8b028272ce3519d
 F ext/wasm/tester1.html 624ec41cd9f78a1f2b6d7df70aaa7a6394396b1f2455ecbd6de5775c1275b121
 F ext/wasm/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd72273503ae7d5
 F ext/wasm/wasmfs.make 8aa7565f9de8dd3c291ad8c3ceb1a2c67a3eb31a8e531070b25c6c6b1f0278bf
@@ -2057,8 +2057,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 9776fa31758161970a50995a487b6543ed71e9610460b7324304ef21d9248707
-R bee5cd2196754b460638bc4389e4c820
-U drh
-Z 72dd876552688ca64c7de697dec658ae
+P f40bf2c642643ae61d331e8d4815f601224fa258ab34344c6756966163a89f4a
+R bd56fdaa00a2ddbbb971d4117ea354ba
+U stephan
+Z faec45069379feabec016e0ee445a4ae
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 83c0e52e7bf88246e4568ee8e35eab20a0a52ebd..4f65f59d3a4d3f829d71bf4951cf639bc088101e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f40bf2c642643ae61d331e8d4815f601224fa258ab34344c6756966163a89f4a
\ No newline at end of file
+205884a273128bb666b496b659b4fa9f031ebdbbc1aa704fdeb4b7e015740098
\ No newline at end of file