sqlmath 2023.1.29 → 2023.3.21

package/CHANGELOG.md

@@ -3,6 +3,21 @@
 # Todo
 - none
 
+# v2023.3.21
+- sqlmath - move c-function str99JsonAppendText() from file sqlmath_base.c to sqlite3.c
+- sqlmath - merge file sqlite3_ext.c into sqlite3.c
+- sqlmath - streamline str99 c-code
+- sqlmath - add sql-functions jenks_concat(kk, col1, col2, ...), jenks_json(kk, jsonArray)
+- chart - bugfix - fix special-character in col-name being sql-injected
+
+# v2023.2.26
+- chart - bugfix - use spy for reference previous-ydate instead of 1a_mybot
+- sqlmath - add functions dbExecAndReturnLastJsonAsync(), dbExecAndReturnLastTextAsync()
+- sqlmath - add sql-functions jfromfloat64array(), jtofloat64array()
+- sqlite - update to sqlite v3.39.4
+- ci - replace shell-function shGithubPushBackupAndSquash() with simplified shGitCommitPushOrSquash()
+- ci - in windows-ci-env, alias node=node.exe instead of using winpty for pipes
+
 # v2023.1.29
 - ci - add auto-logo-creation in private repo
 - ci - auto-create asset_image_logo_512.png from asset_image_logo_512.html

package/README.md

@@ -2,7 +2,7 @@
 
 
 # Status
-| Branch | [master<br>(v2023.1.29)](https://github.com/sqlmath/sqlmath/tree/master) | [beta<br>(Web Demo)](https://github.com/sqlmath/sqlmath/tree/beta) | [alpha<br>(Development)](https://github.com/sqlmath/sqlmath/tree/alpha) |
+| Branch | [master<br>(v2023.3.21)](https://github.com/sqlmath/sqlmath/tree/master) | [beta<br>(Web Demo)](https://github.com/sqlmath/sqlmath/tree/beta) | [alpha<br>(Development)](https://github.com/sqlmath/sqlmath/tree/alpha) |
 |--:|:--:|:--:|:--:|
 | CI | [![ci](https://github.com/sqlmath/sqlmath/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/sqlmath/sqlmath/actions?query=branch%3Amaster) | [![ci](https://github.com/sqlmath/sqlmath/actions/workflows/ci.yml/badge.svg?branch=beta)](https://github.com/sqlmath/sqlmath/actions?query=branch%3Abeta) | [![ci](https://github.com/sqlmath/sqlmath/actions/workflows/ci.yml/badge.svg?branch=alpha)](https://github.com/sqlmath/sqlmath/actions?query=branch%3Aalpha) |
 | Coverage | [![coverage](https://sqlmath.github.io/sqlmath/branch-master/.artifact/coverage/coverage_badge.svg)](https://sqlmath.github.io/sqlmath/branch-master/.artifact/coverage/index.html) | [![coverage](https://sqlmath.github.io/sqlmath/branch-beta/.artifact/coverage/coverage_badge.svg)](https://sqlmath.github.io/sqlmath/branch-beta/.artifact/coverage/index.html) | [![coverage](https://sqlmath.github.io/sqlmath/branch-alpha/.artifact/coverage/coverage_badge.svg)](https://sqlmath.github.io/sqlmath/branch-alpha/.artifact/coverage/index.html) |

package/jslint.mjs

@@ -165,7 +165,7 @@ let jslint_charset_ascii = (
     + "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
     + "`abcdefghijklmnopqrstuvwxyz{|}~\u007f"
 );
-let jslint_edition = "v2023.1.1-beta";
+let jslint_edition = "v2022.3.1-beta";
 let jslint_export;                      // The jslint object to be exported.
 let jslint_fudge = 1;                   // Fudge starting line and starting
                                         // ... column to 1.
@@ -11236,25 +11236,27 @@ function sentinel() {}
             }
         }));
         exitCode = await new Promise(function (resolve) {
-            moduleChildProcess.spawn((
-                processArgv[0] === "npm"
+            moduleChildProcess.spawn(
+                (
+                    processArgv[0] === "npm"
 
 // If win32 environment, then replace program npm with npm.cmd.
 // Coverage-hack - Ugly-hack to get test-coverage under both win32 and linux.
 
-                ? process.platform.replace("win32", "npm.cmd").replace(
-                    process.platform,
-                    "npm"
-                )
-                : processArgv[0]
-            ), processArgv.slice(1), {
-                env: Object.assign({}, process.env, {
-                    NODE_V8_COVERAGE: coverageDir
-                }),
-                stdio: [
-                    "ignore", 1, 2
-                ]
-            }).on("exit", resolve);
+                    ? process.platform.replace("win32", "npm.cmd").replace(
+                        process.platform,
+                        "npm"
+                    )
+                    : processArgv[0]
+                ),
+                processArgv.slice(1),
+                {
+                    env: Object.assign({}, process.env, {
+                        NODE_V8_COVERAGE: coverageDir
+                    }),
+                    stdio: ["ignore", 1, 2]
+                }
+            ).on("exit", resolve);
         });
     }
 

package/package.json

@@ -11,7 +11,7 @@
     "engines": {
         "node": ">=14"
     },
-    "fileCount": 33,
+    "fileCount": 32,
     "homepage": "https://github.com/sqlmath/sqlmath",
     "keywords": [
         "data-science",
@@ -38,5 +38,5 @@
     },
     "shCiArtifactUpload": 1,
     "shCiNpmPublish": 1,
-    "version": "2023.1.29"
+    "version": "2023.3.21"
 }

package/sqlmath.mjs

@@ -29,15 +29,13 @@ let FILENAME_DBTMP = "/tmp/__dbtmp1";
 let IS_BROWSER;
 let JSBATON_ARGC = 16;
 let SQLITE_DATATYPE_BLOB = 0x04;
-// let SQLITE_DATATYPE_BLOB_0 = 0x14;
-let SQLITE_DATATYPE_EXTERNALBUFFER = -0x01;
 let SQLITE_DATATYPE_FLOAT = 0x02;
-// let SQLITE_DATATYPE_FLOAT_0 = 0x12;
 let SQLITE_DATATYPE_INTEGER = 0x01;
 let SQLITE_DATATYPE_INTEGER_0 = 0x11;
 let SQLITE_DATATYPE_INTEGER_1 = 0x21;
 let SQLITE_DATATYPE_NULL = 0x05;
 let SQLITE_DATATYPE_OFFSET = 768;
+let SQLITE_DATATYPE_SHAREDARRAYBUFFER = 0x71;
 let SQLITE_DATATYPE_TEXT = 0x03;
 let SQLITE_DATATYPE_TEXT_0 = 0x13;
 let SQLITE_MAX_LENGTH2 = 1_000_000_000;
@@ -87,7 +85,7 @@ let debugInline = (function () {
 let sqlMessageDict = {}; // dict of web-worker-callbacks
 let sqlMessageId = 0;
 let sqlWorker;
-let version = "v2023.1.29";
+let version = "v2023.3.21";
 
 function assertJsonEqual(aa, bb, message) {
 
@@ -304,6 +302,26 @@ function dbExecAndReturnLastBlobAsync({
     });
 }
 
+async function dbExecAndReturnLastJsonAsync(option) {
+
+// This function will exec <sql> in <db> and return last value retrieved
+// from execution as raw text.
+
+    return JSON.parse(
+        await dbExecAndReturnLastTextAsync(option)
+    );
+}
+
+async function dbExecAndReturnLastTextAsync(option) {
+
+// This function will exec <sql> in <db> and return last value retrieved
+// from execution as raw text.
+
+    return new TextDecoder().decode(
+        await dbExecAndReturnLastBlobAsync(option)
+    );
+}
+
 async function dbExecAsync({
     bindList = [],
     db,
@@ -337,7 +355,7 @@ async function dbExecAsync({
             );
             modeRetry -= 1;
             await new Promise(function (resolve) {
-                setTimeout(resolve, 50);
+                setTimeout(resolve, 5_000 * !process.env.npm_config_mode_test);
             });
         }
     }
@@ -561,14 +579,13 @@ function jsbatonValuePush({
     let vtype;
 /*
 #define SQLITE_DATATYPE_BLOB            0x04
-// #define SQLITE_DATATYPE_BLOB_0          0x14
 #define SQLITE_DATATYPE_FLOAT           0x02
-// #define SQLITE_DATATYPE_FLOAT_0         0x12
 #define SQLITE_DATATYPE_INTEGER         0x01
 #define SQLITE_DATATYPE_INTEGER_0       0x11
 #define SQLITE_DATATYPE_INTEGER_1       0x21
 #define SQLITE_DATATYPE_NULL            0x05
-#define SQLITE_DATATYPE_EXTERNALBUFFER       -0x01
+#define SQLITE_DATATYPE_OFFSET          768
+#define SQLITE_DATATYPE_SHAREDARRAYBUFFER       0x71
 #define SQLITE_DATATYPE_TEXT            0x03
 #define SQLITE_DATATYPE_TEXT_0          0x13
     //  1. false.bigint
@@ -655,7 +672,7 @@ function jsbatonValuePush({
                 "externalbufferList.length must be less than 8"
             );
             externalbufferList.push(new DataView(value));
-            vtype = SQLITE_DATATYPE_EXTERNALBUFFER;
+            vtype = SQLITE_DATATYPE_SHAREDARRAYBUFFER;
             vsize = 4;
             break;
         }
@@ -732,18 +749,6 @@ function jsbatonValuePush({
             vsize
         ).set(new Uint8Array(value.buffer, value.byteOffset, vsize), 0);
         break;
-    case SQLITE_DATATYPE_EXTERNALBUFFER:
-        vsize = value.byteLength;
-        // push vsize
-        assertOrThrow(
-            0 <= vsize && vsize <= 1_000_000_000,
-            (
-                "sqlite-blob byte-length must be within inclusive-range"
-                + " 0 to 1,000,000,000"
-            )
-        );
-        baton.setInt32(nused + 1, vsize, true);
-        break;
     case SQLITE_DATATYPE_FLOAT:
         baton.setFloat64(nused + 1, value, true);
         break;
@@ -760,6 +765,18 @@ function jsbatonValuePush({
         );
         baton.setBigInt64(nused + 1, value, true);
         break;
+    case SQLITE_DATATYPE_SHAREDARRAYBUFFER:
+        vsize = value.byteLength;
+        // push vsize
+        assertOrThrow(
+            0 <= vsize && vsize <= 1_000_000_000,
+            (
+                "sqlite-blob byte-length must be within inclusive-range"
+                + " 0 to 1,000,000,000"
+            )
+        );
+        baton.setInt32(nused + 1, vsize, true);
+        break;
     }
     return baton;
 }
@@ -977,6 +994,8 @@ export {
     assertOrThrow,
     dbCloseAsync,
     dbExecAndReturnLastBlobAsync,
+    dbExecAndReturnLastJsonAsync,
+    dbExecAndReturnLastTextAsync,
     dbExecAsync,
     dbFileExportAsync,
     dbFileImportAsync,