🎨 Fixed error catch

Author: nuintun

lib/adodb.js

@@ -4,7 +4,7 @@
  * @version 2017/11/09
  */
 
-import { free, stdout, fillRecords } from './utils';
+import { free, stdout, stdoutError, fillRecords } from './utils';
 
 /**
  * @namespace ADODB
@@ -28,21 +28,25 @@ export var ADODB = {
     // Set CursorLocation
     connection.CursorLocation = 3;
 
-    // Open
-    connection.Open(params.connection);
-    // Execute
-    connection.Execute(params.sql);
+    try {
+      // Open
+      connection.Open(params.connection);
+      // Execute
+      connection.Execute(params.sql);
 
-    // Scalar
-    if (scalarMode) {
-      recordset.Open(params.scalar, connection, 0, 1);
+      // Scalar
+      if (scalarMode) {
+        recordset.Open(params.scalar, connection, 0, 1);
 
-      // fill records
-      result = fillRecords(recordset);
-    }
+        // fill records
+        result = fillRecords(recordset);
+      }
 
-    // Write data
-    stdout(result);
+      // Write data
+      stdout(result);
+    } catch (error) {
+      stdoutError(error);
+    }
 
     // Close database
     free(connection);
@@ -60,13 +64,17 @@ export var ADODB = {
     // Set CursorLocation
     connection.CursorLocation = 3;
 
-    // Open
-    connection.Open(params.connection);
-    // Query
-    recordset.Open(params.sql, connection, 0, 1);
+    try {
+      // Open
+      connection.Open(params.connection);
+      // Query
+      recordset.Open(params.sql, connection, 0, 1);
 
-    // Write data
-    stdout(fillRecords(recordset));
+      // Write data
+      stdout(fillRecords(recordset));
+    } catch (error) {
+      stdoutError(error);
+    }
 
     // Close database
     free(recordset);
@@ -84,21 +92,25 @@ export var ADODB = {
     // Set CursorLocation
     connection.CursorLocation = 3;
 
-    // Open
-    connection.Open(params.connection);
-
-    // OpenSchema
-    if (params.hasOwnProperty('id')) {
-      recordset = connection.OpenSchema(params.type, params.criteria, params.id);
-    } else if (params.hasOwnProperty('criteria')) {
-      recordset = connection.OpenSchema(params.type, params.criteria);
-    } else {
-      recordset = connection.OpenSchema(params.type);
+    try {
+      // Open
+      connection.Open(params.connection);
+
+      // OpenSchema
+      if (params.hasOwnProperty('id')) {
+        recordset = connection.OpenSchema(params.type, params.criteria, params.id);
+      } else if (params.hasOwnProperty('criteria')) {
+        recordset = connection.OpenSchema(params.type, params.criteria);
+      } else {
+        recordset = connection.OpenSchema(params.type);
+      }
+
+      // Write data
+      stdout(fillRecords(recordset));
+    } catch (error) {
+      stdoutError(error);
     }
 
-    // Write data
-    stdout(fillRecords(recordset));
-
     // Close database
     free(recordset);
     free(connection);

lib/adodb/adodb.js

@@ -6,25 +6,11 @@
 
 import './json';
 import { ADODB } from './adodb';
-import { stderr } from './utils';
 
 // Command
 var command = WScript.Arguments(0);
 // Wait stdin
 var params = JSON.parse(WScript.StdIn.ReadAll());
 
 // Main
-try {
-  // Call method
-  ADODB[command](params);
-} catch (e) {
-  var code = e.number;
-  var message = e.description;
-
-  if (!message) {
-    message = 'Unspecified error, SQL may contain reserved words and symbols, surround it with brackets []';
-  }
-
-  // Write error
-  stderr({ code: code, message: message });
-}
+ADODB[command](params);

lib/adodb/main.js

@@ -27,10 +27,26 @@ export function stdout(data) {
  * @function stderr
  * @param {any} data
  */
-export function stderr(data) {
+function stderr(data) {
   WScript.StdErr.Write(JSON.stringify(data));
 }
 
+/**
+ * @function stdoutError
+ * @param {Error} error
+ */
+export function stdoutError(error) {
+  var code = error.number;
+  var message = error.description;
+
+  if (!message) {
+    message = 'Unspecified error, SQL may contain reserved words and symbols, surround it with brackets []';
+  }
+
+  // Write out error
+  stderr({ code: code, message: message });
+}
+
 /**
  * @function isDate
  * @param {number} type

lib/adodb/utils.js

@@ -1,6 +1,6 @@
 {
   "name": "node-adodb",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "main": "index.js",
   "license": "MIT",
   "keywords": [
@@ -36,8 +36,8 @@
   },
   "devDependencies": {
     "chai": "^4.2.0",
-    "rollup": "^1.21.2",
-    "terser": "^4.3.1",
+    "rollup": "^1.32.0",
+    "terser": "^4.6.4",
     "holding": "^3.1.1",
     "fs-extra": "^8.1.0"
   },

package.json

@@ -24,7 +24,7 @@ async function build(inputOptions, outputOptions) {
   const [result] = output;
 
   const file = outputOptions.file;
-  const minify = terser.minify(result.code, { ie8: true });
+  const minify = terser.minify(result.code, { ie8: true, output: { comments: false } });
 
   await fs.outputFile(file, banner + minify.code);
 

rollup.js

@@ -2,20 +2,20 @@
 # yarn lockfile v1
 
 
-"@types/estree@0.0.39":
-  version "0.0.39"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
-  integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
+"@types/estree@*":
+  version "0.0.42"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.42.tgz#8d0c1f480339efedb3e46070e22dd63e0430dd11"
+  integrity sha512-K1DPVvnBCPxzD+G51/cxVIoc2X8uUVl1zpJeE6iKcgHMj4+tbat5Xu4TjV7v2QSDbIeAfLi2hIk+u2+s0MlpUQ==
 
-"@types/node@^12.7.4":
-  version "12.7.5"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.5.tgz#e19436e7f8e9b4601005d73673b6dc4784ffcc2f"
-  integrity sha512-9fq4jZVhPNW8r+UYKnxF1e2HkDWOWKM5bC2/7c9wPV835I0aOrVbS/Hw/pWPk2uKrNXQqg9Z959Kz+IYDd5p3w==
+"@types/node@*":
+  version "13.7.7"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.7.tgz#1628e6461ba8cc9b53196dfeaeec7b07fa6eea99"
+  integrity sha512-Uo4chgKbnPNlxQwoFmYIwctkQVkMMmsAoGGU4JKwLuvBefF0pCq4FybNSnfkfRCpC7ZW7kttcC/TrRtAJsvGtg==
 
-acorn@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.0.0.tgz#26b8d1cd9a9b700350b71c0905546f64d1284e7a"
-  integrity sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ==
+acorn@^7.1.0:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf"
+  integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==
 
 arch@^2.1.1:
   version "2.1.1"
@@ -50,9 +50,9 @@ check-error@^1.0.2:
   integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=
 
 commander@^2.20.0:
-  version "2.20.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
-  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
 debug@^4.1.1:
   version "4.1.1"
@@ -83,9 +83,9 @@ get-func-name@^2.0.0:
   integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=
 
 graceful-fs@^4.1.6, graceful-fs@^4.2.0:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
-  integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
+  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
 
 holding@^3.1.1:
   version "3.1.1"
@@ -109,19 +109,19 @@ pathval@^1.1.0:
   resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
   integrity sha1-uULm1L3mUwBe9rcTYd74cn0GReA=
 
-rollup@^1.21.2:
-  version "1.21.2"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.21.2.tgz#eaabd07d0bd309587ad8bebf731fca6fcb96f4d0"
-  integrity sha512-sCAHlcQ/PExU5t/kRwkEWHdhGmQrZ2IgdQzbjPVNfhWbKHMMZGYqkASVTpQqRPLtQKg15xzEscc+BnIK/TE7/Q==
+rollup@^1.32.0:
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.32.0.tgz#c65ce134850aca1ce595fcac07d1dc5d53bf227c"
+  integrity sha512-ab2tF5pdDqm2zuI8j02ceyrJSScl9V2C24FgWQ1v1kTFTu1UrG5H0hpP++mDZlEFyZX4k0chtGEHU2i+pAzBgA==
   dependencies:
-    "@types/estree" "0.0.39"
-    "@types/node" "^12.7.4"
-    acorn "^7.0.0"
+    "@types/estree" "*"
+    "@types/node" "*"
+    acorn "^7.1.0"
 
 source-map-support@~0.5.12:
-  version "0.5.13"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
-  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
+  version "0.5.16"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
+  integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -131,10 +131,10 @@ source-map@^0.6.0, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-terser@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.1.tgz#09820bcb3398299c4b48d9a86aefc65127d0ed65"
-  integrity sha512-pnzH6dnFEsR2aa2SJaKb1uSCl3QmIsJ8dEkj0Fky+2AwMMcC9doMqLOQIH6wVTEKaVfKVvLSk5qxPBEZT9mywg==
+terser@^4.6.4:
+  version "4.6.4"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.4.tgz#40a0b37afbe5b57e494536815efa68326840fc00"
+  integrity sha512-5fqgBPLgVHZ/fVvqRhhUp9YUiGXhFJ9ZkrZWD9vQtFBR4QIGTnbsb+/kKqSqfgp3WnBwGWAFnedGTtmX1YTn0w==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"