@onetype/framework 2.0.49 → 2.0.52

package/addons/core/database/back/items/commands/update.js

@@ -0,0 +1,70 @@
+import onetype from '#framework/load.js';
+
+onetype.AddonReady('commands', (commands) =>
+{
+	commands.Item({
+		id: 'database:update',
+		exposed: true,
+		method: 'POST',
+		endpoint: '/api/database/update',
+		in: {
+			addon: ['string', null, true],
+			id: ['string', null, true],
+			data: ['object', null, true],
+			translation: ['string']
+		},
+		out: {
+			item: ['object']
+		},
+		callback: async function(properties, resolve)
+		{
+			const addon = onetype.AddonGet(properties.addon);
+
+			if(!addon)
+			{
+				return resolve(null, 'Addon not found.', 404);
+			}
+
+			const expose = addon.database?.expose;
+
+			if(!expose)
+			{
+				return resolve(null, 'Addon is not exposed.', 403);
+			}
+
+			if(!expose.update)
+			{
+				return resolve(null, 'Update is not allowed.', 403);
+			}
+
+			if(!properties.data?.id || (typeof properties.data.id !== 'string' && typeof properties.data.id !== 'number'))
+			{
+				return resolve(null, 'Invalid or missing id.', 400);
+			}
+
+			const item = await addon.Find({translation: properties.translation}).filter('id', properties.data.id).one(true);
+
+			if(!item)
+			{
+				return resolve(null, 'Item not found.', 404);
+			}
+
+			Object.entries(properties.data).forEach(([key, value]) =>
+			{
+				item.Set(key, value);
+			});
+
+			const allowed = expose.update.call({http: this.http, properties, item});
+
+			if(allowed !== true)
+			{
+				return resolve(null, typeof allowed === 'string' ? allowed : 'Update not allowed.', 400);
+			}
+
+			await item.Update({translation: properties.translation});
+			const fields = expose.select || Object.keys(addon.Fields().data);
+
+			resolve({item: item.Get(fields)});
+		}
+	});
+});

package/addons/core/database/back/load.js

@@ -1,37 +1,38 @@
 import onetype from '#framework/load.js';
-import database from '#database/addon.js';
 
-import '#database/functions/find.js';
-import '#database/functions/create.js';
-import '#database/functions/update.js';
-import '#database/functions/delete.js';
+import '#database/events/addon.init.js';
+import '#database/events/addon.item.init.js';
 
-import '#database/functions/find/many.js';
-import '#database/functions/find/count.js';
-import '#database/functions/find/plain.js';
-import '#database/functions/find/filter.js';
-import '#database/functions/find/filters.js';
-import '#database/functions/find/methods.js';
-import '#database/functions/find/builder.js';
-import '#database/functions/find/validation.js';
+import database from '#database/addon.js';
 
-import '#database/item/functions/create.js';
-import '#database/item/functions/update.js';
-import '#database/item/functions/delete.js';
-import '#database/item/functions/find.js';
-import '#database/item/functions/save.js';
-import '#database/item/functions/transaction.js';
+import '#database/functions/items/find.js';
+import '#database/functions/item/create.js';
+import '#database/functions/item/update.js';
+import '#database/functions/item/delete.js';
+import '#database/functions/item/save.js';
 
-import '#database/item/catch/add.js';
+import '#database/functions/items/filter.js';
+import '#database/functions/items/filters.js';
+import '#database/functions/items/methods.js';
+import '#database/functions/items/builder.js';
+import '#database/functions/items/validation.js';
 
-import '#database/events/addon.add.js';
+import '#database/functions/items/methods/query.js';
+import '#database/functions/items/transform/join.js';
+import '#database/functions/items/transform/translate.js';
+import '#database/functions/items/methods/many.js';
+import '#database/functions/items/methods/one.js';
+import '#database/functions/items/methods/count.js';
+import '#database/functions/items/methods/plain.js';
+import '#database/functions/items/methods/exists.js';
+import '#database/functions/items/methods/aggregate.js';
 
-import '#database/events/middleware/addon.items.find.js';
-import '#database/events/middleware/item.crud.create.js';
-import '#database/events/middleware/item.crud.update.js';
-import '#database/events/middleware/item.crud.delete.js';
+import '#database/item/catch/add.js';
 
-import '#database/items/commands/expose.js';
+import '#database/items/commands/find.js';
+import '#database/items/commands/create.js';
+import '#database/items/commands/update.js';
+import '#database/items/commands/delete.js';
 
 onetype.DataSchema('filter', {
     field: ['string', null, true],

package/addons/core/database/front/events/addon.init.js

@@ -0,0 +1,42 @@
+onetype.EmitOn('@addon.init', (addon) =>
+{
+	addon.database =
+	{
+		expose: null,
+		table: null,
+		translations: null
+	};
+
+	addon.Table = function() {};
+	addon.Expose = function() {};
+	addon.Translations = function() {};
+
+	addon.Find = function({translation = null} = {})
+	{
+		translation = translation ? translation : onetype.Language();
+
+		return database.Fn('find', addon, translation);
+	};
+});
+
+onetype.EmitOn('@addon.item.init', (item) =>
+{
+	item.Create = async function({translation = null} = {})
+	{
+		translation = translation || onetype.Language();
+
+		return database.Fn('create', item, translation);
+	};
+
+	item.Update = async function({translation = null} = {})
+	{
+		translation = translation || onetype.Language();
+
+		return database.Fn('update', item, translation);
+	};
+
+	item.Delete = async function()
+	{
+		return database.Fn('delete', item);
+	};
+});

package/addons/core/database/front/functions/create.js

@@ -0,0 +1,11 @@
+database.Fn('create', async function(item, translation)
+{
+	const result = await $ot.command('database:create', {
+		addon: item.addon.name,
+		data: item.data,
+		translation
+	}, true);
+
+	item.SetData(result.data.item, false);
+	return item;
+});

package/addons/core/database/front/functions/delete.js

@@ -0,0 +1,10 @@
+database.Fn('delete', async function(item)
+{
+	const result = await $ot.command('database:delete', {
+		addon: item.addon.name,
+		id: item.Get('id')
+	}, true);
+
+	item.Set('id', null);
+	return item;
+});

package/addons/core/database/front/functions/find.js

@@ -1,142 +1,96 @@
-database.Fn('find', function(addon)
-{
-	const state = {
-		addon: addon.GetName(),
-		filters: [],
-		joins: [],
-		sort_field: null,
-		sort_direction: 'asc',
-		page: 1,
-		limit: 50
-	};
-
-	const methods = {};
-
-	methods.filter = function(field, value, operator = 'EQUALS')
-	{
-		state.filters.push({ field, value, operator });
-		return methods;
-	};
-
-	methods.join = function(addon, field, output, select)
-	{
-		const join = { addon, field, output: output || field };
-
-		if(select)
-		{
-			join.select = Array.isArray(select) ? select : [select];
-		}
-
-		state.joins.push(join);
-		return methods;
-	};
-
-	methods.sort = function(field, direction = 'asc')
-	{
-		state.sort_field = field;
-		state.sort_direction = direction;
-		return methods;
-	};
-
-	methods.page = function(page)
-	{
-		state.page = page;
-		return methods;
-	};
-
-	methods.limit = function(limit)
-	{
-		state.limit = limit;
-		return methods;
-	};
-
-	methods.select = function(fields)
-	{
-		state.select = Array.isArray(fields) ? fields : [fields];
-		return methods;
-	};
-
-	methods.many = async function(set = false)
-	{
-		const response = await fetch('/api/database', {
-			method: 'POST',
-			headers: {
-				'Content-Type': 'application/json'
-			},
-			body: JSON.stringify(state)
-		});
-
-		const result = await response.json();
-
-		if(result.code !== 200)
-		{
-			throw new Error(result.message);
-		}
-
-		const items = result.data.items.map(function(data)
-		{
-			return addon.ItemAdd(data, null, false, set);
-		});
-
-		return items;
-	};
-
-	methods.one = async function(set = false)
-	{
-		state.limit = 1;
-
-		const items = await methods.many(set);
-
-		return items.length > 0 ? items[0] : null;
-	};
-
-	methods.plain = async function()
-	{
-		const response = await fetch('/api/database', {
-			method: 'POST',
-			headers: {
-				'Content-Type': 'application/json'
-			},
-			body: JSON.stringify(state)
-		});
-
-		const result = await response.json();
-
-		if(result.code !== 200)
-		{
-			throw new Error(result.message);
-		}
-
-		const total = result.data.total || 0;
-
-		return {
-			items: result.data.items,
-			total,
-			page: result.data.page || state.page,
-			pages: state.limit > 0 ? Math.ceil(total / state.limit) : 1,
-			limit: result.data.limit || state.limit
-		};
-	};
-
-	methods.count = async function()
-	{
-		const response = await fetch('/api/database', {
-			method: 'POST',
-			headers: {
-				'Content-Type': 'application/json'
-			},
-			body: JSON.stringify(state)
-		});
-
-		const result = await response.json();
-
-		if(result.code !== 200)
-		{
-			throw new Error(result.message);
-		}
-
-		return result.data.total;
-	};
-
-	return methods;
-});
+database.Fn('find', function(addon, translation)
+{
+	const state = {
+		addon: addon.name,
+		filters: [],
+		sort_field: null,
+		sort_direction: 'asc',
+		page: 1,
+		limit: 50,
+		translation
+	};
+
+	const request = async function()
+	{
+		const response = await fetch('/api/database/find', {
+			method: 'POST',
+			headers: { 'Content-Type': 'application/json' },
+			body: JSON.stringify(state)
+		});
+
+		const result = await response.json();
+
+		if(result.code !== 200)
+		{
+			throw new Error(result.message);
+		}
+
+		return result.data;
+	};
+
+	const methods = {};
+
+	methods.filter = function(field, value, operator = 'EQUALS')
+	{
+		state.filters.push({ field, value, operator });
+		return methods;
+	};
+
+	methods.sort = function(field, direction = 'asc')
+	{
+		state.sort_field = field;
+		state.sort_direction = direction;
+		return methods;
+	};
+
+	methods.page = function(page)
+	{
+		state.page = page;
+		return methods;
+	};
+
+	methods.limit = function(limit)
+	{
+		state.limit = limit;
+		return methods;
+	};
+
+	methods.select = function(fields)
+	{
+		state.select = Array.isArray(fields) ? fields : [fields];
+		return methods;
+	};
+	
+	methods.many = async function(set = false)
+	{
+		const data = await request();
+		return data.items.map(item => addon.ItemAdd(item, null, false, set));
+	};
+
+	methods.one = async function(set = false)
+	{
+		state.limit = 1;
+		const items = await methods.many(set);
+		return items.length > 0 ? items[0] : null;
+	};
+
+	methods.plain = async function()
+	{
+		return request();
+	};
+
+	methods.count = async function()
+	{
+		const data = await request();
+		return data.total;
+	};
+
+	methods.exists = async function()
+	{
+		state.limit = 1;
+		const data = await request();
+		return data.total > 0;
+	};
+
+	return methods;
+});

package/addons/core/database/front/functions/update.js

@@ -0,0 +1,12 @@
+database.Fn('update', async function(item, translation)
+{
+	const result = await $ot.command('database:update', {
+		addon: item.addon.name,
+		id: item.Get('id'),
+		data: item.data,
+		translation
+	}, true);
+
+	item.SetData(result.data.item, false);
+	return item;
+});

package/addons/float/popup/css/popup.css

@@ -38,23 +38,35 @@
 .ot-toast
 {
 	display: flex;
-	align-items: flex-start;
+	align-items: center;
 	gap: var(--ot-spacing-m);
-	padding: var(--ot-spacing-m);
-	background: var(--ot-bg-2);
-	border: 1px solid var(--ot-bg-2-border);
-	border-radius: var(--ot-radius-m);
+	padding: 16px 20px;
+	background: var(--ot-bg-1);
+	border: 1px solid var(--ot-bg-1-border);
+	border-radius: var(--ot-radius-l);
 	color: var(--ot-text-1);
 	font-size: var(--ot-size-m);
-	min-width: 280px;
-	max-width: 400px;
-	box-shadow: 0 8px 24px rgba(0, 0, 0, 0.3);
+	min-width: 320px;
+	max-width: 420px;
+	animation: toast-in 0.35s cubic-bezier(0.22, 1, 0.36, 1);
+}
+
+@keyframes toast-in
+{
+	from { opacity: 0; transform: translateY(-12px) scale(0.96); }
+	to { opacity: 1; transform: translateY(0) scale(1); }
 }
 
 .ot-toast > .icon
 {
-	font-size: 20px;
-	margin-top: 1px;
+	width: 32px;
+	height: 32px;
+	border-radius: 8px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 18px;
+	flex-shrink: 0;
 }
 
 .ot-toast > .content
@@ -65,29 +77,140 @@
 .ot-toast > .content > .title
 {
 	font-weight: 600;
-	margin-bottom: 2px;
+	font-size: 13.5px;
+	margin-bottom: 3px;
+	color: var(--ot-text-1);
 }
 
 .ot-toast > .content > .message
 {
-	color: var(--ot-text-2);
+	font-size: var(--ot-size-m);
+	font-weight: 600;
+	line-height: 1.45;
+	color: var(--ot-text-1);
 }
 
 .ot-toast > .close
 {
+	width: 28px;
+	height: 28px;
 	background: none;
 	border: none;
-	color: var(--ot-text-2);
+	color: var(--ot-text-3);
 	cursor: pointer;
-	padding: 0;
+	border-radius: 6px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-shrink: 0;
+	transition: background 0.15s ease, color 0.15s ease;
 }
 
 .ot-toast > .close:hover
 {
+	background: var(--ot-bg-2);
 	color: var(--ot-text-1);
 }
 
-.ot-toast.info > .icon { color: var(--ot-blue); }
-.ot-toast.success > .icon { color: var(--ot-green); }
-.ot-toast.warning > .icon { color: var(--ot-orange); }
-.ot-toast.error > .icon { color: var(--ot-red); }
+.ot-toast > .close > i
+{
+	font-size: 16px;
+}
+
+.ot-toast.info > .icon { background: var(--ot-blue-opacity); color: var(--ot-blue); }
+.ot-toast.success > .icon { background: var(--ot-green-opacity); color: var(--ot-green); }
+.ot-toast.warning > .icon { background: var(--ot-orange-opacity); color: var(--ot-orange); }
+.ot-toast.error > .icon { background: var(--ot-red-opacity); color: var(--ot-red); }
+
+/* Confirm */
+
+.ot-confirm
+{
+	display: flex;
+	flex-direction: column;
+	padding: 28px 32px 24px;
+	background: var(--ot-bg-1);
+	border: 1px solid var(--ot-bg-1-border);
+	border-radius: 20px;
+	min-width: 400px;
+	max-width: 460px;
+	animation: confirm-in 0.25s cubic-bezier(0.22, 1, 0.36, 1);
+}
+
+@keyframes confirm-in
+{
+	from { opacity: 0; transform: scale(0.95) translateY(8px); }
+	to { opacity: 1; transform: scale(1) translateY(0); }
+}
+
+/* Icon */
+
+.ot-confirm > .icon
+{
+	width: 44px;
+	height: 44px;
+	border-radius: 12px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-bottom: 18px;
+}
+
+.ot-confirm > .icon > i
+{
+	font-size: 22px;
+}
+
+.ot-confirm > .icon.default { background: var(--ot-brand-opacity); color: var(--ot-brand); }
+.ot-confirm > .icon.danger { background: var(--ot-red-opacity); color: var(--ot-red); }
+.ot-confirm > .icon.warning { background: var(--ot-orange-opacity); color: var(--ot-orange); }
+.ot-confirm > .icon.info { background: var(--ot-blue-opacity); color: var(--ot-blue); }
+.ot-confirm > .icon.success { background: var(--ot-green-opacity); color: var(--ot-green); }
+
+/* Title */
+
+.ot-confirm > .title
+{
+	font-family: var(--ot-font-secondary);
+	font-size: 22px;
+	font-weight: 500;
+	letter-spacing: -0.015em;
+	line-height: 1.15;
+	color: var(--ot-text-1);
+	margin-bottom: 8px;
+}
+
+/* Description */
+
+.ot-confirm > .description
+{
+	font-size: 13.5px;
+	line-height: 1.55;
+	color: var(--ot-text-2);
+	margin-bottom: 24px;
+}
+
+/* Input */
+
+.ot-confirm > .input
+{
+	width: 100%;
+	margin-bottom: 24px;
+}
+
+/* Actions */
+
+.ot-confirm > .actions
+{
+	display: flex;
+	gap: 10px;
+	width: 100%;
+	padding-top: 20px;
+	border-top: 1px solid var(--ot-bg-1-border);
+}
+
+.ot-confirm > .actions > *
+{
+	flex: 1;
+	width: 100%;
+}

package/addons/float/popup/js/addon.js

@@ -32,3 +32,8 @@ onetype.$ot.toast = function(message, options)
 onetype.$ot.toast.open = onetype.$ot.toast;
 onetype.$ot.toast.close = (id) => popup.Fn('close', id);
 
+onetype.$ot.confirm = function(title, description, options)
+{
+	return popup.Fn('confirm', title, description, options);
+};
+