@thzero/library_client_svelte 0.15.7 → 0.15.9

package/boot/baseServices.js

@@ -13,19 +13,19 @@ class SvelteBaseServices extends BaseServices {
 	}
 
 	_initializeEvent(injector) {
-		return new eventService(injector);
+		return new eventService();
 	}
 
 	_initializeRouter(injector) {
-		return new routerService(injector);
+		return new routerService();
 	}
 
 	_initializeStore(injector) {
-		return new storeService(injector);
+		return new storeService();
 	}
 
 	_initializeTranslate(injector) {
-		return new translateService(injector);
+		return new translateService();
 	}
 }
 

package/boot/baseValidation.js

@@ -0,0 +1,54 @@
+class BaseValidate {
+	// eslint-disable-next-line
+	async execute(framework, app, store) {
+// 		extend('decimal', {
+// 			validate: (value, { decimals = '*', separator = '.' } = {}) => {
+// 				if (value === null || value === undefined || value === '') {
+// 					return {
+// 						valid: false
+// 					};
+// 				}
+// 				if (Number(decimals) === 0) {
+// 					return {
+// 						valid: /^-?\d*$/.test(value)
+// 					};
+// 				}
+// 				const regexPart = decimals === '*' ? '+' : `{1,${decimals}}`;
+// 				const regex = new RegExp(`^[-+]?\\d*(\\${separator}\\d${regexPart})?([eE]{1}[-]?\\d+)?$`);
+// 				return {
+// 					valid: regex.test(value),
+// 					data: {
+// 						serverMessage: 'Only decimal values are available'
+// 					}
+// 				};
+// 			},
+// 			message: '{serverMessage}'
+// 		});
+
+// 		extend('name', {
+// 			getMessage: field => 'The ' + field + ' field may only contain alphanumeric and space characters',
+// 			// eslint-disable-next-line
+// 			validate(value, args) {
+// 				const regEx = /^[a-zA-Z0-9]+(['\-a-zA-Z0-9 ]*)*$/;
+// 				return regEx.test(value);
+// 			}
+// 		});
+
+// 		extend('tagLine', {
+// 			getMessage: field => 'The ' + field + ' field may only contain alphanumeric, space, and punctuation characters',
+// 			// eslint-disable-next-line
+// 			validate(value, args) {
+// 				const regEx = /^[a-zA-Z0-9]+([',.!& \-a-zA-Z0-9 ]*)*$/;
+// 				return regEx.test(value);
+// 			}
+// 		});
+
+		this._initialize();
+	}
+
+	// eslint-disable-next-line
+	_initialize(extend) {
+	}
+}
+
+export default BaseValidate;

package/boot/basei18n.js

@@ -1,4 +1,4 @@
-import { init, getLocaleFromNavigator, register, _, t, addMessages } from 'svelte-i18n';
+import { init, getLocaleFromNavigator, register, format, addMessages, unwrapFunctionStore } from 'svelte-i18n';
 
 import GlobalUtility from '@thzero/library_client/utility/global';
 
@@ -8,14 +8,14 @@ import NotImplementedError from '@thzero/library_common/errors/notImplemented';
 
 class SvelteBasei18n extends Basei18n {
 	// eslint-disable-next-line
-	async execute(framework, app, router, store) {
+	async execute(framework, app, store) {
 		this._initMessages(register, addMessages);
 
 		init({
 			fallbackLocale: 'en',
 			initialLocale: getLocaleFromNavigator()
 		});
-		GlobalUtility.$trans = { t: _ };
+		GlobalUtility.$trans = { t: unwrapFunctionStore(format) };
 	}
 
 	_initMessages(register) {

package/boot/main.js

@@ -1,9 +1,10 @@
 import GlobalUtility from '@thzero/library_client/utility/global';
 
+// @ts-ignore
 import {} from '@thzero/library_common/utility/string';
 
 // eslint-disable-next-line
-async function start(app, router, storeRequest, bootFiles, starter) {
+async function start(app, storeRequest, bootFiles, starter) {
 	let store = null;
 	if (storeRequest) {
 		try {
@@ -18,8 +19,6 @@ async function start(app, router, storeRequest, bootFiles, starter) {
 	if (!store)
 		throw Error('Unable to create store.');
 	GlobalUtility.$store = store;
-	
-	GlobalUtility.$navRouter = router;
 
 	if (bootFiles && (bootFiles.length > 0)) {
 		let obj;
@@ -30,7 +29,6 @@ async function start(app, router, storeRequest, bootFiles, starter) {
 			try {
 				try {
 					await bootFile({
-						router,
 						store
 					});
 					continue;
@@ -38,7 +36,6 @@ async function start(app, router, storeRequest, bootFiles, starter) {
 				catch (err) {
 					obj = new bootFile();
 					await obj.execute(
-						router,
 						store
 					);
 					continue;
@@ -65,7 +62,6 @@ async function start(app, router, storeRequest, bootFiles, starter) {
 
 	try {
 		const result = starter({
-			router,
 			store
 		});
 

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@thzero/library_client_svelte",
-  "version": "0.15.7",
+  "version": "0.15.9",
   "version_major": 0,
   "version_minor": 15,
-  "version_patch": 7,
-  "version_date": "12/06/2022",
+  "version_patch": 9,
+  "version_date": "12/15/2022",
   "description": "An opinionated library of common functionality to bootstrap a Svelte based SPA application.",
   "author": "thZero",
   "license": "MIT",
@@ -24,7 +24,8 @@
     "@thzero/library_client": "^0.16",
     "@thzero/library_common": "^0.16",
     "mitt": "^3.0.0",
-    "svelte-i18n": "^3.6.0"
+    "svelte-i18n": "^3.6.0",
+    "svelte-spa-router": "^3.3.0"
   },
   "peerDependencies": {
     "svelte": "^3"

package/service/baseUser.js

@@ -0,0 +1,49 @@
+import LibraryConstants from '@thzero/library_client/constants';
+
+import BaseUserService from '@thzero/library_client/service/baseUser';
+
+class VueBaseUserService extends BaseUserService {
+	constructor() {
+		super();
+
+		this._serviceStore = null;
+	}
+
+	async init(injector) {
+		await super.init(injector);
+
+		this._serviceStore = this._injector.getService(LibraryConstants.InjectorKeys.SERVICE_STORE);
+	}
+
+	async resetUser(correlationId) {
+		await this._serviceStore.dispatcher.user.resetUser(correlationId);
+	}
+
+	async setAuthCompleted(correlationId) {
+		await this._serviceStore.dispatcher.user.setAuthCompleted(correlationId, true);
+	}
+
+	async setClaims(correlationId, claims) {
+		await this._serviceStore.dispatcher.user.setClaims(correlationId, claims);
+	}
+
+	async setLoggedIn(correlationId, value) {
+		await this._serviceStore.dispatcher.user.setLoggedIn(correlationId, value);
+	}
+	
+	async setTokenResult(correlationId, tokenResult) {
+		await this._serviceStore.dispatcher.user.setTokenResult(correlationId, tokenResult);
+	}
+
+	async setUser(correlationId, user) {
+		await this._serviceStore.dispatcher.user.setUser(correlationId, user);
+	}
+
+	get token() {
+		if (this._serviceStore.state.user) 
+			return this._serviceStore.state.user.token;
+		return null;
+	}
+}
+
+export default VueBaseUserService;

package/service/event.js

@@ -2,11 +2,11 @@ import GlobalUtility from '@thzero/library_client/utility/global';
 
 import EventService from '@thzero/library_client/service/event';
 
-class VueEventService extends EventService {
+class SvelteEventService extends EventService {
 	// eslint-disable-next-line
 	emit(channel, value) {
 		GlobalUtility.$EventBus.emit(channel, value);
 	}
 }
 
-export default VueEventService;
+export default SvelteEventService;

package/service/router.js

@@ -1,12 +1,12 @@
-import GlobalUtility from '@thzero/library_client/utility/global';
+import { navigateTo } from 'svelte-router-spa';
 
 import RouterService from '@thzero/library_client/service/router';
 
-class VueRouterService extends RouterService {
+class SvelteRouterService extends RouterService {
 	// eslint-disable-next-line
 	route(path, options) {
-		GlobalUtility.$navRouter.push(path);
+		navigateTo(path);
 	}
 }
 
-export default VueRouterService;
+export default SvelteRouterService;

package/service/store.js

@@ -2,10 +2,10 @@ import GlobalUtility from '@thzero/library_client/utility/global';
 
 import Service from '@thzero/library_client/service/index';
 
-class VuexStoreService extends Service {
+class SvelteStoreService extends Service {
 	get store() {
 		return GlobalUtility.$store;
 	}
 }
 
-export default VuexStoreService;
+export default SvelteStoreService;

package/service/translate.js

@@ -2,11 +2,11 @@ import GlobalUtility from '@thzero/library_client/utility/global';
 
 import TranslateService from '@thzero/library_client/service/translate';
 
-class VueTranslateService extends TranslateService {
+class SvelteTranslateService extends TranslateService {
 	// eslint-disable-next-line
 	translate(correlationId, id) {
 		return GlobalUtility.$trans.t(id);
 	}
 }
 
-export default VueTranslateService;
+export default SvelteTranslateService;