npm - @fernir2/saas-kit - Versions diffs - 0.0.190 → 0.0.203 - Mend

@fernir2/saas-kit 0.0.190 → 0.0.203

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3909) hide show

package/packages/level2/meta/resource-list/resource-lists.js CHANGED Viewed

@@ -1,14 +1,14 @@
 'use strict';
 import { metaNavigateToResourceList, navigateToResourceEdit } from '../services/meta-navigations.js';
 import { silentChangeUrl } from '../../../fd-toolbox/routing/routers.js';
-import { getODataParams } from '../../../fd-toolbox/odata/odatas.js';
+import { getODataParams } from '../../../fd-toolbox/odata/odata.js';
 import { oDataOperators } from '../../../fd-toolbox/enums/enums.js';
 import { metaQueryParams } from '../../../fd-toolbox/constants/meta-query-params.js';
 import { routes } from '../../../fd-toolbox/routing/routes.js';
 import { oDataComparisonTypes, oDataFilterTypes } from '../../../fd-toolbox/odata/odata-enums.js';
 import { isUuidSet } from '../../../fd-toolbox/functions/value-checking-functions.js';
-import { viewNames } from '../view/view-names.js';
+import { viewNames } from '../edit-resource/edit-resource-names.js';
-var __defProp=Object['defineProperty'],__name=(_0x44f640,_0x29b229)=>__defProp(_0x44f640,'name',{'value':_0x29b229,'configurable':!![]});function navigateToResourceList(_0x172982,_0x44c3a5,_0x2dc98c){let _0x292faa=_0x44c3a5['properties'][_0x172982['name']];if(_0x292faa&&_0x172982['relation']){let _0x6093f4={};if(_0x2dc98c)_0x6093f4['filters']=[{'leftSide':_0x172982['relation']['relatedPropertyName'],'rightSide':[_0x2dc98c],'type':oDataFilterTypes['guid'],'operator':oDataOperators['in'],'comparisonType':oDataComparisonTypes['equal']}];metaNavigateToResourceList(_0x172982['relation']['relatedResourceName'],_0x6093f4);}}__name(navigateToResourceList,'navigateToResourceList');function navigateToResource(_0x527638){navigateToResourceEdit(_0x527638);}__name(navigateToResource,'navigateToResource');function navigateToList(_0x43ae4b,_0x2a0ccd,_0x169c2d){navigateToResourceList(_0x43ae4b,_0x2a0ccd,_0x169c2d);}__name(navigateToList,'navigateToList');function resourceListOnFilterChange(_0x539e91,_0x586d3c){let _0x365b3a=getODataParams({'filters':_0x539e91});_0x365b3a['unshift']({'name':metaQueryParams['resource'],'value':_0x586d3c}),silentChangeUrl(routes['list'],_0x365b3a);}__name(resourceListOnFilterChange,'resourceListOnFilterChange');function isResourceListView(_0x37607f,_0x5c93eb){const _0x1b324e=isUuidSet(_0x5c93eb);return !_0x1b324e&&_0x37607f!==viewNames['viewResource'];}__name(isResourceListView,'isResourceListView');
+var __defProp=Object['defineProperty'],__name=(_0x1a9e00,_0x21bce8)=>__defProp(_0x1a9e00,'name',{'value':_0x21bce8,'configurable':!![]});function navigateToResourceList(_0x3d9212,_0x49e751,_0x1c2636){let _0x4e1a46=_0x49e751['properties'][_0x3d9212['name']];if(_0x4e1a46&&_0x3d9212['relation']){let _0x17872f={};if(_0x1c2636)_0x17872f['filters']=[{'leftSide':_0x3d9212['relation']['relatedPropertyName'],'rightSide':[_0x1c2636],'type':oDataFilterTypes['guid'],'operator':oDataOperators['in'],'comparisonType':oDataComparisonTypes['equal']}];metaNavigateToResourceList(_0x3d9212['relation']['relatedResourceName'],_0x17872f);}}__name(navigateToResourceList,'navigateToResourceList');function navigateToResource(_0x2623d6){navigateToResourceEdit(_0x2623d6);}__name(navigateToResource,'navigateToResource');function navigateToList(_0x19f639,_0x3699b9,_0x3a8266){navigateToResourceList(_0x19f639,_0x3699b9,_0x3a8266);}__name(navigateToList,'navigateToList');function resourceListOnFilterChange(_0xda785a,_0x2e8a22){let _0x5ea0c7=getODataParams({'filters':_0xda785a});_0x5ea0c7['unshift']({'name':metaQueryParams['resource'],'value':_0x2e8a22}),silentChangeUrl(routes['list'],_0x5ea0c7);}__name(resourceListOnFilterChange,'resourceListOnFilterChange');function isResourceListView(_0x125eaa,_0x16006a){const _0x5c7de4=isUuidSet(_0x16006a);return !_0x5c7de4&&_0x125eaa!==viewNames['editResource'];}__name(isResourceListView,'isResourceListView');
 export { isResourceListView, navigateToList, navigateToResource, navigateToResourceList, resourceListOnFilterChange };

package/packages/level2/meta/resource-list/use-resource-list-config.js CHANGED Viewed

@@ -1,8 +1,8 @@
 'use strict';
 import { c } from 'react/compiler-runtime';
 import { useGlobalConfig } from '../providers/global-provider/GlobalContext.js';
-import { getResourceListConfig } from './resource-list-configs.js';
+import { getMultilistResourceListConfig } from './resource-list-configs.js';
-var __defProp=Object['defineProperty'],__name=(_0x44c9ee,_0x2ac7d9)=>__defProp(_0x44c9ee,'name',{'value':_0x2ac7d9,'configurable':!![]});function useResourceListConfig(_0x4badbb,_0x57c890){const _0x544b58=c(0x1d93*-0x1+0x25fb+-0x866),{globalConfig:_0x37c4aa}=useGlobalConfig();if(_0x57c890)return _0x57c890;let _0x5893c7;_0x544b58[-0x1*0x1f1f+0x29f*-0xb+0x3bf4]!==_0x4badbb?(_0x5893c7=getResourceListConfig(_0x4badbb),_0x544b58[0x18b9+0x5cf*0x1+-0x1e88]=_0x4badbb,_0x544b58[0x1735+0x7*0x11+-0x1*0x17ab]=_0x5893c7):_0x5893c7=_0x544b58[-0xd83+-0x12d3+-0x1*-0x2057];const _0x220680=_0x5893c7;if(!_0x4badbb)return _0x220680;const _0x4256e6=_0x37c4aa['resourceListConfigs']?.[_0x4badbb];return _0x4256e6??_0x220680;}__name(useResourceListConfig,'useResourceListConfig');
+var __defProp=Object['defineProperty'],__name=(_0x438d72,_0x14a524)=>__defProp(_0x438d72,'name',{'value':_0x14a524,'configurable':!![]});function useResourceListConfig(_0x5c7304,_0xb4462a){const _0x520943=c(-0x1*-0xf59+0x716*-0x3+-0x12f*-0x5),{globalConfig:_0x4c5ad5}=useGlobalConfig();if(_0xb4462a)return _0xb4462a;let _0x3c9040;_0x520943[-0x113b*-0x1+0x233*-0x5+-0x2*0x31e]!==_0x5c7304?(_0x3c9040=getMultilistResourceListConfig(_0x5c7304),_0x520943[0xfc3+-0x17b8+-0x2a7*-0x3]=_0x5c7304,_0x520943[-0x245*-0x9+-0x1a*-0x52+0x1cc0*-0x1]=_0x3c9040):_0x3c9040=_0x520943[-0x2*0xdf6+0x19cf+-0x10f*-0x2];const _0x53443d=_0x3c9040;if(!_0x5c7304)return _0x53443d;const _0x1f05f3=_0x4c5ad5['resourceListConfigs']?.[_0x5c7304];return _0x1f05f3??_0x53443d;}__name(useResourceListConfig,'useResourceListConfig');
 export { useResourceListConfig };

package/packages/level2/meta/resource-providers.js CHANGED Viewed

@@ -7,6 +7,6 @@ import { addPaging } from '../../fd-toolbox/odata/odataconfig.js';
 import { isNullOrUndefined } from '../../fd-toolbox/functions/value-checking-functions.js';
 import { fetchResourceMeta } from './meta-providers.js';
-var __defProp=Object['defineProperty'],__name=(_0x157508,_0x1de734)=>__defProp(_0x157508,'name',{'value':_0x1de734,'configurable':!![]});async function fetchResources(_0x3f4571,_0x1c75ab){const _0x408aac=await fetchResourceMeta(_0x3f4571),_0x1af7d1=await getResourceODataConfig(_0x408aac,_0x1c75ab);return (await apiGetWithOData(_0x3f4571,_0x1af7d1))['data'];}__name(fetchResources,'fetchResources');async function fetchResource(_0x111f21,_0x3932d0,_0x544706){let _0x4b84f8,_0x339baa;if(_0x544706){const _0x7cb2cb=await getResourceODataConfig(_0x111f21,_0x544706);_0x339baa=await apiGetWithOData(_0x111f21['resourceName'],_0x7cb2cb,_0x3932d0);}else _0x339baa=await apiGet(_0x111f21['resourceName'],_0x3932d0);if(_0x339baa['data'])_0x4b84f8=_0x339baa['data'];return _0x4b84f8;}__name(fetchResource,'fetchResource');async function getResourceODataConfig(_0x57e18a,_0x1960c0){const _0xacf406=_0x1960c0??{};if(!_0xacf406['expands']){const _0x4b143b=await getRelatedResourcesMetasIfExpandForDescription(_0x57e18a);_0xacf406['selects']=Array['from'](new Set(getODataSelectIfExpandForDescription(_0x57e18a,_0x4b143b)['concat'](_0xacf406['selects']??[]))),_0xacf406['expands']=getODataExpandIfExpandForDescription(_0x57e18a);}return isNullOrUndefined(_0xacf406['top'])&&addPaging(_0xacf406,oDataDefaultTop),_0xacf406;}__name(getResourceODataConfig,'getResourceODataConfig');async function fetchResourceByName(_0x1cf486,_0x300dc5,_0x3ba50b){let _0x4d8cdd,_0x5c6825;_0x3ba50b?_0x5c6825=await apiGetWithOData(_0x1cf486,_0x3ba50b,_0x300dc5):_0x5c6825=await apiGet(_0x1cf486,_0x300dc5);if(_0x5c6825['data'])_0x4d8cdd=_0x5c6825['data'];return _0x4d8cdd;}__name(fetchResourceByName,'fetchResourceByName');
+var __defProp=Object['defineProperty'],__name=(_0x30ff13,_0x2603da)=>__defProp(_0x30ff13,'name',{'value':_0x2603da,'configurable':!![]});async function fetchResources(_0xaa3f37,_0x28638d){const _0xf97561=await fetchResourceMeta(_0xaa3f37),_0x50acce=await getResourceODataConfig(_0xf97561,_0x28638d);return (await apiGetWithOData(_0xaa3f37,_0x50acce))['data'];}__name(fetchResources,'fetchResources');async function fetchResource(_0x5f3e0b,_0x410559,_0x9a29c2){let _0x577b07,_0x4a1703;if(_0x9a29c2){const _0x37075f=await getResourceODataConfig(_0x5f3e0b,_0x9a29c2);_0x4a1703=await apiGetWithOData(_0x5f3e0b['resourceName'],_0x37075f,_0x410559);}else _0x4a1703=await apiGet(_0x5f3e0b['resourceName'],_0x410559);if(_0x4a1703['data'])_0x577b07=_0x4a1703['data'];return _0x577b07;}__name(fetchResource,'fetchResource');async function getResourceODataConfig(_0x2b6e8b,_0xcd9b61){const _0x3b64e8=_0xcd9b61??{};if(!_0x3b64e8['expands']){const _0x208894=await getRelatedResourcesMetasIfExpandForDescription(_0x2b6e8b);_0x3b64e8['selects']=Array['from'](new Set(getODataSelectIfExpandForDescription(_0x2b6e8b,_0x208894)['concat'](_0x3b64e8['selects']??[]))),_0x3b64e8['expands']=getODataExpandIfExpandForDescription(_0x2b6e8b);}return isNullOrUndefined(_0x3b64e8['top'])&&addPaging(_0x3b64e8,oDataDefaultTop),_0x3b64e8;}__name(getResourceODataConfig,'getResourceODataConfig');async function fetchResourceByName(_0x428f76,_0x4f3efd,_0x1d60d2){let _0x223d46,_0x80ae6;_0x1d60d2?_0x80ae6=await apiGetWithOData(_0x428f76,_0x1d60d2,_0x4f3efd):_0x80ae6=await apiGet(_0x428f76,_0x4f3efd);if(_0x80ae6['data'])_0x223d46=_0x80ae6['data'];return _0x223d46;}__name(fetchResourceByName,'fetchResourceByName');
 export { fetchResource, fetchResourceByName, fetchResources, getResourceODataConfig };

package/packages/level2/meta/resources/session/session.resource.js CHANGED Viewed

@@ -2,6 +2,6 @@
 import { resourceMetaId } from '../../decorators/resource-id.js';
 import { resourceIds } from '../../../../fd-toolbox/constants/resource-id-constants.js';
-var __defProp=Object['defineProperty'],__getOwnPropDesc=Object['getOwnPropertyDescriptor'],__name=(_0x38a999,_0xd1bd9d)=>__defProp(_0x38a999,'name',{'value':_0xd1bd9d,'configurable':!![]}),__decorateClass=(_0xe1fcbb,_0x553536,_0x1d5005,_0x2a9104)=>{var _0x166c37=_0x2a9104>0x12b+-0x1147*0x2+0x4*0x859?void(-0xe1c+0x66+0xdb6):_0x2a9104?__getOwnPropDesc(_0x553536,_0x1d5005):_0x553536;for(var _0x463cf8=_0xe1fcbb['length']-(-0x846+-0x1020+0x1*0x1867),_0xab5a46;_0x463cf8>=0x59*-0x4f+0x1*0xcd7+0xd0*0x12;_0x463cf8--)if(_0xab5a46=_0xe1fcbb[_0x463cf8])_0x166c37=(_0x2a9104?_0xab5a46(_0x553536,_0x1d5005,_0x166c37):_0xab5a46(_0x166c37))||_0x166c37;if(_0x2a9104&&_0x166c37)__defProp(_0x553536,_0x1d5005,_0x166c37);return _0x166c37;};let Session=class{['homeWorkspaceId'];['currentWorkspaceId'];['userId'];['id'];['expiresAt'];['fresh'];};__name(Session,'Session'),Session=__decorateClass([resourceMetaId(resourceIds['session'])],Session);
+var __defProp=Object['defineProperty'],__getOwnPropDesc=Object['getOwnPropertyDescriptor'],__name=(_0x40d77a,_0x2e5232)=>__defProp(_0x40d77a,'name',{'value':_0x2e5232,'configurable':!![]}),__decorateClass=(_0x2b666b,_0x1e9167,_0x1e42b2,_0x3845ff)=>{var _0x4d1c5e=_0x3845ff>0xf51+0x17b*0x7+0x3ab*-0x7?void(-0x25e+-0x2b*0x59+-0xd*-0x155):_0x3845ff?__getOwnPropDesc(_0x1e9167,_0x1e42b2):_0x1e9167;for(var _0x505e27=_0x2b666b['length']-(0xea2+-0x173*0xd+0x436),_0x45961d;_0x505e27>=-0xb*0x1eb+-0xb09+0x2022;_0x505e27--)if(_0x45961d=_0x2b666b[_0x505e27])_0x4d1c5e=(_0x3845ff?_0x45961d(_0x1e9167,_0x1e42b2,_0x4d1c5e):_0x45961d(_0x4d1c5e))||_0x4d1c5e;if(_0x3845ff&&_0x4d1c5e)__defProp(_0x1e9167,_0x1e42b2,_0x4d1c5e);return _0x4d1c5e;};let Session=class{['homeWorkspaceId'];['currentWorkspaceId'];['userId'];['id'];['expiresAt'];['fresh'];};__name(Session,'Session'),Session=__decorateClass([resourceMetaId(resourceIds['session'])],Session);
 export { Session };

package/packages/level2/meta/server/api/odata/odata-expression-operators.d.ts CHANGED Viewed

@@ -17,4 +17,4 @@ export declare function limit<TQuery extends SelectQuery>(query: TQuery, table:
 export declare function sort<TQuery extends SelectQuery>(query: TQuery, sorts: SortColumn[]): {
     query: any;
 };
-export declare function getSortColumns<TTable extends TableWithId, TQuery extends SelectQuery>(query: TQuery, table: TTable, orderBys: ODataOrderBy[], resourceMeta: ResourceMeta): Promise<SortColumn[]>;
+export declare function getSortColumns<TTable extends TableWithId, TQuery extends SelectQuery>(query: TQuery, table: TTable, resourceMeta: ResourceMeta, orderBysProp?: ODataOrderBy[]): Promise<SortColumn[]>;

package/packages/level2/meta/server/api/odata/odata-expression-operators.js CHANGED Viewed

@@ -1,12 +1,12 @@
 'use strict';
 import { asc, desc, aliasedTable, inArray, eq } from 'drizzle-orm';
-import { getQuery, getAliasedTableByResourceName, getTableByResourceName } from '../../web/drizzle.js';
+import { getQuery, getTableByResourceName, getAliasedTableByResourceName } from '../../web/drizzle.js';
 import { getColumnsFromTable, getQueryConfig, compareTableByName, getTableColumn } from '../../../../db/drizzle-queries.js';
 import { propertyTypes } from '../../../properties/property-type.js';
 import { dbOrderBy, createDynamicSelect, dbWhere, dbOffset, dbLimit, dbLeftJoin } from '../../../../db/db-connection.js';
 import { cutOffSuffix } from '../../props/property-names.js';
 import { isPropertyExpandable } from '../../services/property-metas.js';
-import { metas } from '../../fd-meta-core/constants/metas.js';
+import { metas } from '../../meta-core/constants/metas.js';
 import { getInternalResourceMeta } from '../../resources/internal-resource-meta.js';
 import { paginationTypes } from '../../../../../fd-toolbox/server/api-enums/pagination-type.js';
 import { createError } from '../../../../../fd-toolbox/errors/errors.js';
@@ -15,6 +15,6 @@ import { withIdProps } from '../../../../../fd-toolbox-core/types/resource-with-
 import { oDataOrderByDirectionConsts } from '../../../../../fd-toolbox/enums/enums.js';
 import { convertFromPascalToCamelCase } from '../../../../../fd-toolbox/strings/casing-converter.js';
-var __defProp=Object['defineProperty'],__name=(_0x202494,_0x5093de)=>__defProp(_0x202494,'name',{'value':_0x5093de,'configurable':!![]});async function getRelatedResourceName(_0x1f0f7f,_0x51fea7,_0x20fe9f){const _0xc727a3=_0x20fe9f;if(_0xc727a3){const _0x344628=_0xc727a3['properties'][_0x51fea7];if(_0x344628?.['relation']?.['relatedResourceName'])return _0x344628['relation']['relatedResourceName'];}const _0xdf6846=await getInternalResourceMeta(_0x1f0f7f),_0x5ddd91=_0xdf6846['properties'][_0x51fea7];if(_0x5ddd91?.['declaredWithType'])return _0x5ddd91['declaredWithType'];throw createError('Could\x20not\x20determine\x20related\x20resource\x20for\x20property\x20\x27'+_0x51fea7+'\x27\x20on\x20resource\x20\x27'+_0x1f0f7f+'\x27.\x20It\x20was\x20not\x20found\x20in\x20ResourceMeta\x20relations\x20nor\x20in\x20InternalResourceMeta\x20declaredWithType.');}__name(getRelatedResourceName,'getRelatedResourceName');async function select(_0x362b12,_0x5ac5bf,_0x31ccdc){let _0x4af486={};const _0x529082=_0x5ac5bf['children']??{};!Object['keys'](_0x529082)['includes'](withIdProps['id'])&&(_0x4af486[withIdProps['id']]=_0x362b12['id']);for(const [_0x2da57c,_0x17f11f]of Object['entries'](_0x529082)){const _0x3ca196=await buildSelectedProperty(_0x362b12,_0x31ccdc,_0x2da57c,_0x17f11f);_0x4af486[_0x2da57c]=_0x3ca196;}let {query:_0x44de20}=await getQuery(_0x362b12,_0x4af486);return await joinRelatedTables(_0x44de20,_0x362b12,_0x5ac5bf,_0x31ccdc),{'query':_0x44de20};}__name(select,'select');async function buildSelectedProperty(_0x33f4f9,_0x18663e,_0x891c6a,_0x3161e3={}){const _0x371dd1=_0x18663e['properties'][_0x891c6a];if(!isPropertyExpandable(_0x371dd1))return getColumnsFromTable(_0x33f4f9)[_0x891c6a];const _0xa3a7b7=await getRelatedResourceName(_0x18663e['resourceName'],_0x891c6a,_0x18663e),_0x3b6b7d=await getAliasedTableByResourceName(_0xa3a7b7,_0x891c6a),_0x2c450a={[withIdProps['id']]:getColumnsFromTable(_0x3b6b7d)[withIdProps['id']]};if(_0x3161e3['children']&&Object['keys'](_0x3161e3['children'])['length']&&_0x3161e3['resourceMeta'])for(const [_0xf54b2f,_0x2f1411]of Object['entries'](_0x3161e3['children'])){const _0x30b276=await buildSelectedProperty(_0x3b6b7d,_0x3161e3['resourceMeta'],_0xf54b2f,_0x2f1411);_0x2c450a[_0xf54b2f]=_0x30b276;}else return getColumnsFromTable(_0x3b6b7d);return _0x2c450a;}__name(buildSelectedProperty,'buildSelectedProperty');async function expand(_0x3f3d03,_0xd0a9c6,_0x2e35b7){let _0x7803a4={...getColumnsFromTable(_0x3f3d03)};const _0x387080=_0xd0a9c6['children']??{};for(const [_0x40ec35,_0x239d06]of Object['entries'](_0x387080)){const _0x7ea491=await buildExpandedProperty(_0x40ec35,_0x2e35b7,_0x239d06);_0x7803a4[_0x40ec35]=_0x7ea491;}let {query:_0x4969e4}=await getQuery(_0x3f3d03,_0x7803a4);return await joinRelatedTables(_0x4969e4,_0x3f3d03,_0xd0a9c6,_0x2e35b7),{'query':_0x4969e4};}__name(expand,'expand');async function buildExpandedProperty(_0x36e051,_0x497ca0,_0x1d9a27={}){const _0x8bd5ec=await getRelatedResourceName(_0x497ca0['resourceName'],_0x36e051,_0x497ca0),_0x38cbc7=await getAliasedTableByResourceName(_0x8bd5ec,_0x36e051),_0x579bea=getColumnsFromTable(_0x38cbc7);if(_0x1d9a27['children']&&_0x1d9a27['resourceMeta'])for(const [_0x162ede,_0x5e1812]of Object['entries'](_0x1d9a27['children'])){const _0x21b752=await buildExpandedProperty(_0x162ede,_0x1d9a27['resourceMeta'],_0x5e1812);_0x579bea[_0x162ede]=_0x21b752;}return _0x579bea;}__name(buildExpandedProperty,'buildExpandedProperty');async function offset(_0x357f67,_0x29a8a3,_0x5c4f20,_0x1f516c,_0x931920){return applyPagination(_0x357f67,_0x29a8a3,_0x5c4f20,_0x1f516c,_0x931920,paginationTypes['offset']);}__name(offset,'offset');async function limit(_0x35f36c,_0x59fded,_0x312406,_0x3be95c,_0x1453f7){return applyPagination(_0x35f36c,_0x59fded,_0x312406,_0x3be95c,_0x1453f7,paginationTypes['limit']);}__name(limit,'limit');function sort(_0x45b173,_0x1ca452){const _0x119eae=dbOrderBy(_0x45b173,..._0x1ca452['map'](_0x32f8a9=>_0x32f8a9['ascending']?asc(_0x32f8a9['column']):desc(_0x32f8a9['column'])));return {'query':_0x119eae};}__name(sort,'sort');async function getSortColumns(_0x425a60,_0x5037e3,_0x20a0b6,_0x21bdaa){const _0x23d5fd=getQueryConfig(_0x425a60)['joins']?.['map'](_0xe16ac4=>_0xe16ac4['table']),_0x20d6cf=[];for(const _0x69a00f of _0x20a0b6['toSorted']((_0x396334,_0x1f693d)=>_0x396334['priority']-_0x1f693d['priority'])){let _0x1d4d75=_0x69a00f['propertyName'],_0x435b08=_0x5037e3,_0x3e7b28=![];const _0x1e6c05=_0x21bdaa['properties'][_0x1d4d75];if(_0x1e6c05?.['relation']&&_0x1e6c05['relation']['relatedPropertyName']===withIdProps['id']){const _0x428e45=await getRelatedResourceName(_0x21bdaa['resourceName'],_0x1d4d75,_0x21bdaa),_0x2031d3=await getTableByResourceName(_0x428e45);_0x23d5fd?.['find'](_0x20115c=>compareTableByName(_0x20115c,_0x2031d3))&&(_0x435b08=aliasedTable(_0x2031d3,convertFromPascalToCamelCase(_0x428e45)),_0x1d4d75=(await getInternalResourceMeta(_0x428e45))['description']['resourceDescriptionProperty']??'',_0x3e7b28=!![]);}if(!(_0x1d4d75 in _0x435b08))throw createError(metaErrorMessages['resourceCannotBeOrderedByNavigationProperty']['replace']('{0}',_0x21bdaa['resourceName'])['replace']('{1}',_0x1d4d75));_0x20d6cf['push']({'joined':_0x3e7b28,'ascending':_0x69a00f['direction']===oDataOrderByDirectionConsts['asc'],'column':getTableColumn(_0x435b08,_0x1d4d75),'basePropertyName':_0x69a00f['propertyName']});}return _0x20d6cf;}__name(getSortColumns,'getSortColumns');async function applyPagination(_0x331609,_0x376e4c,_0x5a245c,_0x59a839,_0x606eaf,_0x1b4c1e){let _0xa5dee=createDynamicSelect(_0x376e4c,{'id':_0x376e4c['id']});if(_0x59a839['length']>-0xb30+0x1aff*-0x1+0x262f){for(const _0x5c6648 of _0x59a839){let _0x3e8c58=_0x5c6648['basePropertyName'];if(_0x3e8c58['endsWith'](metas['idSuffix'])&&_0x3e8c58!==withIdProps['id']){_0x3e8c58=cutOffSuffix(_0x3e8c58,metas['idSuffix']);const _0x420914=_0x606eaf['properties'][_0x3e8c58];isPropertyExpandable(_0x420914)&&await joinOneSideRelation(_0xa5dee,_0x376e4c,_0x606eaf,_0x3e8c58);}}sort(_0xa5dee,_0x59a839);}const _0xbad216=getQueryConfig(_0x331609)['where'];_0xbad216&&dbWhere(_0xa5dee,_0xbad216);_0x1b4c1e===paginationTypes['offset']?dbOffset(_0xa5dee,_0x5a245c):dbLimit(_0xa5dee,_0x5a245c);const _0x315b54=inArray(_0x376e4c['id'],_0xa5dee),_0x47ebc0=dbWhere(_0x331609,_0x315b54);return {'query':_0x47ebc0};}__name(applyPagination,'applyPagination');async function joinRelatedTables(_0x4cecf2,_0x72e1a8,_0x53a572,_0x4a9902){return await Promise['all'](Object['entries'](_0x53a572['children']??{})['map'](([_0x504793,_0x497511])=>joinRelatedTable(_0x4cecf2,_0x72e1a8,_0x4a9902,_0x504793,_0x497511))),_0x4cecf2;}__name(joinRelatedTables,'joinRelatedTables');async function joinRelatedTable(_0x3482db,_0x242eb8,_0x337f7b,_0x59aaed,_0x491a2e){const _0x2e88a2=_0x337f7b['properties'][_0x59aaed];if(!isPropertyExpandable(_0x2e88a2))return;let _0x102e46;if(_0x2e88a2['type']===propertyTypes['array']){const _0x33e65f=await getRelatedResourceName(_0x337f7b['resourceName'],_0x59aaed,_0x337f7b);_0x102e46=await joinManySideRelation(_0x3482db,_0x242eb8,_0x59aaed,_0x33e65f,_0x2e88a2['relation']['relatedPropertyName']);}else _0x102e46=await joinOneSideRelation(_0x3482db,_0x242eb8,_0x337f7b,_0x59aaed);await joinChildRelatedTables(_0x3482db,_0x102e46,_0x491a2e);}__name(joinRelatedTable,'joinRelatedTable');async function joinChildRelatedTables(_0x12c06f,_0x41fb9b,_0x6065){if(!_0x6065['resourceMeta']||!_0x6065['children'])return;for(const [_0x2cca0e,_0x246ebd]of Object['entries'](_0x6065['children'])){await joinRelatedTable(_0x12c06f,_0x41fb9b,_0x6065['resourceMeta'],_0x2cca0e,_0x246ebd);}}__name(joinChildRelatedTables,'joinChildRelatedTables');async function joinManySideRelation(_0x27b46f,_0x303603,_0x34369d,_0x5cfa55,_0x4b2c6e){const _0x3ebcc9=await getAliasedTableByResourceName(_0x5cfa55,_0x34369d),_0x1b18cb=_0x4b2c6e['endsWith'](metas['idSuffix'])?_0x4b2c6e:_0x4b2c6e+metas['idSuffix'],_0x45e4a6=eq(_0x303603['id'],getTableColumn(_0x3ebcc9,_0x1b18cb));return dbLeftJoin(_0x27b46f,_0x3ebcc9,_0x45e4a6),_0x3ebcc9;}__name(joinManySideRelation,'joinManySideRelation');async function joinOneSideRelation(_0x25107c,_0x313d34,_0x60e59,_0x45ea39){const _0x12bf48=await getRelatedResourceName(_0x60e59['resourceName'],_0x45ea39,_0x60e59),_0x490245=await getAliasedTableByResourceName(_0x12bf48,_0x45ea39),_0x4f12bf=_0x45ea39['endsWith'](metas['idSuffix'])?_0x45ea39:''+_0x45ea39+metas['idSuffix'],_0x20776e=eq(_0x490245['id'],getTableColumn(_0x313d34,_0x4f12bf));return dbLeftJoin(_0x25107c,_0x490245,_0x20776e),_0x490245;}__name(joinOneSideRelation,'joinOneSideRelation');
+var __defProp=Object['defineProperty'],__name=(_0x28e3c8,_0x23db87)=>__defProp(_0x28e3c8,'name',{'value':_0x23db87,'configurable':!![]});async function select(_0x5fc845,_0x51340f,_0x3df797){let _0x184c90={};const _0x158e82=_0x51340f['children']??{};!Object['keys'](_0x158e82)['includes'](withIdProps['id'])&&(_0x184c90[withIdProps['id']]=_0x5fc845['id']);for(const [_0x40c00d,_0x661be9]of Object['entries'](_0x158e82)){const _0x5e3336=await buildSelectedProperty(_0x5fc845,_0x3df797,_0x40c00d,_0x661be9);_0x184c90[_0x40c00d]=_0x5e3336;}let {query:_0x5b090e}=await getQuery(_0x5fc845,_0x184c90);return await joinRelatedTables(_0x5b090e,_0x5fc845,_0x51340f,_0x3df797),{'query':_0x5b090e};}__name(select,'select');async function expand(_0x159692,_0x121dc3,_0x552244){let _0x5e2e3f={...getColumnsFromTable(_0x159692)};const _0x2024e1=_0x121dc3['children']??{};for(const [_0x5996bf,_0x2f4681]of Object['entries'](_0x2024e1)){const _0x57af41=await buildExpandedProperty(_0x5996bf,_0x552244,_0x2f4681);_0x5e2e3f[_0x5996bf]=_0x57af41;}let {query:_0x38d32e}=await getQuery(_0x159692,_0x5e2e3f);return await joinRelatedTables(_0x38d32e,_0x159692,_0x121dc3,_0x552244),{'query':_0x38d32e};}__name(expand,'expand');async function offset(_0x354f57,_0x4d7217,_0x5775fe,_0x32bd8b,_0x214f5){return applyPagination(_0x354f57,_0x4d7217,_0x5775fe,_0x32bd8b,_0x214f5,paginationTypes['offset']);}__name(offset,'offset');async function limit(_0x5378a7,_0xe25333,_0x5d1df1,_0x27cbab,_0x4714fa){return applyPagination(_0x5378a7,_0xe25333,_0x5d1df1,_0x27cbab,_0x4714fa,paginationTypes['limit']);}__name(limit,'limit');function sort(_0x1e9848,_0xf8f85){const _0x1e6d5f=dbOrderBy(_0x1e9848,..._0xf8f85['map'](_0x409483=>_0x409483['ascending']?asc(_0x409483['column']):desc(_0x409483['column'])));return {'query':_0x1e6d5f};}__name(sort,'sort');async function getSortColumns(_0x294173,_0x14182c,_0x2b9109,_0x1f9e10){const _0x16822b=getQueryConfig(_0x294173)['joins']?.['map'](_0x3b0239=>_0x3b0239['table']),_0x1c2a68=[],_0x579e54=_0x1f9e10??[];for(const _0x13ac01 of _0x579e54['toSorted']((_0x2891d5,_0x1f3cf2)=>_0x2891d5['priority']-_0x1f3cf2['priority'])){let _0x15e48f=_0x13ac01['propertyName'],_0x4fec1d=_0x14182c,_0x3e5f63=![];const _0x5eea10=_0x2b9109['properties'][_0x15e48f];if(_0x5eea10?.['relation']&&_0x5eea10['relation']['relatedPropertyName']===withIdProps['id']){const _0xde3824=await getRelatedResourceName(_0x2b9109['resourceName'],_0x15e48f,_0x2b9109),_0x347447=await getTableByResourceName(_0xde3824);if(_0x16822b?.['find'](_0x1038c5=>compareTableByName(_0x1038c5,_0x347447))){_0x4fec1d=aliasedTable(_0x347447,convertFromPascalToCamelCase(_0xde3824));const _0x3c2bb8=await getInternalResourceMeta(_0xde3824);_0x15e48f=_0x3c2bb8['description']['resourceDescriptionProperty']??'',_0x3e5f63=!![];}}if(!(_0x15e48f in _0x4fec1d))throw createError(metaErrorMessages['resourceCannotBeOrderedByNavigationProperty']['replace']('{0}',_0x2b9109['resourceName'])['replace']('{1}',_0x15e48f));_0x1c2a68['push']({'joined':_0x3e5f63,'ascending':_0x13ac01['direction']===oDataOrderByDirectionConsts['asc'],'column':getTableColumn(_0x4fec1d,_0x15e48f),'basePropertyName':_0x13ac01['propertyName']});}return _0x1c2a68;}__name(getSortColumns,'getSortColumns');async function buildSelectedProperty(_0x2d7a11,_0x184b51,_0x434389,_0xb60b28={}){const _0x33ee79=_0x184b51['properties'][_0x434389];if(!isPropertyExpandable(_0x33ee79))return getColumnsFromTable(_0x2d7a11)[_0x434389];const _0x2b822d=await getRelatedResourceName(_0x184b51['resourceName'],_0x434389,_0x184b51),_0x25979a=await getAliasedTableByResourceName(_0x2b822d,_0x434389),_0x2920a3={[withIdProps['id']]:getColumnsFromTable(_0x25979a)[withIdProps['id']]};if(_0xb60b28['children']&&Object['keys'](_0xb60b28['children'])['length']&&_0xb60b28['resourceMeta'])for(const [_0x3908d3,_0x4b5ac5]of Object['entries'](_0xb60b28['children'])){const _0xf3d8e9=await buildSelectedProperty(_0x25979a,_0xb60b28['resourceMeta'],_0x3908d3,_0x4b5ac5);_0x2920a3[_0x3908d3]=_0xf3d8e9;}else return getColumnsFromTable(_0x25979a);return _0x2920a3;}__name(buildSelectedProperty,'buildSelectedProperty');async function getRelatedResourceName(_0x1fc731,_0x386dad,_0xa0f98d){const _0x55c622=_0xa0f98d;if(_0x55c622){const _0x8c5828=_0x55c622['properties'][_0x386dad];if(_0x8c5828?.['relation']?.['relatedResourceName'])return _0x8c5828['relation']['relatedResourceName'];}const _0x2482ec=await getInternalResourceMeta(_0x1fc731),_0x96a076=_0x2482ec['properties'][_0x386dad];if(_0x96a076?.['declaredWithType'])return _0x96a076['declaredWithType'];throw createError('Could\x20not\x20determine\x20related\x20resource\x20for\x20property\x20\x27'+_0x386dad+'\x27\x20on\x20resource\x20\x27'+_0x1fc731+'\x27.\x20It\x20was\x20not\x20found\x20in\x20ResourceMeta\x20relations\x20nor\x20in\x20InternalResourceMeta\x20declaredWithType.');}__name(getRelatedResourceName,'getRelatedResourceName');async function buildExpandedProperty(_0x4f56ee,_0x5a8365,_0x2dcea0={}){const _0x3d4aeb=await getRelatedResourceName(_0x5a8365['resourceName'],_0x4f56ee,_0x5a8365),_0x41d852=await getAliasedTableByResourceName(_0x3d4aeb,_0x4f56ee),_0x41f7c0=getColumnsFromTable(_0x41d852);if(_0x2dcea0['children']&&_0x2dcea0['resourceMeta'])for(const [_0x194de8,_0x52f8c3]of Object['entries'](_0x2dcea0['children'])){const _0x2f5fe0=await buildExpandedProperty(_0x194de8,_0x2dcea0['resourceMeta'],_0x52f8c3);_0x41f7c0[_0x194de8]=_0x2f5fe0;}return _0x41f7c0;}__name(buildExpandedProperty,'buildExpandedProperty');async function applyPagination(_0x1a06da,_0x2a5e26,_0x42e910,_0x91b1ef,_0x3a7c5a,_0x3cfde2){let _0x532843=createDynamicSelect(_0x2a5e26,{'id':_0x2a5e26['id']});if(_0x91b1ef['length']>0x6b*-0x42+-0x46c+0x2002){for(const _0x1e4f3b of _0x91b1ef){let _0x51f36a=_0x1e4f3b['basePropertyName'];if(_0x51f36a['endsWith'](metas['idSuffix'])&&_0x51f36a!==withIdProps['id']){_0x51f36a=cutOffSuffix(_0x51f36a,metas['idSuffix']);const _0x151fa6=_0x3a7c5a['properties'][_0x51f36a];isPropertyExpandable(_0x151fa6)&&await joinOneSideRelation(_0x532843,_0x2a5e26,_0x3a7c5a,_0x51f36a);}}sort(_0x532843,_0x91b1ef);}const _0x45672c=getQueryConfig(_0x1a06da)['where'];_0x45672c&&dbWhere(_0x532843,_0x45672c);_0x3cfde2===paginationTypes['offset']?dbOffset(_0x532843,_0x42e910):dbLimit(_0x532843,_0x42e910);const _0x39402e=inArray(_0x2a5e26['id'],_0x532843),_0x592f35=dbWhere(_0x1a06da,_0x39402e);return {'query':_0x592f35};}__name(applyPagination,'applyPagination');async function joinRelatedTables(_0x4ebf1c,_0x33f98d,_0xa1bf92,_0x222051){await Promise['all'](Object['entries'](_0xa1bf92['children']??{})['map'](([_0x56dcdf,_0x116e84])=>joinRelatedTable(_0x4ebf1c,_0x33f98d,_0x222051,_0x56dcdf,_0x116e84)));}__name(joinRelatedTables,'joinRelatedTables');async function joinRelatedTable(_0x519da2,_0x360090,_0x3f7d99,_0x4b50e8,_0x55b2bc){const _0x219cc1=_0x3f7d99['properties'][_0x4b50e8];if(!isPropertyExpandable(_0x219cc1))return;let _0x33bfd2;if(_0x219cc1['type']===propertyTypes['array']){const _0x35e198=await getRelatedResourceName(_0x3f7d99['resourceName'],_0x4b50e8,_0x3f7d99);_0x33bfd2=await joinManySideRelation(_0x519da2,_0x360090,_0x4b50e8,_0x35e198,_0x219cc1['relation']['relatedPropertyName']);}else _0x33bfd2=await joinOneSideRelation(_0x519da2,_0x360090,_0x3f7d99,_0x4b50e8);await joinChildRelatedTables(_0x519da2,_0x33bfd2,_0x55b2bc);}__name(joinRelatedTable,'joinRelatedTable');async function joinChildRelatedTables(_0x2ae13a,_0x2a4df1,_0x4b60cf){if(!_0x4b60cf['resourceMeta']||!_0x4b60cf['children'])return;for(const [_0x2657a5,_0x175310]of Object['entries'](_0x4b60cf['children'])){await joinRelatedTable(_0x2ae13a,_0x2a4df1,_0x4b60cf['resourceMeta'],_0x2657a5,_0x175310);}}__name(joinChildRelatedTables,'joinChildRelatedTables');async function joinManySideRelation(_0x5d44ab,_0x33448d,_0x45f6cd,_0x3277ac,_0x1612a1){const _0x252482=await getAliasedTableByResourceName(_0x3277ac,_0x45f6cd),_0x331ff9=_0x1612a1['endsWith'](metas['idSuffix'])?_0x1612a1:_0x1612a1+metas['idSuffix'],_0x5764a5=eq(_0x33448d['id'],getTableColumn(_0x252482,_0x331ff9));return dbLeftJoin(_0x5d44ab,_0x252482,_0x5764a5),_0x252482;}__name(joinManySideRelation,'joinManySideRelation');async function joinOneSideRelation(_0x29ee12,_0x3c0db3,_0x2ecc00,_0x344ed9){const _0x42269c=await getRelatedResourceName(_0x2ecc00['resourceName'],_0x344ed9,_0x2ecc00),_0x40e2e9=await getAliasedTableByResourceName(_0x42269c,_0x344ed9),_0x32f1f0=_0x344ed9['endsWith'](metas['idSuffix'])?_0x344ed9:''+_0x344ed9+metas['idSuffix'],_0x1c40df=eq(_0x40e2e9['id'],getTableColumn(_0x3c0db3,_0x32f1f0));return dbLeftJoin(_0x29ee12,_0x40e2e9,_0x1c40df),_0x40e2e9;}__name(joinOneSideRelation,'joinOneSideRelation');
 export { expand, getSortColumns, limit, offset, select, sort };

package/packages/level2/meta/server/api/odata/odata-expressions.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 import { TableWithId } from "@db/types/db-types";
 import { WithId } from "../../../../../fd-toolbox-core/types/resource-with-id";
 import { ODataConfig } from "../../../../../fd-toolbox/odata/odataconfig";
-export declare function getWithOData<TTable extends TableWithId>(table: TTable, oDataConfig: ODataConfig, resourceName: string): Promise<WithId[] | import("../../../../../../lib/internal").WithIndexer<unknown>[]>;
+export declare function getWithOData<TTable extends TableWithId>(table: TTable, oDataConfig: ODataConfig, resourceName: string): Promise<WithId[] | import("../../../../../../lib/package/internal").WithIndexer<unknown>[]>;

package/packages/level2/meta/server/api/odata/odata-expressions.js CHANGED Viewed

@@ -7,6 +7,6 @@ import { prepareODataSelectOrExpandTree } from './odata-parsers.js';
 import { filterODataSelectOrExpandTree, groupODataResults } from './odata.js';
 import { execQuery } from '../../db/db.js';
-var __defProp=Object['defineProperty'],__name=(_0x3a4962,_0x5b522a)=>__defProp(_0x3a4962,'name',{'value':_0x5b522a,'configurable':!![]});async function getWithOData(_0x56ed7b,_0x24c129,_0x5f3d68){const _0x3911b8=await getResourceMeta(_0x5f3d68),_0x1595de=prepareODataSelectOrExpandTree(_0x24c129['selects']),_0x55cc86=prepareODataSelectOrExpandTree(_0x24c129['expands']),_0x900176=await filterODataSelectOrExpandTree(_0x5f3d68,_0x1595de),_0x3ffe11=await filterODataSelectOrExpandTree(_0x5f3d68,_0x55cc86,!![]),_0x41aa11=_0x900176['children']&&Object['keys'](_0x900176['children'])['length'],_0x2953ae=_0x3ffe11['children']&&Object['keys'](_0x3ffe11['children'])['length'];let {query:_0x189434}=await getInitialQuery(_0x56ed7b,_0x900176,_0x3ffe11,_0x3911b8),_0x2c3f36=_0x189434;const _0x54eb75=await getSortColumns(_0x2c3f36,_0x56ed7b,_0x24c129['orderBys'],_0x3911b8);_0x54eb75['length']!==0x145c+0x130a+-0xd22*0x3&&(_0x2c3f36=sort(_0x2c3f36,_0x54eb75)['query']);_0x24c129['filters']['length']>-0x572+-0x13c6+0x2*0xc9c&&await tryFilter(_0x2c3f36,_0x24c129,_0x56ed7b,_0x5f3d68);if(_0x24c129['skip']){const _0x311eed=await offset(_0x2c3f36,_0x56ed7b,_0x24c129['skip'],_0x54eb75,_0x3911b8);_0x2c3f36=_0x311eed['query'];}if(_0x24c129['top']){const _0x24175e=await limit(_0x2c3f36,_0x56ed7b,_0x24c129['top'],_0x54eb75,_0x3911b8);_0x2c3f36=_0x24175e['query'];}const _0x251ad9=await execQuery(_0x2c3f36);if(_0x41aa11||_0x2953ae){const _0x8a1f2f=_0x41aa11?_0x900176:_0x3ffe11,_0x10ca54=groupODataResults(_0x251ad9,_0x8a1f2f,_0x3911b8);return _0x10ca54;}return _0x251ad9;}__name(getWithOData,'getWithOData');async function getInitialQuery(_0x5d03e8,_0x5a6e7a,_0xd06155,_0x2231a0){const _0x14f409=_0x5a6e7a['children']&&Object['keys'](_0x5a6e7a['children'])['length'],_0x5969eb=_0xd06155['children']&&Object['keys'](_0xd06155['children'])['length'];if(_0x14f409)return select(_0x5d03e8,_0x5a6e7a,_0x2231a0);if(_0x5969eb)return select(_0x5d03e8,_0xd06155,_0x2231a0);return getQuery(_0x5d03e8);}__name(getInitialQuery,'getInitialQuery');
+var __defProp=Object['defineProperty'],__name=(_0x348d35,_0x38000b)=>__defProp(_0x348d35,'name',{'value':_0x38000b,'configurable':!![]});async function getWithOData(_0x2f62c6,_0x313acd,_0x45e347){const _0x5b3e2f=await getResourceMeta(_0x45e347),_0x3e17cf=prepareODataSelectOrExpandTree(_0x313acd['selects']),_0x1d0faf=prepareODataSelectOrExpandTree(_0x313acd['expands']),_0x46e243=await filterODataSelectOrExpandTree(_0x45e347,_0x3e17cf),_0x1b4a98=await filterODataSelectOrExpandTree(_0x45e347,_0x1d0faf,!![]),_0x173dcc=!!_0x46e243['children']&&Object['keys'](_0x46e243['children'])['length']>-0x1a16+-0x59*-0x1d+0x1001,_0x3c392c=!!_0x1b4a98['children']&&Object['keys'](_0x1b4a98['children'])['length']>0x1463+0x167f+-0x2ae2;let {query:_0x520c72}=await getInitialQuery(_0x2f62c6,_0x46e243,_0x1b4a98,_0x5b3e2f),_0x2efc17=_0x520c72;const _0x475873=await getSortColumns(_0x2efc17,_0x2f62c6,_0x5b3e2f,_0x313acd['orderBys']);_0x475873['length']!==0x1d*-0xe5+-0x1323+-0x1*-0x2d14&&(_0x2efc17=sort(_0x2efc17,_0x475873)['query']);if((_0x313acd['filters']?.['length']??-0x53f+-0x74b+-0x141*-0xa)>0x28f*-0xe+-0x4*0x13+0x241e){const _0x926dde=await tryFilter(_0x2efc17,_0x313acd,_0x2f62c6,_0x45e347);_0x2efc17=_0x926dde['query'];}if(_0x313acd['skip']){const _0x3b8ce0=await offset(_0x2efc17,_0x2f62c6,_0x313acd['skip'],_0x475873,_0x5b3e2f);_0x2efc17=_0x3b8ce0['query'];}if(_0x313acd['top']){const _0x400c79=await limit(_0x2efc17,_0x2f62c6,_0x313acd['top'],_0x475873,_0x5b3e2f);_0x2efc17=_0x400c79['query'];}const _0x244e8b=await execQuery(_0x2efc17);if(_0x173dcc||_0x3c392c){const _0x20fd84=_0x173dcc?_0x46e243:_0x1b4a98,_0x51e21d=groupODataResults(_0x244e8b,_0x20fd84,_0x5b3e2f);return _0x51e21d;}return _0x244e8b;}__name(getWithOData,'getWithOData');async function getInitialQuery(_0x3b186d,_0x1d5214,_0x17f988,_0xd24d68){const _0x3a0ea2=!!_0x1d5214['children']&&Object['keys'](_0x1d5214['children'])['length']>-0xbb0*0x2+-0x5*-0x74a+-0xd12,_0x19a31a=!!_0x17f988['children']&&Object['keys'](_0x17f988['children'])['length']>0xca1+0x640+0x64b*-0x3;if(_0x3a0ea2)return select(_0x3b186d,_0x1d5214,_0xd24d68);if(_0x19a31a)return select(_0x3b186d,_0x17f988,_0xd24d68);return getQuery(_0x3b186d);}__name(getInitialQuery,'getInitialQuery');
 export { getWithOData };

package/packages/level2/meta/server/api/odata/odata-filters-helpers.js CHANGED Viewed

@@ -8,6 +8,6 @@ import { convertFromPascalToCamelCase } from '../../../../../fd-toolbox/strings/
 import { createError } from '../../../../../fd-toolbox/errors/errors.js';
 import { isArray } from '../../../../../fd-toolbox/types/ensure-type.js';
-var __defProp=Object['defineProperty'],__name=(_0xfa2f21,_0x4db429)=>__defProp(_0xfa2f21,'name',{'value':_0x4db429,'configurable':!![]});function getComparisonTypeFromOperation(_0x37cb28){switch(_0x37cb28){case oDataComparisonTypes['equal']:return (_0x3ffe0b,_0x5d7470)=>compareDateOrDefault(_0x3ffe0b,_0x5d7470);case oDataComparisonTypes['notEqual']:return (_0x49e86,_0x1a4beb)=>ne(_0x49e86,_0x1a4beb);case oDataComparisonTypes['greaterThan']:return (_0x4f4b2d,_0x25c35d)=>gt(_0x4f4b2d,_0x25c35d);case oDataComparisonTypes['greaterThanOrEqual']:return (_0x39ae40,_0x5a0375)=>gte(_0x39ae40,_0x5a0375);case oDataComparisonTypes['lessThan']:return (_0x5d0e25,_0x251271)=>lt(_0x5d0e25,_0x251271);case oDataComparisonTypes['lessThanOrEqual']:return (_0x1b22fd,_0x3af60d)=>lte(_0x1b22fd,_0x3af60d);case oDataComparisonTypes['in']:return (_0x179558,_0x5ea904)=>{if(!isArray(_0x5ea904))throw createError(toolboxErrorMessages['valueIsNotArray']);return inArray(_0x179558,_0x5ea904);};case oDataComparisonTypes['nin']:return (_0x6495bd,_0x4cf3d9)=>{if(!isArray(_0x4cf3d9))throw createError(toolboxErrorMessages['valueIsNotArray']);return notInArray(_0x6495bd,_0x4cf3d9);};case oDataComparisonTypes['startsWith']:return (_0x2c87d1,_0xf4f89b)=>dbLike(_0x2c87d1,_0xf4f89b+'%');case oDataComparisonTypes['includes']:return (_0x1b8848,_0x2d907f)=>dbLike(_0x1b8848,'%'+_0x2d907f+'%');default:throw createError(toolboxErrorMessages['odataUnsupportedType']['replace']('{0}',_0x37cb28['toString']()));}}__name(getComparisonTypeFromOperation,'getComparisonTypeFromOperation');function isNullOrUndefinedWithLogging(_0x54c107,_0x258489){if(!_0x258489)return error(toolboxErrorMessages['objectWasNull']['replace']('{0}',_0x54c107)),!![];return ![];}__name(isNullOrUndefinedWithLogging,'isNullOrUndefinedWithLogging');const propertyNamePluralSuffix='s';function convertPropertyNameToTableName(_0x3c36cf){return ''+convertFromPascalToCamelCase(_0x3c36cf)+(_0x3c36cf['endsWith'](propertyNamePluralSuffix)?'':propertyNamePluralSuffix);}__name(convertPropertyNameToTableName,'convertPropertyNameToTableName');function compareDateOrDefault(_0x2cc343,_0x3fea70){let _0x2e4fa5;if(_0x3fea70 instanceof Date)_0x2e4fa5=_0x3fea70['toISOString']()['split']('T')[-0x1*-0x105+-0x13ff*0x1+0x12fa];else typeof _0x3fea70==='string'&&_0x3fea70['includes']('T')?_0x2e4fa5=_0x3fea70['split']('T')[-0x2273*0x1+-0x1*-0x185c+-0xa17*-0x1]:_0x2e4fa5=_0x3fea70;const _0x491c0f=dbExtractDate(_0x2cc343);if(_0x2e4fa5 instanceof Date||typeof _0x2e4fa5==='string'&&_0x2e4fa5['length']===-0xe3*0xa+0x111c+-0x46*0x1e)return eq(_0x491c0f,_0x2e4fa5);return eq(_0x2cc343,_0x3fea70);}__name(compareDateOrDefault,'compareDateOrDefault');
+var __defProp=Object['defineProperty'],__name=(_0x3f0005,_0x3186ed)=>__defProp(_0x3f0005,'name',{'value':_0x3186ed,'configurable':!![]});function getComparisonTypeFromOperation(_0x66d50f){switch(_0x66d50f){case oDataComparisonTypes['equal']:return (_0x2987fb,_0x321959)=>compareDateOrDefault(_0x2987fb,_0x321959);case oDataComparisonTypes['notEqual']:return (_0x3694e6,_0x4f5587)=>ne(_0x3694e6,_0x4f5587);case oDataComparisonTypes['greaterThan']:return (_0x52d868,_0x1b8010)=>gt(_0x52d868,_0x1b8010);case oDataComparisonTypes['greaterThanOrEqual']:return (_0x31763f,_0x21a104)=>gte(_0x31763f,_0x21a104);case oDataComparisonTypes['lessThan']:return (_0x8f8898,_0x66a0c0)=>lt(_0x8f8898,_0x66a0c0);case oDataComparisonTypes['lessThanOrEqual']:return (_0x4921cf,_0x1882fc)=>lte(_0x4921cf,_0x1882fc);case oDataComparisonTypes['in']:return (_0x269ecd,_0x527a5a)=>{if(!isArray(_0x527a5a))throw createError(toolboxErrorMessages['valueIsNotArray']);return inArray(_0x269ecd,_0x527a5a);};case oDataComparisonTypes['nin']:return (_0x5618a6,_0x5a617a)=>{if(!isArray(_0x5a617a))throw createError(toolboxErrorMessages['valueIsNotArray']);return notInArray(_0x5618a6,_0x5a617a);};case oDataComparisonTypes['startsWith']:return (_0x444ecf,_0x145a69)=>dbLike(_0x444ecf,_0x145a69+'%');case oDataComparisonTypes['includes']:return (_0x2706cc,_0x56af7b)=>dbLike(_0x2706cc,'%'+_0x56af7b+'%');default:throw createError(toolboxErrorMessages['odataUnsupportedType']['replace']('{0}',_0x66d50f['toString']()));}}__name(getComparisonTypeFromOperation,'getComparisonTypeFromOperation');function isNullOrUndefinedWithLogging(_0x148a56,_0x4bac8c){if(!_0x4bac8c)return error(toolboxErrorMessages['objectWasNull']['replace']('{0}',_0x148a56)),!![];return ![];}__name(isNullOrUndefinedWithLogging,'isNullOrUndefinedWithLogging');const propertyNamePluralSuffix='s';function convertPropertyNameToTableName(_0xd549ed){return ''+convertFromPascalToCamelCase(_0xd549ed)+(_0xd549ed['endsWith'](propertyNamePluralSuffix)?'':propertyNamePluralSuffix);}__name(convertPropertyNameToTableName,'convertPropertyNameToTableName');function compareDateOrDefault(_0x1dd363,_0x264c18){let _0x3dcf19;if(_0x264c18 instanceof Date)_0x3dcf19=_0x264c18['toISOString']()['split']('T')[-0x1cf2+-0x136*-0x10+0x992];else typeof _0x264c18==='string'&&_0x264c18['includes']('T')?_0x3dcf19=_0x264c18['split']('T')[0x8de+-0x67*-0x7+-0xbaf]:_0x3dcf19=_0x264c18;const _0x1bd49b=dbExtractDate(_0x1dd363);if(_0x3dcf19 instanceof Date||typeof _0x3dcf19==='string'&&_0x3dcf19['length']===0x1*-0x6bb+-0x1250*0x1+0x1915*0x1)return eq(_0x1bd49b,_0x3dcf19);return eq(_0x1dd363,_0x264c18);}__name(compareDateOrDefault,'compareDateOrDefault');
 export { compareDateOrDefault, convertPropertyNameToTableName, getComparisonTypeFromOperation, isNullOrUndefinedWithLogging };

package/packages/level2/meta/server/api/odata/odata-filters.d.ts CHANGED Viewed

@@ -1,4 +1,6 @@
 import { TableWithId, SelectQuery } from "@db/types/db-types";
 import { ODataConfig } from "../../../../../fd-toolbox/odata/odataconfig";
 export declare function getFilterValue<T>(oDataConfig: ODataConfig, filterName: string): T;
-export declare function tryFilter<T extends SelectQuery>(query: T, oDataConfig: ODataConfig, table: TableWithId, resourceName: string): Promise<T>;
+export declare function tryFilter<T extends SelectQuery>(query: T, oDataConfig: ODataConfig, table: TableWithId, resourceName: string): Promise<{
+    query: T;
+}>;

package/packages/level2/meta/server/api/odata/odata-filters.js CHANGED Viewed

@@ -19,9 +19,9 @@ import { isString } from '../../../../../fd-toolbox/types/ensure-type.js';
 import { getTable } from '../../db/db.js';
 import { isNullOrUndefinedWithLogging, convertPropertyNameToTableName, getComparisonTypeFromOperation } from './odata-filters-helpers.js';
 import { oDataQueryParams } from '../../../../../fd-toolbox/server/api/odata/odata-query-params.js';
-import { metas } from '../../fd-meta-core/constants/metas.js';
-import { parseUtcStringToDate } from '../../../../../fd-toolbox/dates/date-times.js';
+import { metas } from '../../meta-core/constants/metas.js';
+import { parseUtcStringToDate } from '../../../../../fd-toolbox/dates/date-time.js';
-var __defProp=Object['defineProperty'],__name=(_0x23580e,_0x29f8c1)=>__defProp(_0x23580e,'name',{'value':_0x29f8c1,'configurable':!![]});function getFilterValue(_0x570b91,_0x11dca0){return _0x570b91['filters']?.['find'](_0x3af43a=>_0x3af43a['leftSide']===_0x11dca0)?.['rightSide'];}__name(getFilterValue,'getFilterValue');async function tryFilter(_0x2dbaec,_0x3462d0,_0x5419b8,_0x3fcc91){if(_0x5419b8 instanceof Subquery)return error('Cannot\x20filter\x20subquery\x20directly'),_0x2dbaec;const _0x554c9f=getTableName(_0x5419b8);if(!_0x554c9f)return error(toolboxErrorMessages['symbolNotFound']['replace']('{0}',''+queryIndexes['tableName'])),_0x2dbaec;const {defaultFilters:_0x3cac94,relatedFilters:_0x1bf3fd}=getBaseAndRelatedFilters(_0x3462d0);await addRelatedFilterToQuery(_0x2dbaec,_0x1bf3fd,_0x5419b8,_0x3fcc91);const _0x31fb03=_0x3cac94??[],_0x1cbec4=groupBaseODataFilterByLogicalOrs(_0x31fb03),_0x5765b8=await getOrExpressions(_0x1cbec4,_0x5419b8,_0x554c9f);return _0x5765b8['length']>-0xa*-0x128+0x3d9*0x1+-0xf*0x107&&applyFilterToQuery(_0x2dbaec,or(..._0x5765b8)),_0x2dbaec;}__name(tryFilter,'tryFilter');async function addRelatedFilterToQuery(_0x2a427c,_0x184eb2,_0x24a23f,_0x387cba){for(const _0x42c773 of _0x184eb2){const {leftSide:_0x462717,rightSide:_0x4fe3df,comparisonType:_0x4e9277}=_0x42c773;if(_0x462717&&_0x4fe3df){const [_0x529543,_0x54a0c0]=_0x462717['split'](oDataSeparators['propertySeparator']),_0x556e3b=await getTableByResourceName(_0x529543),_0x3c3002=getTableColumn(_0x556e3b,convertFromPascalToCamelCase(_0x387cba)+metas['idSuffix']),_0x2adf8f=getTableColumn(_0x556e3b,_0x54a0c0),_0x4949c6=isString(_0x4fe3df)?_0x4fe3df:'',_0x556aa5=createDynamicSelect(_0x556e3b,{'value':_0x3c3002});dbWhere(_0x556aa5,inArray(_0x2adf8f,_0x4949c6['split'](oDataSeparators['selectSeparator'])));const _0x2c9252=addExpressionByType(_0x24a23f['id'],_0x556aa5,_0x4e9277);dbWhere(_0x2a427c,_0x2c9252);}}}__name(addRelatedFilterToQuery,'addRelatedFilterToQuery');async function getOrExpressions(_0x105728,_0x1cb71f,_0x4d3895){const _0x7385de=[];for(const _0x4f675f of Object['values'](_0x105728)){const _0x1826cf=await getAndExpressions(_0x4f675f,_0x1cb71f,_0x4d3895);_0x1826cf['length']>0x5*-0x205+0x8*0x461+0x18ef*-0x1&&_0x7385de['push'](and(..._0x1826cf));}return _0x7385de;}__name(getOrExpressions,'getOrExpressions');async function getAndExpressions(_0x42e118,_0x3f2488,_0x25b10c){const _0x1bf5d4=[];for(const _0x5912ef of _0x42e118){const _0x5b4686=await getFilterExpression(_0x5912ef,_0x3f2488,_0x25b10c);_0x5b4686&&_0x1bf5d4['push'](_0x5b4686);}return _0x1bf5d4;}__name(getAndExpressions,'getAndExpressions');async function getFilterExpression(_0x2ab2da,_0x4aa985,_0x44cc9d){let _0x321ae1;if(_0x2ab2da['type']===oDataFilterTypes['lambda']){const _0x944112=getPredicate(_0x44cc9d,_0x2ab2da);!isNullOrUndefinedWithLogging(objectNameConstants['predicate'],_0x944112)&&(_0x321ae1=_0x944112);}else {if(_0x2ab2da['leftSide']&&_0x2ab2da['leftSide']in _0x4aa985)_0x321ae1=tryGetAndExpression(_0x2ab2da,getTableColumn(_0x4aa985,_0x2ab2da['leftSide']));else {if(_0x2ab2da['leftSide']?.['endsWith'](oDataSeparators['propertySeparator']+oDataQueryParams['count'])){const _0x13ce4b=_0x2ab2da['leftSide']['split'](oDataSeparators['propertySeparator'])[0xaa9+0x20a6+-0x2b4f],_0x2fd0c9=_0x13ce4b['slice'](-0x5*-0x4a9+0xd*-0x64+-0x1239,_0x13ce4b['indexOf'](metas['listSuffix'])),_0x29397f=await getTable(_0x2fd0c9),_0x187d5a=getForeignColumn(_0x29397f,_0x44cc9d),_0x167dbb=createDynamicSelect(_0x4aa985,{'id':_0x4aa985[metas['idConstant']]});dbLeftJoin(_0x167dbb,_0x29397f,eq(_0x187d5a,_0x4aa985[metas['idConstant']])),dbGroupBy(_0x167dbb,_0x4aa985[metas['idConstant']]);const _0xb6bbca=addExpressionByType(count(_0x187d5a),_0x2ab2da['rightSide'],_0x2ab2da['comparisonType']);dbHaving(_0x167dbb,_0xb6bbca);const _0x1111a2=await runQuery(_0x167dbb);_0x2ab2da['leftSide']=metas['idConstant'],_0x2ab2da['comparisonType']=oDataComparisonTypes['in'],_0x2ab2da['rightSide']=_0x1111a2['map'](_0x32896d=>_0x32896d[metas['idConstant']]),_0x321ae1=tryGetAndExpression(_0x2ab2da,getTableColumn(_0x4aa985,_0x2ab2da['leftSide']));}}}return _0x321ae1;}__name(getFilterExpression,'getFilterExpression');function getPredicate(_0x5cd7f8,_0x492502){const _0x2451ea=getTablesAndColumns(_0x5cd7f8,_0x492502);if(!_0x2451ea)return void(-0x4*0x2ee+0x13d9*-0x1+0x1f91);const {enumerablePropertyTableName:_0x19fa8a,enumerablePropertyTable:_0x22e869,subPropertyTable:_0x4871ac,leftSide:_0x16cd0f,leftSide1Column:_0x36a1f6,leftSide2Column:_0x3c53db,subQueryIdEqOperator:_0xfe579b}=_0x2451ea,_0x54ed34=_0x492502['lambdaConfig']?.['method']===oDataLambdaMethods['all']?notExists:exists;if(_0x16cd0f['length']===-0xbb*-0x2a+-0x23aa+-0x4fd*-0x1){const _0x397d2f=_0x492502['lambdaConfig']?.['method']===oDataLambdaMethods['all']?not(tryGetAndExpression(_0x492502,_0x36a1f6)):tryGetAndExpression(_0x492502,_0x36a1f6),_0x327a80=createDynamicSelect(_0x22e869,{'leftSide1Column':_0x36a1f6});return applyFilterToQuery(_0x327a80,and(_0xfe579b,_0x397d2f)),_0x54ed34(_0x327a80);}else {const _0x3385fc=_0x19fa8a+metas['idConstant'],_0x9d21af=eq(_0x22e869['id'],getTableColumn(_0x4871ac,_0x3385fc)),_0x132e5e=_0x492502['lambdaConfig']?.['method']===oDataLambdaMethods['all']?not(tryGetAndExpression(_0x492502,_0x3c53db)):tryGetAndExpression(_0x492502,_0x3c53db),_0x45f195=createDynamicSelect(_0x4871ac,{'leftSide2Column':_0x3c53db}),_0x4d6c5a=and(_0x9d21af,_0x132e5e);_0x4d6c5a&&dbWhere(_0x45f195,_0x4d6c5a);const _0x2eee8d=createDynamicSelect(_0x22e869),_0x1a828e=and(_0xfe579b,exists(_0x45f195));return _0x1a828e&&dbWhere(_0x2eee8d,_0x1a828e),_0x54ed34(_0x2eee8d);}}__name(getPredicate,'getPredicate');function getTablesAndColumns(_0x20af4a,_0x2a2955){const _0x3f7b4f=convertPropertyNameToTableName(_0x2a2955['lambdaConfig']?.['baseEnumerablePropertyName']??'');if(isNullOrUndefinedWithLogging(lambdaConfigNameConstants['baseEnumerablePropertyName'],_0x3f7b4f)||isNullOrUndefinedWithLogging(lambdaConfigNameConstants['method'],_0x2a2955['lambdaConfig']?.['method']))return void(0x3*0x498+-0x1*-0x1653+-0xc09*0x3);const _0x731c2d=_0x2a2955['leftSide']['split'](oDataSeparators['propertySeparator']),_0x2a382e=getTableByName(_0x20af4a),_0x12e5b4=getTableByName(_0x3f7b4f),_0x47be8d=getTableByName(convertPropertyNameToTableName(_0x731c2d[-0x695+0x6*0x18b+-0x2ad])),_0x481df2=getTableColumn(_0x12e5b4,convertFromPascalToCamelCase(_0x731c2d[-0x22fb+0xcc*-0x9+0x21*0x147])),_0x347799=getTableColumn(_0x47be8d,convertFromPascalToCamelCase(_0x731c2d[_0x731c2d['length']-(0x17b*0x1+-0x1870+-0x1*-0x16f6)])),_0x24b7b4=eq(_0x2a382e['id'],getTableColumn(_0x12e5b4,_0x20af4a+metas['idConstant']));return {'enumerablePropertyTableName':_0x3f7b4f,'enumerablePropertyTable':_0x12e5b4,'subPropertyTable':_0x47be8d,'leftSide':_0x731c2d,'leftSide1Column':_0x481df2,'leftSide2Column':_0x347799,'subQueryIdEqOperator':_0x24b7b4};}__name(getTablesAndColumns,'getTablesAndColumns');function groupBaseODataFilterByLogicalOrs(_0x25db43){const _0x3783b1={};let _0x44ce56=[],_0x2c039b=0x9*0x97+0x9ca+-0x305*0x5;_0x3783b1[_0x2c039b]=_0x44ce56;for(const _0x900f03 of _0x25db43){_0x900f03['logicalOperationType']===oDataLogicalOperationTypes['or']?(_0x3783b1[_0x2c039b]=_0x44ce56,_0x44ce56=[_0x900f03],_0x3783b1[++_0x2c039b]=_0x44ce56):_0x44ce56['push'](_0x900f03);}return _0x3783b1;}__name(groupBaseODataFilterByLogicalOrs,'groupBaseODataFilterByLogicalOrs');function tryGetAndExpression(_0x3ebcbc,_0x19e3f6){const _0x4072e0=tryGetConstantExpression(_0x19e3f6['dataType'],String(_0x3ebcbc['rightSide']),_0x3ebcbc['comparisonType']);return addExpressionByType(_0x19e3f6,_0x4072e0,_0x3ebcbc['comparisonType']);}__name(tryGetAndExpression,'tryGetAndExpression');function tryGetConstantExpression(_0x423e3c,_0x2b6946,_0x3b45a8){let _0x34f6a6;if(_0x2b6946===oDataSpecialValues['nullValue'])_0x34f6a6=[_0x2b6946];else _0x3b45a8===oDataComparisonTypes['in']||_0x3b45a8===oDataComparisonTypes['nin']?_0x34f6a6=parseRightSideToArray(_0x2b6946):_0x34f6a6=tryParseToType(_0x423e3c,_0x2b6946);return _0x34f6a6;}__name(tryGetConstantExpression,'tryGetConstantExpression');function tryParseToType(_0x585431,_0x4399c3){let _0x190105;switch(_0x585431){case columnDataTypes['string']:_0x190105=_0x4399c3;break;case columnDataTypes['bigint']:case columnDataTypes['number']:_0x190105=parseFloat(_0x4399c3);break;case columnDataTypes['boolean']:_0x190105=_0x4399c3===columnDataTypes['integrationEnabled'];break;case columnDataTypes['date']:_0x190105=parseUtcStringToDate(_0x4399c3);break;case columnDataTypes['array']:throw createError(toolboxErrorMessages['odataUnsupportedType']['replace']('{0}',_0x585431));case columnDataTypes['json']:throw createError(toolboxErrorMessages['odataUnsupportedType']['replace']('{0}',_0x585431));case columnDataTypes['custom']:throw createError(toolboxErrorMessages['odataUnsupportedType']['replace']('{0}',_0x585431));case columnDataTypes['buffer']:throw createError(toolboxErrorMessages['odataUnsupportedType']['replace']('{0}',_0x585431));default:throw createError(toolboxErrorMessages['odataUnsupportedType']['replace']('{0}',_0x585431));}return _0x190105;}__name(tryParseToType,'tryParseToType');function addExpressionByType(_0x2c7432,_0x324c3c,_0x349f61){const _0x324fde=getComparisonTypeFromOperation(_0x349f61),_0x5383dd=sql`${_0x2c7432}`;return _0x324fde(_0x5383dd,_0x324c3c);}__name(addExpressionByType,'addExpressionByType');
+var __defProp=Object['defineProperty'],__name=(_0x4fdf50,_0x5e78a5)=>__defProp(_0x4fdf50,'name',{'value':_0x5e78a5,'configurable':!![]});function getFilterValue(_0x2d9f53,_0x12e53d){return _0x2d9f53['filters']?.['find'](_0x43c69e=>_0x43c69e['leftSide']===_0x12e53d)?.['rightSide'];}__name(getFilterValue,'getFilterValue');async function tryFilter(_0x9402cb,_0x172c5b,_0x10fad5,_0x14e309){if(_0x10fad5 instanceof Subquery)return error('Cannot\x20filter\x20subquery\x20directly'),{'query':_0x9402cb};const _0x2b59f8=getTableName(_0x10fad5);if(!_0x2b59f8)return error(toolboxErrorMessages['symbolNotFound']['replace']('{0}',''+queryIndexes['tableName'])),{'query':_0x9402cb};const {defaultFilters:_0x327f0c,relatedFilters:_0x92f642}=getBaseAndRelatedFilters(_0x172c5b);await addRelatedFilterToQuery(_0x9402cb,_0x92f642,_0x10fad5,_0x14e309);const _0x4f735f=_0x327f0c??[],_0x25671e=groupBaseODataFilterByLogicalOrs(_0x4f735f),_0x140f71=await getOrExpressions(_0x25671e,_0x10fad5,_0x2b59f8);return _0x140f71['length']>0x1*-0x2006+-0x1*0x257+-0x1*-0x225d&&applyFilterToQuery(_0x9402cb,or(..._0x140f71)),{'query':_0x9402cb};}__name(tryFilter,'tryFilter');async function addRelatedFilterToQuery(_0x1be4e0,_0x3c3949,_0xf9343f,_0x36f1d4){for(const _0x5ca397 of _0x3c3949){const {leftSide:_0x10bff4,rightSide:_0x14dad6,comparisonType:_0x3ce334}=_0x5ca397;if(_0x10bff4&&_0x14dad6){const [_0x4b22c7,_0x39a941]=_0x10bff4['split'](oDataSeparators['propertySeparator']),_0x527446=await getTableByResourceName(_0x4b22c7),_0x35d467=getTableColumn(_0x527446,convertFromPascalToCamelCase(_0x36f1d4)+metas['idSuffix']),_0xf03693=getTableColumn(_0x527446,_0x39a941),_0x1b6ce9=isString(_0x14dad6)?_0x14dad6:'',_0x5162fe=createDynamicSelect(_0x527446,{'value':_0x35d467});dbWhere(_0x5162fe,inArray(_0xf03693,_0x1b6ce9['split'](oDataSeparators['selectSeparator'])));const _0x554324=addExpressionByType(_0xf9343f['id'],_0x5162fe,_0x3ce334);dbWhere(_0x1be4e0,_0x554324);}}}__name(addRelatedFilterToQuery,'addRelatedFilterToQuery');async function getOrExpressions(_0x15d065,_0x4fbea6,_0x558181){const _0x498421=[];for(const _0x3e5ba2 of Object['values'](_0x15d065)){const _0x3d5780=await getAndExpressions(_0x3e5ba2,_0x4fbea6,_0x558181);_0x3d5780['length']>-0x6*-0x457+-0x9*-0x222+-0x2d3c&&_0x498421['push'](and(..._0x3d5780));}return _0x498421;}__name(getOrExpressions,'getOrExpressions');async function getAndExpressions(_0xa99ca9,_0x81b2f7,_0x16902d){const _0x271b56=[];for(const _0x2966ba of _0xa99ca9){const _0x2a5a3c=await getFilterExpression(_0x2966ba,_0x81b2f7,_0x16902d);_0x2a5a3c&&_0x271b56['push'](_0x2a5a3c);}return _0x271b56;}__name(getAndExpressions,'getAndExpressions');async function getFilterExpression(_0x2270e3,_0x2654f2,_0x9101ce){let _0x35d201;if(_0x2270e3['type']===oDataFilterTypes['lambda']){const _0x5c35eb=getPredicate(_0x9101ce,_0x2270e3);!isNullOrUndefinedWithLogging(objectNameConstants['predicate'],_0x5c35eb)&&(_0x35d201=_0x5c35eb);}else {if(_0x2270e3['leftSide']&&_0x2270e3['leftSide']in _0x2654f2)_0x35d201=tryGetAndExpression(_0x2270e3,getTableColumn(_0x2654f2,_0x2270e3['leftSide']));else {if(_0x2270e3['leftSide']?.['endsWith'](oDataSeparators['propertySeparator']+oDataQueryParams['count'])){const _0x1a89ab=_0x2270e3['leftSide']['split'](oDataSeparators['propertySeparator'])[0x21*0x59+-0xc3*-0xc+-0x149d*0x1],_0x41f234=_0x1a89ab['slice'](0x425*-0x7+-0x81f+-0x2a7*-0xe,_0x1a89ab['indexOf'](metas['listSuffix'])),_0xffabcf=await getTable(_0x41f234),_0x4ae6a0=getForeignColumn(_0xffabcf,_0x9101ce),_0xcea81d=createDynamicSelect(_0x2654f2,{'id':_0x2654f2[metas['idConstant']]});dbLeftJoin(_0xcea81d,_0xffabcf,eq(_0x4ae6a0,_0x2654f2[metas['idConstant']])),dbGroupBy(_0xcea81d,_0x2654f2[metas['idConstant']]);const _0x26aeb4=addExpressionByType(count(_0x4ae6a0),_0x2270e3['rightSide'],_0x2270e3['comparisonType']);dbHaving(_0xcea81d,_0x26aeb4);const _0x2a21dc=await runQuery(_0xcea81d);_0x2270e3['leftSide']=metas['idConstant'],_0x2270e3['comparisonType']=oDataComparisonTypes['in'],_0x2270e3['rightSide']=_0x2a21dc['map'](_0x33688e=>_0x33688e[metas['idConstant']]),_0x35d201=tryGetAndExpression(_0x2270e3,getTableColumn(_0x2654f2,_0x2270e3['leftSide']));}}}return _0x35d201;}__name(getFilterExpression,'getFilterExpression');function getPredicate(_0x3ae990,_0xf6c356){const _0x17163c=getTablesAndColumns(_0x3ae990,_0xf6c356);if(!_0x17163c)return void(0xb2b+0x42*-0x3+-0xa65);const {enumerablePropertyTableName:_0x115311,enumerablePropertyTable:_0x1ae537,subPropertyTable:_0x7feeef,leftSide:_0xb0d6d1,leftSide1Column:_0x146667,leftSide2Column:_0x36a705,subQueryIdEqOperator:_0x4133b1}=_0x17163c,_0x363b3c=_0xf6c356['lambdaConfig']?.['method']===oDataLambdaMethods['all']?notExists:exists;if(_0xb0d6d1['length']===-0x1*0x10f+-0x142e+0x153e){const _0x34ffa8=_0xf6c356['lambdaConfig']?.['method']===oDataLambdaMethods['all']?not(tryGetAndExpression(_0xf6c356,_0x146667)):tryGetAndExpression(_0xf6c356,_0x146667),_0x2cf4e4=createDynamicSelect(_0x1ae537,{'leftSide1Column':_0x146667});return applyFilterToQuery(_0x2cf4e4,and(_0x4133b1,_0x34ffa8)),_0x363b3c(_0x2cf4e4);}else {const _0x519dac=_0x115311+metas['idConstant'],_0x5a2683=eq(_0x1ae537['id'],getTableColumn(_0x7feeef,_0x519dac)),_0xb88919=_0xf6c356['lambdaConfig']?.['method']===oDataLambdaMethods['all']?not(tryGetAndExpression(_0xf6c356,_0x36a705)):tryGetAndExpression(_0xf6c356,_0x36a705),_0x1dbb65=createDynamicSelect(_0x7feeef,{'leftSide2Column':_0x36a705}),_0x545599=and(_0x5a2683,_0xb88919);_0x545599&&dbWhere(_0x1dbb65,_0x545599);const _0x4e7396=createDynamicSelect(_0x1ae537),_0x100084=and(_0x4133b1,exists(_0x1dbb65));return _0x100084&&dbWhere(_0x4e7396,_0x100084),_0x363b3c(_0x4e7396);}}__name(getPredicate,'getPredicate');function getTablesAndColumns(_0x4b0c80,_0x5c626b){const _0x50c070=convertPropertyNameToTableName(_0x5c626b['lambdaConfig']?.['baseEnumerablePropertyName']??'');if(isNullOrUndefinedWithLogging(lambdaConfigNameConstants['baseEnumerablePropertyName'],_0x50c070)||isNullOrUndefinedWithLogging(lambdaConfigNameConstants['method'],_0x5c626b['lambdaConfig']?.['method']))return void(-0x1*0x2141+-0x5b7+-0x3a*-0xac);const _0x3b07f9=_0x5c626b['leftSide']['split'](oDataSeparators['propertySeparator']),_0x588efd=getTableByName(_0x4b0c80),_0x52592c=getTableByName(_0x50c070),_0x1c21f6=getTableByName(convertPropertyNameToTableName(_0x3b07f9[-0xe32+0x10c*0x1+0x66*0x21])),_0x200aba=getTableColumn(_0x52592c,convertFromPascalToCamelCase(_0x3b07f9[-0x1a1*-0xd+0xa*-0x3e0+0x199*0xb])),_0xac54c7=getTableColumn(_0x1c21f6,convertFromPascalToCamelCase(_0x3b07f9[_0x3b07f9['length']-(0x3*0x669+0x10c*-0x1d+-0x23a*-0x5)])),_0x9650d3=eq(_0x588efd['id'],getTableColumn(_0x52592c,_0x4b0c80+metas['idConstant']));return {'enumerablePropertyTableName':_0x50c070,'enumerablePropertyTable':_0x52592c,'subPropertyTable':_0x1c21f6,'leftSide':_0x3b07f9,'leftSide1Column':_0x200aba,'leftSide2Column':_0xac54c7,'subQueryIdEqOperator':_0x9650d3};}__name(getTablesAndColumns,'getTablesAndColumns');function groupBaseODataFilterByLogicalOrs(_0x3f7d76){const _0x5241e3={};let _0x261374=[],_0x34f804=-0x5b*0x34+0x11fa+0x82;_0x5241e3[_0x34f804]=_0x261374;for(const _0x4ff4f4 of _0x3f7d76){_0x4ff4f4['logicalOperationType']===oDataLogicalOperationTypes['or']?(_0x5241e3[_0x34f804]=_0x261374,_0x261374=[_0x4ff4f4],_0x5241e3[++_0x34f804]=_0x261374):_0x261374['push'](_0x4ff4f4);}return _0x5241e3;}__name(groupBaseODataFilterByLogicalOrs,'groupBaseODataFilterByLogicalOrs');function tryGetAndExpression(_0xda6965,_0x5a1412){const _0x454ac7=tryGetConstantExpression(_0x5a1412['dataType'],String(_0xda6965['rightSide']),_0xda6965['comparisonType']);return addExpressionByType(_0x5a1412,_0x454ac7,_0xda6965['comparisonType']);}__name(tryGetAndExpression,'tryGetAndExpression');function tryGetConstantExpression(_0x35e5ff,_0x13e80d,_0x378172){let _0x2c605a;if(_0x13e80d===oDataSpecialValues['nullValue'])_0x2c605a=[_0x13e80d];else _0x378172===oDataComparisonTypes['in']||_0x378172===oDataComparisonTypes['nin']?_0x2c605a=parseRightSideToArray(_0x13e80d):_0x2c605a=tryParseToType(_0x35e5ff,_0x13e80d);return _0x2c605a;}__name(tryGetConstantExpression,'tryGetConstantExpression');function tryParseToType(_0x2ecef2,_0x6e235d){let _0x3fbc8a;switch(_0x2ecef2){case columnDataTypes['string']:_0x3fbc8a=_0x6e235d;break;case columnDataTypes['bigint']:case columnDataTypes['number']:_0x3fbc8a=parseFloat(_0x6e235d);break;case columnDataTypes['boolean']:_0x3fbc8a=_0x6e235d===columnDataTypes['integrationEnabled'];break;case columnDataTypes['date']:_0x3fbc8a=parseUtcStringToDate(_0x6e235d);break;case columnDataTypes['array']:throw createError(toolboxErrorMessages['odataUnsupportedType']['replace']('{0}',_0x2ecef2));case columnDataTypes['json']:throw createError(toolboxErrorMessages['odataUnsupportedType']['replace']('{0}',_0x2ecef2));case columnDataTypes['custom']:throw createError(toolboxErrorMessages['odataUnsupportedType']['replace']('{0}',_0x2ecef2));case columnDataTypes['buffer']:throw createError(toolboxErrorMessages['odataUnsupportedType']['replace']('{0}',_0x2ecef2));default:throw createError(toolboxErrorMessages['odataUnsupportedType']['replace']('{0}',_0x2ecef2));}return _0x3fbc8a;}__name(tryParseToType,'tryParseToType');function addExpressionByType(_0x4d1185,_0x2d437c,_0x2f6114){const _0x119b00=getComparisonTypeFromOperation(_0x2f6114),_0x4c7505=sql`${_0x4d1185}`;return _0x119b00(_0x4c7505,_0x2d437c);}__name(addExpressionByType,'addExpressionByType');
 export { getFilterValue, tryFilter };

package/packages/level2/meta/server/api/odata/odata-metas.js CHANGED Viewed

@@ -4,6 +4,6 @@ import { withIdProps } from '../../../../../fd-toolbox-core/types/resource-with-
 import { oDataOrderByDirectionConsts, tableSortDirections } from '../../../../../fd-toolbox/enums/enums.js';
 import { convertFromPascalToCamelCase } from '../../../../../fd-toolbox/strings/casing-converter.js';
-var __defProp=Object['defineProperty'],__name=(_0xfdf6e7,_0x14f9eb)=>__defProp(_0xfdf6e7,'name',{'value':_0x14f9eb,'configurable':!![]});function setDefaultOrderBy(_0x27d5ce){if(_0x27d5ce['length']===-0x20ab*-0x1+0x23c6+-0x4471){const _0x481574={'direction':oDataOrderByDirectionConsts['asc'],'propertyName':withIdProps['id'],'priority':0x0};_0x27d5ce['push'](_0x481574);}}__name(setDefaultOrderBy,'setDefaultOrderBy');async function getMetaOrderBys(_0x1fa024){const _0x474e4a=[],{orderByProperty:_0x27860b,orderByPriority:_0x18711c}=await getInternalResourceMeta(_0x1fa024['resourceName']);addOrderBys(_0x474e4a,_0x27860b,_0x18711c);const _0x4f1e43=(await getInternalResourceMeta(_0x1fa024['resourceName']))['properties'];for(const [_0xd1ddf,_0xeea350]of Object['entries'](_0x1fa024['properties'])){addOrderBys(_0x474e4a,_0x4f1e43[_0xd1ddf]?.['orderByProperty'],_0x4f1e43[_0xd1ddf]?.['orderByPriority'],_0xeea350);}return setDefaultOrderBy(_0x474e4a),_0x474e4a;}__name(getMetaOrderBys,'getMetaOrderBys');async function fillOdataConfigForMany(_0x3d4586,_0x4c388a){if(_0x4c388a&&!_0x4c388a['orderBys']?.['length']){const _0x4c32e7=await getMetaOrderBys(_0x3d4586),_0x164f1b=[];for(const _0x278275 of _0x4c32e7){const _0x12efc1={'propertyName':convertFromPascalToCamelCase(_0x278275['propertyName']),'priority':_0x278275['priority'],'direction':_0x278275['direction']};_0x164f1b['push'](_0x12efc1);}_0x4c388a['orderBys']=_0x164f1b;}return _0x4c388a;}__name(fillOdataConfigForMany,'fillOdataConfigForMany');function addOrderBys(_0xfb4bcd,_0x44dcea,_0x2c2986,_0x3a4556){if(_0x2c2986){const _0x5d6981=_0x3a4556?.['name']??_0x44dcea??withIdProps['id'];if(_0xfb4bcd['some'](_0x8774e4=>_0x8774e4['propertyName']===_0x5d6981))return;const _0x1721cf={'propertyName':_0x5d6981,'direction':tableSortDirections['asc'],'priority':_0x2c2986};_0xfb4bcd['push'](_0x1721cf);}}__name(addOrderBys,'addOrderBys');
+var __defProp=Object['defineProperty'],__name=(_0x4e0102,_0x15dea4)=>__defProp(_0x4e0102,'name',{'value':_0x15dea4,'configurable':!![]});function setDefaultOrderBy(_0x5d29b1){if(_0x5d29b1['length']===-0x18b3+-0x1b03+0x2*0x19db){const _0x30c8fd={'direction':oDataOrderByDirectionConsts['asc'],'propertyName':withIdProps['id'],'priority':0x0};_0x5d29b1['push'](_0x30c8fd);}}__name(setDefaultOrderBy,'setDefaultOrderBy');async function getMetaOrderBys(_0x383c26){const _0x36191e=[],_0x4da242=await getInternalResourceMeta(_0x383c26['resourceName']),{orderByProperty:_0x958bfa,orderByPriority:_0x3a2eae}=_0x4da242;addOrderBys(_0x36191e,_0x958bfa,_0x3a2eae);const _0x1bf743=_0x4da242['properties'];for(const [_0x406b5d,_0x78269c]of Object['entries'](_0x383c26['properties'])){addOrderBys(_0x36191e,_0x1bf743[_0x406b5d]?.['orderByProperty'],_0x1bf743[_0x406b5d]?.['orderByPriority'],_0x78269c);}return setDefaultOrderBy(_0x36191e),_0x36191e;}__name(getMetaOrderBys,'getMetaOrderBys');async function fillOdataConfigForMany(_0x831f33,_0x2d1dc0){if(_0x2d1dc0&&!_0x2d1dc0['orderBys']?.['length']){const _0x472693=await getMetaOrderBys(_0x831f33),_0x11322a=[];for(const _0x325268 of _0x472693){const _0x440b0f={'propertyName':convertFromPascalToCamelCase(_0x325268['propertyName']),'priority':_0x325268['priority'],'direction':_0x325268['direction']};_0x11322a['push'](_0x440b0f);}_0x2d1dc0['orderBys']=_0x11322a;}return _0x2d1dc0;}__name(fillOdataConfigForMany,'fillOdataConfigForMany');function addOrderBys(_0x329361,_0x33bc8c,_0xd2f221,_0x2ab1ce){if(_0xd2f221){const _0x1f6b1f=_0x2ab1ce?.['name']??_0x33bc8c??withIdProps['id'];if(_0x329361['some'](_0x899594=>_0x899594['propertyName']===_0x1f6b1f))return;const _0x4ae07b={'propertyName':_0x1f6b1f,'direction':tableSortDirections['asc'],'priority':_0xd2f221};_0x329361['push'](_0x4ae07b);}}__name(addOrderBys,'addOrderBys');
 export { fillOdataConfigForMany, getMetaOrderBys, setDefaultOrderBy };

package/packages/level2/meta/server/api/odata/odata-parsers.js CHANGED Viewed

@@ -10,6 +10,6 @@ import { oDataLambdaMethods } from '../../../../../fd-toolbox/odata/odata-lambda
 import { columnDataTypes } from '../../db/colums-data-types.js';
 import { trimQuotesRegex, removeNonAlphanumericEndRegex, uuidRegex, numericRegex, guidPrefixWithParenthesisLength, guidPrefixLength, parenthesizedContent } from '../../../../../fd-toolbox/constants/odata-helper-constants.js';
-var __defProp=Object['defineProperty'],__name=(_0xd9d6e3,_0x5f5d19)=>__defProp(_0xd9d6e3,'name',{'value':_0x5f5d19,'configurable':!![]});function prepareODataSelectOrExpandTree(_0x37816d){const _0x5c4a48=_0x37816d??[],_0x4dcb3b={};return _0x5c4a48['forEach'](_0x5b5a9c=>{const _0x2f643f=_0x5b5a9c['split'](oDataSeparators['propertySeparator']);let _0x31ed54=_0x4dcb3b;_0x2f643f['forEach'](_0x108755=>{_0x31ed54['children']??={},!_0x31ed54['children'][_0x108755]&&(_0x31ed54['children'][_0x108755]={}),_0x31ed54=_0x31ed54['children'][_0x108755];});}),_0x4dcb3b;}__name(prepareODataSelectOrExpandTree,'prepareODataSelectOrExpandTree');function parseODataFilter(_0x433ee9){const _0x4afe78=[];if(!_0x433ee9['trim']())return _0x4afe78;let _0x25bfa2=![];const _0x43e480=metaSplitFilters(_0x433ee9);for(const _0x12b2cd of _0x43e480){if(_0x12b2cd===oDataLogicalOperators['or'])_0x25bfa2=!![];else {const _0x128be9={'logicalOperationType':oDataLogicalOperationTypes['and'],'comparisonType':getComparisonType(_0x12b2cd)};_0x25bfa2&&(_0x128be9['logicalOperationType']=oDataLogicalOperationTypes['or'],_0x25bfa2=![]);const _0xeabb9e=setLambdaConfigAndGetFilterComponents(_0x12b2cd,_0x128be9);_0x128be9['leftSide']=convertFromPascalToCamelCase(_0xeabb9e[-0x1ba7+0xef8+0x1*0xcaf]);if(_0xeabb9e[0x1*0x1ad2+-0xe+0x1f*-0xdd]['startsWith']('('+columnDataTypes['uuid'])||_0xeabb9e[-0x81d+-0x1*-0x841+-0x1*0x23]['startsWith'](columnDataTypes['uuid'])){const _0x26aa6b=parseGuidFilterValue(_0xeabb9e[0xfc5+0xd5*0x2e+-0x1b05*0x2]);_0x128be9['rightSide']=trimWithRegex(_0x26aa6b,![],oDataSeparators['stringQuote']),_0x128be9['type']=oDataFilterTypes['guid'];}else {if(_0xeabb9e[-0x19*0x16d+0x2*-0xa75+0x3890]['startsWith'](columnDataTypes['datetime']))_0x128be9['rightSide']=trimWithRegex(_0xeabb9e[-0xdf0+0xdcf+0x22]['substring'](0x7c*0x3f+-0x1545+0x9*-0x106),![],oDataSeparators['stringQuote'],oDataSeparators['timezoneSuffix']);else {const _0x82f7cc=trimWithRegex(_0xeabb9e[0x2bf*0x2+-0x1ea7*0x1+-0x1*-0x192a],!![],oDataSeparators['stringQuote'],oDataSeparators['openParenthesis']);_0x128be9['rightSide']=trimWithRegex(_0x82f7cc,![],oDataSeparators['stringQuote'],oDataSeparators['closeParenthesis']);}}_0x4afe78['push'](_0x128be9);}}return _0x4afe78;}__name(parseODataFilter,'parseODataFilter');function parseExpand(_0x3b953e){if(!_0x3b953e)return [];return _0x3b953e['split'](oDataSeparators['selectSeparator']);}__name(parseExpand,'parseExpand');function parseSorts(_0x11e686){if(_0x11e686){const _0x567266=[],_0x3113d5=_0x11e686['split'](oDataSeparators['selectSeparator']);for(const _0x335b5c of _0x3113d5){const _0x2801e0=_0x335b5c['trim']()['split'](oDataSeparators['space']),_0x14ef01={'propertyName':isPascalCase(_0x2801e0[-0x1*-0x1a4a+-0xf*0x11a+-0x9c4])?convertFromPascalToCamelCase(_0x2801e0[0x1*0x1641+-0xd2a*-0x2+0x1*-0x3095]):_0x2801e0[-0x1410+-0x21b8+0x35c8],'priority':0x0,'direction':_0x2801e0[-0x1*0x125e+0x640+0xc1f]===oDataQueryParams['orderByDesc']?oDataOrderByDirectionConsts['desc']:oDataOrderByDirectionConsts['asc']};_0x567266['push'](_0x14ef01);}return _0x567266;}return [];}__name(parseSorts,'parseSorts');function parseSelects(_0x47ad06){return _0x47ad06['split'](oDataSeparators['selectSeparator']);}__name(parseSelects,'parseSelects');function trimWithRegex(_0x15d7d1,_0x480d7d,..._0x199151){const _0x275ab9=_0x199151['map'](escapeChar),_0x4207ae='['+_0x275ab9['join'](oDataSeparators['emptyString'])+']+',_0x4153b4=_0x480d7d?oDataSeparators['emptyString']:oDataRegexPatterns['endOfLineMarker'],_0x1dbb05=new RegExp(''+_0x4207ae+_0x4153b4);return _0x15d7d1['replace'](_0x1dbb05,oDataSeparators['emptyString']);}__name(trimWithRegex,'trimWithRegex');function metaSplitFilters(_0xfdb095){return _0xfdb095['split'](new RegExp('\x5cs*('+oDataLogicalOperators['or']+'|'+oDataLogicalOperators['and']+')\x5cs*',oDataRegexPatterns['caseInsensitiveFlag']))['filter'](_0x2dcc66=>_0x2dcc66['trim']()!==oDataSeparators['emptyString']&&_0x2dcc66!==oDataLogicalOperators['and']);}__name(metaSplitFilters,'metaSplitFilters');function parseRightSideToArray(_0x4e03d2){const _0x120332=[],_0x438e26=_0x4e03d2['trim']()['replace'](trimQuotesRegex,oDataSpecialValues['parameterPlaceholder'])['split'](oDataSeparators['selectSeparator']);for(const _0x52447f of _0x438e26){let _0x2aa315=_0x52447f['replaceAll'](oDataSeparators['stringQuote'],oDataSeparators['emptyString'])['trim']();_0x2aa315=_0x2aa315['replace'](removeNonAlphanumericEndRegex,oDataSeparators['emptyString'])['trim']();if(uuidRegex['test'](_0x2aa315))_0x120332['push'](_0x2aa315);else _0x2aa315['includes'](columnDataTypes['uuid'])?_0x120332['push'](_0x2aa315['replace'](columnDataTypes['uuid'],oDataSeparators['emptyString'])['trim']()):_0x120332['push'](numericRegex['test'](_0x2aa315)?String(parseInt(_0x2aa315,0x8f1+0xe02+-0x5*0x495)):_0x2aa315);}return _0x120332;}__name(parseRightSideToArray,'parseRightSideToArray');function getComparisonType(_0x28a658){for(const [_0x3eeaec,_0x5a2010]of filterConstantToComparison){if(_0x28a658['includes'](_0x3eeaec))return _0x5a2010;}throw createError(toolboxErrorMessages['unpredictableExpression']);}__name(getComparisonType,'getComparisonType');const filterConstantToComparison=new Map([[oDataComparisonOperators['eq'],oDataComparisonTypes['equal']],[oDataComparisonOperators['ne'],oDataComparisonTypes['notEqual']],[oDataComparisonOperators['gt'],oDataComparisonTypes['greaterThan']],[oDataComparisonOperators['ge'],oDataComparisonTypes['greaterThanOrEqual']],[oDataComparisonOperators['lt'],oDataComparisonTypes['lessThan']],[oDataComparisonOperators['le'],oDataComparisonTypes['lessThanOrEqual']],[oDataComparisonOperators['in'],oDataComparisonTypes['in']],[oDataComparisonOperators['nin'],oDataComparisonTypes['nin']],[oDataComparisonOperators['startsWith'],oDataComparisonTypes['startsWith']]]);function setLambdaConfigAndGetFilterComponents(_0x4b7ec8,_0x5adf98){if(_0x4b7ec8['includes'](oDataSeparators['propertySeparator']+oDataLambdaOperators['any']+oDataSeparators['openParenthesis'])){const _0x23c9d6=setODataLambdaConfigAndGetFilterString(_0x5adf98,_0x4b7ec8,oDataLambdaMethods['any']);return getSplittedWithConstantsFilter(_0x23c9d6);}else {if(_0x4b7ec8['includes'](oDataSeparators['propertySeparator']+oDataLambdaOperators['all']+oDataSeparators['openParenthesis'])){const _0x27c9c7=setODataLambdaConfigAndGetFilterString(_0x5adf98,_0x4b7ec8,oDataLambdaMethods['all']);return getSplittedWithConstantsFilter(_0x27c9c7);}else {if(_0x4b7ec8['includes'](oDataComparisonOperators['startsWith']+oDataSeparators['openParenthesis'])){const _0x27bad6=oDataRegexPatterns['functionParametersPattern'],_0x35a2a1=_0x27bad6['exec'](_0x4b7ec8);return [_0x35a2a1?.[-0xe0f+-0x20c*0xe+0x2*0x155c]??oDataSeparators['emptyString'],_0x35a2a1?.[0x1559+0x264d*-0x1+0x1a*0xa7]??oDataSeparators['emptyString']];}}}return getSplittedWithConstantsFilter(_0x4b7ec8);}__name(setLambdaConfigAndGetFilterComponents,'setLambdaConfigAndGetFilterComponents');function setODataLambdaConfigAndGetFilterString(_0x16ab99,_0x93b8c8,_0x377a7e){_0x16ab99['type']=oDataFilterTypes['lambda'];const _0x15f2b2=_0x93b8c8['split'](oDataSeparators['propertySeparator'],0x185e+-0x8*0x40a+-0x2a7*-0x3),_0x479682={'baseEnumerablePropertyName':_0x15f2b2[0x11eb+0x1*0x254a+0x15*-0x2a1],'method':_0x377a7e};return _0x16ab99['lambdaConfig']=_0x479682,trimWithRegex(_0x15f2b2[_0x15f2b2['length']-(0x25c5+0x1*-0x1a16+0x12b*-0xa)],![],oDataSeparators['closeParenthesis']);}__name(setODataLambdaConfigAndGetFilterString,'setODataLambdaConfigAndGetFilterString');function getSplittedWithConstantsFilter(_0x2f0dda){return _0x2f0dda['split'](new RegExp(oDataComparisonOperators['eq']+'|'+oDataComparisonOperators['ne']+'|'+oDataComparisonOperators['gt']+'|'+oDataComparisonOperators['ge']+'|'+oDataComparisonOperators['lt']+'|'+oDataComparisonOperators['le']+'|'+oDataComparisonOperators['in']+'|'+oDataComparisonOperators['nin']+'|'+oDataComparisonOperators['startsWith']));}__name(getSplittedWithConstantsFilter,'getSplittedWithConstantsFilter');function parseGuidFilterValue(_0x25e0c8){const _0x56f071=[],_0x5cbd94=_0x25e0c8['split'](oDataSeparators['selectSeparator']);for(const _0x136419 of _0x5cbd94){let _0xd9e1df=_0x136419['startsWith']('('+columnDataTypes['uuid'])?_0x136419['substring'](guidPrefixWithParenthesisLength):_0x136419['substring'](guidPrefixLength);_0xd9e1df=_0xd9e1df['replace'](trimQuotesRegex,oDataSpecialValues['parameterPlaceholder']),_0xd9e1df=_0xd9e1df['replace'](parenthesizedContent,oDataSpecialValues['parameterPlaceholder']),_0xd9e1df=_0xd9e1df['replace'](removeNonAlphanumericEndRegex,oDataSeparators['emptyString'])['trim'](),_0x56f071['push'](_0xd9e1df);}return _0x56f071['join'](oDataSeparators['selectSeparator']);}__name(parseGuidFilterValue,'parseGuidFilterValue');function escapeChar(_0x5f8083){let _0x54f33c=_0x5f8083;if(_0x5f8083==='(')_0x54f33c=String['raw']`\(`;else _0x5f8083===')'&&(_0x54f33c=String['raw']`\)`);return _0x54f33c;}__name(escapeChar,'escapeChar');
+var __defProp=Object['defineProperty'],__name=(_0x2aafed,_0x181947)=>__defProp(_0x2aafed,'name',{'value':_0x181947,'configurable':!![]});function prepareODataSelectOrExpandTree(_0x43e3fc){const _0x52cbcd=_0x43e3fc??[],_0x3088a3={};return _0x52cbcd['forEach'](_0x127f38=>{const _0x1bccff=_0x127f38['split'](oDataSeparators['propertySeparator']);let _0x3b868a=_0x3088a3;_0x1bccff['forEach'](_0x105785=>{_0x3b868a['children']??={},!_0x3b868a['children'][_0x105785]&&(_0x3b868a['children'][_0x105785]={}),_0x3b868a=_0x3b868a['children'][_0x105785];});}),_0x3088a3;}__name(prepareODataSelectOrExpandTree,'prepareODataSelectOrExpandTree');function parseODataFilter(_0x4fc27c){const _0xe52af9=[];if(!_0x4fc27c['trim']())return _0xe52af9;let _0x1644c3=![];const _0xbcdf73=metaSplitFilters(_0x4fc27c);for(const _0x4d3486 of _0xbcdf73){if(_0x4d3486===oDataLogicalOperators['or'])_0x1644c3=!![];else {const _0x4cd49a={'logicalOperationType':oDataLogicalOperationTypes['and'],'comparisonType':getComparisonType(_0x4d3486)};_0x1644c3&&(_0x4cd49a['logicalOperationType']=oDataLogicalOperationTypes['or'],_0x1644c3=![]);const _0x4e0418=setLambdaConfigAndGetFilterComponents(_0x4d3486,_0x4cd49a);_0x4cd49a['leftSide']=convertFromPascalToCamelCase(_0x4e0418[0x1*-0x1101+-0x1579+0x267a]);if(_0x4e0418[0x1a75+-0x5*-0x9f+-0x17*0x149]['startsWith']('('+columnDataTypes['uuid'])||_0x4e0418[0x1*0x9bb+0x1*-0x195e+0xfa4]['startsWith'](columnDataTypes['uuid'])){const _0x44886e=parseGuidFilterValue(_0x4e0418[0x1e4c+-0x8d8+-0x143*0x11]);_0x4cd49a['rightSide']=trimWithRegex(_0x44886e,![],oDataSeparators['stringQuote']),_0x4cd49a['type']=oDataFilterTypes['guid'];}else {if(_0x4e0418[0x2406+0x1d*0xa+-0x2527]['startsWith'](columnDataTypes['datetime']))_0x4cd49a['rightSide']=trimWithRegex(_0x4e0418[-0x1d24+-0xfc3+0x2*0x1674]['substring'](-0x207a+-0xa7*0xc+0x2857),![],oDataSeparators['stringQuote'],oDataSeparators['timezoneSuffix']);else {const _0x5001de=trimWithRegex(_0x4e0418[-0x1d3*0x8+0x19f6+0xb5d*-0x1],!![],oDataSeparators['stringQuote'],oDataSeparators['openParenthesis']);_0x4cd49a['rightSide']=trimWithRegex(_0x5001de,![],oDataSeparators['stringQuote'],oDataSeparators['closeParenthesis']);}}_0xe52af9['push'](_0x4cd49a);}}return _0xe52af9;}__name(parseODataFilter,'parseODataFilter');function parseExpand(_0x47a7dd){if(!_0x47a7dd)return [];return _0x47a7dd['split'](oDataSeparators['selectSeparator']);}__name(parseExpand,'parseExpand');function parseSorts(_0x5ebd9f){if(_0x5ebd9f){const _0x446ea9=[],_0x2825b4=_0x5ebd9f['split'](oDataSeparators['selectSeparator']);for(const _0x4b1b28 of _0x2825b4){const _0x43c3ba=_0x4b1b28['trim']()['split'](oDataSeparators['space']),_0x36e4d3={'propertyName':isPascalCase(_0x43c3ba[0x2f5*0xd+0x1408+-0x1*0x3a79])?convertFromPascalToCamelCase(_0x43c3ba[0x84a*-0x2+0x111f+-0x8b]):_0x43c3ba[-0x1402+-0x12*-0xa6+0x61*0x16],'priority':0x0,'direction':_0x43c3ba[-0x1163+0x10cb+0x99*0x1]===oDataQueryParams['orderByDesc']?oDataOrderByDirectionConsts['desc']:oDataOrderByDirectionConsts['asc']};_0x446ea9['push'](_0x36e4d3);}return _0x446ea9;}return [];}__name(parseSorts,'parseSorts');function parseSelects(_0x22d17d){return _0x22d17d['split'](oDataSeparators['selectSeparator']);}__name(parseSelects,'parseSelects');function trimWithRegex(_0x14e20f,_0x2e1835,..._0x1c44a6){const _0x27792a=_0x1c44a6['map'](escapeChar),_0x386c5d='['+_0x27792a['join'](oDataSeparators['emptyString'])+']+',_0xcbbc3f=_0x2e1835?oDataSeparators['emptyString']:oDataRegexPatterns['endOfLineMarker'],_0x3cfe9c=new RegExp(''+_0x386c5d+_0xcbbc3f);return _0x14e20f['replace'](_0x3cfe9c,oDataSeparators['emptyString']);}__name(trimWithRegex,'trimWithRegex');function metaSplitFilters(_0x52de6e){return _0x52de6e['split'](new RegExp('\x5cs*('+oDataLogicalOperators['or']+'|'+oDataLogicalOperators['and']+')\x5cs*',oDataRegexPatterns['caseInsensitiveFlag']))['filter'](_0x49d7f6=>_0x49d7f6['trim']()!==oDataSeparators['emptyString']&&_0x49d7f6!==oDataLogicalOperators['and']);}__name(metaSplitFilters,'metaSplitFilters');function parseRightSideToArray(_0x114f24){const _0x29d4b9=[],_0x3187dd=_0x114f24['trim']()['replace'](trimQuotesRegex,oDataSpecialValues['parameterPlaceholder'])['split'](oDataSeparators['selectSeparator']);for(const _0x56a7b9 of _0x3187dd){let _0xa09bfa=_0x56a7b9['replaceAll'](oDataSeparators['stringQuote'],oDataSeparators['emptyString'])['trim']();_0xa09bfa=_0xa09bfa['replace'](removeNonAlphanumericEndRegex,oDataSeparators['emptyString'])['trim']();if(uuidRegex['test'](_0xa09bfa))_0x29d4b9['push'](_0xa09bfa);else _0xa09bfa['includes'](columnDataTypes['uuid'])?_0x29d4b9['push'](_0xa09bfa['replace'](columnDataTypes['uuid'],oDataSeparators['emptyString'])['trim']()):_0x29d4b9['push'](numericRegex['test'](_0xa09bfa)?String(parseInt(_0xa09bfa,-0x1ba7+-0x19f2+-0x17*-0x255)):_0xa09bfa);}return _0x29d4b9;}__name(parseRightSideToArray,'parseRightSideToArray');function getComparisonType(_0x18d55a){for(const [_0x54da90,_0x21f8d9]of filterConstantToComparison){if(_0x18d55a['includes'](_0x54da90))return _0x21f8d9;}throw createError(toolboxErrorMessages['unpredictableExpression']);}__name(getComparisonType,'getComparisonType');const filterConstantToComparison=new Map([[oDataComparisonOperators['eq'],oDataComparisonTypes['equal']],[oDataComparisonOperators['ne'],oDataComparisonTypes['notEqual']],[oDataComparisonOperators['gt'],oDataComparisonTypes['greaterThan']],[oDataComparisonOperators['ge'],oDataComparisonTypes['greaterThanOrEqual']],[oDataComparisonOperators['lt'],oDataComparisonTypes['lessThan']],[oDataComparisonOperators['le'],oDataComparisonTypes['lessThanOrEqual']],[oDataComparisonOperators['in'],oDataComparisonTypes['in']],[oDataComparisonOperators['nin'],oDataComparisonTypes['nin']],[oDataComparisonOperators['startsWith'],oDataComparisonTypes['startsWith']]]);function setLambdaConfigAndGetFilterComponents(_0x1aaf08,_0x5767f6){if(_0x1aaf08['includes'](oDataSeparators['propertySeparator']+oDataLambdaOperators['any']+oDataSeparators['openParenthesis'])){const _0x4b59bf=setODataLambdaConfigAndGetFilterString(_0x5767f6,_0x1aaf08,oDataLambdaMethods['any']);return getSplittedWithConstantsFilter(_0x4b59bf);}else {if(_0x1aaf08['includes'](oDataSeparators['propertySeparator']+oDataLambdaOperators['all']+oDataSeparators['openParenthesis'])){const _0x544941=setODataLambdaConfigAndGetFilterString(_0x5767f6,_0x1aaf08,oDataLambdaMethods['all']);return getSplittedWithConstantsFilter(_0x544941);}else {if(_0x1aaf08['includes'](oDataComparisonOperators['startsWith']+oDataSeparators['openParenthesis'])){const _0x19c72d=oDataRegexPatterns['functionParametersPattern'],_0x42faf6=_0x19c72d['exec'](_0x1aaf08);return [_0x42faf6?.[0x1*-0x22eb+0x117+0x21d5]??oDataSeparators['emptyString'],_0x42faf6?.[0x655+0x1*0x147b+-0x1ace]??oDataSeparators['emptyString']];}}}return getSplittedWithConstantsFilter(_0x1aaf08);}__name(setLambdaConfigAndGetFilterComponents,'setLambdaConfigAndGetFilterComponents');function setODataLambdaConfigAndGetFilterString(_0x281f5c,_0x443537,_0x4cafd4){_0x281f5c['type']=oDataFilterTypes['lambda'];const _0x5cfb75=_0x443537['split'](oDataSeparators['propertySeparator'],0xc34+-0x11c1+0x590),_0x45ddba={'baseEnumerablePropertyName':_0x5cfb75[-0x1a5e+-0xd0*0x27+-0x3*-0x135a],'method':_0x4cafd4};return _0x281f5c['lambdaConfig']=_0x45ddba,trimWithRegex(_0x5cfb75[_0x5cfb75['length']-(-0x626*0x5+0x3*-0x251+0x25b2)],![],oDataSeparators['closeParenthesis']);}__name(setODataLambdaConfigAndGetFilterString,'setODataLambdaConfigAndGetFilterString');function getSplittedWithConstantsFilter(_0x4960c8){return _0x4960c8['split'](new RegExp(oDataComparisonOperators['eq']+'|'+oDataComparisonOperators['ne']+'|'+oDataComparisonOperators['gt']+'|'+oDataComparisonOperators['ge']+'|'+oDataComparisonOperators['lt']+'|'+oDataComparisonOperators['le']+'|'+oDataComparisonOperators['in']+'|'+oDataComparisonOperators['nin']+'|'+oDataComparisonOperators['startsWith']));}__name(getSplittedWithConstantsFilter,'getSplittedWithConstantsFilter');function parseGuidFilterValue(_0x111e6e){const _0x2e2cde=[],_0x434cb4=_0x111e6e['split'](oDataSeparators['selectSeparator']);for(const _0x312a30 of _0x434cb4){let _0xd2ee1a=_0x312a30['startsWith']('('+columnDataTypes['uuid'])?_0x312a30['substring'](guidPrefixWithParenthesisLength):_0x312a30['substring'](guidPrefixLength);_0xd2ee1a=_0xd2ee1a['replace'](trimQuotesRegex,oDataSpecialValues['parameterPlaceholder']),_0xd2ee1a=_0xd2ee1a['replace'](parenthesizedContent,oDataSpecialValues['parameterPlaceholder']),_0xd2ee1a=_0xd2ee1a['replace'](removeNonAlphanumericEndRegex,oDataSeparators['emptyString'])['trim'](),_0x2e2cde['push'](_0xd2ee1a);}return _0x2e2cde['join'](oDataSeparators['selectSeparator']);}__name(parseGuidFilterValue,'parseGuidFilterValue');function escapeChar(_0x5dc65e){let _0x141e51=_0x5dc65e;if(_0x5dc65e==='(')_0x141e51=String['raw']`\(`;else _0x5dc65e===')'&&(_0x141e51=String['raw']`\)`);return _0x141e51;}__name(escapeChar,'escapeChar');
 export { metaSplitFilters, parseExpand, parseODataFilter, parseRightSideToArray, parseSelects, parseSorts, prepareODataSelectOrExpandTree, trimWithRegex };

package/packages/level2/meta/server/api/odata/odata.d.ts CHANGED Viewed

@@ -7,9 +7,16 @@ import { QueryParam } from "../../../../../fd-toolbox/url/query-param";
 import { BaseODataFilter } from "../../../../../fd-toolbox/odata/filters/base-odata-filter";
 /** @internal */
 export declare function getODataConfig(filter?: string, expand?: string, orderby?: string, skip?: number, top?: number, select?: string): {
+    filters?: undefined;
+    expands?: undefined;
+    orderBys?: undefined;
+    selects?: undefined;
+    skip?: undefined;
+    top?: undefined;
+} | {
     filters: BaseODataFilter<unknown>[];
     expands: string[];
-    orderBys: import("../../../../../../lib").ODataOrderBy[];
+    orderBys: import("../../../../../../lib/package").ODataOrderBy[];
     selects: string[];
     skip: number;
     top: number;
@@ -18,9 +25,16 @@ export declare function filterODataSelectOrExpandTree(resourceName: string, prep
 export declare function groupODataResults(elements: WithId[], oDataSelectOrExpandTree: ODataSelectOrExpandTree, resourceMeta: ResourceMeta): WithIndexer<unknown>[];
 export declare function getEmptyODataConfig(): ODataConfig;
 export declare function getODataConfigFromRequest(request: Request): Promise<{
+    filters?: undefined;
+    expands?: undefined;
+    orderBys?: undefined;
+    selects?: undefined;
+    skip?: undefined;
+    top?: undefined;
+} | {
     filters: BaseODataFilter<unknown>[];
     expands: string[];
-    orderBys: import("../../../../../../lib").ODataOrderBy[];
+    orderBys: import("../../../../../../lib/package").ODataOrderBy[];
     selects: string[];
     skip: number;
     top: number;

package/packages/level2/meta/server/api/odata/odata.js CHANGED Viewed

@@ -5,7 +5,7 @@ import { isNullOrUndefined } from '../../../../../fd-toolbox/functions/value-che
 import { createError } from '../../../../../fd-toolbox/errors/errors.js';
 import { metaErrorMessages } from '../../../constants/meta-error-messages-constants.js';
 import { getSingleOrEmpty } from '../../../../../fd-toolbox/server/collections/single-funcs.js';
-import { metas } from '../../fd-meta-core/constants/metas.js';
+import { metas } from '../../meta-core/constants/metas.js';
 import { isString } from '../../../../../fd-toolbox/types/ensure-type.js';
 import { isWithId } from '../../../../../fd-toolbox/lib/utils.js';
 import { isPropertyExpandable } from '../../services/property-metas.js';
@@ -16,6 +16,6 @@ import { oDataQueryParams } from '../../../../../fd-toolbox/server/api/odata/oda
 import { relatedFilterRegex } from '../../../../../fd-toolbox/constants/odata-helper-constants.js';
 import { oDataFilterTypes } from '../../../../../fd-toolbox/odata/odata-enums.js';
-var __defProp=Object['defineProperty'],__name=(_0x2fcf36,_0x3d76cf)=>__defProp(_0x2fcf36,'name',{'value':_0x3d76cf,'configurable':!![]});function getODataConfig(_0x2b7699,_0x3a8c9e,_0x5b5481,_0x39391f,_0x2f69c7,_0x105e3e){if(!hasAnyParams(_0x2b7699,_0x3a8c9e,_0x5b5481,_0x39391f,_0x2f69c7,_0x105e3e))return null;return {'filters':_0x2b7699?parseODataFilter(_0x2b7699):[],'expands':_0x3a8c9e?parseExpand(_0x3a8c9e):[],'orderBys':_0x5b5481?parseSorts(_0x5b5481):[],'selects':_0x105e3e?parseSelects(_0x105e3e):[],'skip':_0x39391f,'top':_0x2f69c7};}__name(getODataConfig,'getODataConfig');async function filterODataSelectOrExpandTree(_0x1b2f2d,_0x554366,_0x407cfd){const _0x541794=await getResourceMeta(_0x1b2f2d),_0x589db1={'resourceMeta':_0x541794,'children':_0x407cfd?getNotExpandblePropertyChidren(_0x541794):{}};if(_0x554366['children'])for(const [_0x1242e2,_0x8137a7]of Object['entries'](_0x554366['children'])){await processProperty(_0x1242e2,_0x541794,_0x8137a7,_0x589db1,_0x407cfd);}return _0x589db1;}__name(filterODataSelectOrExpandTree,'filterODataSelectOrExpandTree');function groupODataResults(_0x1ad62e,_0x3bbdd1,_0x450b8c){const _0x5e4f74=new Map();for(const _0xe584f6 of _0x1ad62e){const _0x9ee11d=_0xe584f6[metas['idConstant']];isString(_0x9ee11d)&&(!_0x5e4f74['has'](_0x9ee11d)&&_0x5e4f74['set'](_0x9ee11d,[]),_0x5e4f74['get'](_0x9ee11d)['push'](_0xe584f6));}const _0x2e71cb=[];for(const _0xb3a450 of _0x5e4f74['values']()){const _0x33ee37=processGroupElements(_0xb3a450,_0x3bbdd1,_0x450b8c);_0x2e71cb['push'](_0x33ee37);}return _0x2e71cb;}__name(groupODataResults,'groupODataResults');function getEmptyODataConfig(){const _0x41d4f7={'filters':[],'expands':[],'orderBys':[],'selects':[]};return _0x41d4f7;}__name(getEmptyODataConfig,'getEmptyODataConfig');async function getODataConfigFromRequest(_0x29ffb7){const {searchParams:_0x51c67e}=new URL(_0x29ffb7['url']),_0x5efe11=new URL(_0x29ffb7['url'])['pathname']['split']('/'),_0x25fa5a=_0x51c67e['get'](oDataQueryParams['filter']),_0x2d32db=_0x51c67e['get'](oDataQueryParams['expand']),_0x38764c=_0x51c67e['get'](oDataQueryParams['orderBys'])??await checkForDefaultSorting(_0x5efe11[_0x5efe11['length']-(0x2*-0xeb7+-0x1f*0xb+0x4*0x7b1)],_0x51c67e),_0x36b0a6=_0x51c67e['get'](oDataQueryParams['select']),_0x3be10d=_0x51c67e['get'](oDataQueryParams['skip']),_0x31b044=_0x51c67e['get'](oDataQueryParams['top']),_0x3b5b5a=_0x3be10d?Number(_0x3be10d):void(0x4*0x76d+0xa*0x225+0x1993*-0x2),_0x343f74=_0x31b044?Number(_0x31b044):void(-0xd42+-0x1*-0x501+0x1*0x841),_0x17bbeb=getODataConfig(_0x25fa5a,_0x2d32db,_0x38764c,_0x3b5b5a,_0x343f74,_0x36b0a6);return _0x17bbeb;}__name(getODataConfigFromRequest,'getODataConfigFromRequest');function getODataFilterParams(_0x20c19a){if(!_0x20c19a['filters']||_0x20c19a['filters']['length']===0x1f6*-0x1+0xe*0x173+0x61c*-0x3)return [];const _0x2f5c88={'name':oDataQueryParams['filter'],'value':buildFilterString(_0x20c19a['filters'])};return [_0x2f5c88];}__name(getODataFilterParams,'getODataFilterParams');function getBaseAndRelatedFilters(_0x5aa798){const _0x5a3bdb=_0x5aa798['filters'],{defaultFilters:_0x17386e,relatedFilters:_0x10cb7c}=groupQueryFilters(_0x5a3bdb);return {'defaultFilters':_0x17386e,'relatedFilters':_0x10cb7c};}__name(getBaseAndRelatedFilters,'getBaseAndRelatedFilters');function buildFilterString(_0x284eda){return _0x284eda['map'](_0x521c41=>{const _0x4f3d45=_0x521c41['leftSide'],_0x37ddce=_0x521c41['rightSide'];return _0x521c41['type']===oDataFilterTypes['guid']?_0x4f3d45+'\x20eq\x20guid\x27'+_0x37ddce+'\x27':_0x4f3d45+'\x20eq\x20\x27'+_0x37ddce+'\x27';})['join']('\x20'+oDataQueryParams['and']+'\x20');}__name(buildFilterString,'buildFilterString');function groupQueryFilters(_0xe57c7f){const _0x121432=[],_0x4fd081=[];for(const _0x41e099 of _0xe57c7f){relatedFilterRegex['test'](_0x41e099['leftSide'])?_0x4fd081['push'](_0x41e099):_0x121432['push'](_0x41e099);}return {'defaultFilters':_0x121432,'relatedFilters':_0x4fd081};}__name(groupQueryFilters,'groupQueryFilters');async function checkForDefaultSorting(_0x588369,_0xdde217){const _0x1d9d88=await getResourceMeta(_0x588369),_0x128c31=_0xdde217['get'](oDataQueryParams['select']);let _0x1b6724=null;return _0x1d9d88?.['orderBys']&&_0x1d9d88['orderBys']['forEach'](_0x37e95f=>{if(_0x37e95f['propertyName']===_0x128c31)_0x1b6724=_0x37e95f['propertyName'];}),_0x1b6724;}__name(checkForDefaultSorting,'checkForDefaultSorting');function hasAnyParams(..._0x270861){return _0x270861['some'](_0x552af0=>_0x552af0!==null);}__name(hasAnyParams,'hasAnyParams');function getNotExpandblePropertyChidren(_0x509fa7){const _0x37c0a2={};return Object['keys'](_0x509fa7['properties'])['forEach'](_0x1a8e4e=>{const _0x553b38=_0x509fa7['properties'][_0x1a8e4e];!isPropertyExpandable(_0x553b38)&&!_0x553b38['isDynamic']&&(_0x37c0a2[_0x1a8e4e]={});}),_0x37c0a2;}__name(getNotExpandblePropertyChidren,'getNotExpandblePropertyChidren');async function processProperty(_0x176d16,_0x143c4c,_0x52ef6d,_0x11d08a,_0x1dc9e5){const _0x3afb61=_0x143c4c['properties'][_0x176d16];if(_0x3afb61){if(isPropertyExpandable(_0x3afb61)){const _0x29640d=await filterODataSelectOrExpandTree(_0x3afb61['relation']['relatedResourceName'],_0x52ef6d,_0x1dc9e5);_0x29640d&&(_0x11d08a['children'][_0x176d16]=_0x29640d);}else _0x11d08a['children'][_0x176d16]={};}else logWarning(warningMessages['odataSelectNoProperty']['replace']('{0}',_0x143c4c['resourceName'])['replace']('{1}',_0x176d16));}__name(processProperty,'processProperty');function processElement(_0x444e83,_0x5d0d89,_0x3d2a5b){let _0x4e3aa7;const _0x1729d9=processGroupElements([_0x444e83],_0x5d0d89,_0x3d2a5b);return _0x4e3aa7=_0x1729d9,_0x4e3aa7;}__name(processElement,'processElement');function processGroupElements(_0x59423b,_0x41bb30,_0x5da909){const _0x9c884c=_0x41bb30['children']??{},_0x3b42ef={};for(const [_0x46efe0,_0xc670c8]of Object['entries'](_0x9c884c)){const _0x6841c3=_0x5da909['properties'][_0x46efe0],_0x3555d6=getGroupedPropertyValuesByName(_0x59423b,_0x46efe0);if(Object['keys'](_0xc670c8)['length']>-0x2686+0x3da*-0x7+0x1*0x417c){const _0x507f45=getUniqueObjectPropertyValues(_0x3555d6);switch(_0x6841c3['type']){case propertyTypes['array']:{_0x3b42ef[_0x46efe0]=processArray(_0x507f45,_0xc670c8,_0xc670c8['resourceMeta']);break;}case propertyTypes['object']:{_0x3b42ef[_0x46efe0]=processObject(_0x507f45,_0xc670c8,_0xc670c8['resourceMeta']);break;}default:{throw createError(metaErrorMessages['typeMismatch']);}}}else _0x3b42ef[_0x46efe0]=getSingleOrEmpty(getUniqueSimplePropertyValues(_0x3555d6));}return _0x3b42ef;}__name(processGroupElements,'processGroupElements');function processArray(_0x1aa580,_0x4ed120,_0x1cee71){return _0x1aa580['map'](_0x17c1b0=>{const _0x4bbb6c=processElement(_0x17c1b0,_0x4ed120,_0x1cee71);return _0x4bbb6c;});}__name(processArray,'processArray');function processObject(_0x1ca946,_0x4ef7b9,_0x21c017){let _0x40c888;const _0x5d45e9=getSingleOrEmpty(_0x1ca946);return _0x5d45e9&&(_0x40c888=processElement(_0x5d45e9,_0x4ef7b9,_0x21c017)),_0x40c888;}__name(processObject,'processObject');function getGroupedPropertyValuesByName(_0x63f83d,_0x3ca227){const _0x3e15b9=[];for(const _0x31fdf9 of _0x63f83d){!isNullOrUndefined(_0x31fdf9[_0x3ca227])&&_0x3e15b9['push'](_0x31fdf9[_0x3ca227]);}return _0x3e15b9;}__name(getGroupedPropertyValuesByName,'getGroupedPropertyValuesByName');function getUniqueObjectPropertyValues(_0x315821){const _0x28f2bb={};for(const _0x7181f0 of _0x315821){if(isWithId(_0x7181f0))_0x28f2bb[_0x7181f0['id']]=_0x7181f0;else throw createError(metaErrorMessages['valueIsNotObjectWithId']);}return Object['values'](_0x28f2bb);}__name(getUniqueObjectPropertyValues,'getUniqueObjectPropertyValues');function getUniqueSimplePropertyValues(_0x34c458){const _0x326e40=[];for(const _0xb13594 of _0x34c458){const _0x45e81c=_0x326e40['some'](_0x4a7efd=>{if(_0xb13594 instanceof Date&&_0x4a7efd instanceof Date)return _0x4a7efd['getTime']()===_0xb13594['getTime']();return _0x4a7efd===_0xb13594;});!_0x45e81c&&_0x326e40['push'](_0xb13594);}return _0x326e40;}__name(getUniqueSimplePropertyValues,'getUniqueSimplePropertyValues');
+var __defProp=Object['defineProperty'],__name=(_0x4343cc,_0x26e50f)=>__defProp(_0x4343cc,'name',{'value':_0x26e50f,'configurable':!![]});function getODataConfig(_0x1e55f6,_0x50acb1,_0x5bbdcb,_0x2ec6c3,_0x5cbfae,_0x13722b){if(!hasAnyParams(_0x1e55f6,_0x50acb1,_0x5bbdcb,_0x2ec6c3,_0x5cbfae,_0x13722b))return {};return {'filters':_0x1e55f6?parseODataFilter(_0x1e55f6):[],'expands':_0x50acb1?parseExpand(_0x50acb1):[],'orderBys':_0x5bbdcb?parseSorts(_0x5bbdcb):[],'selects':_0x13722b?parseSelects(_0x13722b):[],'skip':_0x2ec6c3,'top':_0x5cbfae};}__name(getODataConfig,'getODataConfig');async function filterODataSelectOrExpandTree(_0x297f5f,_0x42e832,_0x4fcc7b){const _0x2e206a=await getResourceMeta(_0x297f5f),_0xa2863={'resourceMeta':_0x2e206a,'children':_0x4fcc7b?getNotExpandblePropertyChidren(_0x2e206a):{}};if(_0x42e832['children'])for(const [_0x3f2ad1,_0x126868]of Object['entries'](_0x42e832['children'])){await processProperty(_0x3f2ad1,_0x2e206a,_0x126868,_0xa2863,_0x4fcc7b);}return _0xa2863;}__name(filterODataSelectOrExpandTree,'filterODataSelectOrExpandTree');function groupODataResults(_0x1112a5,_0xd0ad24,_0x3c65ed){const _0x9dd63f=new Map();for(const _0x3e21e5 of _0x1112a5){const _0x261e28=_0x3e21e5[metas['idConstant']];isString(_0x261e28)&&(!_0x9dd63f['has'](_0x261e28)&&_0x9dd63f['set'](_0x261e28,[]),_0x9dd63f['get'](_0x261e28)['push'](_0x3e21e5));}const _0x291800=[];for(const _0x2929df of _0x9dd63f['values']()){const _0xc01dcf=processGroupElements(_0x2929df,_0xd0ad24,_0x3c65ed);_0x291800['push'](_0xc01dcf);}return _0x291800;}__name(groupODataResults,'groupODataResults');function getEmptyODataConfig(){const _0xbe3f9f={'filters':[],'expands':[],'orderBys':[],'selects':[]};return _0xbe3f9f;}__name(getEmptyODataConfig,'getEmptyODataConfig');async function getODataConfigFromRequest(_0x5b987f){const {searchParams:_0x25a9e8}=new URL(_0x5b987f['url']),_0x3b88c9=new URL(_0x5b987f['url'])['pathname']['split']('/'),_0x2c7cf2=_0x25a9e8['get'](oDataQueryParams['filter']),_0x3644c0=_0x25a9e8['get'](oDataQueryParams['expand']),_0x650238=_0x25a9e8['get'](oDataQueryParams['orderBys'])??await checkForDefaultSorting(_0x3b88c9[_0x3b88c9['length']-(-0x1*-0x25ab+0x12*-0x18b+0xd3*-0xc)],_0x25a9e8),_0x542df0=_0x25a9e8['get'](oDataQueryParams['select']),_0x537c04=_0x25a9e8['get'](oDataQueryParams['skip']),_0x244626=_0x25a9e8['get'](oDataQueryParams['top']),_0x5b3b57=_0x537c04?Number(_0x537c04):void(0x94d+-0xbf3*0x2+0xe99),_0x47ce8a=_0x244626?Number(_0x244626):void(0x22*-0x13+-0x1*-0x245f+-0x21d9),_0x157042=getODataConfig(_0x2c7cf2,_0x3644c0,_0x650238,_0x5b3b57,_0x47ce8a,_0x542df0);return _0x157042;}__name(getODataConfigFromRequest,'getODataConfigFromRequest');function getODataFilterParams(_0x58bb93){if(!_0x58bb93['filters']||_0x58bb93['filters']['length']===0x1*0x793+-0x1827*-0x1+-0x1fba)return [];const _0x56e658={'name':oDataQueryParams['filter'],'value':buildFilterString(_0x58bb93['filters'])};return [_0x56e658];}__name(getODataFilterParams,'getODataFilterParams');function getBaseAndRelatedFilters(_0xeb3c2f){const _0x203c06=_0xeb3c2f['filters'],{defaultFilters:_0x48d5aa,relatedFilters:_0x2c85b5}=groupQueryFilters(_0x203c06);return {'defaultFilters':_0x48d5aa,'relatedFilters':_0x2c85b5};}__name(getBaseAndRelatedFilters,'getBaseAndRelatedFilters');function buildFilterString(_0x2c59d6){return _0x2c59d6['map'](_0x1720f6=>{const _0x870247=_0x1720f6['leftSide'],_0x19cffa=_0x1720f6['rightSide'];return _0x1720f6['type']===oDataFilterTypes['guid']?_0x870247+'\x20eq\x20guid\x27'+_0x19cffa+'\x27':_0x870247+'\x20eq\x20\x27'+_0x19cffa+'\x27';})['join']('\x20'+oDataQueryParams['and']+'\x20');}__name(buildFilterString,'buildFilterString');function groupQueryFilters(_0x2a34e5){const _0x355665=[],_0xa8f83e=[];for(const _0xdbb5ba of _0x2a34e5){relatedFilterRegex['test'](_0xdbb5ba['leftSide'])?_0xa8f83e['push'](_0xdbb5ba):_0x355665['push'](_0xdbb5ba);}return {'defaultFilters':_0x355665,'relatedFilters':_0xa8f83e};}__name(groupQueryFilters,'groupQueryFilters');async function checkForDefaultSorting(_0x10a8d5,_0x2b50fb){const _0x1fa911=await getResourceMeta(_0x10a8d5),_0x336af9=_0x2b50fb['get'](oDataQueryParams['select']);let _0x31ca5a;return _0x1fa911?.['orderBys']&&_0x1fa911['orderBys']['forEach'](_0x58c015=>{if(_0x58c015['propertyName']===_0x336af9)_0x31ca5a=_0x58c015['propertyName'];}),_0x31ca5a;}__name(checkForDefaultSorting,'checkForDefaultSorting');function hasAnyParams(..._0x6ffd09){return _0x6ffd09['some'](_0x12edac=>_0x12edac!==void(0x11*0x20e+-0x4a1+-0x1e4d));}__name(hasAnyParams,'hasAnyParams');function getNotExpandblePropertyChidren(_0x5b111a){const _0x71d31d={};return Object['keys'](_0x5b111a['properties'])['forEach'](_0x409e87=>{const _0x412eef=_0x5b111a['properties'][_0x409e87];!isPropertyExpandable(_0x412eef)&&!_0x412eef['isDynamic']&&(_0x71d31d[_0x409e87]={});}),_0x71d31d;}__name(getNotExpandblePropertyChidren,'getNotExpandblePropertyChidren');async function processProperty(_0x1fe3e6,_0x1c468f,_0x45d9d6,_0x3fddd2,_0x284e67){const _0x14361b=_0x1c468f['properties'][_0x1fe3e6];if(_0x14361b){if(isPropertyExpandable(_0x14361b)){const _0xeb9949=await filterODataSelectOrExpandTree(_0x14361b['relation']['relatedResourceName'],_0x45d9d6,_0x284e67);_0xeb9949&&(_0x3fddd2['children'][_0x1fe3e6]=_0xeb9949);}else _0x3fddd2['children'][_0x1fe3e6]={};}else logWarning(warningMessages['odataSelectNoProperty']['replace']('{0}',_0x1c468f['resourceName'])['replace']('{1}',_0x1fe3e6));}__name(processProperty,'processProperty');function processElement(_0x204ec8,_0x232868,_0x4fdcd1){let _0x4dd1ab;const _0x38f3c5=processGroupElements([_0x204ec8],_0x232868,_0x4fdcd1);return _0x4dd1ab=_0x38f3c5,_0x4dd1ab;}__name(processElement,'processElement');function processGroupElements(_0x293aa9,_0x4d4cef,_0x27febe){const _0x9de968=_0x4d4cef['children']??{},_0x2b2cb0={};for(const [_0x222b2a,_0x55a107]of Object['entries'](_0x9de968)){const _0x39e2f3=_0x27febe['properties'][_0x222b2a],_0x31ab44=getGroupedPropertyValuesByName(_0x293aa9,_0x222b2a);if(Object['keys'](_0x55a107)['length']>0xab*0x1+-0x1263*-0x1+-0x130e){const _0x596177=getUniqueObjectPropertyValues(_0x31ab44);switch(_0x39e2f3['type']){case propertyTypes['array']:{_0x2b2cb0[_0x222b2a]=processArray(_0x596177,_0x55a107,_0x55a107['resourceMeta']);break;}case propertyTypes['object']:{_0x2b2cb0[_0x222b2a]=processObject(_0x596177,_0x55a107,_0x55a107['resourceMeta']);break;}default:{throw createError(metaErrorMessages['typeMismatch']);}}}else _0x2b2cb0[_0x222b2a]=getSingleOrEmpty(getUniqueSimplePropertyValues(_0x31ab44));}return _0x2b2cb0;}__name(processGroupElements,'processGroupElements');function processArray(_0x102fa4,_0x31b441,_0x1d3a42){return _0x102fa4['map'](_0x2cb12c=>{const _0x3505f8=processElement(_0x2cb12c,_0x31b441,_0x1d3a42);return _0x3505f8;});}__name(processArray,'processArray');function processObject(_0x103c76,_0x1e9cfe,_0x549a69){let _0x570067;const _0x4beecb=getSingleOrEmpty(_0x103c76);return _0x4beecb&&(_0x570067=processElement(_0x4beecb,_0x1e9cfe,_0x549a69)),_0x570067;}__name(processObject,'processObject');function getGroupedPropertyValuesByName(_0x130b06,_0x22a106){const _0x2e4de9=[];for(const _0x4c2892 of _0x130b06){!isNullOrUndefined(_0x4c2892[_0x22a106])&&_0x2e4de9['push'](_0x4c2892[_0x22a106]);}return _0x2e4de9;}__name(getGroupedPropertyValuesByName,'getGroupedPropertyValuesByName');function getUniqueObjectPropertyValues(_0x1777af){const _0xc945b6={};for(const _0x23ff53 of _0x1777af){if(isWithId(_0x23ff53))_0xc945b6[_0x23ff53['id']]=_0x23ff53;else throw createError(metaErrorMessages['valueIsNotObjectWithId']);}return Object['values'](_0xc945b6);}__name(getUniqueObjectPropertyValues,'getUniqueObjectPropertyValues');function getUniqueSimplePropertyValues(_0x2e4f70){const _0xb81543=[];for(const _0x4c2b42 of _0x2e4f70){const _0x28bd1e=_0xb81543['some'](_0x361aab=>{if(_0x4c2b42 instanceof Date&&_0x361aab instanceof Date)return _0x361aab['getTime']()===_0x4c2b42['getTime']();return _0x361aab===_0x4c2b42;});!_0x28bd1e&&_0xb81543['push'](_0x4c2b42);}return _0xb81543;}__name(getUniqueSimplePropertyValues,'getUniqueSimplePropertyValues');
 export { filterODataSelectOrExpandTree, getBaseAndRelatedFilters, getEmptyODataConfig, getODataConfig, getODataConfigFromRequest, getODataFilterParams, groupODataResults };

package/packages/level2/meta/server/auth/auth-guard.d.ts CHANGED Viewed

@@ -1,2 +1,2 @@
-export declare function apiAuthorize(): Promise<import("../../../../../lib/undocumented").SessionValidationResult2>;
-export declare function pageAuthorize(): Promise<boolean>;
+export declare function apiAuthorize(): Promise<import("./session").SessionValidationResult>;
+export declare function requirePageAuth(): Promise<void>;

package/packages/level2/meta/server/auth/auth-guard.js CHANGED Viewed

@@ -1,9 +1,13 @@
 'use strict';
+import { tryGetFromCoreCache, setCoreCache } from '../../../../fd-toolbox/server/cachings/core-cache.js';
+import { fdServerCacheKeys } from '../../../../fd-toolbox/server/constants/fd-server-cache-keys.js';
+import { routes } from '../../../../fd-toolbox/routing/routes.js';
+import { fdRedirect } from '../../../../fd-toolbox/server/framework/index.js';
 import { apiUnauthorizedError } from '../../../../fd-toolbox/server/web/errors.js';
 import { getSessionToken } from './session-access.js';
 import { validateSessionToken } from './session.js';
 import { isEmptyNullOrUndefined } from '../../../../fd-toolbox/functions/value-checking-functions.js';
-var __defProp=Object['defineProperty'],__name=(_0x595009,_0x1eebee)=>__defProp(_0x595009,'name',{'value':_0x1eebee,'configurable':!![]});async function apiAuthorize(){const _0x2535b9=await getSessionToken();if(isEmptyNullOrUndefined(_0x2535b9))throw apiUnauthorizedError();const _0x36c902=await validateSessionToken(_0x2535b9);if(isEmptyNullOrUndefined(_0x36c902['userId']))throw apiUnauthorizedError();return _0x36c902;}__name(apiAuthorize,'apiAuthorize');async function pageAuthorize(){const _0x5e5bff=await getSessionToken();if(!_0x5e5bff)return ![];const _0x25f0d5=await validateSessionToken(_0x5e5bff);return !!_0x25f0d5['userId'];}__name(pageAuthorize,'pageAuthorize');
+var __defProp=Object['defineProperty'],__name=(_0x3fd747,_0x5ab298)=>__defProp(_0x3fd747,'name',{'value':_0x5ab298,'configurable':!![]});async function apiAuthorize(){const _0xff8ba9=await getSessionToken();if(isEmptyNullOrUndefined(_0xff8ba9))throw apiUnauthorizedError();const _0x41825e=await validateSessionToken(_0xff8ba9);if(isEmptyNullOrUndefined(_0x41825e['userId']))throw apiUnauthorizedError();return _0x41825e;}__name(apiAuthorize,'apiAuthorize');async function requirePageAuth(){const _0x1a4e8a=await pageAuthorize();!_0x1a4e8a&&fdRedirect('/'+routes['login']);}__name(requirePageAuth,'requirePageAuth');async function pageAuthorize(){const _0xdf8eab=await getSessionToken();if(!_0xdf8eab)return ![];const _0x4a5ffe=await tryGetFromCoreCache(fdServerCacheKeys['pageAuth'],_0xdf8eab);if(_0x4a5ffe)return _0x4a5ffe;const _0x10bea9=await validateSessionToken(_0xdf8eab),_0x4ee21e=!!_0x10bea9['userId'];return await setCoreCache(fdServerCacheKeys['pageAuth'],_0x4ee21e,{'slidingExpirationSeconds':fdServerCacheKeys['secondsInFifteenMinutes']},_0xdf8eab),_0x4ee21e;}__name(pageAuthorize,'pageAuthorize');
-export { apiAuthorize, pageAuthorize };
+export { apiAuthorize, requirePageAuth };

package/packages/level2/meta/server/auth/fd-sessions.d.ts CHANGED Viewed

@@ -5,5 +5,5 @@ interface DatabaseSessionAttributes {
 }
 export declare function createSession(userId: string, { homeWorkspaceId, currentWorkspaceId }: DatabaseSessionAttributes): Promise<Session>;
 export declare function invalidateSession(token: string): Promise<void>;
-export declare function createSessionCookie(sessionId: string): import("../../../../../lib/undocumented").Cookie;
+export declare function createSessionCookie(sessionId: string): import("../../../../fd-toolbox/server/auth/cookies").Cookie;
 export {};