From 488d3762628fb4c1bab2089641d92f4a03b6dd56 Mon Sep 17 00:00:00 2001
From: charlie <xyhp915@qq.com>
Date: Thu, 22 Dec 2022 13:53:38 +0800
Subject: [PATCH] fix(plugin): correct parameters of datascript query api

---
 libs/CHANGELOG.md         |  6 +++
 libs/package.json         |  2 +-
 libs/src/LSPlugin.user.ts |  3 +-
 libs/webpack.config.js    | 86 ++++++++++++++++++++-------------------
 4 files changed, 54 insertions(+), 43 deletions(-)

diff --git a/libs/CHANGELOG.md b/libs/CHANGELOG.md
index c801cdf0af..368a4d40b8 100644
--- a/libs/CHANGELOG.md
+++ b/libs/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
+
+## [0.0.14]
+
+### Fixed
+- missing arguments of `DB.datascriptQuery`
+
 ## [0.0.13]
 
 ### Added
diff --git a/libs/package.json b/libs/package.json
index fbce1fd15c..3804d18667 100644
--- a/libs/package.json
+++ b/libs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@logseq/libs",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "Logseq SDK libraries",
   "main": "dist/lsplugin.user.js",
   "typings": "index.d.ts",
diff --git a/libs/src/LSPlugin.user.ts b/libs/src/LSPlugin.user.ts
index 9819b6cfbd..1fb04b44c6 100644
--- a/libs/src/LSPlugin.user.ts
+++ b/libs/src/LSPlugin.user.ts
@@ -410,6 +410,7 @@ const db: Partial<IDBProxy> = {
     query: string,
     ...inputs: Array<any>
   ): Promise<T> {
+    // force remove proxy ns flag `db`
     inputs.pop()
 
     if (inputs?.some(it => (typeof it === 'function'))) {
@@ -419,7 +420,7 @@ const db: Partial<IDBProxy> = {
 
     return this._execCallableAPIAsync(
       `datascript_query`,
-      ...inputs
+      ...[query, ...inputs]
     )
   }
 }
diff --git a/libs/webpack.config.js b/libs/webpack.config.js
index b649a6ddab..f7fb2ac164 100644
--- a/libs/webpack.config.js
+++ b/libs/webpack.config.js
@@ -4,46 +4,50 @@ const webpack = require('webpack')
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
 const TerserPlugin = require('terser-webpack-plugin')
 
-module.exports = {
-  entry: './src/LSPlugin.user.ts',
-  module: {
-    rules: [
-      {
-        test: /\.tsx?$/,
-        use: [
-          {
-            loader: 'babel-loader'
-          },
-          {
-            loader: 'ts-loader'
-          }
-        ],
-        exclude: /node_modules/,
-      }
+module.exports = (env, argv) => {
+  const isProd = argv.mode === 'production'
+
+  return {
+    entry: './src/LSPlugin.user.ts',
+    module: {
+      rules: [
+        {
+          test: /\.tsx?$/,
+          use: [
+            {
+              loader: 'babel-loader'
+            },
+            {
+              loader: 'ts-loader'
+            }
+          ],
+          exclude: /node_modules/,
+        }
+      ],
+    },
+    resolve: {
+      extensions: ['.tsx', '.ts', '.js'],
+    },
+    optimization: {
+      minimize: isProd,
+      minimizer: [
+        new TerserPlugin()
+      ]
+    },
+    plugins: [
+      new webpack.ProvidePlugin({
+        process: 'process/browser',
+      }),
+      new webpack.DefinePlugin({
+        LIB_VERSION: JSON.stringify(pkg.version)
+      })
+      // new BundleAnalyzerPlugin()
     ],
-  },
-  resolve: {
-    extensions: ['.tsx', '.ts', '.js'],
-  },
-  optimization: {
-    minimize: true,
-    minimizer: [
-      new TerserPlugin()
-    ]
-  },
-  plugins: [
-    new webpack.ProvidePlugin({
-      process: 'process/browser',
-    }),
-    new webpack.DefinePlugin({
-      LIB_VERSION: JSON.stringify(pkg.version)
-    })
-    // new BundleAnalyzerPlugin()
-  ],
-  output: {
-    library: 'LSPluginEntry',
-    libraryTarget: 'umd',
-    filename: 'lsplugin.user.js',
-    path: path.resolve(__dirname, 'dist')
-  },
+    output: {
+      library: 'LSPluginEntry',
+      libraryTarget: 'umd',
+      filename: 'lsplugin.user.js',
+      path: path.resolve(__dirname, 'dist')
+    },
+  }
 }
\ No newline at end of file