sql-js · lovasoa · Feb 29, 2020 · Feb 24, 2020 · Feb 24, 2020 · Feb 24, 2020
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -0,0 +1,37 @@
+module.exports = {
+  env: {
+    browser: true,
+    es6: true,
+    node: true,
+  },
+  extends: [
+    'airbnb-base',
+  ],
+  globals: {
+    Atomics: 'readonly',
+    SharedArrayBuffer: 'readonly',
+  },
+  parserOptions: {
+    ecmaVersion: 5,
+    sourceType: "script",
+  },
+  rules: {
+    "strict": ["error", "function"],
+    "no-cond-assign": ["error", "except-parens"],
+    "no-var": "off",
+    "vars-on-top": "off",
+    "prefer-destructuring": "off",
+    "prefer-spread": "off",
+    "prefer-template": "off",
+    "prefer-arrow-callback": "off",
+    "comma-dangle": "off",
+    "object-shorthand": "off",
+    "no-throw-literal": "off",
+    "no-param-reassign": "off",
+    "no-bitwise": "off",
+    "camelcase": "off",
+    "dot-notation": "off",
+    "indent": ["error", 4],
+    "quotes": ["error", "double"],
+  },
+};
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -10,8 +10,6 @@ jobs:
     - uses: mymindstorm/setup-emsdk@v1
       with:
         version: '1.38.48'
-    - name: install coffee
-      run: npm install --global coffeescript@1
     - uses: actions/cache@v1
       id: cache
       with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,8 +15,6 @@ jobs:
       - uses: mymindstorm/setup-emsdk@v1
         with:
           version: '1.38.48'
-      - name: install coffee
-        run: npm install --global coffeescript@1
       - name: make
         run: make
       - name: Create Release
@@ -37,7 +35,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
+          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
           asset_path: ./sqljs.zip
           asset_name: sqljs.zip
           asset_content_type: application/zip
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,9 @@ node_modules/
 *~
 
 # Intermediary files:
+cache/
 out/
 sqlite-src/
-cache/
+tmp/
+c/
+emsdk/
diff --git a/.npmignore b/.npmignore
@@ -1,6 +1,5 @@
 test/
 c/
-coffee/
 gh-pages/
 node_modules/
 node-debug.log

diff --git a/AUTHORS b/AUTHORS
@@ -4,3 +4,4 @@ Ophir LOJKINE <pere.jobs@gmail.com> (https://github.com/lovasoa)
 @firien
 @dinedal
 @taytay
+@kaizhu256
diff --git a/Makefile b/Makefile
@@ -62,10 +62,10 @@ BITCODE_FILES = out/sqlite3.bc out/extension-functions.bc
 
 OUTPUT_WRAPPER_FILES = src/shell-pre.js src/shell-post.js
 
-OUTPUT_API_FILES = out/api.js
+SOURCE_API_FILES = src/api.js
 
 EMFLAGS_PRE_JS_FILES = \
-	--pre-js out/api.js
+	--pre-js src/api.js
 
 EXPORTED_METHODS_JSON_FILES = src/exported_functions.json src/exported_runtime_methods.json
 
@@ -74,13 +74,13 @@ all: optimized debug worker
 .PHONY: debug
 debug: dist/sql-asm-debug.js dist/sql-wasm-debug.js
 
-dist/sql-asm-debug.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) $(OUTPUT_API_FILES) $(EXPORTED_METHODS_JSON_FILES)
+dist/sql-asm-debug.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) $(SOURCE_API_FILES) $(EXPORTED_METHODS_JSON_FILES)
 	$(EMCC) $(EMFLAGS) $(EMFLAGS_DEBUG) $(EMFLAGS_ASM) $(BITCODE_FILES) $(EMFLAGS_PRE_JS_FILES) -o $@
 	mv $@ out/tmp-raw.js
 	cat src/shell-pre.js out/tmp-raw.js src/shell-post.js > $@
 	rm out/tmp-raw.js
 
-dist/sql-wasm-debug.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) $(OUTPUT_API_FILES) $(EXPORTED_METHODS_JSON_FILES)
+dist/sql-wasm-debug.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) $(SOURCE_API_FILES) $(EXPORTED_METHODS_JSON_FILES)
 	$(EMCC) $(EMFLAGS) $(EMFLAGS_DEBUG) $(EMFLAGS_WASM) $(BITCODE_FILES) $(EMFLAGS_PRE_JS_FILES) -o $@
 	mv $@ out/tmp-raw.js
 	cat src/shell-pre.js out/tmp-raw.js src/shell-post.js > $@
@@ -89,19 +89,19 @@ dist/sql-wasm-debug.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) $(OUTPUT_API_FI
 .PHONY: optimized
 optimized: dist/sql-asm.js dist/sql-wasm.js dist/sql-asm-memory-growth.js
 
-dist/sql-asm.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) $(OUTPUT_API_FILES) $(EXPORTED_METHODS_JSON_FILES)
+dist/sql-asm.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) $(SOURCE_API_FILES) $(EXPORTED_METHODS_JSON_FILES)
 	$(EMCC) $(EMFLAGS) $(EMFLAGS_OPTIMIZED) $(EMFLAGS_ASM) $(BITCODE_FILES) $(EMFLAGS_PRE_JS_FILES) -o $@
 	mv $@ out/tmp-raw.js
 	cat src/shell-pre.js out/tmp-raw.js src/shell-post.js > $@
 	rm out/tmp-raw.js
 
-dist/sql-wasm.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) $(OUTPUT_API_FILES) $(EXPORTED_METHODS_JSON_FILES)
+dist/sql-wasm.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) $(SOURCE_API_FILES) $(EXPORTED_METHODS_JSON_FILES)
 	$(EMCC) $(EMFLAGS) $(EMFLAGS_OPTIMIZED) $(EMFLAGS_WASM) $(BITCODE_FILES) $(EMFLAGS_PRE_JS_FILES) -o $@
 	mv $@ out/tmp-raw.js
 	cat src/shell-pre.js out/tmp-raw.js src/shell-post.js > $@
 	rm out/tmp-raw.js
 
-dist/sql-asm-memory-growth.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) $(OUTPUT_API_FILES) $(EXPORTED_METHODS_JSON_FILES)
+dist/sql-asm-memory-growth.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) $(SOURCE_API_FILES) $(EXPORTED_METHODS_JSON_FILES)
 	$(EMCC) $(EMFLAGS) $(EMFLAGS_OPTIMIZED) $(EMFLAGS_ASM_MEMORY_GROWTH) $(BITCODE_FILES) $(EMFLAGS_PRE_JS_FILES) -o $@
 	mv $@ out/tmp-raw.js
 	cat src/shell-pre.js out/tmp-raw.js src/shell-post.js > $@
@@ -111,64 +111,50 @@ dist/sql-asm-memory-growth.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) $(OUTPUT
 .PHONY: worker
 worker: dist/worker.sql-asm.js dist/worker.sql-asm-debug.js dist/worker.sql-wasm.js dist/worker.sql-wasm-debug.js
 
-out/worker.js: src/worker.coffee
-	cat $^ | npx coffee --bare --compile --stdio > $@
-
-dist/worker.sql-asm.js: dist/sql-asm.js out/worker.js
+dist/worker.sql-asm.js: dist/sql-asm.js src/worker.js
 	cat $^ > $@
 
-dist/worker.sql-asm-debug.js: dist/sql-asm-debug.js out/worker.js
+dist/worker.sql-asm-debug.js: dist/sql-asm-debug.js src/worker.js
 	cat $^ > $@
 
-dist/worker.sql-wasm.js: dist/sql-wasm.js out/worker.js
+dist/worker.sql-wasm.js: dist/sql-wasm.js src/worker.js
 	cat $^ > $@
 
-dist/worker.sql-wasm-debug.js: dist/sql-wasm-debug.js out/worker.js
+dist/worker.sql-wasm-debug.js: dist/sql-wasm-debug.js src/worker.js
 	cat $^ > $@
 
 # Building it this way gets us a wrapper that _knows_ it's in worker mode, which is nice.
 # However, since we can't tell emcc that we don't need the wasm generated, and just want the wrapper, we have to pay to have the .wasm generated
 # even though we would have already generated it with our sql-wasm.js target above.
 # This would be made easier if this is implemented: https://github.com/emscripten-core/emscripten/issues/8506
-# dist/worker.sql-wasm.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) out/api.js out/worker.js $(EXPORTED_METHODS_JSON_FILES) dist/sql-wasm-debug.wasm
-# 	$(EMCC) $(EMFLAGS) $(EMFLAGS_OPTIMIZED) -s ENVIRONMENT=worker -s $(EMFLAGS_WASM) $(BITCODE_FILES) --pre-js out/api.js -o out/sql-wasm.js
+# dist/worker.sql-wasm.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) src/api.js src/worker.js $(EXPORTED_METHODS_JSON_FILES) dist/sql-wasm-debug.wasm
+# 	$(EMCC) $(EMFLAGS) $(EMFLAGS_OPTIMIZED) -s ENVIRONMENT=worker -s $(EMFLAGS_WASM) $(BITCODE_FILES) --pre-js src/api.js -o out/sql-wasm.js
 # 	mv out/sql-wasm.js out/tmp-raw.js
-# 	cat src/shell-pre.js out/tmp-raw.js src/shell-post.js out/worker.js > $@
+# 	cat src/shell-pre.js out/tmp-raw.js src/shell-post.js src/worker.js > $@
 # 	#mv out/sql-wasm.wasm dist/sql-wasm.wasm
 # 	rm out/tmp-raw.js
 
-# dist/worker.sql-wasm-debug.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) out/api.js out/worker.js $(EXPORTED_METHODS_JSON_FILES) dist/sql-wasm-debug.wasm
-# 	$(EMCC) -s ENVIRONMENT=worker $(EMFLAGS) $(EMFLAGS_DEBUG) -s ENVIRONMENT=worker -s WASM_BINARY_FILE=sql-wasm-foo.debug $(EMFLAGS_WASM) $(BITCODE_FILES) --pre-js out/api.js -o out/sql-wasm-debug.js
+# dist/worker.sql-wasm-debug.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) src/api.js src/worker.js $(EXPORTED_METHODS_JSON_FILES) dist/sql-wasm-debug.wasm
+# 	$(EMCC) -s ENVIRONMENT=worker $(EMFLAGS) $(EMFLAGS_DEBUG) -s ENVIRONMENT=worker -s WASM_BINARY_FILE=sql-wasm-foo.debug $(EMFLAGS_WASM) $(BITCODE_FILES) --pre-js src/api.js -o out/sql-wasm-debug.js
 # 	mv out/sql-wasm-debug.js out/tmp-raw.js
-# 	cat src/shell-pre.js out/tmp-raw.js src/shell-post.js out/worker.js > $@
+# 	cat src/shell-pre.js out/tmp-raw.js src/shell-post.js src/worker.js > $@
 # 	#mv out/sql-wasm-debug.wasm dist/sql-wasm-debug.wasm
 # 	rm out/tmp-raw.js
 
-out/api.js: src/output-pre.js src/api.coffee src/exports.coffee src/api-data.coffee src/output-post.js
-	mkdir -p out
-	cat src/api.coffee src/exports.coffee src/api-data.coffee | npx coffee --bare --compile --stdio > $@
-	cat src/output-pre.js $@ src/output-post.js > out/api-wrapped.js
-	mv out/api-wrapped.js $@
-
 out/sqlite3.bc: sqlite-src/$(SQLITE_AMALGAMATION)
 	mkdir -p out
 	# Generate llvm bitcode
-	$(EMCC) $(CFLAGS) sqlite-src/$(SQLITE_AMALGAMATION)/sqlite3.c -o $@
+	$(EMCC) $(CFLAGS) -c sqlite-src/$(SQLITE_AMALGAMATION)/sqlite3.c -o $@
 
 out/extension-functions.bc: sqlite-src/$(SQLITE_AMALGAMATION)/$(EXTENSION_FUNCTIONS)
 	mkdir -p out
-	$(EMCC) $(CFLAGS) -s LINKABLE=1 sqlite-src/$(SQLITE_AMALGAMATION)/extension-functions.c -o $@
+	$(EMCC) $(CFLAGS) -s LINKABLE=1 -c sqlite-src/$(SQLITE_AMALGAMATION)/extension-functions.c -o $@
 
 # TODO: This target appears to be unused. If we re-instatate it, we'll need to add more files inside of the JS folder
 # module.tar.gz: test package.json AUTHORS README.md dist/sql-asm.js
 # 	tar --create --gzip $^ > $@
 
 ## cache
-
-.PHONY: clean-cache
-clean-cache:
-	rm -rf cache
-
 cache/$(SQLITE_AMALGAMATION).zip:
 	mkdir -p cache
 	curl -LsSf '$(SQLITE_AMALGAMATION_ZIP_URL)' -o $@
@@ -178,11 +164,6 @@ cache/$(EXTENSION_FUNCTIONS):
 	curl -LsSf '$(EXTENSION_FUNCTIONS_URL)' -o $@
 
 ## sqlite-src
-
-.PHONY: clean-sqlite-src
-clean-sqlite-src:
-	rm -rf sqlite
-
 .PHONY: sqlite-src
 sqlite-src: sqlite-src/$(SQLITE_AMALGAMATION) sqlite-src/$(EXTENSION_FUNCTIONS)
 
@@ -203,10 +184,6 @@ sqlite-src/$(SQLITE_AMALGAMATION)/$(EXTENSION_FUNCTIONS): cache/$(EXTENSION_FUNC
 
 .PHONY: clean
 clean:
-	rm -rf out/* dist/*
-
-.PHONY: clean-all
-clean-all:
 	rm -f out/* dist/* cache/*
-	rm -rf sqlite-src/
+	rm -rf sqlite-src/ c/
 
diff --git a/dist/.gitignore b/dist/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,9 @@ node_modules/ @@
     *~
     # Intermediary files:
+    cache/
     out/
     sqlite-src/
-    cache/
+    tmp/
+    c/
+    emsdk/