utilitas 1995.2.13 → 1995.2.15

package/lib/dbio.mjs

@@ -25,6 +25,7 @@ const quote = name => `${bracket}${name}${bracket}`;
 const join = elements => elements.join(', ');
 const assembleDelete = table => `DELETE FROM ${quote(assertTable(table))}`;
 const execByQuery = async (...a) => await rawQuery(...distillArguments(...a));
+const getProvider = async () => (await init()) && provider;
 
 let provider, pool, actExecute, bracket, sqlShowTables, placeholder,
     sqlShowIndexes, fieldCountResult, sqlDesc, doublePlaceholder;
@@ -32,7 +33,7 @@ let provider, pool, actExecute, bracket, sqlShowTables, placeholder,
 const init = async (options) => {
     if (options) {
         const _provider = ensureString(options?.provider, { case: 'UP' });
-        let port;
+        let port, vector = '';
         switch (_provider) {
             case MYSQL:
             case 'MARIA':
@@ -70,6 +71,10 @@ const init = async (options) => {
                     ['pg_indexes', 'tablename', ''],
                     [`${IFSC}.COLUMNS`, 'TABLE_NAME', ''],
                 ].map(args => assembleQueryByKeyValue(...args));
+                if (options?.vector) {
+                    await enableVector();
+                    vector = '(vector)';
+                }
                 break;
             default:
                 assert(
@@ -80,6 +85,7 @@ const init = async (options) => {
         isPrimary && !options.silent && log(
             `Initialized: ${_provider.toLowerCase()}://${options.user}@`
             + `${options.host}:${options.port || port}/${options.database}`
+            + `${vector}`
         );
     }
     assert(pool, 'Database has not been initialized.', 501);
@@ -120,7 +126,6 @@ const rawQuery = async (...args) => {
 
 const rawExecute = async (...args) => {
     const conn = await init();
-    console.log(args);
     logCommand(...args);
     return await conn[actExecute](...args);
 };
@@ -422,9 +427,15 @@ const deleteAll = async (table, options) => {
     return await execute(assembleDelete(table));
 };
 
+const enableVector = async (options) => await execute(
+    'CREATE EXTENSION IF NOT EXISTS vector'
+);
+
 export default init;
 export {
     _NEED,
+    MYSQL,
+    POSTGRESQL,
     assembleInsert,
     assembleQuery,
     assembleSet,
@@ -437,8 +448,10 @@ export {
     deleteByKeyValue,
     desc,
     drop,
+    enableVector,
     end,
     execute,
+    getProvider,
     indexes,
     init,
     insert,

package/lib/manifest.mjs

@@ -1,7 +1,7 @@
 const manifest = {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1995.2.13",
+    "version": "1995.2.15",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",

package/lib/memory.mjs

@@ -1,25 +1,48 @@
 import {
-    deleteAll, deleteById, query, queryAll, queryById, upsert
+    MYSQL, POSTGRESQL, deleteAll, deleteById, getProvider, query, queryAll,
+    queryById, upsert,
 } from './dbio.mjs';
 
 import { ensureArray, parseJson, trim } from './utilitas.mjs';
 
 const [table, defaultKey] = ['utilitas_memory', { key: 'key' }];
 const [pack, unpack] = [val => JSON.stringify(val), val => parseJson(val, val)];
+const cleanSql = sql => sql.replace(/\ {8}/g, '');
+
+const initSql = {
+    [MYSQL]: [[
+        cleanSql(`CREATE TABLE IF NOT EXISTS ?? (
+            \`key\`       VARCHAR(255) NOT NULL,
+            \`value\`     TEXT,
+            \`createdAt\` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+            \`updatedAt\` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+            PRIMARY KEY (\`key\`),
+            INDEX (\`value\`(768)),
+            INDEX (\`createdAt\`),
+            INDEX (\`updatedAt\`)
+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4`), [table],
+    ]],
+    [POSTGRESQL]: [[
+        cleanSql(`CREATE TABLE IF NOT EXISTS ${table} (
+            key       VARCHAR(255) NOT NULL,
+            value     TEXT,
+            createdAt TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+            updatedAt TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+            PRIMARY KEY (key)
+        )`)
+    ], [
+        `CREATE INDEX IF NOT EXISTS value_index ON ${table} (value)`,
+    ], [
+        `CREATE INDEX IF NOT EXISTS createdAt_index ON ${table} (createdAt)`,
+    ], [
+        `CREATE INDEX IF NOT EXISTS updatedAt_index ON ${table} (updatedAt)`,
+    ]],
+};
 
 const init = async () => {
-    const _result = await query(
-        `CREATE TABLE IF NOT EXISTS ?? (
-        \`key\`       VARCHAR(255) NOT NULL,
-        \`value\`     TEXT,
-        \`createdAt\` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-        \`updatedAt\` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-        PRIMARY KEY (\`key\`),
-        INDEX (\`value\`(768)),
-        INDEX (\`createdAt\`),
-        INDEX (\`updatedAt\`)
-        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4`, [table]
-    );
+    const provider = await getProvider();
+    const _result = [];
+    for (let act of initSql[provider]) { _result.push(await query(...act)); }
     return { del, get, set, _result };
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1995.2.13",
+    "version": "1995.2.15",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",