@joystick.js/node-canary 0.0.0-canary.434 → 0.0.0-canary.435

package/dist/app/databases/postgresql/create_indexes.js

@@ -1 +1 @@
-import o from"node-cron";import t from"../../../lib/types.js";import i from"./handle_cleanup_sessions.js";const n=async(r="",e="",_=[])=>process.databases._users?.query(`CREATE UNIQUE INDEX IF NOT EXISTS ${r} ON ${e}(${_.join(", ")})`),s=async(r="",e="",_=[])=>process.databases._users?.query(`CREATE INDEX IF NOT EXISTS ${r} ON ${e}(${_.join(", ")})`),a={sessions:async()=>{await s("session_by_id","sessions",["session_id"]),await s("session_created_at","sessions",["created_at"]),o.schedule("*/30 * * * * *",()=>{i()})},users:async()=>{await s("user_by_email","users",["email_address"]),await s("user_by_username","users",["username"]),await s("user_by_user_id","users",["user_id"]),await s("user_session_by_token","users_sessions",["token"]),await s("user_password_reset_token_by_token","users_password_reset_tokens",["token"]),await s("user_password_reset_token_by_user_id_token","users_password_reset_tokens",["user_id","token"]),await s("user_role","users_roles",["role"]),await s("user_roles_by_user_id_role","users_roles",["user_id","role"]),await s("role","roles",["role"]),await n("user_roles","users_roles",["user_id","role"])}},u=async(r=[])=>{for(let e=0;e<r?.length;e+=1){const _=r[e];t.is_function(a[_])&&await a[_]()}};var w=u;export{w as default};
+import t from"node-cron";import i from"../../../lib/types.js";import n from"./handle_cleanup_sessions.js";const u=async(r="",e="",_="",a=[])=>process.databases[r]?.query(`CREATE UNIQUE INDEX IF NOT EXISTS ${e} ON ${_}(${a.join(", ")})`),s=async(r="",e="",_="",a=[])=>process.databases[r]?.query(`CREATE INDEX IF NOT EXISTS ${e} ON ${_}(${a.join(", ")})`),o={sessions:async()=>{await s("_sessions","session_by_id","sessions",["session_id"]),await s("_sessions","session_created_at","sessions",["created_at"]),t.schedule("*/30 * * * * *",()=>{n()})},users:async()=>{await s("_users","user_by_email","users",["email_address"]),await s("_users","user_by_username","users",["username"]),await s("_users","user_by_user_id","users",["user_id"]),await s("user_session_by_token","users_sessions",["token"]),await s("_users","user_password_reset_token_by_token","users_password_reset_tokens",["token"]),await s("_users","user_password_reset_token_by_user_id_token","users_password_reset_tokens",["user_id","token"]),await s("_users","user_role","users_roles",["role"]),await s("_users","user_roles_by_user_id_role","users_roles",["user_id","role"]),await s("_users","role","roles",["role"]),await u("_users","user_roles","users_roles",["user_id","role"])}},d=async(r=[])=>{for(let e=0;e<r?.length;e+=1){const _=r[e];i.is_function(o[_])&&await o[_]()}};var y=d;export{y as default};

package/dist/app/databases/postgresql/create_tables.js

@@ -1 +1 @@
-import a from"../../../lib/types.js";const e=(s="",t=[])=>process.databases._users?.query(`CREATE TABLE IF NOT EXISTS ${s} (${t.join(", ")})`),i={sessions:async()=>{await e("sessions",["id bigserial primary key","session_id text","csrf text","created_at text"])},users:async()=>{await e("users",["id bigserial primary key","user_id text","email_address text","password text","username text","language text"]),await e("users_sessions",["id bigserial primary key","user_id text","token text","token_expires_at text"]),await e("users_password_reset_tokens",["id bigserial primary key","user_id text","token text","requested_at text"]),await e("users_verify_email_tokens",["id bigserial primary key","user_id text","token text"]),await e("roles",["id bigserial primary key","role text"]),await e("users_roles",["id bigserial primary key","user_id text","role text"])}},o=async(s=[])=>{for(let t=0;t<s?.length;t+=1){const r=s[t];a.is_function(i[r])&&await i[r]()}};var _=o;export{_ as default};
+import a from"../../../lib/types.js";const e=(t="",s="",r=[])=>process.databases[t]?.query(`CREATE TABLE IF NOT EXISTS ${s} (${r.join(", ")})`),i={sessions:async()=>{await e("_sessions","sessions",["id bigserial primary key","session_id text","csrf text","created_at text"])},users:async()=>{await e("_users","users",["id bigserial primary key","user_id text","email_address text","password text","username text","language text"]),await e("_users","users_sessions",["id bigserial primary key","user_id text","token text","token_expires_at text"]),await e("_users","users_password_reset_tokens",["id bigserial primary key","user_id text","token text","requested_at text"]),await e("_users","users_verify_email_tokens",["id bigserial primary key","user_id text","token text"]),await e("_users","roles",["id bigserial primary key","role text"]),await e("_users","users_roles",["id bigserial primary key","user_id text","role text"])}},o=async(t=[])=>{for(let s=0;s<t?.length;s+=1){const r=t[s];a.is_function(i[r])&&await i[r]()}};var n=o;export{n as default};

package/dist/app/databases/postgresql/handle_cleanup_sessions.js

@@ -1 +1 @@
-const e=async()=>{await database.query("DELETE FROM sessions where created_at::timestamp <= timezone('utc', now() - interval '1 hour')")};var a=e;export{a as default};
+const s=async()=>{await process.databases._sessions.query("DELETE FROM sessions where created_at::timestamp <= timezone('utc', now() - interval '1 hour')")};var e=s;export{e as default};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@joystick.js/node-canary",
   "type": "module",
-  "version": "0.0.0-canary.434",
+  "version": "0.0.0-canary.435",
   "description": "The Node.js framework for Joystick.",
   "main": "./dist/index.js",
   "scripts": {

package/src/app/databases/postgresql/create_indexes.js

@@ -2,12 +2,12 @@ import cron from 'node-cron';
 import types from "../../../lib/types.js";
 import handle_cleanup_sessions from "./handle_cleanup_sessions.js";
 
-const create_unique_index = async (index_name = '', table_name = '', table_columns = []) => {
-  return process.databases._users?.query(`CREATE UNIQUE INDEX IF NOT EXISTS ${index_name} ON ${table_name}(${table_columns.join(', ')})`);
+const create_unique_index = async (target_database = '', index_name = '', table_name = '', table_columns = []) => {
+  return process.databases[target_database]?.query(`CREATE UNIQUE INDEX IF NOT EXISTS ${index_name} ON ${table_name}(${table_columns.join(', ')})`);
 };
 
-const create_index = async (index_name = '', table_name = '', table_columns = []) => {
-  return process.databases._users?.query(`CREATE INDEX IF NOT EXISTS ${index_name} ON ${table_name}(${table_columns.join(', ')})`);
+const create_index = async (target_database = '', index_name = '', table_name = '', table_columns = []) => {
+  return process.databases[target_database]?.query(`CREATE INDEX IF NOT EXISTS ${index_name} ON ${table_name}(${table_columns.join(', ')})`);
 };
 
 const indexes = {
@@ -15,8 +15,8 @@ const indexes = {
 	// app/databases/queries/<provider>/queues.js initialize_database function
 	// to account for developer customization options.
 	sessions: async () => {
-	  await create_index('session_by_id', 'sessions', ['session_id']);
-	  await create_index('session_created_at', 'sessions', ['created_at']);
+	  await create_index('_sessions', 'session_by_id', 'sessions', ['session_id']);
+	  await create_index('_sessions', 'session_created_at', 'sessions', ['created_at']);
 
 	  // NOTE: Simulate a TTL index using cron to wipe out sessions older than 1 hour.
     cron.schedule('*/30 * * * * *', () => {
@@ -25,24 +25,24 @@ const indexes = {
 	},
 	users: async () => {
 	  // users
-	  await create_index('user_by_email', 'users', ['email_address']);
-	  await create_index('user_by_username', 'users', ['username']);
-	  await create_index('user_by_user_id', 'users', ['user_id']);
+	  await create_index('_users', 'user_by_email', 'users', ['email_address']);
+	  await create_index('_users', 'user_by_username', 'users', ['username']);
+	  await create_index('_users', 'user_by_user_id', 'users', ['user_id']);
 	  
 	  // users_sessions
 	  await create_index('user_session_by_token', 'users_sessions', ['token']);
 
 	  // users_password_reset_tokens
-	  await create_index('user_password_reset_token_by_token', 'users_password_reset_tokens', ['token']);
-	  await create_index('user_password_reset_token_by_user_id_token', 'users_password_reset_tokens', ['user_id', 'token']);
+	  await create_index('_users', 'user_password_reset_token_by_token', 'users_password_reset_tokens', ['token']);
+	  await create_index('_users', 'user_password_reset_token_by_user_id_token', 'users_password_reset_tokens', ['user_id', 'token']);
 	 
 	  // users_roles
-	  await create_index('user_role', 'users_roles', ['role']);
-	  await create_index('user_roles_by_user_id_role', 'users_roles', ['user_id', 'role']);
+	  await create_index('_users', 'user_role', 'users_roles', ['role']);
+	  await create_index('_users', 'user_roles_by_user_id_role', 'users_roles', ['user_id', 'role']);
 	  
 	  // roles
-	  await create_index('role', 'roles', ['role']);
-	  await create_unique_index('user_roles', 'users_roles', ['user_id', 'role']);
+	  await create_index('_users', 'role', 'roles', ['role']);
+	  await create_unique_index('_users', 'user_roles', 'users_roles', ['user_id', 'role']);
 	},
 };
 

package/src/app/databases/postgresql/create_tables.js

@@ -1,7 +1,7 @@
 import types from "../../../lib/types.js";
 
-const create_table = (table_name = '', table_columns = []) => {
-  return process.databases._users?.query(
+const create_table = (target_database = '', table_name = '', table_columns = []) => {
+  return process.databases[target_database]?.query(
     `CREATE TABLE IF NOT EXISTS ${table_name} (${table_columns.join(", ")})`
   );
 };
@@ -11,49 +11,49 @@ const tables = {
 	// app/databases/queries/<provider>/queues.js initialize_database function
 	// to account for dynamic table names.
 	sessions: async () => {
-	  await create_table("sessions", [
-	    "id bigserial primary key",
-	    "session_id text",
-	    "csrf text",
-	    "created_at text"
+	  await create_table('_sessions', 'sessions', [
+	    'id bigserial primary key',
+	    'session_id text',
+	    'csrf text',
+	    'created_at text'
 	  ]);
 	},
 	users: async () => {
-	  await create_table("users", [
-	    "id bigserial primary key",
-	    "user_id text",
-	    "email_address text",
-	    "password text",
-	    "username text",
-	    "language text",
+	  await create_table('_users', 'users', [
+	    'id bigserial primary key',
+	    'user_id text',
+	    'email_address text',
+	    'password text',
+	    'username text',
+	    'language text',
 	  ]);
 
-	  await create_table("users_sessions", [
-	    "id bigserial primary key",
-	    "user_id text",
-	    "token text",
-	    "token_expires_at text",
+	  await create_table('_users', 'users_sessions', [
+	    'id bigserial primary key',
+	    'user_id text',
+	    'token text',
+	    'token_expires_at text',
 	  ]);
 
-	  await create_table("users_password_reset_tokens", [
-	    "id bigserial primary key",
-	    "user_id text",
-	    "token text",
-	    "requested_at text",
+	  await create_table('_users', 'users_password_reset_tokens', [
+	    'id bigserial primary key',
+	    'user_id text',
+	    'token text',
+	    'requested_at text',
 	  ]);
 
-	  await create_table("users_verify_email_tokens", [
-	    "id bigserial primary key",
-	    "user_id text",
-	    "token text",
+	  await create_table('_users', 'users_verify_email_tokens', [
+	    'id bigserial primary key',
+	    'user_id text',
+	    'token text',
 	  ]);
 
-	  await create_table("roles", ["id bigserial primary key", "role text"]);
+	  await create_table('_users', 'roles', ['id bigserial primary key', 'role text']);
 
-	  await create_table("users_roles", [
-	    "id bigserial primary key",
-	    "user_id text",
-	    "role text",
+	  await create_table('_users', 'users_roles', [
+	    'id bigserial primary key',
+	    'user_id text',
+	    'role text',
 	  ]);
 	},
 };

package/src/app/databases/postgresql/handle_cleanup_sessions.js

@@ -1,5 +1,5 @@
 const handle_cleanup_sessions = async () => {
-	await database.query(`DELETE FROM sessions where created_at::timestamp <= timezone('utc', now() - interval '1 hour')`);
+	await process.databases._sessions.query(`DELETE FROM sessions where created_at::timestamp <= timezone('utc', now() - interval '1 hour')`);
 };
 
 export default handle_cleanup_sessions;