@actdim/dynstruct 1.1.1 → 1.1.3

package/dist/net/client.es.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.es.js","sources":["../../src/net/client.ts"],"sourcesContent":["import { v4 as uuid } from \"uuid\";\r\nimport httpStatus from \"http-status\";\r\nimport { getResponseResult, IFetcher, IRequestCallbacks, IRequestParams, IRequestState } from \"./request\";\r\nimport { ApiError } from \"./apiError\";\r\nimport { BaseAppMsgStruct, BaseAppContext } from \"@/appDomain/appContracts\";\r\nimport { MsgBus } from \"@actdim/msgmesh/msgBusCore\";\r\n\r\n// MLWEB-2172\r\n\r\n// TODO: support request cancellation\r\n// https://stackoverflow.com/questions/31061838/how-do-i-cancel-an-http-fetch-request\r\n// https://mukeshprajapati0251.medium.com/cancel-rest-api-pending-request-1af65e70366d\r\n\r\nexport function extractApiName(name: string, suffixes: string[]): string | null {\r\n    if (!name) {\r\n        return name;\r\n    }\r\n    const escaped = suffixes.map((s) => s.replace(/[.*+?^${}()|[\\]\\\\]/g, \"\\\\$&\"));\r\n    const group = escaped.join(\"|\");\r\n    const pattern = new RegExp(`(_?(${group}))+?$`, \"i\");\r\n\r\n    let result = name.replace(pattern, \"\");\r\n\r\n    result = result.trim();\r\n    return result.length > 0 ? result : name;\r\n}\r\n\r\nconst API_SUFFIXES = [\"api\", \"controller\", \"client\", \"fetcher\"];\r\n// App(Api)ClientBase\r\nexport class ClientBase {\r\n    protected baseUrl: string;\r\n    protected name: string;\r\n    // private requestStates\r\n    private requestStateMap: Map<string, IRequestState>;\r\n\r\n    private fetcher: IFetcher;\r\n\r\n    private msgBus: MsgBus<BaseAppMsgStruct>;\r\n\r\n    private accessToken: string;\r\n\r\n    private init: Promise<any>;\r\n\r\n    constructor(context: BaseAppContext, fetcher?: IFetcher) {\r\n        this.fetcher = fetcher || window;\r\n        this.requestStateMap = new Map<string, IRequestState>();\r\n        this.msgBus = context.msgBus;\r\n        // TODO: unsubscribe\r\n        this.msgBus.on({\r\n            channel: \"APP-SECURITY-AUTH-SIGNIN\",\r\n            group: \"out\",\r\n            callback: (msg) => {\r\n                this.accessToken = msg.payload.accessToken;\r\n            }\r\n        });\r\n        this.init = Promise.all([this.getBaseUrlAsync(), this.updateSecurityAsync()]);\r\n    }\r\n\r\n    protected async getBaseUrlAsync() {\r\n        const msg = await this.msgBus.dispatchAsync({\r\n            channel: \"APP-CONFIG-GET\"\r\n        });\r\n        const config = msg.payload;\r\n        const apiName = extractApiName(this.name, API_SUFFIXES);\r\n        const apiEntry = Object.entries(config.apis).find((entry) => entry[0].toLowerCase() === apiName?.toLowerCase());\r\n        this.baseUrl = apiEntry?.[1].url || config.baseUrl;\r\n    }\r\n\r\n    private async updateSecurityAsync() {\r\n        if (!this.accessToken) {\r\n            const msg = await this.msgBus.dispatchAsync({\r\n                channel: \"APP-SECURITY-GET-CONTEXT\"\r\n            });\r\n            this.accessToken = msg.payload.accessToken;\r\n        }\r\n        return this.accessToken;\r\n    }\r\n\r\n    private async addAuthorizationAsync(request: IRequestParams) {\r\n        const accessToken = await this.updateSecurityAsync();\r\n        if (!accessToken) {\r\n            throw ApiError.create({\r\n                status: httpStatus.UNAUTHORIZED\r\n            });\r\n        }\r\n        const authorizationHeader = \"Authorization\";\r\n        const headers = request.headers;\r\n        const headerValue = `Bearer ${accessToken}`;\r\n        if (headers instanceof Headers) {\r\n            // if (headers.has(authorizationHeader)) {\r\n            //     headers.delete(authorizationHeader)\r\n            // }\r\n            // headers.append(authorizationHeader, headerValue);\r\n            headers.set(authorizationHeader, headerValue);\r\n        } else {\r\n            throw new Error(\"Unsupported headers\"); // object type\r\n        }\r\n    }\r\n\r\n    private async executeRequestInternalAsync(request: IRequestState) {\r\n        try {\r\n            let proceed = true;\r\n            const onBeforeSendRequest = request.callbacks && request.callbacks.onBeforeSendRequest;\r\n            if (onBeforeSendRequest) {\r\n                const event = {\r\n                    request: request,\r\n                    cancel: false,\r\n                    handled: false\r\n                } as Parameters<IRequestCallbacks[\"onBeforeSendRequest\"]>[0];\r\n                await onBeforeSendRequest(event);\r\n                if (event.cancel) {\r\n                    // interrupt\r\n                    proceed = false;\r\n                    request.status = \"canceled\";\r\n                    if (event.handled) {\r\n                        request.result = event.result;\r\n                    } else {\r\n                        // ApiError?\r\n                        throw new Error(\"The request was aborted\"); // has been? canceled?\r\n                    }\r\n                }\r\n            }\r\n            if (proceed) {\r\n                request.status = \"executing\";\r\n                const response = await this.fetcher.fetch(request.url, request);\r\n                ApiError.assert(response, request);\r\n                let onResponseRead = request.callbacks && request.callbacks.onResponseRead;\r\n                if (!onResponseRead) {\r\n                    onResponseRead = async (event) => {\r\n                        const result = await getResponseResult(response, request);\r\n                        event.result = result;\r\n                    };\r\n                }\r\n                const event = {\r\n                    response: response\r\n                } as Parameters<IRequestCallbacks[\"onResponseRead\"]>[0];\r\n\r\n                await onResponseRead(event);\r\n                request.result = event.result;\r\n                request.status = \"succeeded\";\r\n            }\r\n        } catch (err) {\r\n            request.status = \"failed\";\r\n            // throw ApiError.create(undefined, request);\r\n            throw err;\r\n        }\r\n        return request;\r\n    }\r\n\r\n    private async executeRequestAsync(request: IRequestState): Promise<IRequestState> {\r\n        let attempt = 0;\r\n        do {\r\n            try {\r\n                if (request.useAuth) {\r\n                    await this.addAuthorizationAsync(request);\r\n                }\r\n                return await this.executeRequestInternalAsync(request);\r\n            } catch (err) {\r\n                if (err instanceof ApiError) {\r\n                    if (attempt > 0) {\r\n                        throw err;\r\n                    }\r\n                    if (err.status === httpStatus.UPGRADE_REQUIRED) {\r\n                        // await this.context.msgBus.dispatchAsync({\r\n                        //     channel: \"APP_RELOAD\" // APP_REQUEST_UPDGRADE\r\n                        // });\r\n                        throw err;\r\n                    } else if (err.status === httpStatus.UNAUTHORIZED) {\r\n                        if (err.response?.headers?.get(\"token-expired\")) {\r\n                            // token expired or invalid\r\n                            await this.msgBus.dispatchAsync({\r\n                                channel: \"APP-SECURITY-AUTH-REFRESH\"\r\n                            });\r\n                        } else {\r\n                            await this.msgBus.dispatchAsync({\r\n                                channel: \"APP-SECURITY-REQUEST-AUTH\"\r\n                            });\r\n                        }\r\n                        // codes:\r\n                        // TOKEN_EXPIRED\r\n                        // TOKEN_INVALID\r\n                        // TOKEN_MISSING\r\n                        // AUTH_REQUIRED\r\n                        // header: WWW-Authenticate\r\n                        continue;\r\n                    }\r\n                    continue;\r\n                }\r\n                throw err;\r\n            } finally {\r\n                attempt++;\r\n            }\r\n        } while (true);\r\n    }\r\n\r\n    // T extends IApiResponse\r\n    public async fetchAsync<T>(requestParams: IRequestParams): Promise<T> {\r\n        await this.init;\r\n\r\n        const defaultParams: Partial<IRequestParams> = {\r\n            contentType: \"application/json\",\r\n            method: \"POST\",\r\n            body: null,\r\n            headers: {},\r\n            cache: \"default\",\r\n            credentials: \"same-origin\",\r\n            mode: \"cors\"\r\n        };\r\n\r\n        requestParams = { ...defaultParams, ...requestParams };\r\n        if (!requestParams.id) {\r\n            requestParams.id = uuid();\r\n        }\r\n\r\n        if (!(requestParams.headers instanceof Headers)) {\r\n            requestParams.headers = new Headers(requestParams.headers);\r\n        }\r\n\r\n        requestParams.headers.append(\"Content-Type\", requestParams.contentType);\r\n        // \"api-version\"\r\n\r\n        if (requestParams.method === \"POST\") {\r\n            if (!requestParams.body) {\r\n                requestParams.body = \"\";\r\n            }\r\n        }\r\n\r\n        let request = {\r\n            ...requestParams,\r\n            status: \"queued\",\r\n            response: undefined,\r\n            result: undefined\r\n        } as IRequestState;\r\n\r\n        this.requestStateMap.set(requestParams.id, request);\r\n\r\n        await this.executeRequestAsync(request);\r\n        return request.result;\r\n    }\r\n}\r\n/* \r\nif (status === 404) {\r\n      return response.text().then((_responseText) => {\r\n      let result404: any = null;\r\n      result404 = _responseText === \"\" ? null : JSON.parse(_responseText, this.jsonParseReviver) as __API__ProblemDetails;\r\n      return throwException(\"Not Found\", status, _responseText, _headers, result404);\r\n      });\r\n  } else if (status !== 200 && status !== 204) {\r\n      return response.text().then((_responseText) => {\r\n      return throwException(\"An unexpected server error occurred.\", status, _responseText, _headers);\r\n      });\r\n  }\r\n\r\nBLOB\r\nlet reader = new FileReader();\r\n        reader.onload = event => resolve((event.target as any).result);\r\n        reader.readAsText(blob);\r\n*/\r\n"],"names":["extractApiName","name","suffixes","group","s","pattern","result","API_SUFFIXES","ClientBase","context","fetcher","msg","config","apiName","apiEntry","entry","request","accessToken","ApiError","httpStatus","authorizationHeader","headers","headerValue","proceed","onBeforeSendRequest","event","response","onResponseRead","getResponseResult","err","attempt","requestParams","uuid"],"mappings":"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"}
+{"version":3,"file":"client.es.js","sources":["../../src/net/client.ts"],"sourcesContent":["import { v4 as uuid } from \"uuid\";\r\nimport httpStatus from \"http-status\";\r\nimport { getResponseResult, IFetcher, IRequestCallbacks, IRequestParams, IRequestState } from \"./request\";\r\nimport { ApiError } from \"./apiError\";\r\nimport { BaseAppMsgStruct, BaseAppContext } from \"@/appDomain/appContracts\";\r\nimport { MsgBus } from \"@actdim/msgmesh/contracts\";\r\n\r\n// MLWEB-2172\r\n\r\n// TODO: support request cancellation\r\n// https://stackoverflow.com/questions/31061838/how-do-i-cancel-an-http-fetch-request\r\n// https://mukeshprajapati0251.medium.com/cancel-rest-api-pending-request-1af65e70366d\r\n\r\nexport function extractApiName(name: string, suffixes: string[]): string | null {\r\n    if (!name) {\r\n        return name;\r\n        // return null; // ?\r\n    }\r\n    const escaped = suffixes.map((s) => s.replace(/[.*+?^${}()|[\\]\\\\]/g, \"\\\\$&\"));\r\n    const group = escaped.join(\"|\");\r\n    const pattern = new RegExp(`(_?(${group}))+?$`, \"i\");\r\n\r\n    let result = name.replace(pattern, \"\");\r\n\r\n    result = result.trim();\r\n    return result.length > 0 ? result : name;\r\n}\r\n\r\nconst API_SUFFIXES = [\"api\", \"controller\", \"client\", \"fetcher\"];\r\n// App(Api)ClientBase\r\nexport class ClientBase {\r\n    protected baseUrl: string;\r\n\r\n    protected name: string;\r\n\r\n    // private requestStates\r\n    private requestStateMap: Map<string, IRequestState>;\r\n\r\n    private fetcher: IFetcher;\r\n\r\n    private msgBus: MsgBus<BaseAppMsgStruct>;\r\n\r\n    private accessToken: string;\r\n\r\n    private init: Promise<any>;\r\n\r\n    private apiSuffixes: string[];\r\n\r\n    constructor(context: BaseAppContext, fetcher?: IFetcher, apiSuffixes = API_SUFFIXES) {\r\n        this.apiSuffixes = apiSuffixes;\r\n        this.fetcher = fetcher || window;\r\n        this.requestStateMap = new Map<string, IRequestState>();\r\n        this.msgBus = context.msgBus;\r\n        // TODO: unsubscribe\r\n        this.msgBus.on({\r\n            channel: \"APP-SECURITY-AUTH-SIGNIN\",\r\n            group: \"out\",\r\n            callback: (msg) => {\r\n                this.accessToken = msg.payload.accessToken;\r\n            }\r\n        });\r\n        this.init = Promise.all([this.getBaseUrlAsync(), this.updateSecurityAsync()]);\r\n    }\r\n\r\n    protected async getBaseUrlAsync() {\r\n        const msg = await this.msgBus.request({\r\n            channel: \"APP-CONFIG-GET\"\r\n        });\r\n        const config = msg.payload;\r\n        const apiName = extractApiName(this.name, this.apiSuffixes);\r\n        const apiEntry = Object.entries(config.apis).find((entry) => entry[0].toLowerCase() === apiName?.toLowerCase());\r\n        if (!apiEntry) {\r\n            // console.debug\r\n            console.warn(`API \"${apiName}\" is not defined in the current configuration. Using default configuration.`);\r\n        }\r\n        this.baseUrl = apiEntry?.[1].url || config.baseUrl;\r\n    }\r\n\r\n    private async updateSecurityAsync() {\r\n        if (!this.accessToken) {\r\n            const msg = await this.msgBus.request({\r\n                channel: \"APP-SECURITY-GET-CONTEXT\"\r\n            });\r\n            this.accessToken = msg.payload.accessToken;\r\n        }\r\n        return this.accessToken;\r\n    }\r\n\r\n    private async addAuthorizationAsync(request: IRequestParams) {\r\n        const accessToken = await this.updateSecurityAsync();\r\n        if (!accessToken) {\r\n            throw ApiError.create({\r\n                status: httpStatus.UNAUTHORIZED\r\n            });\r\n        }\r\n        const authorizationHeader = \"Authorization\";\r\n        const headers = request.headers;\r\n        const headerValue = `Bearer ${accessToken}`;\r\n        if (headers instanceof Headers) {\r\n            // if (headers.has(authorizationHeader)) {\r\n            //     headers.delete(authorizationHeader)\r\n            // }\r\n            // headers.append(authorizationHeader, headerValue);\r\n            headers.set(authorizationHeader, headerValue);\r\n        } else {\r\n            throw new Error(\"Unsupported headers\"); // object type\r\n        }\r\n    }\r\n\r\n    private async executeRequestInternalAsync(request: IRequestState) {\r\n        try {\r\n            let proceed = true;\r\n            const onBeforeSendRequest = request.callbacks && request.callbacks.onBeforeSendRequest;\r\n            if (onBeforeSendRequest) {\r\n                const event = {\r\n                    request: request,\r\n                    cancel: false,\r\n                    handled: false\r\n                } as Parameters<IRequestCallbacks[\"onBeforeSendRequest\"]>[0];\r\n                await onBeforeSendRequest(event);\r\n                if (event.cancel) {\r\n                    // interrupt\r\n                    proceed = false;\r\n                    request.status = \"canceled\";\r\n                    if (event.handled) {\r\n                        request.result = event.result;\r\n                    } else {\r\n                        // ApiError?\r\n                        throw new Error(\"The request was aborted\"); // has been? canceled?\r\n                    }\r\n                }\r\n            }\r\n            if (proceed) {\r\n                request.status = \"executing\";\r\n                const response = await this.fetcher.fetch(request.url, request);\r\n                ApiError.assert(response, request);\r\n                let onResponseRead = request.callbacks && request.callbacks.onResponseRead;\r\n                if (!onResponseRead) {\r\n                    onResponseRead = async (event) => {\r\n                        const result = await getResponseResult(response, request);\r\n                        event.result = result;\r\n                    };\r\n                }\r\n                const event = {\r\n                    response: response\r\n                } as Parameters<IRequestCallbacks[\"onResponseRead\"]>[0];\r\n\r\n                await onResponseRead(event);\r\n                request.result = event.result;\r\n                request.status = \"succeeded\";\r\n            }\r\n        } catch (err) {\r\n            request.status = \"failed\";\r\n            // throw ApiError.create(undefined, request);\r\n            throw err;\r\n        }\r\n        return request;\r\n    }\r\n\r\n    private async executeRequestAsync(request: IRequestState): Promise<IRequestState> {\r\n        let attempt = 0;\r\n        do {\r\n            try {\r\n                if (request.useAuth) {\r\n                    await this.addAuthorizationAsync(request);\r\n                }\r\n                return await this.executeRequestInternalAsync(request);\r\n            } catch (err) {\r\n                if (err instanceof ApiError) {\r\n                    if (attempt > 0) {\r\n                        throw err;\r\n                    }\r\n                    if (err.status === httpStatus.UPGRADE_REQUIRED) {\r\n                        // await this.context.msgBus.request({\r\n                        //     channel: \"APP_RELOAD\" // APP_REQUEST_UPDGRADE\r\n                        // });\r\n                        throw err;\r\n                    } else if (err.status === httpStatus.UNAUTHORIZED) {\r\n                        if (err.response?.headers?.get(\"token-expired\")) {\r\n                            // token expired or invalid\r\n                            await this.msgBus.request({\r\n                                channel: \"APP-SECURITY-AUTH-REFRESH\"\r\n                            });\r\n                        } else {\r\n                            await this.msgBus.request({\r\n                                channel: \"APP-SECURITY-REQUEST-AUTH\"\r\n                            });\r\n                        }\r\n                        // codes:\r\n                        // TOKEN_EXPIRED\r\n                        // TOKEN_INVALID\r\n                        // TOKEN_MISSING\r\n                        // AUTH_REQUIRED\r\n                        // header: WWW-Authenticate\r\n                        continue;\r\n                    }\r\n                    continue;\r\n                }\r\n                throw err;\r\n            } finally {\r\n                attempt++;\r\n            }\r\n        } while (true);\r\n    }\r\n\r\n    // T extends IApiResponse\r\n    public async fetchAsync<T>(requestParams: IRequestParams): Promise<T> {\r\n        await this.init;\r\n\r\n        const defaultParams: Partial<IRequestParams> = {\r\n            contentType: \"application/json\",\r\n            method: \"POST\",\r\n            body: null,\r\n            headers: {},\r\n            cache: \"default\",\r\n            credentials: \"same-origin\",\r\n            mode: \"cors\"\r\n        };\r\n\r\n        requestParams = { ...defaultParams, ...requestParams };\r\n        if (!requestParams.id) {\r\n            requestParams.id = uuid();\r\n        }\r\n\r\n        if (!(requestParams.headers instanceof Headers)) {\r\n            requestParams.headers = new Headers(requestParams.headers);\r\n        }\r\n\r\n        requestParams.headers.append(\"Content-Type\", requestParams.contentType);\r\n        // \"api-version\"\r\n\r\n        if (requestParams.method === \"POST\") {\r\n            if (!requestParams.body) {\r\n                requestParams.body = \"\";\r\n            }\r\n        }\r\n\r\n        let request = {\r\n            ...requestParams,\r\n            status: \"queued\",\r\n            response: undefined,\r\n            result: undefined\r\n        } as IRequestState;\r\n\r\n        this.requestStateMap.set(requestParams.id, request);\r\n\r\n        await this.executeRequestAsync(request);\r\n        return request.result;\r\n    }\r\n}\r\n/* \r\nif (status === 404) {\r\n      return response.text().then((_responseText) => {\r\n      let result404: any = null;\r\n      result404 = _responseText === \"\" ? null : JSON.parse(_responseText, this.jsonParseReviver) as __API__ProblemDetails;\r\n      return throwException(\"Not Found\", status, _responseText, _headers, result404);\r\n      });\r\n  } else if (status !== 200 && status !== 204) {\r\n      return response.text().then((_responseText) => {\r\n      return throwException(\"An unexpected server error occurred.\", status, _responseText, _headers);\r\n      });\r\n  }\r\n\r\nBLOB\r\nlet reader = new FileReader();\r\n        reader.onload = event => resolve((event.target as any).result);\r\n        reader.readAsText(blob);\r\n*/\r\n"],"names":["extractApiName","name","suffixes","group","s","pattern","result","API_SUFFIXES","ClientBase","context","fetcher","apiSuffixes","msg","config","apiName","apiEntry","entry","request","accessToken","ApiError","httpStatus","authorizationHeader","headers","headerValue","proceed","onBeforeSendRequest","event","response","onResponseRead","getResponseResult","err","attempt","requestParams","uuid"],"mappings":"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"}

package/dist/services/NavService.d.ts

@@ -1,5 +1,5 @@
 import { BaseAppMsgChannels, BaseAppMsgStruct, NavContext, NavRoutes } from '../appDomain/appContracts';
-import { Component, ComponentParams, ComponentStruct } from '../componentModel/componentModel';
+import { Component, ComponentParams, ComponentStruct } from '../componentModel/contracts';
 type Struct = ComponentStruct<BaseAppMsgStruct, {
     props: {
         history: NavContext[];

package/dist/services/NavService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NavService.d.ts","sourceRoot":"","sources":["../../src/services/NavService.tsx"],"names":[],"mappings":"AAUA,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACvG,OAAO,EAAuB,KAAK,SAAS,EAA0C,KAAK,eAAe,EAAE,KAAK,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAE1K,KAAK,MAAM,GAAG,eAAe,CACzB,gBAAgB,EAChB;IACI,KAAK,EAAE;QACH,OAAO,EAAE,UAAU,EAAE,CAAC;QACtB,MAAM,EAAE,SAAS,CAAC;KACrB,CAAC;IACF,QAAQ,EAAE;QACN,OAAO,EAAE,kBAAkB,CACrB,cAAc,GACd,qBAAqB,GACrB,sBAAsB,GACtB,yBAAyB,CAC9B,CAAC;KACL,CAAC;CACL,CACJ,CAAC;AAIF,eAAO,MAAM,aAAa,GAAI,QAAQ,eAAe,CAAC,MAAM,CAAC,sBA+E5D,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC;AACtC,eAAO,MAAM,YAAY,8BAAuB,CAAC"}
+{"version":3,"file":"NavService.d.ts","sourceRoot":"","sources":["../../src/services/NavService.tsx"],"names":[],"mappings":"AAQA,OAAO,EACH,kBAAkB,EAClB,gBAAgB,EAChB,UAAU,EACV,SAAS,EACZ,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EACR,SAAS,EAGT,eAAe,EACf,eAAe,EAClB,MAAM,4BAA4B,CAAC;AAGpC,KAAK,MAAM,GAAG,eAAe,CACzB,gBAAgB,EAChB;IACI,KAAK,EAAE;QACH,OAAO,EAAE,UAAU,EAAE,CAAC;QACtB,MAAM,EAAE,SAAS,CAAC;KACrB,CAAC;IACF,QAAQ,EAAE;QACN,OAAO,EAAE,kBAAkB,CACrB,cAAc,GACd,qBAAqB,GACrB,sBAAsB,GACtB,yBAAyB,CAC9B,CAAC;KACL,CAAC;CACL,CACJ,CAAC;AAIF,eAAO,MAAM,aAAa,GAAI,QAAQ,eAAe,CAAC,MAAM,CAAC,sBA+E5D,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC;AACtC,eAAO,MAAM,YAAY,8BAAuB,CAAC"}

package/dist/services/NavService.es.js

@@ -1,9 +1,9 @@
 import { useNavigate as p, useLocation as m, useNavigationType as y, useParams as h, useSearchParams as N } from "react-router-dom";
-import { getFC as P, useComponent as v } from "../componentModel/componentModel.es.js";
+import { getFC as P, useComponent as v } from "../componentModel/react.es.js";
 const A = (n) => {
-  let s, o;
+  let t, o;
   const e = p(), c = m(), i = y(), l = h(), [u] = N();
-  return s = v({
+  return t = v({
     props: {
       history: [],
       routes: void 0
@@ -18,8 +18,8 @@ const A = (n) => {
           },
           ex: {
             callback: async (a) => {
-              const t = a.payload.route;
-              e(o.routes[t].path(a.payload.params));
+              const s = a.payload.route;
+              e(o.routes[s].path(a.payload.params));
             }
           }
         },
@@ -38,15 +38,15 @@ const A = (n) => {
     },
     events: {
       onLayout: (a) => {
-        const t = o.history;
-        if (t) {
+        const s = o.history;
+        if (s) {
           const r = {
             location: c,
             searchParams: u,
             params: l,
             navType: i
           };
-          t.push(r), a.msgBus.dispatch({
+          s.push(r), a.msgBus.send({
             channel: "APP-NAV-CONTEXT-CHANGED",
             group: "in",
             payload: r
@@ -55,7 +55,7 @@ const A = (n) => {
       }
     },
     view: () => null
-  }, n), o = s.model, s;
+  }, n), o = t.model, t;
 }, C = P(A);
 export {
   C as NavServiceFC,

package/dist/services/NavService.es.js.map

@@ -1 +1 @@
-{"version":3,"file":"NavService.es.js","sources":["../../src/services/NavService.tsx"],"sourcesContent":["\r\nimport {\r\n    To,\r\n    useLocation,\r\n    useNavigate,\r\n    useNavigationType,\r\n    useParams,\r\n    useSearchParams,\r\n} from 'react-router-dom';\r\nimport { PersistentStore } from '@actdim/utico/store/persistentStore';\r\nimport { BaseAppMsgChannels, BaseAppMsgStruct, NavContext, NavRoutes } from '@/appDomain/appContracts';\r\nimport { getFC, useComponent, type Component, type ComponentDef, type ComponentModel, type ComponentParams, type ComponentStruct } from '@/componentModel/componentModel';\r\n\r\ntype Struct = ComponentStruct<\r\n    BaseAppMsgStruct,\r\n    {\r\n        props: {\r\n            history: NavContext[];\r\n            routes: NavRoutes;\r\n        };\r\n        msgScope: {\r\n            provide: BaseAppMsgChannels<\r\n                | 'APP-NAV-GOTO'\r\n                | 'APP-NAV-GET-CONTEXT'\r\n                | 'APP-NAV-READ-HISTORY'\r\n                | 'APP-NAV-CONTEXT-CHANGED'\r\n            >;\r\n        };\r\n    }\r\n>;\r\n\r\n// const store = new PersistentStore('history');\r\n\r\nexport const useNavService = (params: ComponentParams<Struct>) => {\r\n    let c: Component<Struct>;\r\n    let m: ComponentModel<Struct>;\r\n\r\n    const navigate = useNavigate();\r\n\r\n    const location = useLocation();\r\n    const navType = useNavigationType();\r\n    const nvaParams = useParams();\r\n    const [searchParams] = useSearchParams();\r\n\r\n    const def: ComponentDef<Struct> = {\r\n        props: {\r\n            history: [],\r\n            routes: undefined,\r\n        },\r\n        msgBroker: {\r\n            provide: {\r\n                'APP-NAV-GOTO': {\r\n                    in: {\r\n                        callback: async (msg) => {\r\n                            navigate(msg.payload as To);\r\n                        },\r\n                    },\r\n                    ex: {\r\n                        callback: async (msg) => {\r\n                            const route = msg.payload.route;\r\n                            navigate(m.routes[route].path(msg.payload.params));\r\n                        },\r\n                    },\r\n                },\r\n                'APP-NAV-GET-CONTEXT': {\r\n                    in: {\r\n                        callback: (msg) => {\r\n                            return m.history[m.history.length - 1];\r\n                        },\r\n                    },\r\n                },\r\n                'APP-NAV-READ-HISTORY': {\r\n                    in: {\r\n                        callback: (msg) => {\r\n                            return m.history[m.history.length - 1];\r\n                        },\r\n                    },\r\n                },\r\n                'APP-NAV-CONTEXT-CHANGED': {},\r\n            },\r\n        },\r\n        events: {\r\n            onLayout: (c) => {\r\n                const history = m.history;\r\n                if (history) {\r\n                    const ctx = {\r\n                        location: location,\r\n                        searchParams: searchParams,\r\n                        params: nvaParams,\r\n                        navType: navType,\r\n                    };\r\n                    history.push(ctx);\r\n                    c.msgBus.dispatch({\r\n                        channel: 'APP-NAV-CONTEXT-CHANGED',\r\n                        group: 'in',\r\n                        payload: ctx,\r\n                    });\r\n                }\r\n            },\r\n        },\r\n        view: () => {\r\n            return null;\r\n        },\r\n    };\r\n\r\n    c = useComponent(def, params);\r\n    m = c.model;\r\n\r\n    // deps\r\n    // location, navType, params, searchParams\r\n\r\n    return c;\r\n};\r\n\r\nexport type NavServiceStruct = Struct;\r\nexport const NavServiceFC = getFC(useNavService);\r\n"],"names":["useNavService","params","c","m","navigate","useNavigate","location","useLocation","navType","useNavigationType","nvaParams","useParams","searchParams","useSearchParams","useComponent","msg","route","history","ctx","NavServiceFC","getFC"],"mappings":";;AAiCO,MAAMA,IAAgB,CAACC,MAAoC;AAC9D,MAAIC,GACAC;AAEJ,QAAMC,IAAWC,EAAA,GAEXC,IAAWC,EAAA,GACXC,IAAUC,EAAA,GACVC,IAAYC,EAAA,GACZ,CAACC,CAAY,IAAIC,EAAA;AA+DvB,SAAAX,IAAIY,EA7D8B;AAAA,IAC9B,OAAO;AAAA,MACH,SAAS,CAAA;AAAA,MACT,QAAQ;AAAA,IAAA;AAAA,IAEZ,WAAW;AAAA,MACP,SAAS;AAAA,QACL,gBAAgB;AAAA,UACZ,IAAI;AAAA,YACA,UAAU,OAAOC,MAAQ;AACrB,cAAAX,EAASW,EAAI,OAAa;AAAA,YAC9B;AAAA,UAAA;AAAA,UAEJ,IAAI;AAAA,YACA,UAAU,OAAOA,MAAQ;AACrB,oBAAMC,IAAQD,EAAI,QAAQ;AAC1B,cAAAX,EAASD,EAAE,OAAOa,CAAK,EAAE,KAAKD,EAAI,QAAQ,MAAM,CAAC;AAAA,YACrD;AAAA,UAAA;AAAA,QACJ;AAAA,QAEJ,uBAAuB;AAAA,UACnB,IAAI;AAAA,YACA,UAAU,CAACA,MACAZ,EAAE,QAAQA,EAAE,QAAQ,SAAS,CAAC;AAAA,UACzC;AAAA,QACJ;AAAA,QAEJ,wBAAwB;AAAA,UACpB,IAAI;AAAA,YACA,UAAU,CAACY,MACAZ,EAAE,QAAQA,EAAE,QAAQ,SAAS,CAAC;AAAA,UACzC;AAAA,QACJ;AAAA,QAEJ,2BAA2B,CAAA;AAAA,MAAC;AAAA,IAChC;AAAA,IAEJ,QAAQ;AAAA,MACJ,UAAU,CAACD,MAAM;AACb,cAAMe,IAAUd,EAAE;AAClB,YAAIc,GAAS;AACT,gBAAMC,IAAM;AAAA,YACR,UAAAZ;AAAA,YACA,cAAAM;AAAA,YACA,QAAQF;AAAA,YACR,SAAAF;AAAA,UAAA;AAEJ,UAAAS,EAAQ,KAAKC,CAAG,GAChBhB,EAAE,OAAO,SAAS;AAAA,YACd,SAAS;AAAA,YACT,OAAO;AAAA,YACP,SAASgB;AAAA,UAAA,CACZ;AAAA,QACL;AAAA,MACJ;AAAA,IAAA;AAAA,IAEJ,MAAM,MACK;AAAA,EACX,GAGkBjB,CAAM,GAC5BE,IAAID,EAAE,OAKCA;AACX,GAGaiB,IAAeC,EAAMpB,CAAa;"}
+{"version":3,"file":"NavService.es.js","sources":["../../src/services/NavService.tsx"],"sourcesContent":["import {\r\n    To,\r\n    useLocation,\r\n    useNavigate,\r\n    useNavigationType,\r\n    useParams,\r\n    useSearchParams,\r\n} from 'react-router-dom';\r\nimport {\r\n    BaseAppMsgChannels,\r\n    BaseAppMsgStruct,\r\n    NavContext,\r\n    NavRoutes,\r\n} from '@/appDomain/appContracts';\r\nimport type {\r\n    Component,\r\n    ComponentDef,\r\n    ComponentModel,\r\n    ComponentParams,\r\n    ComponentStruct,\r\n} from '@/componentModel/contracts';\r\nimport { getFC, useComponent } from '@/componentModel/react';\r\n\r\ntype Struct = ComponentStruct<\r\n    BaseAppMsgStruct,\r\n    {\r\n        props: {\r\n            history: NavContext[];\r\n            routes: NavRoutes;\r\n        };\r\n        msgScope: {\r\n            provide: BaseAppMsgChannels<\r\n                | 'APP-NAV-GOTO'\r\n                | 'APP-NAV-GET-CONTEXT'\r\n                | 'APP-NAV-READ-HISTORY'\r\n                | 'APP-NAV-CONTEXT-CHANGED'\r\n            >;\r\n        };\r\n    }\r\n>;\r\n\r\n// const store = new PersistentStore('history');\r\n\r\nexport const useNavService = (params: ComponentParams<Struct>) => {\r\n    let c: Component<Struct>;\r\n    let m: ComponentModel<Struct>;\r\n\r\n    const navigate = useNavigate();\r\n\r\n    const location = useLocation();\r\n    const navType = useNavigationType();\r\n    const nvaParams = useParams();\r\n    const [searchParams] = useSearchParams();\r\n\r\n    const def: ComponentDef<Struct> = {\r\n        props: {\r\n            history: [],\r\n            routes: undefined,\r\n        },\r\n        msgBroker: {\r\n            provide: {\r\n                'APP-NAV-GOTO': {\r\n                    in: {\r\n                        callback: async (msg) => {\r\n                            navigate(msg.payload as To);\r\n                        },\r\n                    },\r\n                    ex: {\r\n                        callback: async (msg) => {\r\n                            const route = msg.payload.route;\r\n                            navigate(m.routes[route].path(msg.payload.params));\r\n                        },\r\n                    },\r\n                },\r\n                'APP-NAV-GET-CONTEXT': {\r\n                    in: {\r\n                        callback: (msg) => {\r\n                            return m.history[m.history.length - 1];\r\n                        },\r\n                    },\r\n                },\r\n                'APP-NAV-READ-HISTORY': {\r\n                    in: {\r\n                        callback: (msg) => {\r\n                            return m.history[m.history.length - 1];\r\n                        },\r\n                    },\r\n                },\r\n                'APP-NAV-CONTEXT-CHANGED': {},\r\n            },\r\n        },\r\n        events: {\r\n            onLayout: (c) => {\r\n                const history = m.history;\r\n                if (history) {\r\n                    const ctx = {\r\n                        location: location,\r\n                        searchParams: searchParams,\r\n                        params: nvaParams,\r\n                        navType: navType,\r\n                    };\r\n                    history.push(ctx);\r\n                    c.msgBus.send({\r\n                        channel: 'APP-NAV-CONTEXT-CHANGED',\r\n                        group: 'in',\r\n                        payload: ctx,\r\n                    });\r\n                }\r\n            },\r\n        },\r\n        view: () => {\r\n            return null;\r\n        },\r\n    };\r\n\r\n    c = useComponent(def, params);\r\n    m = c.model;\r\n\r\n    // deps\r\n    // location, navType, params, searchParams\r\n\r\n    return c;\r\n};\r\n\r\nexport type NavServiceStruct = Struct;\r\nexport const NavServiceFC = getFC(useNavService);\r\n"],"names":["useNavService","params","c","m","navigate","useNavigate","location","useLocation","navType","useNavigationType","nvaParams","useParams","searchParams","useSearchParams","useComponent","msg","route","history","ctx","NavServiceFC","getFC"],"mappings":";;AA2CO,MAAMA,IAAgB,CAACC,MAAoC;AAC9D,MAAIC,GACAC;AAEJ,QAAMC,IAAWC,EAAA,GAEXC,IAAWC,EAAA,GACXC,IAAUC,EAAA,GACVC,IAAYC,EAAA,GACZ,CAACC,CAAY,IAAIC,EAAA;AA+DvB,SAAAX,IAAIY,EA7D8B;AAAA,IAC9B,OAAO;AAAA,MACH,SAAS,CAAA;AAAA,MACT,QAAQ;AAAA,IAAA;AAAA,IAEZ,WAAW;AAAA,MACP,SAAS;AAAA,QACL,gBAAgB;AAAA,UACZ,IAAI;AAAA,YACA,UAAU,OAAOC,MAAQ;AACrB,cAAAX,EAASW,EAAI,OAAa;AAAA,YAC9B;AAAA,UAAA;AAAA,UAEJ,IAAI;AAAA,YACA,UAAU,OAAOA,MAAQ;AACrB,oBAAMC,IAAQD,EAAI,QAAQ;AAC1B,cAAAX,EAASD,EAAE,OAAOa,CAAK,EAAE,KAAKD,EAAI,QAAQ,MAAM,CAAC;AAAA,YACrD;AAAA,UAAA;AAAA,QACJ;AAAA,QAEJ,uBAAuB;AAAA,UACnB,IAAI;AAAA,YACA,UAAU,CAACA,MACAZ,EAAE,QAAQA,EAAE,QAAQ,SAAS,CAAC;AAAA,UACzC;AAAA,QACJ;AAAA,QAEJ,wBAAwB;AAAA,UACpB,IAAI;AAAA,YACA,UAAU,CAACY,MACAZ,EAAE,QAAQA,EAAE,QAAQ,SAAS,CAAC;AAAA,UACzC;AAAA,QACJ;AAAA,QAEJ,2BAA2B,CAAA;AAAA,MAAC;AAAA,IAChC;AAAA,IAEJ,QAAQ;AAAA,MACJ,UAAU,CAACD,MAAM;AACb,cAAMe,IAAUd,EAAE;AAClB,YAAIc,GAAS;AACT,gBAAMC,IAAM;AAAA,YACR,UAAAZ;AAAA,YACA,cAAAM;AAAA,YACA,QAAQF;AAAA,YACR,SAAAF;AAAA,UAAA;AAEJ,UAAAS,EAAQ,KAAKC,CAAG,GAChBhB,EAAE,OAAO,KAAK;AAAA,YACV,SAAS;AAAA,YACT,OAAO;AAAA,YACP,SAASgB;AAAA,UAAA,CACZ;AAAA,QACL;AAAA,MACJ;AAAA,IAAA;AAAA,IAEJ,MAAM,MACK;AAAA,EACX,GAGkBjB,CAAM,GAC5BE,IAAID,EAAE,OAKCA;AACX,GAGaiB,IAAeC,EAAMpB,CAAa;"}

package/dist/services/StorageService.d.ts

@@ -1,8 +1,9 @@
-import { ComponentParams, ComponentStruct, Component } from '../componentModel/componentModel';
+import { ComponentParams, ComponentStruct, Component } from '../componentModel/contracts';
 import { BaseAppMsgChannels, BaseAppMsgStruct } from '../appDomain/appContracts';
+import { PropsWithChildren } from 'react';
 type Struct = ComponentStruct<BaseAppMsgStruct, {
-    props: {
-        name?: string;
+    props: PropsWithChildren & {
+        storeName?: string;
     };
     msgScope: {
         provide: BaseAppMsgChannels<'APP-KV-STORE-GET' | 'APP-KV-STORE-SET' | 'APP-KV-STORE-REMOVE'>;

package/dist/services/StorageService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StorageService.d.ts","sourceRoot":"","sources":["../../src/services/StorageService.tsx"],"names":[],"mappings":"AAAA,OAAO,EACH,eAAe,EACf,eAAe,EAGf,SAAS,EAEZ,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAqB,MAAM,0BAA0B,CAAC;AAGnG,KAAK,MAAM,GAAG,eAAe,CACzB,gBAAgB,EAChB;IACI,KAAK,EAAE;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,QAAQ,EAAE;QACN,OAAO,EAAE,kBAAkB,CACvB,kBAAkB,GAAG,kBAAkB,GAAG,qBAAqB,CAClE,CAAC;KACL,CAAC;CACL,CACJ,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,QAAQ,eAAe,CAAC,MAAM,CAAC,sBA+DhE,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC;AAC1C,eAAO,MAAM,gBAAgB,8BAA2B,CAAC"}
+{"version":3,"file":"StorageService.d.ts","sourceRoot":"","sources":["../../src/services/StorageService.tsx"],"names":[],"mappings":"AAAA,OAAO,EACH,eAAe,EACf,eAAe,EACf,SAAS,EAGZ,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAqB,MAAM,0BAA0B,CAAC;AACnG,OAAO,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAE1C,KAAK,MAAM,GAAG,eAAe,CACzB,gBAAgB,EAChB;IACI,KAAK,EAAE,iBAAiB,GAAG;QACvB,SAAS,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,QAAQ,EAAE;QACN,OAAO,EAAE,kBAAkB,CACvB,kBAAkB,GAAG,kBAAkB,GAAG,qBAAqB,CAClE,CAAC;KACL,CAAC;CACL,CACJ,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,QAAQ,eAAe,CAAC,MAAM,CAAC,sBA+DhE,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC;AAC1C,eAAO,MAAM,gBAAgB,8BAA2B,CAAC"}

package/dist/services/StorageService.es.js

@@ -1,29 +1,29 @@
-import { getFC as i, useComponent as l } from "../componentModel/componentModel.es.js";
+import { getFC as c, useComponent as l } from "../componentModel/react.es.js";
 import { PersistentStore as y } from "@actdim/utico/store/persistentStore";
 const m = (s) => {
-  let t, o;
-  async function c() {
-    a = await y.openAsync(o.name);
+  let t, n;
+  async function r() {
+    a = await y.open(n.storeName);
   }
-  let a, r;
-  const n = new Promise((e) => {
-    r = e;
+  let a, i;
+  const o = new Promise((e) => {
+    i = e;
   });
   return t = l({
     props: {
-      name: ""
+      storeName: ""
     },
     msgBroker: {
       provide: {
         "APP-KV-STORE-GET": {
           in: {
-            callback: async (e) => (await n, (await a.getAsync(e.payload.key))?.data.value)
+            callback: async (e) => (await o, (await a.get(e.payload.key))?.data.value)
           }
         },
         "APP-KV-STORE-SET": {
           in: {
             callback: async (e) => {
-              await n, await a.setAsync(
+              await o, await a.set(
                 {
                   key: e.payload.key
                 },
@@ -35,19 +35,19 @@ const m = (s) => {
         "APP-KV-STORE-REMOVE": {
           in: {
             callback: async (e) => {
-              await n, await a.deleteAsync(e.payload.key);
+              await o, await a.delete(e.payload.key);
             }
           }
         }
       }
     },
     events: {
-      onChangeName: () => {
-        c();
+      onChangeStoreName: () => {
+        r();
       }
     }
-  }, s), o = t.model, c().then(() => r()), t;
-}, u = i(m);
+  }, s), n = t.model, r().then(() => i()), t;
+}, u = c(m);
 export {
   u as StorageServiceFC,
   m as useStorageService

package/dist/services/StorageService.es.js.map

@@ -1 +1 @@
-{"version":3,"file":"StorageService.es.js","sources":["../../src/services/StorageService.tsx"],"sourcesContent":["import {\r\n    ComponentParams,\r\n    ComponentStruct,\r\n    getFC,\r\n    useComponent,\r\n    Component,\r\n    ComponentModel,\r\n} from '@/componentModel/componentModel';\r\nimport { PersistentStore } from '@actdim/utico/store/persistentStore';\r\nimport { BaseAppMsgChannels, BaseAppMsgStruct, useBaseAppContext } from '@/appDomain/appContracts';\r\nimport type { ComponentDef } from '@/componentModel/componentModel';\r\n\r\ntype Struct = ComponentStruct<\r\n    BaseAppMsgStruct,\r\n    {\r\n        props: {\r\n            name?: string;\r\n        };\r\n        msgScope: {\r\n            provide: BaseAppMsgChannels<\r\n                'APP-KV-STORE-GET' | 'APP-KV-STORE-SET' | 'APP-KV-STORE-REMOVE'\r\n            >;\r\n        };\r\n    }\r\n>;\r\n\r\nexport const useStorageService = (params: ComponentParams<Struct>) => {\r\n    let c: Component<Struct>;\r\n    let m: ComponentModel<Struct>;\r\n\r\n    async function _updateStoreAsync() {\r\n        store = await PersistentStore.openAsync(m.name);\r\n    }\r\n\r\n    let store: PersistentStore;\r\n    let ready: () => void;\r\n    const init = new Promise<void>((res) => {\r\n        ready = res;\r\n    });\r\n\r\n    const def: ComponentDef<Struct> = {\r\n        props: {\r\n            name: '',\r\n        },\r\n        msgBroker: {\r\n            provide: {\r\n                'APP-KV-STORE-GET': {\r\n                    in: {\r\n                        callback: async (msg) => {\r\n                            await init;\r\n                            const item = await store.getAsync(msg.payload.key);\r\n                            return item?.data.value;\r\n                        },\r\n                    },\r\n                },\r\n                'APP-KV-STORE-SET': {\r\n                    in: {\r\n                        callback: async (msg) => {\r\n                            await init;\r\n                            await store.setAsync(\r\n                                {\r\n                                    key: msg.payload.key,\r\n                                },\r\n                                msg.payload.value,\r\n                            );\r\n                        },\r\n                    },\r\n                },\r\n                'APP-KV-STORE-REMOVE': {\r\n                    in: {\r\n                        callback: async (msg) => {\r\n                            await init;\r\n                            await store.deleteAsync(msg.payload.key);\r\n                        },\r\n                    },\r\n                },\r\n            },\r\n        },\r\n        events: {\r\n            onChangeName: () => {\r\n                _updateStoreAsync();\r\n            },\r\n        },\r\n    };\r\n\r\n    c = useComponent(def, params);\r\n    m = c.model;\r\n    _updateStoreAsync().then(() => ready());\r\n    return c;\r\n};\r\n\r\nexport type StorageServiceStruct = Struct;\r\nexport const StorageServiceFC = getFC(useStorageService);\r\n"],"names":["useStorageService","params","c","m","_updateStoreAsync","store","PersistentStore","ready","init","res","useComponent","msg","StorageServiceFC","getFC"],"mappings":";;AA0BO,MAAMA,IAAoB,CAACC,MAAoC;AAClE,MAAIC,GACAC;AAEJ,iBAAeC,IAAoB;AAC/B,IAAAC,IAAQ,MAAMC,EAAgB,UAAUH,EAAE,IAAI;AAAA,EAClD;AAEA,MAAIE,GACAE;AACJ,QAAMC,IAAO,IAAI,QAAc,CAACC,MAAQ;AACpC,IAAAF,IAAQE;AAAA,EACZ,CAAC;AA+CD,SAAAP,IAAIQ,EA7C8B;AAAA,IAC9B,OAAO;AAAA,MACH,MAAM;AAAA,IAAA;AAAA,IAEV,WAAW;AAAA,MACP,SAAS;AAAA,QACL,oBAAoB;AAAA,UAChB,IAAI;AAAA,YACA,UAAU,OAAOC,OACb,MAAMH,IACO,MAAMH,EAAM,SAASM,EAAI,QAAQ,GAAG,IACpC,KAAK;AAAA,UACtB;AAAA,QACJ;AAAA,QAEJ,oBAAoB;AAAA,UAChB,IAAI;AAAA,YACA,UAAU,OAAOA,MAAQ;AACrB,oBAAMH,GACN,MAAMH,EAAM;AAAA,gBACR;AAAA,kBACI,KAAKM,EAAI,QAAQ;AAAA,gBAAA;AAAA,gBAErBA,EAAI,QAAQ;AAAA,cAAA;AAAA,YAEpB;AAAA,UAAA;AAAA,QACJ;AAAA,QAEJ,uBAAuB;AAAA,UACnB,IAAI;AAAA,YACA,UAAU,OAAOA,MAAQ;AACrB,oBAAMH,GACN,MAAMH,EAAM,YAAYM,EAAI,QAAQ,GAAG;AAAA,YAC3C;AAAA,UAAA;AAAA,QACJ;AAAA,MACJ;AAAA,IACJ;AAAA,IAEJ,QAAQ;AAAA,MACJ,cAAc,MAAM;AAChB,QAAAP,EAAA;AAAA,MACJ;AAAA,IAAA;AAAA,EACJ,GAGkBH,CAAM,GAC5BE,IAAID,EAAE,OACNE,IAAoB,KAAK,MAAMG,GAAO,GAC/BL;AACX,GAGaU,IAAmBC,EAAMb,CAAiB;"}
+{"version":3,"file":"StorageService.es.js","sources":["../../src/services/StorageService.tsx"],"sourcesContent":["import {\r\n    ComponentParams,\r\n    ComponentStruct,\r\n    Component,\r\n    ComponentModel,\r\n    ComponentDef,\r\n} from '@/componentModel/contracts';\r\nimport { getFC, useComponent } from '@/componentModel/react';\r\nimport { PersistentStore } from '@actdim/utico/store/persistentStore';\r\nimport { BaseAppMsgChannels, BaseAppMsgStruct, useBaseAppContext } from '@/appDomain/appContracts';\r\nimport { PropsWithChildren } from 'react';\r\n\r\ntype Struct = ComponentStruct<\r\n    BaseAppMsgStruct,\r\n    {\r\n        props: PropsWithChildren & {\r\n            storeName?: string;\r\n        };\r\n        msgScope: {\r\n            provide: BaseAppMsgChannels<\r\n                'APP-KV-STORE-GET' | 'APP-KV-STORE-SET' | 'APP-KV-STORE-REMOVE'\r\n            >;\r\n        };\r\n    }\r\n>;\r\n\r\nexport const useStorageService = (params: ComponentParams<Struct>) => {\r\n    let c: Component<Struct>;\r\n    let m: ComponentModel<Struct>;\r\n\r\n    async function _updateStoreAsync() {\r\n        store = await PersistentStore.open(m.storeName);\r\n    }\r\n\r\n    let store: PersistentStore;\r\n    let ready: () => void;\r\n    const init = new Promise<void>((res) => {\r\n        ready = res;\r\n    });\r\n\r\n    const def: ComponentDef<Struct> = {\r\n        props: {\r\n            storeName: '',\r\n        },\r\n        msgBroker: {\r\n            provide: {\r\n                'APP-KV-STORE-GET': {\r\n                    in: {\r\n                        callback: async (msg) => {\r\n                            await init;\r\n                            const item = await store.get(msg.payload.key);\r\n                            return item?.data.value;\r\n                        },\r\n                    },\r\n                },\r\n                'APP-KV-STORE-SET': {\r\n                    in: {\r\n                        callback: async (msg) => {\r\n                            await init;\r\n                            await store.set(\r\n                                {\r\n                                    key: msg.payload.key,\r\n                                },\r\n                                msg.payload.value,\r\n                            );\r\n                        },\r\n                    },\r\n                },\r\n                'APP-KV-STORE-REMOVE': {\r\n                    in: {\r\n                        callback: async (msg) => {\r\n                            await init;\r\n                            await store.delete(msg.payload.key);\r\n                        },\r\n                    },\r\n                },\r\n            },\r\n        },\r\n        events: {\r\n            onChangeStoreName: () => {\r\n                _updateStoreAsync();\r\n            },\r\n        },\r\n    };\r\n\r\n    c = useComponent(def, params);\r\n    m = c.model;\r\n    _updateStoreAsync().then(() => ready());\r\n    return c;\r\n};\r\n\r\nexport type StorageServiceStruct = Struct;\r\nexport const StorageServiceFC = getFC(useStorageService);\r\n"],"names":["useStorageService","params","c","m","_updateStoreAsync","store","PersistentStore","ready","init","res","useComponent","msg","StorageServiceFC","getFC"],"mappings":";;AA0BO,MAAMA,IAAoB,CAACC,MAAoC;AAClE,MAAIC,GACAC;AAEJ,iBAAeC,IAAoB;AAC/B,IAAAC,IAAQ,MAAMC,EAAgB,KAAKH,EAAE,SAAS;AAAA,EAClD;AAEA,MAAIE,GACAE;AACJ,QAAMC,IAAO,IAAI,QAAc,CAACC,MAAQ;AACpC,IAAAF,IAAQE;AAAA,EACZ,CAAC;AA+CD,SAAAP,IAAIQ,EA7C8B;AAAA,IAC9B,OAAO;AAAA,MACH,WAAW;AAAA,IAAA;AAAA,IAEf,WAAW;AAAA,MACP,SAAS;AAAA,QACL,oBAAoB;AAAA,UAChB,IAAI;AAAA,YACA,UAAU,OAAOC,OACb,MAAMH,IACO,MAAMH,EAAM,IAAIM,EAAI,QAAQ,GAAG,IAC/B,KAAK;AAAA,UACtB;AAAA,QACJ;AAAA,QAEJ,oBAAoB;AAAA,UAChB,IAAI;AAAA,YACA,UAAU,OAAOA,MAAQ;AACrB,oBAAMH,GACN,MAAMH,EAAM;AAAA,gBACR;AAAA,kBACI,KAAKM,EAAI,QAAQ;AAAA,gBAAA;AAAA,gBAErBA,EAAI,QAAQ;AAAA,cAAA;AAAA,YAEpB;AAAA,UAAA;AAAA,QACJ;AAAA,QAEJ,uBAAuB;AAAA,UACnB,IAAI;AAAA,YACA,UAAU,OAAOA,MAAQ;AACrB,oBAAMH,GACN,MAAMH,EAAM,OAAOM,EAAI,QAAQ,GAAG;AAAA,YACtC;AAAA,UAAA;AAAA,QACJ;AAAA,MACJ;AAAA,IACJ;AAAA,IAEJ,QAAQ;AAAA,MACJ,mBAAmB,MAAM;AACrB,QAAAP,EAAA;AAAA,MACJ;AAAA,IAAA;AAAA,EACJ,GAGkBH,CAAM,GAC5BE,IAAID,EAAE,OACNE,IAAoB,KAAK,MAAMG,GAAO,GAC/BL;AACX,GAGaU,IAAmBC,EAAMb,CAAiB;"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@actdim/dynstruct",
-    "version": "1.1.1",
+    "version": "1.1.3",
     "description": "A type-safe component system for large-scale apps: explicit dependencies, message bus communication, and structure-first, declarative design",
     "author": "Pavel Borodaev",
     "license": "Proprietary",
@@ -18,7 +18,7 @@
         "components",
         "react",
         "component-model",
-        "architecure",
+        "architecture",
         "modularity",
         "structure",
         "communication"
@@ -55,8 +55,8 @@
         "test": "npx vitest --config=vitest.node.config.ts --no-cache",
         "test:w": "npx vitest --config=vitest.node.config.ts --watch",
         "test:v8": "npx vite",
-        "lint": "eslint . -f visualstudio --ext .ts,.tsx --report-unused-disable-directives --max-warnings 0",
-        "build": "tsc -b && vite build",
+        "lint": "eslint \"./**/*.{ts,tsx}\" -f visualstudio --ext .ts,.tsx --report-unused-disable-directives --max-warnings 0",
+        "build": "tsc -b tsconfig.json --noEmit && vite build",
         "pnpm:u": "pnpm update",
         "pnpm:ou": "pnpm outdated",
         "ncu:l": "ncu",
@@ -67,11 +67,12 @@
         "format": "prettier --write .",
         "format:check": "prettier --check .",
         "storybook": "storybook dev -p 6006",
-        "build-storybook": "storybook build"
+        "build-storybook": "storybook build",
+        "typecheck": "tsc -p tsconfig.json --noEmit"
     },
     "peerDependencies": {
-        "@actdim/msgmesh": "^1.2.1",
-        "@actdim/utico": "^1.1.0",
+        "@actdim/msgmesh": "^1.2.3",
+        "@actdim/utico": "^1.1.2",
         "http-status": "^2.1.0",
         "jwt-decode": "^4.0.0",
         "mobx": "^6.15.0",

package/dist/componentModel/componentModel.d.ts

@@ -1,165 +0,0 @@
-import { PropsWithChildren, FC, ReactNode } from 'react';
-import { $CG_IN, $CG_OUT, Msg, MsgBus, MsgProviderParams, MsgStruct, MsgSubscriberParams, OutStruct } from '@actdim/msgmesh/msgBusCore';
-import { HasKeys, MaybeKeyOf, MaybePromise, Require, Skip } from '@actdim/utico/typeCore';
-import { ComponentMsgHeaders, TreeNode } from './contracts';
-export declare enum ComponentMsgFilter {
-    None = 0,
-    FromAncestors = 1,
-    FromDescendants = 2
-}
-export type MsgChannelGroupProviderParams<TStruct extends MsgStruct = MsgStruct, TChannel extends keyof TStruct = keyof TStruct, TGroup extends keyof TStruct[TChannel] = typeof $CG_IN, TMsgHeaders extends ComponentMsgHeaders = ComponentMsgHeaders, TScope = any> = Skip<MsgProviderParams<TStruct, TChannel, TGroup>, 'channel' | 'group' | 'callback' | 'filter'> & {
-    callback?: (msgIn: Msg<TStruct, TChannel, TGroup, TMsgHeaders>, headers: TMsgHeaders, scope: TScope) => MaybePromise<OutStruct<TStruct, TChannel>>;
-    filter?: (msg: Msg<TStruct, TChannel, TGroup, TMsgHeaders>, scope: TScope) => boolean;
-    componentFilter?: ComponentMsgFilter;
-};
-export type MsgChannelGroupSubscriberParams<TStruct extends MsgStruct = MsgStruct, TChannel extends keyof TStruct = keyof TStruct, TGroup extends keyof TStruct[TChannel] = typeof $CG_IN, TMsgHeaders extends ComponentMsgHeaders = ComponentMsgHeaders, TScope = any> = Skip<MsgSubscriberParams<TStruct, TChannel, TGroup>, 'channel' | 'group' | 'callback' | 'filter'> & {
-    callback?: (msg: Msg<TStruct, TChannel, TGroup, TMsgHeaders>, scope: TScope) => void;
-    filter?: (msg: Msg<TStruct, TChannel, TGroup, TMsgHeaders>, scope: TScope) => boolean;
-    componentFilter?: ComponentMsgFilter;
-};
-export type MsgBrokerScope<TStruct extends MsgStruct, TKeysToProvide extends keyof TStruct = keyof TStruct, TKeysToSubscribe extends keyof TStruct = keyof TStruct, TKeysToPublish extends keyof TStruct = keyof TStruct> = {
-    provide?: TKeysToProvide;
-    subscribe?: TKeysToSubscribe;
-    publish?: TKeysToPublish;
-};
-export type ComponentPropStruct = Record<string, any>;
-export type ComponentMethodStruct = Record<string, Function>;
-export type ComponentRefStruct = {
-    [name: string]: ComponentStruct | ((params: any) => ComponentStruct);
-};
-export type ComponentStructBase<TMsgStruct extends MsgStruct = MsgStruct, TPropStruct extends ComponentPropStruct = ComponentPropStruct, TMsgScope extends MsgBrokerScope<TMsgStruct> = MsgBrokerScope<TMsgStruct>> = {
-    props?: TPropStruct;
-    actions?: ComponentMethodStruct;
-    effects?: string[] | string | undefined;
-    children?: ComponentRefStruct;
-    msgScope?: TMsgScope;
-};
-export type ComponentStruct<TMsgStruct extends MsgStruct = MsgStruct, T extends ComponentStructBase<TMsgStruct> = ComponentStructBase<TMsgStruct>> = T & {
-    msg: TMsgStruct;
-};
-export type MsgBroker<TStructToProvide extends MsgStruct = MsgStruct, TStructToSubscribe extends MsgStruct = MsgStruct, TMsgHeaders extends ComponentMsgHeaders = ComponentMsgHeaders, TScope = any> = Require<{
-    provide?: Require<{
-        [TChannel in keyof TStructToProvide]: {
-            [TGroup in keyof Skip<TStructToProvide[TChannel], typeof $CG_OUT>]?: MsgChannelGroupProviderParams<TStructToProvide, TChannel, TGroup, TMsgHeaders, TScope>;
-        };
-    }, HasKeys<TStructToProvide>>;
-    subscribe?: Require<{
-        [TChannel in keyof TStructToSubscribe]: {
-            [TGroup in keyof TStructToSubscribe[TChannel]]?: MsgChannelGroupSubscriberParams<TStructToSubscribe, TChannel, TGroup, TMsgHeaders, TScope>;
-        };
-    }, HasKeys<TStructToSubscribe>>;
-    abortController?: AbortController;
-}, HasKeys<TStructToProvide & TStructToSubscribe>>;
-type ValueConverter<TTo, TFrom> = {
-    convert(value: TFrom): TTo;
-    convertBack(value: TTo): TFrom;
-};
-type ValidationResult = {
-    valid: boolean;
-    message: string;
-};
-type Validator<T> = {
-    options: {
-        blur: boolean;
-    };
-    validate: (value: T) => MaybePromise<ValidationResult>;
-};
-declare const $isBinding: unique symbol;
-declare class Binding<T = any, TFrom = any> {
-    readonly get: () => T;
-    readonly set: (value: T) => void;
-    readonly converter: ValueConverter<T, TFrom>;
-    readonly validator: Validator<T>;
-    readonly readOnly: boolean;
-    constructor(get: () => T, set?: (value: T) => void, converter?: ValueConverter<T, TFrom>, validator?: Validator<T>);
-    [$isBinding]: boolean;
-}
-export declare function isBinding(obj: any): obj is Binding;
-export declare function bind<T, TFrom = any>(get: () => T, set?: (value: T) => void, converter?: ValueConverter<T, TFrom>, validator?: Validator<T>): Binding<T, TFrom>;
-export declare function bindProp<T extends object, P extends keyof T>(target: () => T, prop: P): Binding<T[P], any>;
-export type ComponentPropSource<T> = T | Binding<T>;
-export type ComponentPropParams<TPropStruct extends ComponentPropStruct> = {
-    [P in keyof TPropStruct]?: ComponentPropSource<TPropStruct[P]>;
-};
-declare const $ON_GET = "onGet";
-declare const $ON_CHANGING = "onChanging";
-declare const $ON_CHANGE = "onChange";
-type PropValueChangingHandler<TProp = PropertyKey> = (prop: TProp, oldValue: any, newValue: any) => boolean;
-type PropValueChangeHandler<TProp = PropertyKey> = (prop: TProp, value: any) => void;
-type ValueChangingHandler<T = any> = (oldValue: T, newValue: T) => boolean;
-type ValueChangeHandler<T = any> = (value: T) => void;
-type ComponentEvents<TStruct extends ComponentStruct = ComponentStruct> = {
-    onPropChanging?: PropValueChangingHandler<keyof TStruct['props']>;
-    onPropChange?: PropValueChangeHandler<keyof TStruct['props']>;
-    onInit?: (component: Component<TStruct>) => void;
-    onLayout?: (component: Component<TStruct>) => void;
-    onReady?: (component: Component<TStruct>) => void;
-    onLayoutDestroy?: (component: Component<TStruct>) => void;
-    onDestroy?: (component: Component<TStruct>) => void;
-    onError?: (component: Component<TStruct>, error: any) => void;
-} & {
-    [P in keyof TStruct['props'] as `${typeof $ON_GET}${Capitalize<P & string>}`]?: () => TStruct['props'][P];
-} & {
-    [P in keyof TStruct['props'] as `${typeof $ON_CHANGING}${Capitalize<P & string>}`]?: ValueChangingHandler<TStruct['props']>;
-} & {
-    [P in keyof TStruct['props'] as `${typeof $ON_CHANGE}${Capitalize<P & string>}`]?: ValueChangeHandler<TStruct['props']>;
-};
-type ComponentViewProps = {
-    render?: boolean;
-} & PropsWithChildren;
-type ComponentViewImplFn<TStruct extends ComponentStruct, TMsgHeaders extends ComponentMsgHeaders = ComponentMsgHeaders> = (props: ComponentViewProps, component?: Component<TStruct, TMsgHeaders>) => ReactNode;
-type ComponentViewFn = (props: ComponentViewProps) => ReactNode;
-export type ComponentMsgBroker<TStruct extends ComponentStruct, TMsgHeaders extends ComponentMsgHeaders = ComponentMsgHeaders> = MsgBroker<Pick<TStruct['msg'], MaybeKeyOf<TStruct['msg'], TStruct['msgScope']['provide']>>, Pick<TStruct['msg'], MaybeKeyOf<TStruct['msg'], TStruct['msgScope']['subscribe']>>, TMsgHeaders, Component<TStruct, TMsgHeaders>>;
-export type EffectFn<TStruct extends ComponentStruct, TMsgHeaders extends ComponentMsgHeaders = ComponentMsgHeaders> = (component: Component<TStruct, TMsgHeaders>) => void | (() => void);
-export type ComponentDef<TStruct extends ComponentStruct, TMsgHeaders extends ComponentMsgHeaders = ComponentMsgHeaders> = {
-    name?: string;
-    props?: Require<TStruct['props'], HasKeys<TStruct['props']>>;
-    actions?: Require<TStruct['actions'], HasKeys<TStruct['actions']>>;
-    effects?: keyof TStruct['effects'] extends never ? never : Record<TStruct['effects'] extends string ? TStruct['effects'] : TStruct['effects'][number], EffectFn<TStruct, TMsgHeaders>>;
-    children?: ComponentDefChildren<TStruct['children']>;
-    events?: ComponentEvents<TStruct>;
-    msgBroker?: ComponentMsgBroker<TStruct, TMsgHeaders>;
-    msgBus?: MsgBus<TStruct['msg'], TMsgHeaders>;
-    view?: ComponentViewImplFn<TStruct, TMsgHeaders>;
-};
-type ComponentDefChildren<TRefStruct extends ComponentRefStruct> = Require<{
-    [P in keyof TRefStruct]: TRefStruct[P] extends (params: infer TParams) => infer T ? T extends ComponentStruct ? (params: TParams) => Component<T> : never : TRefStruct[P] extends ComponentStruct ? Component<TRefStruct[P]> : never;
-}, HasKeys<TRefStruct>>;
-type ComponentChildren<TRefStruct extends ComponentRefStruct> = {
-    [P in keyof TRefStruct as TRefStruct[P] extends Function ? `${Capitalize<P & string>}` : P]: TRefStruct[P] extends (params: infer TParams) => infer T ? T extends ComponentStruct ? FC<ComponentParams<T> & TParams> : never : TRefStruct[P] extends ComponentStruct ? Component<TRefStruct[P]> : never;
-};
-export type ComponentMsgStruct<TStruct extends ComponentStruct = ComponentStruct> = Pick<TStruct['msg'], MaybeKeyOf<TStruct['msg'], TStruct['msgScope']['provide']> | MaybeKeyOf<TStruct['msg'], TStruct['msgScope']['subscribe']> | MaybeKeyOf<TStruct['msg'], TStruct['msgScope']['publish']>>;
-export type ComponentBase<TStruct extends ComponentStruct = ComponentStruct, TMsgHeaders extends ComponentMsgHeaders = ComponentMsgHeaders> = {
-    id: string;
-    parentId: string;
-    getHierarchyId(): string;
-    getParent(): string | undefined;
-    getChildren(): string[];
-    getChainUp(): string[];
-    getChainDown(): string[];
-    getNodeMap(): Map<string, TreeNode>;
-    bindings: Map<PropertyKey, Binding>;
-    msgBus: MsgBus<ComponentMsgStruct<TStruct>, TMsgHeaders>;
-    msgBroker: ComponentMsgBroker<TStruct>;
-    effects: Record<string, EffectController>;
-    View: ComponentViewFn;
-};
-export type ComponentModel<TStruct extends ComponentStruct = ComponentStruct> = TStruct['props'] & Readonly<TStruct['actions']>;
-export type Component<TStruct extends ComponentStruct = ComponentStruct, TMsgHeaders extends ComponentMsgHeaders = ComponentMsgHeaders> = {
-    readonly model: ComponentModel<TStruct>;
-    readonly children: Readonly<ComponentChildren<TStruct['children']>>;
-} & Readonly<ComponentBase<TStruct, TMsgHeaders>>;
-export type ComponentParams<TStruct extends ComponentStruct = ComponentStruct> = ComponentPropParams<TStruct['props']> & ComponentEvents<TStruct>;
-export declare function toHtmlId(url: string, segmentsCount?: number): string;
-export type EffectController = {
-    start: () => void;
-    pause: () => void;
-    resume: () => void;
-    stop: () => void;
-    restart: () => void;
-};
-export declare function createEffect<TStruct extends ComponentStruct, TMsgHeaders extends ComponentMsgHeaders = ComponentMsgHeaders>(component: Component<TStruct, TMsgHeaders>, name: string, fn: EffectFn<TStruct, TMsgHeaders>): EffectController;
-export declare function useComponent<TStruct extends ComponentStruct = ComponentStruct, TMsgHeaders extends ComponentMsgHeaders = ComponentMsgHeaders>(componentDef: ComponentDef<TStruct, TMsgHeaders>, params: ComponentParams<TStruct>): any;
-export declare function getFC<TStruct extends ComponentStruct>(factory: (params: ComponentParams<TStruct>) => Component<TStruct>): FC<ComponentParams<TStruct>>;
-export {};
-//# sourceMappingURL=componentModel.d.ts.map

package/dist/componentModel/componentModel.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"componentModel.d.ts","sourceRoot":"","sources":["../../src/componentModel/componentModel.tsx"],"names":[],"mappings":"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"}