npm - @fernir2/saas-kit - Versions diffs - 0.0.199 → 0.0.200 - Mend

@fernir2/saas-kit 0.0.199 → 0.0.200

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.

Potentially problematic release.

This version of @fernir2/saas-kit might be problematic. Click here for more details.

Files changed (1436) hide show

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

@@ -9,6 +9,6 @@ import { oDataComparisonTypes, oDataFilterTypes } from '../../../fd-toolbox/odat
 import { isUuidSet } from '../../../fd-toolbox/functions/value-checking-functions.js';
 import { viewNames } from '../edit-resource/edit-resource-names.js';
-var __defProp=Object['defineProperty'],__name=(_0x13b6ca,_0x4da5cd)=>__defProp(_0x13b6ca,'name',{'value':_0x4da5cd,'configurable':!![]});function navigateToResourceList(_0x5bdfd9,_0x5b67a4,_0x41d905){let _0x486304=_0x5b67a4['properties'][_0x5bdfd9['name']];if(_0x486304&&_0x5bdfd9['relation']){let _0x5ecf74={};if(_0x41d905)_0x5ecf74['filters']=[{'leftSide':_0x5bdfd9['relation']['relatedPropertyName'],'rightSide':[_0x41d905],'type':oDataFilterTypes['guid'],'operator':oDataOperators['in'],'comparisonType':oDataComparisonTypes['equal']}];metaNavigateToResourceList(_0x5bdfd9['relation']['relatedResourceName'],_0x5ecf74);}}__name(navigateToResourceList,'navigateToResourceList');function navigateToResource(_0x42f021){navigateToResourceEdit(_0x42f021);}__name(navigateToResource,'navigateToResource');function navigateToList(_0x4faf0f,_0x2c60a1,_0x3621cd){navigateToResourceList(_0x4faf0f,_0x2c60a1,_0x3621cd);}__name(navigateToList,'navigateToList');function resourceListOnFilterChange(_0x14cc28,_0x1790b8){let _0x4454a1=getODataParams({'filters':_0x14cc28});_0x4454a1['unshift']({'name':metaQueryParams['resource'],'value':_0x1790b8}),silentChangeUrl(routes['list'],_0x4454a1);}__name(resourceListOnFilterChange,'resourceListOnFilterChange');function isResourceListView(_0x4cf85d,_0x358e62){const _0xf83da4=isUuidSet(_0x358e62);return !_0xf83da4&&_0x4cf85d!==viewNames['editResource'];}__name(isResourceListView,'isResourceListView');
+var __defProp=Object['defineProperty'],__name=(_0x4d9bd8,_0x4134ef)=>__defProp(_0x4d9bd8,'name',{'value':_0x4134ef,'configurable':!![]});function navigateToResourceList(_0x324b88,_0x38de92,_0x3a9bbd){let _0x25a0ab=_0x38de92['properties'][_0x324b88['name']];if(_0x25a0ab&&_0x324b88['relation']){let _0x45df1c={};if(_0x3a9bbd)_0x45df1c['filters']=[{'leftSide':_0x324b88['relation']['relatedPropertyName'],'rightSide':[_0x3a9bbd],'type':oDataFilterTypes['guid'],'operator':oDataOperators['in'],'comparisonType':oDataComparisonTypes['equal']}];metaNavigateToResourceList(_0x324b88['relation']['relatedResourceName'],_0x45df1c);}}__name(navigateToResourceList,'navigateToResourceList');function navigateToResource(_0x16d356){navigateToResourceEdit(_0x16d356);}__name(navigateToResource,'navigateToResource');function navigateToList(_0x1162c1,_0x51da53,_0x27bb42){navigateToResourceList(_0x1162c1,_0x51da53,_0x27bb42);}__name(navigateToList,'navigateToList');function resourceListOnFilterChange(_0x524833,_0x33011d){let _0x5747c7=getODataParams({'filters':_0x524833});_0x5747c7['unshift']({'name':metaQueryParams['resource'],'value':_0x33011d}),silentChangeUrl(routes['list'],_0x5747c7);}__name(resourceListOnFilterChange,'resourceListOnFilterChange');function isResourceListView(_0xf060d0,_0x5d7f80){const _0x2eda73=isUuidSet(_0x5d7f80);return !_0x2eda73&&_0xf060d0!==viewNames['editResource'];}__name(isResourceListView,'isResourceListView');
 export { isResourceListView, navigateToList, navigateToResource, navigateToResourceList, resourceListOnFilterChange };

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

@@ -3,6 +3,6 @@ import { c } from 'react/compiler-runtime';
 import { useGlobalConfig } from '../providers/global-provider/GlobalContext.js';
 import { getMultilistResourceListConfig } from './resource-list-configs.js';
-var __defProp=Object['defineProperty'],__name=(_0x978a7c,_0x2da61a)=>__defProp(_0x978a7c,'name',{'value':_0x2da61a,'configurable':!![]});function useResourceListConfig(_0x4891d6,_0x4e3d97){const _0x4e1dfa=c(-0x2*-0x8e1+0x1*-0x7a+0xc9*-0x16),{globalConfig:_0x61c2f4}=useGlobalConfig();if(_0x4e3d97)return _0x4e3d97;let _0x2805d3;_0x4e1dfa[0x1ed2+-0x26be+0x7ec]!==_0x4891d6?(_0x2805d3=getMultilistResourceListConfig(_0x4891d6),_0x4e1dfa[-0x4b2*0x2+0x1c5f+-0x71*0x2b]=_0x4891d6,_0x4e1dfa[-0x3*0x72b+-0xb5*0x2b+0x33e9]=_0x2805d3):_0x2805d3=_0x4e1dfa[-0x2*-0x2b1+-0x10b9+0xb58];const _0x591d74=_0x2805d3;if(!_0x4891d6)return _0x591d74;const _0x778aa6=_0x61c2f4['resourceListConfigs']?.[_0x4891d6];return _0x778aa6??_0x591d74;}__name(useResourceListConfig,'useResourceListConfig');
+var __defProp=Object['defineProperty'],__name=(_0x1a1408,_0x186899)=>__defProp(_0x1a1408,'name',{'value':_0x186899,'configurable':!![]});function useResourceListConfig(_0x5cbd71,_0x2f03a9){const _0x2ce811=c(-0x67*-0x3+0x241b+0x1*-0x254e),{globalConfig:_0xaad383}=useGlobalConfig();if(_0x2f03a9)return _0x2f03a9;let _0x4666da;_0x2ce811[0x1b40+0x593*-0x5+-0x3*-0x35]!==_0x5cbd71?(_0x4666da=getMultilistResourceListConfig(_0x5cbd71),_0x2ce811[-0x5*0x4b5+0x1a72*0x1+-0x2e9]=_0x5cbd71,_0x2ce811[-0x2*-0x718+-0xcd5+0x15a*-0x1]=_0x4666da):_0x4666da=_0x2ce811[-0x4*-0x29c+-0x2171*-0x1+-0x2be0];const _0x27c690=_0x4666da;if(!_0x5cbd71)return _0x27c690;const _0x146906=_0xaad383['resourceListConfigs']?.[_0x5cbd71];return _0x146906??_0x27c690;}__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=(_0x4c61ab,_0x5c4ff7)=>__defProp(_0x4c61ab,'name',{'value':_0x5c4ff7,'configurable':!![]});async function fetchResources(_0x513d8d,_0x16c931){const _0x1559fb=await fetchResourceMeta(_0x513d8d),_0x5cd34a=await getResourceODataConfig(_0x1559fb,_0x16c931);return (await apiGetWithOData(_0x513d8d,_0x5cd34a))['data'];}__name(fetchResources,'fetchResources');async function fetchResource(_0x11bf19,_0x2bb786,_0x33d7fa){let _0x59f873,_0x34b801;if(_0x33d7fa){const _0x33748f=await getResourceODataConfig(_0x11bf19,_0x33d7fa);_0x34b801=await apiGetWithOData(_0x11bf19['resourceName'],_0x33748f,_0x2bb786);}else _0x34b801=await apiGet(_0x11bf19['resourceName'],_0x2bb786);if(_0x34b801['data'])_0x59f873=_0x34b801['data'];return _0x59f873;}__name(fetchResource,'fetchResource');async function getResourceODataConfig(_0x2d296d,_0x4bd1e3){const _0x5ee7dc=_0x4bd1e3??{};if(!_0x5ee7dc['expands']){const _0x4aff32=await getRelatedResourcesMetasIfExpandForDescription(_0x2d296d);_0x5ee7dc['selects']=Array['from'](new Set(getODataSelectIfExpandForDescription(_0x2d296d,_0x4aff32)['concat'](_0x5ee7dc['selects']??[]))),_0x5ee7dc['expands']=getODataExpandIfExpandForDescription(_0x2d296d);}return isNullOrUndefined(_0x5ee7dc['top'])&&addPaging(_0x5ee7dc,oDataDefaultTop),_0x5ee7dc;}__name(getResourceODataConfig,'getResourceODataConfig');async function fetchResourceByName(_0x73c066,_0x2224b0,_0x1e636e){let _0x21af98,_0x43cbda;_0x1e636e?_0x43cbda=await apiGetWithOData(_0x73c066,_0x1e636e,_0x2224b0):_0x43cbda=await apiGet(_0x73c066,_0x2224b0);if(_0x43cbda['data'])_0x21af98=_0x43cbda['data'];return _0x21af98;}__name(fetchResourceByName,'fetchResourceByName');
+var __defProp=Object['defineProperty'],__name=(_0x3b567f,_0x567366)=>__defProp(_0x3b567f,'name',{'value':_0x567366,'configurable':!![]});async function fetchResources(_0x3dca13,_0xeb74e8){const _0x4fd9a4=await fetchResourceMeta(_0x3dca13),_0x5bc39d=await getResourceODataConfig(_0x4fd9a4,_0xeb74e8);return (await apiGetWithOData(_0x3dca13,_0x5bc39d))['data'];}__name(fetchResources,'fetchResources');async function fetchResource(_0xe6f8c3,_0x128b4c,_0x1ddca6){let _0x53f172,_0x38cee8;if(_0x1ddca6){const _0x293dad=await getResourceODataConfig(_0xe6f8c3,_0x1ddca6);_0x38cee8=await apiGetWithOData(_0xe6f8c3['resourceName'],_0x293dad,_0x128b4c);}else _0x38cee8=await apiGet(_0xe6f8c3['resourceName'],_0x128b4c);if(_0x38cee8['data'])_0x53f172=_0x38cee8['data'];return _0x53f172;}__name(fetchResource,'fetchResource');async function getResourceODataConfig(_0x4c481b,_0x45e6a9){const _0x38122e=_0x45e6a9??{};if(!_0x38122e['expands']){const _0x4ff7ae=await getRelatedResourcesMetasIfExpandForDescription(_0x4c481b);_0x38122e['selects']=Array['from'](new Set(getODataSelectIfExpandForDescription(_0x4c481b,_0x4ff7ae)['concat'](_0x38122e['selects']??[]))),_0x38122e['expands']=getODataExpandIfExpandForDescription(_0x4c481b);}return isNullOrUndefined(_0x38122e['top'])&&addPaging(_0x38122e,oDataDefaultTop),_0x38122e;}__name(getResourceODataConfig,'getResourceODataConfig');async function fetchResourceByName(_0x274f11,_0x55549b,_0x56741d){let _0x470c68,_0x48be18;_0x56741d?_0x48be18=await apiGetWithOData(_0x274f11,_0x56741d,_0x55549b):_0x48be18=await apiGet(_0x274f11,_0x55549b);if(_0x48be18['data'])_0x470c68=_0x48be18['data'];return _0x470c68;}__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=(_0x494a67,_0x59d9d5)=>__defProp(_0x494a67,'name',{'value':_0x59d9d5,'configurable':!![]}),__decorateClass=(_0x48e6cc,_0x4b8cf2,_0x23d817,_0x56f767)=>{var _0x3989c1=_0x56f767>-0x6*0x523+-0x1a8f+0x3962?void(-0x102a+-0x220d+0xf*0x359):_0x56f767?__getOwnPropDesc(_0x4b8cf2,_0x23d817):_0x4b8cf2;for(var _0xc141c4=_0x48e6cc['length']-(-0x1*-0x183a+-0x269*0x1+-0x15d0),_0xbbeb02;_0xc141c4>=0x22ae+0x1*0x1d2f+-0x3fdd;_0xc141c4--)if(_0xbbeb02=_0x48e6cc[_0xc141c4])_0x3989c1=(_0x56f767?_0xbbeb02(_0x4b8cf2,_0x23d817,_0x3989c1):_0xbbeb02(_0x3989c1))||_0x3989c1;if(_0x56f767&&_0x3989c1)__defProp(_0x4b8cf2,_0x23d817,_0x3989c1);return _0x3989c1;};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=(_0x1633fc,_0xcc15f5)=>__defProp(_0x1633fc,'name',{'value':_0xcc15f5,'configurable':!![]}),__decorateClass=(_0x58bcfc,_0x1d2774,_0x3d5927,_0x4a8335)=>{var _0x11a223=_0x4a8335>-0x1*0x22db+-0x127*-0x4+-0xb*-0x2c0?void(-0x24f8+-0x24f+0x1*0x2747):_0x4a8335?__getOwnPropDesc(_0x1d2774,_0x3d5927):_0x1d2774;for(var _0x45a97b=_0x58bcfc['length']-(0x1*-0x1175+-0x807+-0x9*-0x2d5),_0x129e35;_0x45a97b>=-0x1*0x1ff3+-0xa2d+0xa88*0x4;_0x45a97b--)if(_0x129e35=_0x58bcfc[_0x45a97b])_0x11a223=(_0x4a8335?_0x129e35(_0x1d2774,_0x3d5927,_0x11a223):_0x129e35(_0x11a223))||_0x11a223;if(_0x4a8335&&_0x11a223)__defProp(_0x1d2774,_0x3d5927,_0x11a223);return _0x11a223;};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.js CHANGED Viewed

@@ -6,7 +6,7 @@ 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=(_0x568152,_0x46df08)=>__defProp(_0x568152,'name',{'value':_0x46df08,'configurable':!![]});async function select(_0x250cf4,_0x3baa45,_0x154bea){let _0x4ba0c7={};const _0x385072=_0x3baa45['children']??{};!Object['keys'](_0x385072)['includes'](withIdProps['id'])&&(_0x4ba0c7[withIdProps['id']]=_0x250cf4['id']);for(const [_0x3e3b59,_0x463d91]of Object['entries'](_0x385072)){const _0x9ddaad=await buildSelectedProperty(_0x250cf4,_0x154bea,_0x3e3b59,_0x463d91);_0x4ba0c7[_0x3e3b59]=_0x9ddaad;}let {query:_0x4edade}=await getQuery(_0x250cf4,_0x4ba0c7);return await joinRelatedTables(_0x4edade,_0x250cf4,_0x3baa45,_0x154bea),{'query':_0x4edade};}__name(select,'select');async function expand(_0x2cd33b,_0xd5dc9a,_0x27be09){let _0x1a977b={...getColumnsFromTable(_0x2cd33b)};const _0x5e4fb8=_0xd5dc9a['children']??{};for(const [_0x3c5165,_0x54edfa]of Object['entries'](_0x5e4fb8)){const _0x1b791b=await buildExpandedProperty(_0x3c5165,_0x27be09,_0x54edfa);_0x1a977b[_0x3c5165]=_0x1b791b;}let {query:_0x32bd0a}=await getQuery(_0x2cd33b,_0x1a977b);return await joinRelatedTables(_0x32bd0a,_0x2cd33b,_0xd5dc9a,_0x27be09),{'query':_0x32bd0a};}__name(expand,'expand');async function offset(_0x22cb03,_0x491d91,_0x3323c5,_0x5ca744,_0x3af418){return applyPagination(_0x22cb03,_0x491d91,_0x3323c5,_0x5ca744,_0x3af418,paginationTypes['offset']);}__name(offset,'offset');async function limit(_0x178176,_0x3fb659,_0x71f7ba,_0xbf4031,_0x22fa99){return applyPagination(_0x178176,_0x3fb659,_0x71f7ba,_0xbf4031,_0x22fa99,paginationTypes['limit']);}__name(limit,'limit');function sort(_0x2321c7,_0x373b78){const _0x5ecae5=dbOrderBy(_0x2321c7,..._0x373b78['map'](_0x49b0f6=>_0x49b0f6['ascending']?asc(_0x49b0f6['column']):desc(_0x49b0f6['column'])));return {'query':_0x5ecae5};}__name(sort,'sort');async function getSortColumns(_0x18e17a,_0x49a85a,_0x662a00,_0x17780d){const _0x2976ec=getQueryConfig(_0x18e17a)['joins']?.['map'](_0x26efd6=>_0x26efd6['table']),_0x1a84fa=[],_0xfd14a7=_0x17780d??[];for(const _0x16dfa2 of _0xfd14a7['toSorted']((_0x3b294a,_0x25c470)=>_0x3b294a['priority']-_0x25c470['priority'])){let _0x2f1737=_0x16dfa2['propertyName'],_0x32f875=_0x49a85a,_0xe95df3=![];const _0x2d20d9=_0x662a00['properties'][_0x2f1737];if(_0x2d20d9?.['relation']&&_0x2d20d9['relation']['relatedPropertyName']===withIdProps['id']){const _0x367c7c=await getRelatedResourceName(_0x662a00['resourceName'],_0x2f1737,_0x662a00),_0x4e1d81=await getTableByResourceName(_0x367c7c);if(_0x2976ec?.['find'](_0x2c0cdb=>compareTableByName(_0x2c0cdb,_0x4e1d81))){_0x32f875=aliasedTable(_0x4e1d81,convertFromPascalToCamelCase(_0x367c7c));const _0x153372=await getInternalResourceMeta(_0x367c7c);_0x2f1737=_0x153372['description']['resourceDescriptionProperty']??'',_0xe95df3=!![];}}if(!(_0x2f1737 in _0x32f875))throw createError(metaErrorMessages['resourceCannotBeOrderedByNavigationProperty']['replace']('{0}',_0x662a00['resourceName'])['replace']('{1}',_0x2f1737));_0x1a84fa['push']({'joined':_0xe95df3,'ascending':_0x16dfa2['direction']===oDataOrderByDirectionConsts['asc'],'column':getTableColumn(_0x32f875,_0x2f1737),'basePropertyName':_0x16dfa2['propertyName']});}return _0x1a84fa;}__name(getSortColumns,'getSortColumns');async function buildSelectedProperty(_0x1f8d32,_0x2f3833,_0x5d1d9a,_0x379c28={}){const _0x45bc91=_0x2f3833['properties'][_0x5d1d9a];if(!isPropertyExpandable(_0x45bc91))return getColumnsFromTable(_0x1f8d32)[_0x5d1d9a];const _0x4e0042=await getRelatedResourceName(_0x2f3833['resourceName'],_0x5d1d9a,_0x2f3833),_0x8f41c7=await getAliasedTableByResourceName(_0x4e0042,_0x5d1d9a),_0x2b3104={[withIdProps['id']]:getColumnsFromTable(_0x8f41c7)[withIdProps['id']]};if(_0x379c28['children']&&Object['keys'](_0x379c28['children'])['length']&&_0x379c28['resourceMeta'])for(const [_0x5a4d05,_0x52223a]of Object['entries'](_0x379c28['children'])){const _0x506126=await buildSelectedProperty(_0x8f41c7,_0x379c28['resourceMeta'],_0x5a4d05,_0x52223a);_0x2b3104[_0x5a4d05]=_0x506126;}else return getColumnsFromTable(_0x8f41c7);return _0x2b3104;}__name(buildSelectedProperty,'buildSelectedProperty');async function getRelatedResourceName(_0x1949b6,_0x29d773,_0x1697ed){const _0x3aec17=_0x1697ed;if(_0x3aec17){const _0x3939ce=_0x3aec17['properties'][_0x29d773];if(_0x3939ce?.['relation']?.['relatedResourceName'])return _0x3939ce['relation']['relatedResourceName'];}const _0x2fc032=await getInternalResourceMeta(_0x1949b6),_0x5dc46c=_0x2fc032['properties'][_0x29d773];if(_0x5dc46c?.['declaredWithType'])return _0x5dc46c['declaredWithType'];throw createError('Could\x20not\x20determine\x20related\x20resource\x20for\x20property\x20\x27'+_0x29d773+'\x27\x20on\x20resource\x20\x27'+_0x1949b6+'\x27.\x20It\x20was\x20not\x20found\x20in\x20ResourceMeta\x20relations\x20nor\x20in\x20InternalResourceMeta\x20declaredWithType.');}__name(getRelatedResourceName,'getRelatedResourceName');async function buildExpandedProperty(_0x4eab37,_0x42e276,_0x779493={}){const _0x190d49=await getRelatedResourceName(_0x42e276['resourceName'],_0x4eab37,_0x42e276),_0x578894=await getAliasedTableByResourceName(_0x190d49,_0x4eab37),_0x39c334=getColumnsFromTable(_0x578894);if(_0x779493['children']&&_0x779493['resourceMeta'])for(const [_0x410191,_0x279cd6]of Object['entries'](_0x779493['children'])){const _0x4563d7=await buildExpandedProperty(_0x410191,_0x779493['resourceMeta'],_0x279cd6);_0x39c334[_0x410191]=_0x4563d7;}return _0x39c334;}__name(buildExpandedProperty,'buildExpandedProperty');async function applyPagination(_0x588e0e,_0x45dc8c,_0x22313b,_0x21b2f0,_0x525646,_0x34acfe){let _0x43bafa=createDynamicSelect(_0x45dc8c,{'id':_0x45dc8c['id']});if(_0x21b2f0['length']>0x1*-0x1fcd+-0x1ea7+0x3e74){for(const _0x18fc45 of _0x21b2f0){let _0x474755=_0x18fc45['basePropertyName'];if(_0x474755['endsWith'](metas['idSuffix'])&&_0x474755!==withIdProps['id']){_0x474755=cutOffSuffix(_0x474755,metas['idSuffix']);const _0x3f0875=_0x525646['properties'][_0x474755];isPropertyExpandable(_0x3f0875)&&await joinOneSideRelation(_0x43bafa,_0x45dc8c,_0x525646,_0x474755);}}sort(_0x43bafa,_0x21b2f0);}const _0x3a0c4c=getQueryConfig(_0x588e0e)['where'];_0x3a0c4c&&dbWhere(_0x43bafa,_0x3a0c4c);_0x34acfe===paginationTypes['offset']?dbOffset(_0x43bafa,_0x22313b):dbLimit(_0x43bafa,_0x22313b);const _0x4bc77c=inArray(_0x45dc8c['id'],_0x43bafa),_0x5c871f=dbWhere(_0x588e0e,_0x4bc77c);return {'query':_0x5c871f};}__name(applyPagination,'applyPagination');async function joinRelatedTables(_0x1c630d,_0x1b4d9f,_0x17e10b,_0x5f0070){await Promise['all'](Object['entries'](_0x17e10b['children']??{})['map'](([_0x5e75e6,_0x39637f])=>joinRelatedTable(_0x1c630d,_0x1b4d9f,_0x5f0070,_0x5e75e6,_0x39637f)));}__name(joinRelatedTables,'joinRelatedTables');async function joinRelatedTable(_0x4546e9,_0x15bfdf,_0x46fb2e,_0x429b81,_0x2d7d9a){const _0x38359d=_0x46fb2e['properties'][_0x429b81];if(!isPropertyExpandable(_0x38359d))return;let _0x4cba80;if(_0x38359d['type']===propertyTypes['array']){const _0xe81be3=await getRelatedResourceName(_0x46fb2e['resourceName'],_0x429b81,_0x46fb2e);_0x4cba80=await joinManySideRelation(_0x4546e9,_0x15bfdf,_0x429b81,_0xe81be3,_0x38359d['relation']['relatedPropertyName']);}else _0x4cba80=await joinOneSideRelation(_0x4546e9,_0x15bfdf,_0x46fb2e,_0x429b81);await joinChildRelatedTables(_0x4546e9,_0x4cba80,_0x2d7d9a);}__name(joinRelatedTable,'joinRelatedTable');async function joinChildRelatedTables(_0x12ed0e,_0x40f279,_0x1ec799){if(!_0x1ec799['resourceMeta']||!_0x1ec799['children'])return;for(const [_0x38a8d6,_0x30147]of Object['entries'](_0x1ec799['children'])){await joinRelatedTable(_0x12ed0e,_0x40f279,_0x1ec799['resourceMeta'],_0x38a8d6,_0x30147);}}__name(joinChildRelatedTables,'joinChildRelatedTables');async function joinManySideRelation(_0x50ca2b,_0xb58f5f,_0x132342,_0x1fcb9e,_0x56e41e){const _0x3b048d=await getAliasedTableByResourceName(_0x1fcb9e,_0x132342),_0x458cc8=_0x56e41e['endsWith'](metas['idSuffix'])?_0x56e41e:_0x56e41e+metas['idSuffix'],_0x289d0f=eq(_0xb58f5f['id'],getTableColumn(_0x3b048d,_0x458cc8));return dbLeftJoin(_0x50ca2b,_0x3b048d,_0x289d0f),_0x3b048d;}__name(joinManySideRelation,'joinManySideRelation');async function joinOneSideRelation(_0x2712ef,_0x38b396,_0x91b332,_0x44e8e7){const _0x439ad5=await getRelatedResourceName(_0x91b332['resourceName'],_0x44e8e7,_0x91b332),_0x1850fb=await getAliasedTableByResourceName(_0x439ad5,_0x44e8e7),_0x4ea5df=_0x44e8e7['endsWith'](metas['idSuffix'])?_0x44e8e7:''+_0x44e8e7+metas['idSuffix'],_0xb4c608=eq(_0x1850fb['id'],getTableColumn(_0x38b396,_0x4ea5df));return dbLeftJoin(_0x2712ef,_0x1850fb,_0xb4c608),_0x1850fb;}__name(joinOneSideRelation,'joinOneSideRelation');
+var __defProp=Object['defineProperty'],__name=(_0x454f19,_0x4660cd)=>__defProp(_0x454f19,'name',{'value':_0x4660cd,'configurable':!![]});async function select(_0x23ee12,_0x4ea48a,_0x237755){let _0x360c53={};const _0x4c7290=_0x4ea48a['children']??{};!Object['keys'](_0x4c7290)['includes'](withIdProps['id'])&&(_0x360c53[withIdProps['id']]=_0x23ee12['id']);for(const [_0xd2af33,_0x16248f]of Object['entries'](_0x4c7290)){const _0x4409cd=await buildSelectedProperty(_0x23ee12,_0x237755,_0xd2af33,_0x16248f);_0x360c53[_0xd2af33]=_0x4409cd;}let {query:_0x5e9572}=await getQuery(_0x23ee12,_0x360c53);return await joinRelatedTables(_0x5e9572,_0x23ee12,_0x4ea48a,_0x237755),{'query':_0x5e9572};}__name(select,'select');async function expand(_0x35a229,_0x45eb77,_0xecb695){let _0xfbb62e={...getColumnsFromTable(_0x35a229)};const _0x4cac36=_0x45eb77['children']??{};for(const [_0x87b4bf,_0x5a1f19]of Object['entries'](_0x4cac36)){const _0x1d2dae=await buildExpandedProperty(_0x87b4bf,_0xecb695,_0x5a1f19);_0xfbb62e[_0x87b4bf]=_0x1d2dae;}let {query:_0x1cba98}=await getQuery(_0x35a229,_0xfbb62e);return await joinRelatedTables(_0x1cba98,_0x35a229,_0x45eb77,_0xecb695),{'query':_0x1cba98};}__name(expand,'expand');async function offset(_0x39632d,_0x2d94cd,_0x194932,_0x1c5c61,_0x4390a5){return applyPagination(_0x39632d,_0x2d94cd,_0x194932,_0x1c5c61,_0x4390a5,paginationTypes['offset']);}__name(offset,'offset');async function limit(_0x5f1013,_0x3570d1,_0x565d4c,_0x1348e4,_0x2005e3){return applyPagination(_0x5f1013,_0x3570d1,_0x565d4c,_0x1348e4,_0x2005e3,paginationTypes['limit']);}__name(limit,'limit');function sort(_0x5ca6c2,_0x3a1636){const _0x11e862=dbOrderBy(_0x5ca6c2,..._0x3a1636['map'](_0x3a24ba=>_0x3a24ba['ascending']?asc(_0x3a24ba['column']):desc(_0x3a24ba['column'])));return {'query':_0x11e862};}__name(sort,'sort');async function getSortColumns(_0x4893be,_0x16b369,_0x6bdced,_0x15e447){const _0x6a07f4=getQueryConfig(_0x4893be)['joins']?.['map'](_0x53afcc=>_0x53afcc['table']),_0x5ac10a=[],_0x4cb50b=_0x15e447??[];for(const _0x917e83 of _0x4cb50b['toSorted']((_0x47081d,_0xe21d5c)=>_0x47081d['priority']-_0xe21d5c['priority'])){let _0x339654=_0x917e83['propertyName'],_0x30c022=_0x16b369,_0x4fe48d=![];const _0x32c07b=_0x6bdced['properties'][_0x339654];if(_0x32c07b?.['relation']&&_0x32c07b['relation']['relatedPropertyName']===withIdProps['id']){const _0x4342af=await getRelatedResourceName(_0x6bdced['resourceName'],_0x339654,_0x6bdced),_0x4cb318=await getTableByResourceName(_0x4342af);if(_0x6a07f4?.['find'](_0x40eadd=>compareTableByName(_0x40eadd,_0x4cb318))){_0x30c022=aliasedTable(_0x4cb318,convertFromPascalToCamelCase(_0x4342af));const _0x31c2c1=await getInternalResourceMeta(_0x4342af);_0x339654=_0x31c2c1['description']['resourceDescriptionProperty']??'',_0x4fe48d=!![];}}if(!(_0x339654 in _0x30c022))throw createError(metaErrorMessages['resourceCannotBeOrderedByNavigationProperty']['replace']('{0}',_0x6bdced['resourceName'])['replace']('{1}',_0x339654));_0x5ac10a['push']({'joined':_0x4fe48d,'ascending':_0x917e83['direction']===oDataOrderByDirectionConsts['asc'],'column':getTableColumn(_0x30c022,_0x339654),'basePropertyName':_0x917e83['propertyName']});}return _0x5ac10a;}__name(getSortColumns,'getSortColumns');async function buildSelectedProperty(_0x18c9b4,_0x42bcfe,_0x48ce5a,_0x1eb118={}){const _0x165cc3=_0x42bcfe['properties'][_0x48ce5a];if(!isPropertyExpandable(_0x165cc3))return getColumnsFromTable(_0x18c9b4)[_0x48ce5a];const _0x59567b=await getRelatedResourceName(_0x42bcfe['resourceName'],_0x48ce5a,_0x42bcfe),_0x1258c0=await getAliasedTableByResourceName(_0x59567b,_0x48ce5a),_0x2436d6={[withIdProps['id']]:getColumnsFromTable(_0x1258c0)[withIdProps['id']]};if(_0x1eb118['children']&&Object['keys'](_0x1eb118['children'])['length']&&_0x1eb118['resourceMeta'])for(const [_0x593e4b,_0x33c8ae]of Object['entries'](_0x1eb118['children'])){const _0x448b11=await buildSelectedProperty(_0x1258c0,_0x1eb118['resourceMeta'],_0x593e4b,_0x33c8ae);_0x2436d6[_0x593e4b]=_0x448b11;}else return getColumnsFromTable(_0x1258c0);return _0x2436d6;}__name(buildSelectedProperty,'buildSelectedProperty');async function getRelatedResourceName(_0x2a5e71,_0xa062d2,_0x1e3a1d){const _0x4e7ee2=_0x1e3a1d;if(_0x4e7ee2){const _0x3acc27=_0x4e7ee2['properties'][_0xa062d2];if(_0x3acc27?.['relation']?.['relatedResourceName'])return _0x3acc27['relation']['relatedResourceName'];}const _0x3b3350=await getInternalResourceMeta(_0x2a5e71),_0x2f3e3f=_0x3b3350['properties'][_0xa062d2];if(_0x2f3e3f?.['declaredWithType'])return _0x2f3e3f['declaredWithType'];throw createError('Could\x20not\x20determine\x20related\x20resource\x20for\x20property\x20\x27'+_0xa062d2+'\x27\x20on\x20resource\x20\x27'+_0x2a5e71+'\x27.\x20It\x20was\x20not\x20found\x20in\x20ResourceMeta\x20relations\x20nor\x20in\x20InternalResourceMeta\x20declaredWithType.');}__name(getRelatedResourceName,'getRelatedResourceName');async function buildExpandedProperty(_0x2f4cbe,_0x47823e,_0x285ee3={}){const _0x170a7f=await getRelatedResourceName(_0x47823e['resourceName'],_0x2f4cbe,_0x47823e),_0x29e00a=await getAliasedTableByResourceName(_0x170a7f,_0x2f4cbe),_0x2aefc1=getColumnsFromTable(_0x29e00a);if(_0x285ee3['children']&&_0x285ee3['resourceMeta'])for(const [_0x2ea0f0,_0x483036]of Object['entries'](_0x285ee3['children'])){const _0x305f9e=await buildExpandedProperty(_0x2ea0f0,_0x285ee3['resourceMeta'],_0x483036);_0x2aefc1[_0x2ea0f0]=_0x305f9e;}return _0x2aefc1;}__name(buildExpandedProperty,'buildExpandedProperty');async function applyPagination(_0x2db0b2,_0x119bd5,_0x44d333,_0x9e5175,_0x331c5d,_0x123dbc){let _0x480c47=createDynamicSelect(_0x119bd5,{'id':_0x119bd5['id']});if(_0x9e5175['length']>0xac1*0x1+0xe7f+-0x4*0x650){for(const _0x36c090 of _0x9e5175){let _0x5b160d=_0x36c090['basePropertyName'];if(_0x5b160d['endsWith'](metas['idSuffix'])&&_0x5b160d!==withIdProps['id']){_0x5b160d=cutOffSuffix(_0x5b160d,metas['idSuffix']);const _0x4e0061=_0x331c5d['properties'][_0x5b160d];isPropertyExpandable(_0x4e0061)&&await joinOneSideRelation(_0x480c47,_0x119bd5,_0x331c5d,_0x5b160d);}}sort(_0x480c47,_0x9e5175);}const _0x43c2a4=getQueryConfig(_0x2db0b2)['where'];_0x43c2a4&&dbWhere(_0x480c47,_0x43c2a4);_0x123dbc===paginationTypes['offset']?dbOffset(_0x480c47,_0x44d333):dbLimit(_0x480c47,_0x44d333);const _0x1e824c=inArray(_0x119bd5['id'],_0x480c47),_0x3437b6=dbWhere(_0x2db0b2,_0x1e824c);return {'query':_0x3437b6};}__name(applyPagination,'applyPagination');async function joinRelatedTables(_0x43f49a,_0x4a8fbb,_0xf82c72,_0x2b9a1d){await Promise['all'](Object['entries'](_0xf82c72['children']??{})['map'](([_0x50b584,_0x1f9c91])=>joinRelatedTable(_0x43f49a,_0x4a8fbb,_0x2b9a1d,_0x50b584,_0x1f9c91)));}__name(joinRelatedTables,'joinRelatedTables');async function joinRelatedTable(_0x496f4d,_0x1dcb56,_0x521f35,_0x3bc959,_0x70dc23){const _0x458265=_0x521f35['properties'][_0x3bc959];if(!isPropertyExpandable(_0x458265))return;let _0x3fe5ba;if(_0x458265['type']===propertyTypes['array']){const _0x3c267e=await getRelatedResourceName(_0x521f35['resourceName'],_0x3bc959,_0x521f35);_0x3fe5ba=await joinManySideRelation(_0x496f4d,_0x1dcb56,_0x3bc959,_0x3c267e,_0x458265['relation']['relatedPropertyName']);}else _0x3fe5ba=await joinOneSideRelation(_0x496f4d,_0x1dcb56,_0x521f35,_0x3bc959);await joinChildRelatedTables(_0x496f4d,_0x3fe5ba,_0x70dc23);}__name(joinRelatedTable,'joinRelatedTable');async function joinChildRelatedTables(_0x41cdc7,_0x3f1dd8,_0x263009){if(!_0x263009['resourceMeta']||!_0x263009['children'])return;for(const [_0x3371d4,_0x104907]of Object['entries'](_0x263009['children'])){await joinRelatedTable(_0x41cdc7,_0x3f1dd8,_0x263009['resourceMeta'],_0x3371d4,_0x104907);}}__name(joinChildRelatedTables,'joinChildRelatedTables');async function joinManySideRelation(_0x454a38,_0x3b6203,_0xfff3b8,_0x5303b4,_0x30344a){const _0x35a7c0=await getAliasedTableByResourceName(_0x5303b4,_0xfff3b8),_0x2cf41b=_0x30344a['endsWith'](metas['idSuffix'])?_0x30344a:_0x30344a+metas['idSuffix'],_0x5dcb73=eq(_0x3b6203['id'],getTableColumn(_0x35a7c0,_0x2cf41b));return dbLeftJoin(_0x454a38,_0x35a7c0,_0x5dcb73),_0x35a7c0;}__name(joinManySideRelation,'joinManySideRelation');async function joinOneSideRelation(_0x536fb5,_0xb5efaf,_0x21a1be,_0x37c591){const _0x488f1c=await getRelatedResourceName(_0x21a1be['resourceName'],_0x37c591,_0x21a1be),_0x28f1a6=await getAliasedTableByResourceName(_0x488f1c,_0x37c591),_0x26e15e=_0x37c591['endsWith'](metas['idSuffix'])?_0x37c591:''+_0x37c591+metas['idSuffix'],_0x1cb0a9=eq(_0x28f1a6['id'],getTableColumn(_0xb5efaf,_0x26e15e));return dbLeftJoin(_0x536fb5,_0x28f1a6,_0x1cb0a9),_0x28f1a6;}__name(joinOneSideRelation,'joinOneSideRelation');
 export { expand, getSortColumns, limit, offset, select, sort };

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=(_0x53425a,_0x23e724)=>__defProp(_0x53425a,'name',{'value':_0x23e724,'configurable':!![]});async function getWithOData(_0x201734,_0x2c702e,_0x1d3444){const _0x1a08b5=await getResourceMeta(_0x1d3444),_0x406c19=prepareODataSelectOrExpandTree(_0x2c702e['selects']),_0x27e1d9=prepareODataSelectOrExpandTree(_0x2c702e['expands']),_0x276dee=await filterODataSelectOrExpandTree(_0x1d3444,_0x406c19),_0x41ff88=await filterODataSelectOrExpandTree(_0x1d3444,_0x27e1d9,!![]),_0x242c34=!!_0x276dee['children']&&Object['keys'](_0x276dee['children'])['length']>0xc25*-0x1+0xed2+-0x2ad,_0x3beb7c=!!_0x41ff88['children']&&Object['keys'](_0x41ff88['children'])['length']>-0x1*-0x2272+0x16f9*0x1+-0x396b;let {query:_0x5c0846}=await getInitialQuery(_0x201734,_0x276dee,_0x41ff88,_0x1a08b5),_0x5cc08b=_0x5c0846;const _0x401c52=await getSortColumns(_0x5cc08b,_0x201734,_0x1a08b5,_0x2c702e['orderBys']);_0x401c52['length']!==0xd91+0xe81+-0x1c12&&(_0x5cc08b=sort(_0x5cc08b,_0x401c52)['query']);if((_0x2c702e['filters']?.['length']??0x1933+-0x87d*-0x2+0x1*-0x2a2d)>-0x8dd*0x2+0x178*-0x7+0x1c02){const _0x4180a4=await tryFilter(_0x5cc08b,_0x2c702e,_0x201734,_0x1d3444);_0x5cc08b=_0x4180a4['query'];}if(_0x2c702e['skip']){const _0x4b84e7=await offset(_0x5cc08b,_0x201734,_0x2c702e['skip'],_0x401c52,_0x1a08b5);_0x5cc08b=_0x4b84e7['query'];}if(_0x2c702e['top']){const _0x343759=await limit(_0x5cc08b,_0x201734,_0x2c702e['top'],_0x401c52,_0x1a08b5);_0x5cc08b=_0x343759['query'];}const _0x382743=await execQuery(_0x5cc08b);if(_0x242c34||_0x3beb7c){const _0x123ea0=_0x242c34?_0x276dee:_0x41ff88,_0x2490af=groupODataResults(_0x382743,_0x123ea0,_0x1a08b5);return _0x2490af;}return _0x382743;}__name(getWithOData,'getWithOData');async function getInitialQuery(_0x463b79,_0x2a7a24,_0x423c61,_0x46e79d){const _0x16da92=!!_0x2a7a24['children']&&Object['keys'](_0x2a7a24['children'])['length']>0x656+0x349+-0x99f,_0x2a50e7=!!_0x423c61['children']&&Object['keys'](_0x423c61['children'])['length']>0x2392+-0x1c33+-0x25*0x33;if(_0x16da92)return select(_0x463b79,_0x2a7a24,_0x46e79d);if(_0x2a50e7)return select(_0x463b79,_0x423c61,_0x46e79d);return getQuery(_0x463b79);}__name(getInitialQuery,'getInitialQuery');
+var __defProp=Object['defineProperty'],__name=(_0x3813e1,_0x4e4417)=>__defProp(_0x3813e1,'name',{'value':_0x4e4417,'configurable':!![]});async function getWithOData(_0x442520,_0x34e7d0,_0x939aea){const _0x13c44a=await getResourceMeta(_0x939aea),_0x41590f=prepareODataSelectOrExpandTree(_0x34e7d0['selects']),_0x4d1b34=prepareODataSelectOrExpandTree(_0x34e7d0['expands']),_0x1bcbdb=await filterODataSelectOrExpandTree(_0x939aea,_0x41590f),_0x4073e4=await filterODataSelectOrExpandTree(_0x939aea,_0x4d1b34,!![]),_0x3045f5=!!_0x1bcbdb['children']&&Object['keys'](_0x1bcbdb['children'])['length']>0x5*0x656+-0x9f*0x35+0x13d,_0x6cc3b3=!!_0x4073e4['children']&&Object['keys'](_0x4073e4['children'])['length']>0x1261+0x7ea+-0x1a4b;let {query:_0xbddd4b}=await getInitialQuery(_0x442520,_0x1bcbdb,_0x4073e4,_0x13c44a),_0x49c347=_0xbddd4b;const _0x2488e0=await getSortColumns(_0x49c347,_0x442520,_0x13c44a,_0x34e7d0['orderBys']);_0x2488e0['length']!==0x17e1*-0x1+-0x23c5+-0x2*-0x1dd3&&(_0x49c347=sort(_0x49c347,_0x2488e0)['query']);if((_0x34e7d0['filters']?.['length']??0x1141+0x1f57+-0x3098)>-0x18ed+-0x1*0x1c87+-0x2*-0x1aba){const _0x3b6791=await tryFilter(_0x49c347,_0x34e7d0,_0x442520,_0x939aea);_0x49c347=_0x3b6791['query'];}if(_0x34e7d0['skip']){const _0x5d06bf=await offset(_0x49c347,_0x442520,_0x34e7d0['skip'],_0x2488e0,_0x13c44a);_0x49c347=_0x5d06bf['query'];}if(_0x34e7d0['top']){const _0x47260d=await limit(_0x49c347,_0x442520,_0x34e7d0['top'],_0x2488e0,_0x13c44a);_0x49c347=_0x47260d['query'];}const _0x33baa8=await execQuery(_0x49c347);if(_0x3045f5||_0x6cc3b3){const _0x28e4e5=_0x3045f5?_0x1bcbdb:_0x4073e4,_0x453242=groupODataResults(_0x33baa8,_0x28e4e5,_0x13c44a);return _0x453242;}return _0x33baa8;}__name(getWithOData,'getWithOData');async function getInitialQuery(_0x5df4ba,_0x2c3b22,_0xc6490,_0x2b5938){const _0x4bf39a=!!_0x2c3b22['children']&&Object['keys'](_0x2c3b22['children'])['length']>-0xad*0x29+-0x2076+0xd3*0x49,_0x222a10=!!_0xc6490['children']&&Object['keys'](_0xc6490['children'])['length']>0x366+-0x7*0x379+0x14e9;if(_0x4bf39a)return select(_0x5df4ba,_0x2c3b22,_0x2b5938);if(_0x222a10)return select(_0x5df4ba,_0xc6490,_0x2b5938);return getQuery(_0x5df4ba);}__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=(_0x548387,_0x521697)=>__defProp(_0x548387,'name',{'value':_0x521697,'configurable':!![]});function getComparisonTypeFromOperation(_0x37466c){switch(_0x37466c){case oDataComparisonTypes['equal']:return (_0x526f8d,_0x62299a)=>compareDateOrDefault(_0x526f8d,_0x62299a);case oDataComparisonTypes['notEqual']:return (_0x80416e,_0x394ec2)=>ne(_0x80416e,_0x394ec2);case oDataComparisonTypes['greaterThan']:return (_0x92cb78,_0x8bb1ef)=>gt(_0x92cb78,_0x8bb1ef);case oDataComparisonTypes['greaterThanOrEqual']:return (_0x103332,_0x1cfd2d)=>gte(_0x103332,_0x1cfd2d);case oDataComparisonTypes['lessThan']:return (_0x45f206,_0x355539)=>lt(_0x45f206,_0x355539);case oDataComparisonTypes['lessThanOrEqual']:return (_0x1d2299,_0x13aa27)=>lte(_0x1d2299,_0x13aa27);case oDataComparisonTypes['in']:return (_0x11cb47,_0x1b6514)=>{if(!isArray(_0x1b6514))throw createError(toolboxErrorMessages['valueIsNotArray']);return inArray(_0x11cb47,_0x1b6514);};case oDataComparisonTypes['nin']:return (_0x201008,_0x502f29)=>{if(!isArray(_0x502f29))throw createError(toolboxErrorMessages['valueIsNotArray']);return notInArray(_0x201008,_0x502f29);};case oDataComparisonTypes['startsWith']:return (_0x1d54af,_0x509e1c)=>dbLike(_0x1d54af,_0x509e1c+'%');case oDataComparisonTypes['includes']:return (_0x8ecf62,_0x3d2871)=>dbLike(_0x8ecf62,'%'+_0x3d2871+'%');default:throw createError(toolboxErrorMessages['odataUnsupportedType']['replace']('{0}',_0x37466c['toString']()));}}__name(getComparisonTypeFromOperation,'getComparisonTypeFromOperation');function isNullOrUndefinedWithLogging(_0x54ca30,_0x3f92f5){if(!_0x3f92f5)return error(toolboxErrorMessages['objectWasNull']['replace']('{0}',_0x54ca30)),!![];return ![];}__name(isNullOrUndefinedWithLogging,'isNullOrUndefinedWithLogging');const propertyNamePluralSuffix='s';function convertPropertyNameToTableName(_0x340189){return ''+convertFromPascalToCamelCase(_0x340189)+(_0x340189['endsWith'](propertyNamePluralSuffix)?'':propertyNamePluralSuffix);}__name(convertPropertyNameToTableName,'convertPropertyNameToTableName');function compareDateOrDefault(_0x26f2e8,_0x4e1fb0){let _0xf5c561;if(_0x4e1fb0 instanceof Date)_0xf5c561=_0x4e1fb0['toISOString']()['split']('T')[-0x3*-0x2bb+0x10e*-0x2+0x615*-0x1];else typeof _0x4e1fb0==='string'&&_0x4e1fb0['includes']('T')?_0xf5c561=_0x4e1fb0['split']('T')[-0x5a*0x6+-0xa79*-0x3+0x3d*-0x7b]:_0xf5c561=_0x4e1fb0;const _0x31c710=dbExtractDate(_0x26f2e8);if(_0xf5c561 instanceof Date||typeof _0xf5c561==='string'&&_0xf5c561['length']===0x3d*0xe+-0x1a8f+0x1743)return eq(_0x31c710,_0xf5c561);return eq(_0x26f2e8,_0x4e1fb0);}__name(compareDateOrDefault,'compareDateOrDefault');
+var __defProp=Object['defineProperty'],__name=(_0x57a46b,_0x32e444)=>__defProp(_0x57a46b,'name',{'value':_0x32e444,'configurable':!![]});function getComparisonTypeFromOperation(_0x501227){switch(_0x501227){case oDataComparisonTypes['equal']:return (_0x14e7e1,_0x2078cc)=>compareDateOrDefault(_0x14e7e1,_0x2078cc);case oDataComparisonTypes['notEqual']:return (_0x2fdff5,_0x47f9a4)=>ne(_0x2fdff5,_0x47f9a4);case oDataComparisonTypes['greaterThan']:return (_0x3576e1,_0x2d997a)=>gt(_0x3576e1,_0x2d997a);case oDataComparisonTypes['greaterThanOrEqual']:return (_0x17280f,_0x507136)=>gte(_0x17280f,_0x507136);case oDataComparisonTypes['lessThan']:return (_0x2c41c5,_0x2af245)=>lt(_0x2c41c5,_0x2af245);case oDataComparisonTypes['lessThanOrEqual']:return (_0x3045d6,_0xd2b908)=>lte(_0x3045d6,_0xd2b908);case oDataComparisonTypes['in']:return (_0x15e7b1,_0xe8cb40)=>{if(!isArray(_0xe8cb40))throw createError(toolboxErrorMessages['valueIsNotArray']);return inArray(_0x15e7b1,_0xe8cb40);};case oDataComparisonTypes['nin']:return (_0x37f278,_0x5942a0)=>{if(!isArray(_0x5942a0))throw createError(toolboxErrorMessages['valueIsNotArray']);return notInArray(_0x37f278,_0x5942a0);};case oDataComparisonTypes['startsWith']:return (_0x5bc6ab,_0x3884ec)=>dbLike(_0x5bc6ab,_0x3884ec+'%');case oDataComparisonTypes['includes']:return (_0x4f265a,_0xd47659)=>dbLike(_0x4f265a,'%'+_0xd47659+'%');default:throw createError(toolboxErrorMessages['odataUnsupportedType']['replace']('{0}',_0x501227['toString']()));}}__name(getComparisonTypeFromOperation,'getComparisonTypeFromOperation');function isNullOrUndefinedWithLogging(_0x448654,_0xf46258){if(!_0xf46258)return error(toolboxErrorMessages['objectWasNull']['replace']('{0}',_0x448654)),!![];return ![];}__name(isNullOrUndefinedWithLogging,'isNullOrUndefinedWithLogging');const propertyNamePluralSuffix='s';function convertPropertyNameToTableName(_0x285ca2){return ''+convertFromPascalToCamelCase(_0x285ca2)+(_0x285ca2['endsWith'](propertyNamePluralSuffix)?'':propertyNamePluralSuffix);}__name(convertPropertyNameToTableName,'convertPropertyNameToTableName');function compareDateOrDefault(_0x1899cc,_0xb43c6a){let _0x4732c1;if(_0xb43c6a instanceof Date)_0x4732c1=_0xb43c6a['toISOString']()['split']('T')[0xa*0x15a+0x11e9+0x5*-0x649];else typeof _0xb43c6a==='string'&&_0xb43c6a['includes']('T')?_0x4732c1=_0xb43c6a['split']('T')[-0x897*0x4+0xbd0+-0x168c*-0x1]:_0x4732c1=_0xb43c6a;const _0x4eb4e9=dbExtractDate(_0x1899cc);if(_0x4732c1 instanceof Date||typeof _0x4732c1==='string'&&_0x4732c1['length']===-0x2*0x1089+-0x71*-0x35+0x9b7)return eq(_0x4eb4e9,_0x4732c1);return eq(_0x1899cc,_0xb43c6a);}__name(compareDateOrDefault,'compareDateOrDefault');
 export { compareDateOrDefault, convertPropertyNameToTableName, getComparisonTypeFromOperation, isNullOrUndefinedWithLogging };

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 { metas } from '../../meta-core/constants/metas.js';
 import { parseUtcStringToDate } from '../../../../../fd-toolbox/dates/date-time.js';
-var __defProp=Object['defineProperty'],__name=(_0x1afa23,_0x44c33c)=>__defProp(_0x1afa23,'name',{'value':_0x44c33c,'configurable':!![]});function getFilterValue(_0x5d5905,_0x44f727){return _0x5d5905['filters']?.['find'](_0xae7692=>_0xae7692['leftSide']===_0x44f727)?.['rightSide'];}__name(getFilterValue,'getFilterValue');async function tryFilter(_0x4e3d73,_0x57462f,_0x43254a,_0x5eb9e3){if(_0x43254a instanceof Subquery)return error('Cannot\x20filter\x20subquery\x20directly'),{'query':_0x4e3d73};const _0x1945f7=getTableName(_0x43254a);if(!_0x1945f7)return error(toolboxErrorMessages['symbolNotFound']['replace']('{0}',''+queryIndexes['tableName'])),{'query':_0x4e3d73};const {defaultFilters:_0x50d1a2,relatedFilters:_0x359829}=getBaseAndRelatedFilters(_0x57462f);await addRelatedFilterToQuery(_0x4e3d73,_0x359829,_0x43254a,_0x5eb9e3);const _0x6d1a78=_0x50d1a2??[],_0x33fa1d=groupBaseODataFilterByLogicalOrs(_0x6d1a78),_0x497ea6=await getOrExpressions(_0x33fa1d,_0x43254a,_0x1945f7);return _0x497ea6['length']>-0x4*-0x4a+-0x47*0x6+-0x2*-0x41&&applyFilterToQuery(_0x4e3d73,or(..._0x497ea6)),{'query':_0x4e3d73};}__name(tryFilter,'tryFilter');async function addRelatedFilterToQuery(_0xa0e99c,_0x14152f,_0x26e9b2,_0xfb62a0){for(const _0x25285d of _0x14152f){const {leftSide:_0x9001d4,rightSide:_0x4d9fbf,comparisonType:_0x4b64ba}=_0x25285d;if(_0x9001d4&&_0x4d9fbf){const [_0x3c6cb0,_0x17c5cf]=_0x9001d4['split'](oDataSeparators['propertySeparator']),_0x51afc7=await getTableByResourceName(_0x3c6cb0),_0x7858cb=getTableColumn(_0x51afc7,convertFromPascalToCamelCase(_0xfb62a0)+metas['idSuffix']),_0xb29f=getTableColumn(_0x51afc7,_0x17c5cf),_0x19bfee=isString(_0x4d9fbf)?_0x4d9fbf:'',_0x1b84f9=createDynamicSelect(_0x51afc7,{'value':_0x7858cb});dbWhere(_0x1b84f9,inArray(_0xb29f,_0x19bfee['split'](oDataSeparators['selectSeparator'])));const _0x2cc8ef=addExpressionByType(_0x26e9b2['id'],_0x1b84f9,_0x4b64ba);dbWhere(_0xa0e99c,_0x2cc8ef);}}}__name(addRelatedFilterToQuery,'addRelatedFilterToQuery');async function getOrExpressions(_0x5191b4,_0x456110,_0x24cfd9){const _0x116448=[];for(const _0x38f98d of Object['values'](_0x5191b4)){const _0x26bc69=await getAndExpressions(_0x38f98d,_0x456110,_0x24cfd9);_0x26bc69['length']>-0x3a*-0x71+0x1b9*-0xd+-0x335&&_0x116448['push'](and(..._0x26bc69));}return _0x116448;}__name(getOrExpressions,'getOrExpressions');async function getAndExpressions(_0x367b8a,_0x4ccdcf,_0x248c1c){const _0x34a90b=[];for(const _0x41a473 of _0x367b8a){const _0x13d60e=await getFilterExpression(_0x41a473,_0x4ccdcf,_0x248c1c);_0x13d60e&&_0x34a90b['push'](_0x13d60e);}return _0x34a90b;}__name(getAndExpressions,'getAndExpressions');async function getFilterExpression(_0x55a791,_0x340655,_0x239f34){let _0x4b9101;if(_0x55a791['type']===oDataFilterTypes['lambda']){const _0x275fc8=getPredicate(_0x239f34,_0x55a791);!isNullOrUndefinedWithLogging(objectNameConstants['predicate'],_0x275fc8)&&(_0x4b9101=_0x275fc8);}else {if(_0x55a791['leftSide']&&_0x55a791['leftSide']in _0x340655)_0x4b9101=tryGetAndExpression(_0x55a791,getTableColumn(_0x340655,_0x55a791['leftSide']));else {if(_0x55a791['leftSide']?.['endsWith'](oDataSeparators['propertySeparator']+oDataQueryParams['count'])){const _0xfe2d0a=_0x55a791['leftSide']['split'](oDataSeparators['propertySeparator'])[-0x269f+-0x1e09*0x1+-0x4*-0x112a],_0x1cdfff=_0xfe2d0a['slice'](0x259f*-0x1+0x1af2+-0xaad*-0x1,_0xfe2d0a['indexOf'](metas['listSuffix'])),_0x5ba2fe=await getTable(_0x1cdfff),_0x10ab1d=getForeignColumn(_0x5ba2fe,_0x239f34),_0xba39fb=createDynamicSelect(_0x340655,{'id':_0x340655[metas['idConstant']]});dbLeftJoin(_0xba39fb,_0x5ba2fe,eq(_0x10ab1d,_0x340655[metas['idConstant']])),dbGroupBy(_0xba39fb,_0x340655[metas['idConstant']]);const _0x357a07=addExpressionByType(count(_0x10ab1d),_0x55a791['rightSide'],_0x55a791['comparisonType']);dbHaving(_0xba39fb,_0x357a07);const _0x2a98a1=await runQuery(_0xba39fb);_0x55a791['leftSide']=metas['idConstant'],_0x55a791['comparisonType']=oDataComparisonTypes['in'],_0x55a791['rightSide']=_0x2a98a1['map'](_0x5d9bb3=>_0x5d9bb3[metas['idConstant']]),_0x4b9101=tryGetAndExpression(_0x55a791,getTableColumn(_0x340655,_0x55a791['leftSide']));}}}return _0x4b9101;}__name(getFilterExpression,'getFilterExpression');function getPredicate(_0x4b0f98,_0x23f331){const _0x997821=getTablesAndColumns(_0x4b0f98,_0x23f331);if(!_0x997821)return void(0x2c*0x83+-0x1*-0x59+-0x16dd);const {enumerablePropertyTableName:_0x75b85,enumerablePropertyTable:_0x2ba00f,subPropertyTable:_0x1e3499,leftSide:_0x541877,leftSide1Column:_0x10fd7c,leftSide2Column:_0x5349b0,subQueryIdEqOperator:_0x50f33e}=_0x997821,_0x2af6f8=_0x23f331['lambdaConfig']?.['method']===oDataLambdaMethods['all']?notExists:exists;if(_0x541877['length']===0x9eb*-0x1+-0x3*0x845+-0x22bb*-0x1){const _0x51b8d0=_0x23f331['lambdaConfig']?.['method']===oDataLambdaMethods['all']?not(tryGetAndExpression(_0x23f331,_0x10fd7c)):tryGetAndExpression(_0x23f331,_0x10fd7c),_0x166796=createDynamicSelect(_0x2ba00f,{'leftSide1Column':_0x10fd7c});return applyFilterToQuery(_0x166796,and(_0x50f33e,_0x51b8d0)),_0x2af6f8(_0x166796);}else {const _0x12d439=_0x75b85+metas['idConstant'],_0x24bc6c=eq(_0x2ba00f['id'],getTableColumn(_0x1e3499,_0x12d439)),_0x3fc00f=_0x23f331['lambdaConfig']?.['method']===oDataLambdaMethods['all']?not(tryGetAndExpression(_0x23f331,_0x5349b0)):tryGetAndExpression(_0x23f331,_0x5349b0),_0x236ce2=createDynamicSelect(_0x1e3499,{'leftSide2Column':_0x5349b0}),_0x903018=and(_0x24bc6c,_0x3fc00f);_0x903018&&dbWhere(_0x236ce2,_0x903018);const _0x3c712b=createDynamicSelect(_0x2ba00f),_0x594178=and(_0x50f33e,exists(_0x236ce2));return _0x594178&&dbWhere(_0x3c712b,_0x594178),_0x2af6f8(_0x3c712b);}}__name(getPredicate,'getPredicate');function getTablesAndColumns(_0x23e2e9,_0x209c38){const _0x4ac68d=convertPropertyNameToTableName(_0x209c38['lambdaConfig']?.['baseEnumerablePropertyName']??'');if(isNullOrUndefinedWithLogging(lambdaConfigNameConstants['baseEnumerablePropertyName'],_0x4ac68d)||isNullOrUndefinedWithLogging(lambdaConfigNameConstants['method'],_0x209c38['lambdaConfig']?.['method']))return void(-0xe05*-0x2+-0x1835+-0x1*0x3d5);const _0x298527=_0x209c38['leftSide']['split'](oDataSeparators['propertySeparator']),_0x273000=getTableByName(_0x23e2e9),_0x2a6a62=getTableByName(_0x4ac68d),_0x303f94=getTableByName(convertPropertyNameToTableName(_0x298527[0xbbf+-0x337+-0x9c*0xe])),_0x387dac=getTableColumn(_0x2a6a62,convertFromPascalToCamelCase(_0x298527[-0x6*-0x37e+0x102b+0x22f*-0x11])),_0x28c189=getTableColumn(_0x303f94,convertFromPascalToCamelCase(_0x298527[_0x298527['length']-(-0xa2d+-0x29*-0x47+0x5*-0x3d)])),_0x46cbd5=eq(_0x273000['id'],getTableColumn(_0x2a6a62,_0x23e2e9+metas['idConstant']));return {'enumerablePropertyTableName':_0x4ac68d,'enumerablePropertyTable':_0x2a6a62,'subPropertyTable':_0x303f94,'leftSide':_0x298527,'leftSide1Column':_0x387dac,'leftSide2Column':_0x28c189,'subQueryIdEqOperator':_0x46cbd5};}__name(getTablesAndColumns,'getTablesAndColumns');function groupBaseODataFilterByLogicalOrs(_0x1352d3){const _0x137320={};let _0x28e111=[],_0x5e49c9=-0x9*-0x363+-0xcf6+-0x1185;_0x137320[_0x5e49c9]=_0x28e111;for(const _0x4e07e2 of _0x1352d3){_0x4e07e2['logicalOperationType']===oDataLogicalOperationTypes['or']?(_0x137320[_0x5e49c9]=_0x28e111,_0x28e111=[_0x4e07e2],_0x137320[++_0x5e49c9]=_0x28e111):_0x28e111['push'](_0x4e07e2);}return _0x137320;}__name(groupBaseODataFilterByLogicalOrs,'groupBaseODataFilterByLogicalOrs');function tryGetAndExpression(_0x53dd36,_0x2518ff){const _0x2f72c3=tryGetConstantExpression(_0x2518ff['dataType'],String(_0x53dd36['rightSide']),_0x53dd36['comparisonType']);return addExpressionByType(_0x2518ff,_0x2f72c3,_0x53dd36['comparisonType']);}__name(tryGetAndExpression,'tryGetAndExpression');function tryGetConstantExpression(_0x5ce238,_0x51ed11,_0x7c5c87){let _0x18c086;if(_0x51ed11===oDataSpecialValues['nullValue'])_0x18c086=[_0x51ed11];else _0x7c5c87===oDataComparisonTypes['in']||_0x7c5c87===oDataComparisonTypes['nin']?_0x18c086=parseRightSideToArray(_0x51ed11):_0x18c086=tryParseToType(_0x5ce238,_0x51ed11);return _0x18c086;}__name(tryGetConstantExpression,'tryGetConstantExpression');function tryParseToType(_0x41828b,_0x41d4e0){let _0x518dc1;switch(_0x41828b){case columnDataTypes['string']:_0x518dc1=_0x41d4e0;break;case columnDataTypes['bigint']:case columnDataTypes['number']:_0x518dc1=parseFloat(_0x41d4e0);break;case columnDataTypes['boolean']:_0x518dc1=_0x41d4e0===columnDataTypes['integrationEnabled'];break;case columnDataTypes['date']:_0x518dc1=parseUtcStringToDate(_0x41d4e0);break;case columnDataTypes['array']:throw createError(toolboxErrorMessages['odataUnsupportedType']['replace']('{0}',_0x41828b));case columnDataTypes['json']:throw createError(toolboxErrorMessages['odataUnsupportedType']['replace']('{0}',_0x41828b));case columnDataTypes['custom']:throw createError(toolboxErrorMessages['odataUnsupportedType']['replace']('{0}',_0x41828b));case columnDataTypes['buffer']:throw createError(toolboxErrorMessages['odataUnsupportedType']['replace']('{0}',_0x41828b));default:throw createError(toolboxErrorMessages['odataUnsupportedType']['replace']('{0}',_0x41828b));}return _0x518dc1;}__name(tryParseToType,'tryParseToType');function addExpressionByType(_0x2cbb09,_0x47b56a,_0x1edfe0){const _0x416c05=getComparisonTypeFromOperation(_0x1edfe0),_0x3c2ec3=sql`${_0x2cbb09}`;return _0x416c05(_0x3c2ec3,_0x47b56a);}__name(addExpressionByType,'addExpressionByType');
+var __defProp=Object['defineProperty'],__name=(_0x38c1f1,_0x5dafc5)=>__defProp(_0x38c1f1,'name',{'value':_0x5dafc5,'configurable':!![]});function getFilterValue(_0x2083db,_0x356746){return _0x2083db['filters']?.['find'](_0x45dbf4=>_0x45dbf4['leftSide']===_0x356746)?.['rightSide'];}__name(getFilterValue,'getFilterValue');async function tryFilter(_0x1a489b,_0xc66a6e,_0x238bb3,_0x1f887d){if(_0x238bb3 instanceof Subquery)return error('Cannot\x20filter\x20subquery\x20directly'),{'query':_0x1a489b};const _0x59bb9e=getTableName(_0x238bb3);if(!_0x59bb9e)return error(toolboxErrorMessages['symbolNotFound']['replace']('{0}',''+queryIndexes['tableName'])),{'query':_0x1a489b};const {defaultFilters:_0x1531da,relatedFilters:_0x4b6cc4}=getBaseAndRelatedFilters(_0xc66a6e);await addRelatedFilterToQuery(_0x1a489b,_0x4b6cc4,_0x238bb3,_0x1f887d);const _0x48345d=_0x1531da??[],_0x29f045=groupBaseODataFilterByLogicalOrs(_0x48345d),_0x40b930=await getOrExpressions(_0x29f045,_0x238bb3,_0x59bb9e);return _0x40b930['length']>-0x2*-0xd05+0x1*-0xc77+-0xd93&&applyFilterToQuery(_0x1a489b,or(..._0x40b930)),{'query':_0x1a489b};}__name(tryFilter,'tryFilter');async function addRelatedFilterToQuery(_0x2080fe,_0x120a28,_0x64b0b1,_0x10d931){for(const _0x149287 of _0x120a28){const {leftSide:_0x2a8682,rightSide:_0xf2c2e0,comparisonType:_0x3d6356}=_0x149287;if(_0x2a8682&&_0xf2c2e0){const [_0x372212,_0x15ad72]=_0x2a8682['split'](oDataSeparators['propertySeparator']),_0x1a5d47=await getTableByResourceName(_0x372212),_0x4a69ff=getTableColumn(_0x1a5d47,convertFromPascalToCamelCase(_0x10d931)+metas['idSuffix']),_0x2b9484=getTableColumn(_0x1a5d47,_0x15ad72),_0xf96de8=isString(_0xf2c2e0)?_0xf2c2e0:'',_0x1a6ac7=createDynamicSelect(_0x1a5d47,{'value':_0x4a69ff});dbWhere(_0x1a6ac7,inArray(_0x2b9484,_0xf96de8['split'](oDataSeparators['selectSeparator'])));const _0x310f32=addExpressionByType(_0x64b0b1['id'],_0x1a6ac7,_0x3d6356);dbWhere(_0x2080fe,_0x310f32);}}}__name(addRelatedFilterToQuery,'addRelatedFilterToQuery');async function getOrExpressions(_0x37e8f5,_0x5aaab3,_0x2612a0){const _0x50bd58=[];for(const _0x290be4 of Object['values'](_0x37e8f5)){const _0x22ff64=await getAndExpressions(_0x290be4,_0x5aaab3,_0x2612a0);_0x22ff64['length']>-0x4*-0x645+0x569+-0x1e7d&&_0x50bd58['push'](and(..._0x22ff64));}return _0x50bd58;}__name(getOrExpressions,'getOrExpressions');async function getAndExpressions(_0x4558a6,_0x2a2c81,_0x51c823){const _0x172717=[];for(const _0x2dcde0 of _0x4558a6){const _0x33bbe2=await getFilterExpression(_0x2dcde0,_0x2a2c81,_0x51c823);_0x33bbe2&&_0x172717['push'](_0x33bbe2);}return _0x172717;}__name(getAndExpressions,'getAndExpressions');async function getFilterExpression(_0x80ed0d,_0x9b0c14,_0x3fa5b8){let _0xf6815b;if(_0x80ed0d['type']===oDataFilterTypes['lambda']){const _0x3555c4=getPredicate(_0x3fa5b8,_0x80ed0d);!isNullOrUndefinedWithLogging(objectNameConstants['predicate'],_0x3555c4)&&(_0xf6815b=_0x3555c4);}else {if(_0x80ed0d['leftSide']&&_0x80ed0d['leftSide']in _0x9b0c14)_0xf6815b=tryGetAndExpression(_0x80ed0d,getTableColumn(_0x9b0c14,_0x80ed0d['leftSide']));else {if(_0x80ed0d['leftSide']?.['endsWith'](oDataSeparators['propertySeparator']+oDataQueryParams['count'])){const _0x41be82=_0x80ed0d['leftSide']['split'](oDataSeparators['propertySeparator'])[0x20c3+0x5cf*0x1+-0x2692],_0x3c59e7=_0x41be82['slice'](-0x129*0xf+-0x5d6+0x173d,_0x41be82['indexOf'](metas['listSuffix'])),_0x12f251=await getTable(_0x3c59e7),_0x49f61c=getForeignColumn(_0x12f251,_0x3fa5b8),_0x4b61de=createDynamicSelect(_0x9b0c14,{'id':_0x9b0c14[metas['idConstant']]});dbLeftJoin(_0x4b61de,_0x12f251,eq(_0x49f61c,_0x9b0c14[metas['idConstant']])),dbGroupBy(_0x4b61de,_0x9b0c14[metas['idConstant']]);const _0x2b122d=addExpressionByType(count(_0x49f61c),_0x80ed0d['rightSide'],_0x80ed0d['comparisonType']);dbHaving(_0x4b61de,_0x2b122d);const _0xa28dd1=await runQuery(_0x4b61de);_0x80ed0d['leftSide']=metas['idConstant'],_0x80ed0d['comparisonType']=oDataComparisonTypes['in'],_0x80ed0d['rightSide']=_0xa28dd1['map'](_0x1efc38=>_0x1efc38[metas['idConstant']]),_0xf6815b=tryGetAndExpression(_0x80ed0d,getTableColumn(_0x9b0c14,_0x80ed0d['leftSide']));}}}return _0xf6815b;}__name(getFilterExpression,'getFilterExpression');function getPredicate(_0x5da5c5,_0x2a412c){const _0xbaa8ff=getTablesAndColumns(_0x5da5c5,_0x2a412c);if(!_0xbaa8ff)return void(0x20c8+0x2511+-0x1*0x45d9);const {enumerablePropertyTableName:_0x218ca4,enumerablePropertyTable:_0x852053,subPropertyTable:_0x46de1e,leftSide:_0x2c9a3f,leftSide1Column:_0x4b6604,leftSide2Column:_0x3eefb2,subQueryIdEqOperator:_0x975ba5}=_0xbaa8ff,_0x8f08ff=_0x2a412c['lambdaConfig']?.['method']===oDataLambdaMethods['all']?notExists:exists;if(_0x2c9a3f['length']===-0x4d6+-0x6ab+-0x3d6*-0x3){const _0x4f75c1=_0x2a412c['lambdaConfig']?.['method']===oDataLambdaMethods['all']?not(tryGetAndExpression(_0x2a412c,_0x4b6604)):tryGetAndExpression(_0x2a412c,_0x4b6604),_0x8c88=createDynamicSelect(_0x852053,{'leftSide1Column':_0x4b6604});return applyFilterToQuery(_0x8c88,and(_0x975ba5,_0x4f75c1)),_0x8f08ff(_0x8c88);}else {const _0x4ffdd5=_0x218ca4+metas['idConstant'],_0x11f05d=eq(_0x852053['id'],getTableColumn(_0x46de1e,_0x4ffdd5)),_0x1736cb=_0x2a412c['lambdaConfig']?.['method']===oDataLambdaMethods['all']?not(tryGetAndExpression(_0x2a412c,_0x3eefb2)):tryGetAndExpression(_0x2a412c,_0x3eefb2),_0x7e37f7=createDynamicSelect(_0x46de1e,{'leftSide2Column':_0x3eefb2}),_0x11888e=and(_0x11f05d,_0x1736cb);_0x11888e&&dbWhere(_0x7e37f7,_0x11888e);const _0xcf67cb=createDynamicSelect(_0x852053),_0x1436bf=and(_0x975ba5,exists(_0x7e37f7));return _0x1436bf&&dbWhere(_0xcf67cb,_0x1436bf),_0x8f08ff(_0xcf67cb);}}__name(getPredicate,'getPredicate');function getTablesAndColumns(_0x278fb,_0x17fc0e){const _0x35abca=convertPropertyNameToTableName(_0x17fc0e['lambdaConfig']?.['baseEnumerablePropertyName']??'');if(isNullOrUndefinedWithLogging(lambdaConfigNameConstants['baseEnumerablePropertyName'],_0x35abca)||isNullOrUndefinedWithLogging(lambdaConfigNameConstants['method'],_0x17fc0e['lambdaConfig']?.['method']))return void(0x515*-0x5+0x7*0x525+0xa9a*-0x1);const _0x226021=_0x17fc0e['leftSide']['split'](oDataSeparators['propertySeparator']),_0x3c029d=getTableByName(_0x278fb),_0x16dc82=getTableByName(_0x35abca),_0x296025=getTableByName(convertPropertyNameToTableName(_0x226021[-0x254f+-0x172c+0x27*0x18d])),_0x555b1d=getTableColumn(_0x16dc82,convertFromPascalToCamelCase(_0x226021[0x1*0x551+-0x1629+0x58*0x31])),_0x551bbf=getTableColumn(_0x296025,convertFromPascalToCamelCase(_0x226021[_0x226021['length']-(-0x14*-0x137+-0x286+0x15c5*-0x1)])),_0x5bdf98=eq(_0x3c029d['id'],getTableColumn(_0x16dc82,_0x278fb+metas['idConstant']));return {'enumerablePropertyTableName':_0x35abca,'enumerablePropertyTable':_0x16dc82,'subPropertyTable':_0x296025,'leftSide':_0x226021,'leftSide1Column':_0x555b1d,'leftSide2Column':_0x551bbf,'subQueryIdEqOperator':_0x5bdf98};}__name(getTablesAndColumns,'getTablesAndColumns');function groupBaseODataFilterByLogicalOrs(_0x3453e8){const _0x5c980a={};let _0x4f2534=[],_0x170896=-0x4*0x296+-0x1da9+0xb*0x3a3;_0x5c980a[_0x170896]=_0x4f2534;for(const _0x211d53 of _0x3453e8){_0x211d53['logicalOperationType']===oDataLogicalOperationTypes['or']?(_0x5c980a[_0x170896]=_0x4f2534,_0x4f2534=[_0x211d53],_0x5c980a[++_0x170896]=_0x4f2534):_0x4f2534['push'](_0x211d53);}return _0x5c980a;}__name(groupBaseODataFilterByLogicalOrs,'groupBaseODataFilterByLogicalOrs');function tryGetAndExpression(_0x728e3d,_0x113ced){const _0x2fde45=tryGetConstantExpression(_0x113ced['dataType'],String(_0x728e3d['rightSide']),_0x728e3d['comparisonType']);return addExpressionByType(_0x113ced,_0x2fde45,_0x728e3d['comparisonType']);}__name(tryGetAndExpression,'tryGetAndExpression');function tryGetConstantExpression(_0xdb4d3,_0x56df04,_0x3ae23e){let _0x457bbe;if(_0x56df04===oDataSpecialValues['nullValue'])_0x457bbe=[_0x56df04];else _0x3ae23e===oDataComparisonTypes['in']||_0x3ae23e===oDataComparisonTypes['nin']?_0x457bbe=parseRightSideToArray(_0x56df04):_0x457bbe=tryParseToType(_0xdb4d3,_0x56df04);return _0x457bbe;}__name(tryGetConstantExpression,'tryGetConstantExpression');function tryParseToType(_0x7a4734,_0x1bf8ee){let _0x5ccdb7;switch(_0x7a4734){case columnDataTypes['string']:_0x5ccdb7=_0x1bf8ee;break;case columnDataTypes['bigint']:case columnDataTypes['number']:_0x5ccdb7=parseFloat(_0x1bf8ee);break;case columnDataTypes['boolean']:_0x5ccdb7=_0x1bf8ee===columnDataTypes['integrationEnabled'];break;case columnDataTypes['date']:_0x5ccdb7=parseUtcStringToDate(_0x1bf8ee);break;case columnDataTypes['array']:throw createError(toolboxErrorMessages['odataUnsupportedType']['replace']('{0}',_0x7a4734));case columnDataTypes['json']:throw createError(toolboxErrorMessages['odataUnsupportedType']['replace']('{0}',_0x7a4734));case columnDataTypes['custom']:throw createError(toolboxErrorMessages['odataUnsupportedType']['replace']('{0}',_0x7a4734));case columnDataTypes['buffer']:throw createError(toolboxErrorMessages['odataUnsupportedType']['replace']('{0}',_0x7a4734));default:throw createError(toolboxErrorMessages['odataUnsupportedType']['replace']('{0}',_0x7a4734));}return _0x5ccdb7;}__name(tryParseToType,'tryParseToType');function addExpressionByType(_0x508659,_0xce7339,_0x24a431){const _0x318550=getComparisonTypeFromOperation(_0x24a431),_0x137939=sql`${_0x508659}`;return _0x318550(_0x137939,_0xce7339);}__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=(_0x2b2ed4,_0x48dd02)=>__defProp(_0x2b2ed4,'name',{'value':_0x48dd02,'configurable':!![]});function setDefaultOrderBy(_0x41767a){if(_0x41767a['length']===0x26*-0xf1+0x141*0x9+-0x1*-0x187d){const _0x35fad8={'direction':oDataOrderByDirectionConsts['asc'],'propertyName':withIdProps['id'],'priority':0x0};_0x41767a['push'](_0x35fad8);}}__name(setDefaultOrderBy,'setDefaultOrderBy');async function getMetaOrderBys(_0x1a2b89){const _0x83449f=[],_0x3d13cd=await getInternalResourceMeta(_0x1a2b89['resourceName']),{orderByProperty:_0x1448f1,orderByPriority:_0x32e8d6}=_0x3d13cd;addOrderBys(_0x83449f,_0x1448f1,_0x32e8d6);const _0x21c860=_0x3d13cd['properties'];for(const [_0xffe765,_0x1cb997]of Object['entries'](_0x1a2b89['properties'])){addOrderBys(_0x83449f,_0x21c860[_0xffe765]?.['orderByProperty'],_0x21c860[_0xffe765]?.['orderByPriority'],_0x1cb997);}return setDefaultOrderBy(_0x83449f),_0x83449f;}__name(getMetaOrderBys,'getMetaOrderBys');async function fillOdataConfigForMany(_0x5197bd,_0x47ff64){if(_0x47ff64&&!_0x47ff64['orderBys']?.['length']){const _0x4709ee=await getMetaOrderBys(_0x5197bd),_0x78a16c=[];for(const _0x41fd2d of _0x4709ee){const _0xc0fc7b={'propertyName':convertFromPascalToCamelCase(_0x41fd2d['propertyName']),'priority':_0x41fd2d['priority'],'direction':_0x41fd2d['direction']};_0x78a16c['push'](_0xc0fc7b);}_0x47ff64['orderBys']=_0x78a16c;}return _0x47ff64;}__name(fillOdataConfigForMany,'fillOdataConfigForMany');function addOrderBys(_0x437c02,_0x509c84,_0x2c34be,_0x71b81f){if(_0x2c34be){const _0xd03f3=_0x71b81f?.['name']??_0x509c84??withIdProps['id'];if(_0x437c02['some'](_0xda9787=>_0xda9787['propertyName']===_0xd03f3))return;const _0x50b78e={'propertyName':_0xd03f3,'direction':tableSortDirections['asc'],'priority':_0x2c34be};_0x437c02['push'](_0x50b78e);}}__name(addOrderBys,'addOrderBys');
+var __defProp=Object['defineProperty'],__name=(_0x214899,_0x4c1979)=>__defProp(_0x214899,'name',{'value':_0x4c1979,'configurable':!![]});function setDefaultOrderBy(_0x1585a2){if(_0x1585a2['length']===0x723+-0x1949+0x1226){const _0x488dbd={'direction':oDataOrderByDirectionConsts['asc'],'propertyName':withIdProps['id'],'priority':0x0};_0x1585a2['push'](_0x488dbd);}}__name(setDefaultOrderBy,'setDefaultOrderBy');async function getMetaOrderBys(_0x5a43a8){const _0x14ce43=[],_0x5f4740=await getInternalResourceMeta(_0x5a43a8['resourceName']),{orderByProperty:_0x2f0183,orderByPriority:_0x7f79e9}=_0x5f4740;addOrderBys(_0x14ce43,_0x2f0183,_0x7f79e9);const _0x2f8ad1=_0x5f4740['properties'];for(const [_0x18ac75,_0x30b039]of Object['entries'](_0x5a43a8['properties'])){addOrderBys(_0x14ce43,_0x2f8ad1[_0x18ac75]?.['orderByProperty'],_0x2f8ad1[_0x18ac75]?.['orderByPriority'],_0x30b039);}return setDefaultOrderBy(_0x14ce43),_0x14ce43;}__name(getMetaOrderBys,'getMetaOrderBys');async function fillOdataConfigForMany(_0x1cb3d2,_0xbfd56a){if(_0xbfd56a&&!_0xbfd56a['orderBys']?.['length']){const _0xf257a5=await getMetaOrderBys(_0x1cb3d2),_0x469afa=[];for(const _0x5abc82 of _0xf257a5){const _0xc554e2={'propertyName':convertFromPascalToCamelCase(_0x5abc82['propertyName']),'priority':_0x5abc82['priority'],'direction':_0x5abc82['direction']};_0x469afa['push'](_0xc554e2);}_0xbfd56a['orderBys']=_0x469afa;}return _0xbfd56a;}__name(fillOdataConfigForMany,'fillOdataConfigForMany');function addOrderBys(_0x3b9bcc,_0x1ea7b7,_0x12115e,_0x1f8a8b){if(_0x12115e){const _0x21c8ae=_0x1f8a8b?.['name']??_0x1ea7b7??withIdProps['id'];if(_0x3b9bcc['some'](_0x1bdfa0=>_0x1bdfa0['propertyName']===_0x21c8ae))return;const _0x135ace={'propertyName':_0x21c8ae,'direction':tableSortDirections['asc'],'priority':_0x12115e};_0x3b9bcc['push'](_0x135ace);}}__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=(_0x86b5b8,_0x2c9489)=>__defProp(_0x86b5b8,'name',{'value':_0x2c9489,'configurable':!![]});function prepareODataSelectOrExpandTree(_0x26b50b){const _0x50fce8=_0x26b50b??[],_0x33702b={};return _0x50fce8['forEach'](_0x4993e8=>{const _0x31b800=_0x4993e8['split'](oDataSeparators['propertySeparator']);let _0x8d9078=_0x33702b;_0x31b800['forEach'](_0x5a880a=>{_0x8d9078['children']??={},!_0x8d9078['children'][_0x5a880a]&&(_0x8d9078['children'][_0x5a880a]={}),_0x8d9078=_0x8d9078['children'][_0x5a880a];});}),_0x33702b;}__name(prepareODataSelectOrExpandTree,'prepareODataSelectOrExpandTree');function parseODataFilter(_0x50da0f){const _0x60d173=[];if(!_0x50da0f['trim']())return _0x60d173;let _0x526b76=![];const _0x4018ce=metaSplitFilters(_0x50da0f);for(const _0x457cf8 of _0x4018ce){if(_0x457cf8===oDataLogicalOperators['or'])_0x526b76=!![];else {const _0x4fb72b={'logicalOperationType':oDataLogicalOperationTypes['and'],'comparisonType':getComparisonType(_0x457cf8)};_0x526b76&&(_0x4fb72b['logicalOperationType']=oDataLogicalOperationTypes['or'],_0x526b76=![]);const _0x7a29c9=setLambdaConfigAndGetFilterComponents(_0x457cf8,_0x4fb72b);_0x4fb72b['leftSide']=convertFromPascalToCamelCase(_0x7a29c9[0x2710*-0x1+-0xa82+0x3192]);if(_0x7a29c9[-0x10d*-0x1b+-0xd00+-0x2*0x7af]['startsWith']('('+columnDataTypes['uuid'])||_0x7a29c9[0x449*0x5+-0x21a5+0xc39]['startsWith'](columnDataTypes['uuid'])){const _0x5607f4=parseGuidFilterValue(_0x7a29c9[0x1*0x13d9+-0x1cf*-0x1+-0xf1*0x17]);_0x4fb72b['rightSide']=trimWithRegex(_0x5607f4,![],oDataSeparators['stringQuote']),_0x4fb72b['type']=oDataFilterTypes['guid'];}else {if(_0x7a29c9[-0x607*0x5+0x7cf+0x1655]['startsWith'](columnDataTypes['datetime']))_0x4fb72b['rightSide']=trimWithRegex(_0x7a29c9[-0x1ac7+0x1*-0x260f+0x159d*0x3]['substring'](-0x42e+0x137b+-0xf44),![],oDataSeparators['stringQuote'],oDataSeparators['timezoneSuffix']);else {const _0x427524=trimWithRegex(_0x7a29c9[0x13fb+-0x65+-0x1395],!![],oDataSeparators['stringQuote'],oDataSeparators['openParenthesis']);_0x4fb72b['rightSide']=trimWithRegex(_0x427524,![],oDataSeparators['stringQuote'],oDataSeparators['closeParenthesis']);}}_0x60d173['push'](_0x4fb72b);}}return _0x60d173;}__name(parseODataFilter,'parseODataFilter');function parseExpand(_0x147a77){if(!_0x147a77)return [];return _0x147a77['split'](oDataSeparators['selectSeparator']);}__name(parseExpand,'parseExpand');function parseSorts(_0x513e35){if(_0x513e35){const _0x195280=[],_0x448d4b=_0x513e35['split'](oDataSeparators['selectSeparator']);for(const _0x4ee782 of _0x448d4b){const _0x276405=_0x4ee782['trim']()['split'](oDataSeparators['space']),_0x351d15={'propertyName':isPascalCase(_0x276405[-0x1*-0x8ad+-0x11e4+0x937])?convertFromPascalToCamelCase(_0x276405[0x24a7+0x137d+-0xe09*0x4]):_0x276405[0x168d*0x1+-0x1*-0x669+-0x2*0xe7b],'priority':0x0,'direction':_0x276405[-0xc13+-0xc7a*-0x1+0x22*-0x3]===oDataQueryParams['orderByDesc']?oDataOrderByDirectionConsts['desc']:oDataOrderByDirectionConsts['asc']};_0x195280['push'](_0x351d15);}return _0x195280;}return [];}__name(parseSorts,'parseSorts');function parseSelects(_0x3e294b){return _0x3e294b['split'](oDataSeparators['selectSeparator']);}__name(parseSelects,'parseSelects');function trimWithRegex(_0x422497,_0x4d5169,..._0xaa1ca8){const _0x5b6312=_0xaa1ca8['map'](escapeChar),_0x32a508='['+_0x5b6312['join'](oDataSeparators['emptyString'])+']+',_0x41c82a=_0x4d5169?oDataSeparators['emptyString']:oDataRegexPatterns['endOfLineMarker'],_0x391be3=new RegExp(''+_0x32a508+_0x41c82a);return _0x422497['replace'](_0x391be3,oDataSeparators['emptyString']);}__name(trimWithRegex,'trimWithRegex');function metaSplitFilters(_0x1cdcdd){return _0x1cdcdd['split'](new RegExp('\x5cs*('+oDataLogicalOperators['or']+'|'+oDataLogicalOperators['and']+')\x5cs*',oDataRegexPatterns['caseInsensitiveFlag']))['filter'](_0x6cafc9=>_0x6cafc9['trim']()!==oDataSeparators['emptyString']&&_0x6cafc9!==oDataLogicalOperators['and']);}__name(metaSplitFilters,'metaSplitFilters');function parseRightSideToArray(_0x5ad2f5){const _0x3a1a94=[],_0x3299fb=_0x5ad2f5['trim']()['replace'](trimQuotesRegex,oDataSpecialValues['parameterPlaceholder'])['split'](oDataSeparators['selectSeparator']);for(const _0x349ccc of _0x3299fb){let _0x5a7d20=_0x349ccc['replaceAll'](oDataSeparators['stringQuote'],oDataSeparators['emptyString'])['trim']();_0x5a7d20=_0x5a7d20['replace'](removeNonAlphanumericEndRegex,oDataSeparators['emptyString'])['trim']();if(uuidRegex['test'](_0x5a7d20))_0x3a1a94['push'](_0x5a7d20);else _0x5a7d20['includes'](columnDataTypes['uuid'])?_0x3a1a94['push'](_0x5a7d20['replace'](columnDataTypes['uuid'],oDataSeparators['emptyString'])['trim']()):_0x3a1a94['push'](numericRegex['test'](_0x5a7d20)?String(parseInt(_0x5a7d20,-0x1*0x2333+-0x1*0x24b5+0x47f2)):_0x5a7d20);}return _0x3a1a94;}__name(parseRightSideToArray,'parseRightSideToArray');function getComparisonType(_0x2f283b){for(const [_0xce13e4,_0x59fa3b]of filterConstantToComparison){if(_0x2f283b['includes'](_0xce13e4))return _0x59fa3b;}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(_0x26e140,_0x4b4083){if(_0x26e140['includes'](oDataSeparators['propertySeparator']+oDataLambdaOperators['any']+oDataSeparators['openParenthesis'])){const _0x6e969a=setODataLambdaConfigAndGetFilterString(_0x4b4083,_0x26e140,oDataLambdaMethods['any']);return getSplittedWithConstantsFilter(_0x6e969a);}else {if(_0x26e140['includes'](oDataSeparators['propertySeparator']+oDataLambdaOperators['all']+oDataSeparators['openParenthesis'])){const _0x492e24=setODataLambdaConfigAndGetFilterString(_0x4b4083,_0x26e140,oDataLambdaMethods['all']);return getSplittedWithConstantsFilter(_0x492e24);}else {if(_0x26e140['includes'](oDataComparisonOperators['startsWith']+oDataSeparators['openParenthesis'])){const _0x36328e=oDataRegexPatterns['functionParametersPattern'],_0x409f58=_0x36328e['exec'](_0x26e140);return [_0x409f58?.[-0x1*-0x1bae+0xf*-0x1cd+-0xaa]??oDataSeparators['emptyString'],_0x409f58?.[0x1333+-0xcd*0x17+0x9*-0x16]??oDataSeparators['emptyString']];}}}return getSplittedWithConstantsFilter(_0x26e140);}__name(setLambdaConfigAndGetFilterComponents,'setLambdaConfigAndGetFilterComponents');function setODataLambdaConfigAndGetFilterString(_0x272c13,_0x34930b,_0x520ad9){_0x272c13['type']=oDataFilterTypes['lambda'];const _0x2b4fb0=_0x34930b['split'](oDataSeparators['propertySeparator'],-0x3b9+0x5*0x1f9+0x3*-0x20b),_0xb0755b={'baseEnumerablePropertyName':_0x2b4fb0[0x1*0x2169+0x116c+0xb*-0x49f],'method':_0x520ad9};return _0x272c13['lambdaConfig']=_0xb0755b,trimWithRegex(_0x2b4fb0[_0x2b4fb0['length']-(-0x6b*-0x7+0x14*-0x4c+0x304)],![],oDataSeparators['closeParenthesis']);}__name(setODataLambdaConfigAndGetFilterString,'setODataLambdaConfigAndGetFilterString');function getSplittedWithConstantsFilter(_0x1aeaaf){return _0x1aeaaf['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(_0x5631e5){const _0x57a644=[],_0x29c5be=_0x5631e5['split'](oDataSeparators['selectSeparator']);for(const _0x2262c7 of _0x29c5be){let _0x576bc1=_0x2262c7['startsWith']('('+columnDataTypes['uuid'])?_0x2262c7['substring'](guidPrefixWithParenthesisLength):_0x2262c7['substring'](guidPrefixLength);_0x576bc1=_0x576bc1['replace'](trimQuotesRegex,oDataSpecialValues['parameterPlaceholder']),_0x576bc1=_0x576bc1['replace'](parenthesizedContent,oDataSpecialValues['parameterPlaceholder']),_0x576bc1=_0x576bc1['replace'](removeNonAlphanumericEndRegex,oDataSeparators['emptyString'])['trim'](),_0x57a644['push'](_0x576bc1);}return _0x57a644['join'](oDataSeparators['selectSeparator']);}__name(parseGuidFilterValue,'parseGuidFilterValue');function escapeChar(_0x5fb72a){let _0x232d46=_0x5fb72a;if(_0x5fb72a==='(')_0x232d46=String['raw']`\(`;else _0x5fb72a===')'&&(_0x232d46=String['raw']`\)`);return _0x232d46;}__name(escapeChar,'escapeChar');
+var __defProp=Object['defineProperty'],__name=(_0x2679c3,_0x3abe19)=>__defProp(_0x2679c3,'name',{'value':_0x3abe19,'configurable':!![]});function prepareODataSelectOrExpandTree(_0x5ca9bf){const _0x3215d6=_0x5ca9bf??[],_0x127962={};return _0x3215d6['forEach'](_0x2cc868=>{const _0x36e938=_0x2cc868['split'](oDataSeparators['propertySeparator']);let _0x1b12ca=_0x127962;_0x36e938['forEach'](_0x402a43=>{_0x1b12ca['children']??={},!_0x1b12ca['children'][_0x402a43]&&(_0x1b12ca['children'][_0x402a43]={}),_0x1b12ca=_0x1b12ca['children'][_0x402a43];});}),_0x127962;}__name(prepareODataSelectOrExpandTree,'prepareODataSelectOrExpandTree');function parseODataFilter(_0x388f59){const _0x4a6669=[];if(!_0x388f59['trim']())return _0x4a6669;let _0x59c077=![];const _0x2517f0=metaSplitFilters(_0x388f59);for(const _0x2d2c1b of _0x2517f0){if(_0x2d2c1b===oDataLogicalOperators['or'])_0x59c077=!![];else {const _0x5af579={'logicalOperationType':oDataLogicalOperationTypes['and'],'comparisonType':getComparisonType(_0x2d2c1b)};_0x59c077&&(_0x5af579['logicalOperationType']=oDataLogicalOperationTypes['or'],_0x59c077=![]);const _0x274045=setLambdaConfigAndGetFilterComponents(_0x2d2c1b,_0x5af579);_0x5af579['leftSide']=convertFromPascalToCamelCase(_0x274045[0x6e*-0x13+0x10f*-0x1d+0x1*0x26dd]);if(_0x274045[0x13fe+0x19fe+-0x2dfb*0x1]['startsWith']('('+columnDataTypes['uuid'])||_0x274045[-0x165*-0x12+0x17f+-0x1a98]['startsWith'](columnDataTypes['uuid'])){const _0x120635=parseGuidFilterValue(_0x274045[0x129+-0x43*-0x2f+-0xd*0x109]);_0x5af579['rightSide']=trimWithRegex(_0x120635,![],oDataSeparators['stringQuote']),_0x5af579['type']=oDataFilterTypes['guid'];}else {if(_0x274045[-0x1*-0x1bb+-0x1069*0x1+0xeaf]['startsWith'](columnDataTypes['datetime']))_0x5af579['rightSide']=trimWithRegex(_0x274045[-0x1532+0x938+-0xbfb*-0x1]['substring'](0x492+0x13ff+-0x1888),![],oDataSeparators['stringQuote'],oDataSeparators['timezoneSuffix']);else {const _0x387085=trimWithRegex(_0x274045[-0x9c1*0x2+-0xfb*0xa+0x5*0x5dd],!![],oDataSeparators['stringQuote'],oDataSeparators['openParenthesis']);_0x5af579['rightSide']=trimWithRegex(_0x387085,![],oDataSeparators['stringQuote'],oDataSeparators['closeParenthesis']);}}_0x4a6669['push'](_0x5af579);}}return _0x4a6669;}__name(parseODataFilter,'parseODataFilter');function parseExpand(_0x329e8c){if(!_0x329e8c)return [];return _0x329e8c['split'](oDataSeparators['selectSeparator']);}__name(parseExpand,'parseExpand');function parseSorts(_0x4f1b2f){if(_0x4f1b2f){const _0x28fea1=[],_0x59435f=_0x4f1b2f['split'](oDataSeparators['selectSeparator']);for(const _0xe54bbe of _0x59435f){const _0xf65574=_0xe54bbe['trim']()['split'](oDataSeparators['space']),_0x825252={'propertyName':isPascalCase(_0xf65574[-0x28e+0x1*-0x133+0x3c1])?convertFromPascalToCamelCase(_0xf65574[-0x179+-0x12bc*-0x2+-0x23ff]):_0xf65574[0x128c+-0x35*0x5f+0x11f],'priority':0x0,'direction':_0xf65574[-0xb6f*0x1+0x5d1*-0x5+0x2885]===oDataQueryParams['orderByDesc']?oDataOrderByDirectionConsts['desc']:oDataOrderByDirectionConsts['asc']};_0x28fea1['push'](_0x825252);}return _0x28fea1;}return [];}__name(parseSorts,'parseSorts');function parseSelects(_0x49fd47){return _0x49fd47['split'](oDataSeparators['selectSeparator']);}__name(parseSelects,'parseSelects');function trimWithRegex(_0x6fba3,_0x59da66,..._0x568f2f){const _0x1de6e2=_0x568f2f['map'](escapeChar),_0x5c5d0b='['+_0x1de6e2['join'](oDataSeparators['emptyString'])+']+',_0x3ca988=_0x59da66?oDataSeparators['emptyString']:oDataRegexPatterns['endOfLineMarker'],_0x3e7e00=new RegExp(''+_0x5c5d0b+_0x3ca988);return _0x6fba3['replace'](_0x3e7e00,oDataSeparators['emptyString']);}__name(trimWithRegex,'trimWithRegex');function metaSplitFilters(_0x2810ef){return _0x2810ef['split'](new RegExp('\x5cs*('+oDataLogicalOperators['or']+'|'+oDataLogicalOperators['and']+')\x5cs*',oDataRegexPatterns['caseInsensitiveFlag']))['filter'](_0x1bdfd8=>_0x1bdfd8['trim']()!==oDataSeparators['emptyString']&&_0x1bdfd8!==oDataLogicalOperators['and']);}__name(metaSplitFilters,'metaSplitFilters');function parseRightSideToArray(_0x2a5906){const _0x1e556d=[],_0x46e627=_0x2a5906['trim']()['replace'](trimQuotesRegex,oDataSpecialValues['parameterPlaceholder'])['split'](oDataSeparators['selectSeparator']);for(const _0x3804ca of _0x46e627){let _0x1067fa=_0x3804ca['replaceAll'](oDataSeparators['stringQuote'],oDataSeparators['emptyString'])['trim']();_0x1067fa=_0x1067fa['replace'](removeNonAlphanumericEndRegex,oDataSeparators['emptyString'])['trim']();if(uuidRegex['test'](_0x1067fa))_0x1e556d['push'](_0x1067fa);else _0x1067fa['includes'](columnDataTypes['uuid'])?_0x1e556d['push'](_0x1067fa['replace'](columnDataTypes['uuid'],oDataSeparators['emptyString'])['trim']()):_0x1e556d['push'](numericRegex['test'](_0x1067fa)?String(parseInt(_0x1067fa,0x1fe8+0x1*-0x1ebb+-0x3*0x61)):_0x1067fa);}return _0x1e556d;}__name(parseRightSideToArray,'parseRightSideToArray');function getComparisonType(_0x1845a0){for(const [_0x1b3ec2,_0x4f7cec]of filterConstantToComparison){if(_0x1845a0['includes'](_0x1b3ec2))return _0x4f7cec;}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(_0x18a80e,_0x29f7a8){if(_0x18a80e['includes'](oDataSeparators['propertySeparator']+oDataLambdaOperators['any']+oDataSeparators['openParenthesis'])){const _0xf34fc3=setODataLambdaConfigAndGetFilterString(_0x29f7a8,_0x18a80e,oDataLambdaMethods['any']);return getSplittedWithConstantsFilter(_0xf34fc3);}else {if(_0x18a80e['includes'](oDataSeparators['propertySeparator']+oDataLambdaOperators['all']+oDataSeparators['openParenthesis'])){const _0x677080=setODataLambdaConfigAndGetFilterString(_0x29f7a8,_0x18a80e,oDataLambdaMethods['all']);return getSplittedWithConstantsFilter(_0x677080);}else {if(_0x18a80e['includes'](oDataComparisonOperators['startsWith']+oDataSeparators['openParenthesis'])){const _0xdd8807=oDataRegexPatterns['functionParametersPattern'],_0x243b6b=_0xdd8807['exec'](_0x18a80e);return [_0x243b6b?.[0x2303*-0x1+0xbd6+0x8a*0x2b]??oDataSeparators['emptyString'],_0x243b6b?.[0x613*0x1+-0xadd*0x3+0x1a86]??oDataSeparators['emptyString']];}}}return getSplittedWithConstantsFilter(_0x18a80e);}__name(setLambdaConfigAndGetFilterComponents,'setLambdaConfigAndGetFilterComponents');function setODataLambdaConfigAndGetFilterString(_0x478058,_0x1d66de,_0xc457cf){_0x478058['type']=oDataFilterTypes['lambda'];const _0x22fd5d=_0x1d66de['split'](oDataSeparators['propertySeparator'],0xdeb+-0x1877+0xa8f),_0x2a6d34={'baseEnumerablePropertyName':_0x22fd5d[0x10c0+-0x1*0xa75+-0xb3*0x9],'method':_0xc457cf};return _0x478058['lambdaConfig']=_0x2a6d34,trimWithRegex(_0x22fd5d[_0x22fd5d['length']-(-0x21b4+-0x3a6+0x1*0x255b)],![],oDataSeparators['closeParenthesis']);}__name(setODataLambdaConfigAndGetFilterString,'setODataLambdaConfigAndGetFilterString');function getSplittedWithConstantsFilter(_0x4342b4){return _0x4342b4['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(_0x38b369){const _0x37a7c3=[],_0x23cbbc=_0x38b369['split'](oDataSeparators['selectSeparator']);for(const _0x1f1a68 of _0x23cbbc){let _0x312896=_0x1f1a68['startsWith']('('+columnDataTypes['uuid'])?_0x1f1a68['substring'](guidPrefixWithParenthesisLength):_0x1f1a68['substring'](guidPrefixLength);_0x312896=_0x312896['replace'](trimQuotesRegex,oDataSpecialValues['parameterPlaceholder']),_0x312896=_0x312896['replace'](parenthesizedContent,oDataSpecialValues['parameterPlaceholder']),_0x312896=_0x312896['replace'](removeNonAlphanumericEndRegex,oDataSeparators['emptyString'])['trim'](),_0x37a7c3['push'](_0x312896);}return _0x37a7c3['join'](oDataSeparators['selectSeparator']);}__name(parseGuidFilterValue,'parseGuidFilterValue');function escapeChar(_0x310ded){let _0x3e976e=_0x310ded;if(_0x310ded==='(')_0x3e976e=String['raw']`\(`;else _0x310ded===')'&&(_0x3e976e=String['raw']`\)`);return _0x3e976e;}__name(escapeChar,'escapeChar');
 export { metaSplitFilters, parseExpand, parseODataFilter, parseRightSideToArray, parseSelects, parseSorts, prepareODataSelectOrExpandTree, trimWithRegex };

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=(_0x363be4,_0x567a20)=>__defProp(_0x363be4,'name',{'value':_0x567a20,'configurable':!![]});function getODataConfig(_0x53425e,_0xa90926,_0x18c343,_0x35207b,_0x49d71b,_0xae663b){if(!hasAnyParams(_0x53425e,_0xa90926,_0x18c343,_0x35207b,_0x49d71b,_0xae663b))return {};return {'filters':_0x53425e?parseODataFilter(_0x53425e):[],'expands':_0xa90926?parseExpand(_0xa90926):[],'orderBys':_0x18c343?parseSorts(_0x18c343):[],'selects':_0xae663b?parseSelects(_0xae663b):[],'skip':_0x35207b,'top':_0x49d71b};}__name(getODataConfig,'getODataConfig');async function filterODataSelectOrExpandTree(_0x476926,_0x59fed2,_0x5158f3){const _0x48f2f1=await getResourceMeta(_0x476926),_0x4e981e={'resourceMeta':_0x48f2f1,'children':_0x5158f3?getNotExpandblePropertyChidren(_0x48f2f1):{}};if(_0x59fed2['children'])for(const [_0xb4d340,_0x573a0d]of Object['entries'](_0x59fed2['children'])){await processProperty(_0xb4d340,_0x48f2f1,_0x573a0d,_0x4e981e,_0x5158f3);}return _0x4e981e;}__name(filterODataSelectOrExpandTree,'filterODataSelectOrExpandTree');function groupODataResults(_0x4d336f,_0xa271a,_0x5082fc){const _0x4507fa=new Map();for(const _0x5941be of _0x4d336f){const _0x3cf1cc=_0x5941be[metas['idConstant']];isString(_0x3cf1cc)&&(!_0x4507fa['has'](_0x3cf1cc)&&_0x4507fa['set'](_0x3cf1cc,[]),_0x4507fa['get'](_0x3cf1cc)['push'](_0x5941be));}const _0x4d468d=[];for(const _0x44575d of _0x4507fa['values']()){const _0x4005a6=processGroupElements(_0x44575d,_0xa271a,_0x5082fc);_0x4d468d['push'](_0x4005a6);}return _0x4d468d;}__name(groupODataResults,'groupODataResults');function getEmptyODataConfig(){const _0x3dbbec={'filters':[],'expands':[],'orderBys':[],'selects':[]};return _0x3dbbec;}__name(getEmptyODataConfig,'getEmptyODataConfig');async function getODataConfigFromRequest(_0x5a494a){const {searchParams:_0x58f56f}=new URL(_0x5a494a['url']),_0x449a66=new URL(_0x5a494a['url'])['pathname']['split']('/'),_0x2655d2=_0x58f56f['get'](oDataQueryParams['filter']),_0x5b3714=_0x58f56f['get'](oDataQueryParams['expand']),_0x4e96a7=_0x58f56f['get'](oDataQueryParams['orderBys'])??await checkForDefaultSorting(_0x449a66[_0x449a66['length']-(-0xf2b+-0xbcf+0x1afb*0x1)],_0x58f56f),_0x319558=_0x58f56f['get'](oDataQueryParams['select']),_0x46a6ee=_0x58f56f['get'](oDataQueryParams['skip']),_0x59dd84=_0x58f56f['get'](oDataQueryParams['top']),_0x416fd2=_0x46a6ee?Number(_0x46a6ee):void(0x1adb+0xeda*-0x1+-0xc01),_0x2e1d95=_0x59dd84?Number(_0x59dd84):void(-0x169*0x9+0xd6d+-0xbc),_0xd67165=getODataConfig(_0x2655d2,_0x5b3714,_0x4e96a7,_0x416fd2,_0x2e1d95,_0x319558);return _0xd67165;}__name(getODataConfigFromRequest,'getODataConfigFromRequest');function getODataFilterParams(_0x5cc587){if(!_0x5cc587['filters']||_0x5cc587['filters']['length']===-0x18ce+-0x451*0x2+0x358*0xa)return [];const _0x3b2562={'name':oDataQueryParams['filter'],'value':buildFilterString(_0x5cc587['filters'])};return [_0x3b2562];}__name(getODataFilterParams,'getODataFilterParams');function getBaseAndRelatedFilters(_0x1c5b90){const _0x3008e1=_0x1c5b90['filters'],{defaultFilters:_0x141504,relatedFilters:_0x2b89fe}=groupQueryFilters(_0x3008e1);return {'defaultFilters':_0x141504,'relatedFilters':_0x2b89fe};}__name(getBaseAndRelatedFilters,'getBaseAndRelatedFilters');function buildFilterString(_0x1bb895){return _0x1bb895['map'](_0x53f587=>{const _0x2d7aad=_0x53f587['leftSide'],_0xcf8be7=_0x53f587['rightSide'];return _0x53f587['type']===oDataFilterTypes['guid']?_0x2d7aad+'\x20eq\x20guid\x27'+_0xcf8be7+'\x27':_0x2d7aad+'\x20eq\x20\x27'+_0xcf8be7+'\x27';})['join']('\x20'+oDataQueryParams['and']+'\x20');}__name(buildFilterString,'buildFilterString');function groupQueryFilters(_0x267e2c){const _0x331918=[],_0x487379=[];for(const _0x4d0126 of _0x267e2c){relatedFilterRegex['test'](_0x4d0126['leftSide'])?_0x487379['push'](_0x4d0126):_0x331918['push'](_0x4d0126);}return {'defaultFilters':_0x331918,'relatedFilters':_0x487379};}__name(groupQueryFilters,'groupQueryFilters');async function checkForDefaultSorting(_0x355911,_0x366f3f){const _0x225d70=await getResourceMeta(_0x355911),_0x346f48=_0x366f3f['get'](oDataQueryParams['select']);let _0x14cc9c;return _0x225d70?.['orderBys']&&_0x225d70['orderBys']['forEach'](_0x3bee81=>{if(_0x3bee81['propertyName']===_0x346f48)_0x14cc9c=_0x3bee81['propertyName'];}),_0x14cc9c;}__name(checkForDefaultSorting,'checkForDefaultSorting');function hasAnyParams(..._0x4a036a){return _0x4a036a['some'](_0x1bb118=>_0x1bb118!==void(0x7*0xf1+0xd*0xf4+-0x12fb));}__name(hasAnyParams,'hasAnyParams');function getNotExpandblePropertyChidren(_0x5c9c1b){const _0x3c51d7={};return Object['keys'](_0x5c9c1b['properties'])['forEach'](_0x21c6af=>{const _0x225ca6=_0x5c9c1b['properties'][_0x21c6af];!isPropertyExpandable(_0x225ca6)&&!_0x225ca6['isDynamic']&&(_0x3c51d7[_0x21c6af]={});}),_0x3c51d7;}__name(getNotExpandblePropertyChidren,'getNotExpandblePropertyChidren');async function processProperty(_0x4381ed,_0x2de1eb,_0x47e206,_0xf25797,_0x18dba4){const _0x487358=_0x2de1eb['properties'][_0x4381ed];if(_0x487358){if(isPropertyExpandable(_0x487358)){const _0x3e7516=await filterODataSelectOrExpandTree(_0x487358['relation']['relatedResourceName'],_0x47e206,_0x18dba4);_0x3e7516&&(_0xf25797['children'][_0x4381ed]=_0x3e7516);}else _0xf25797['children'][_0x4381ed]={};}else logWarning(warningMessages['odataSelectNoProperty']['replace']('{0}',_0x2de1eb['resourceName'])['replace']('{1}',_0x4381ed));}__name(processProperty,'processProperty');function processElement(_0x53a5fe,_0x4dcce8,_0x4ec154){let _0x1f74a8;const _0x4b7257=processGroupElements([_0x53a5fe],_0x4dcce8,_0x4ec154);return _0x1f74a8=_0x4b7257,_0x1f74a8;}__name(processElement,'processElement');function processGroupElements(_0x15cb62,_0x160a8a,_0x3d0063){const _0x150a49=_0x160a8a['children']??{},_0x573178={};for(const [_0x3d3142,_0x232374]of Object['entries'](_0x150a49)){const _0x5d27be=_0x3d0063['properties'][_0x3d3142],_0x3a6c5b=getGroupedPropertyValuesByName(_0x15cb62,_0x3d3142);if(Object['keys'](_0x232374)['length']>0x2*0x11a2+-0xa00+-0xc*0x21b){const _0x496d0c=getUniqueObjectPropertyValues(_0x3a6c5b);switch(_0x5d27be['type']){case propertyTypes['array']:{_0x573178[_0x3d3142]=processArray(_0x496d0c,_0x232374,_0x232374['resourceMeta']);break;}case propertyTypes['object']:{_0x573178[_0x3d3142]=processObject(_0x496d0c,_0x232374,_0x232374['resourceMeta']);break;}default:{throw createError(metaErrorMessages['typeMismatch']);}}}else _0x573178[_0x3d3142]=getSingleOrEmpty(getUniqueSimplePropertyValues(_0x3a6c5b));}return _0x573178;}__name(processGroupElements,'processGroupElements');function processArray(_0x5ea633,_0x59fb2b,_0x25d40f){return _0x5ea633['map'](_0x413210=>{const _0x281952=processElement(_0x413210,_0x59fb2b,_0x25d40f);return _0x281952;});}__name(processArray,'processArray');function processObject(_0x1034da,_0x3aa35f,_0x433a83){let _0x2554ab;const _0x210654=getSingleOrEmpty(_0x1034da);return _0x210654&&(_0x2554ab=processElement(_0x210654,_0x3aa35f,_0x433a83)),_0x2554ab;}__name(processObject,'processObject');function getGroupedPropertyValuesByName(_0x2da958,_0x972f1e){const _0x5ec79b=[];for(const _0x393c56 of _0x2da958){!isNullOrUndefined(_0x393c56[_0x972f1e])&&_0x5ec79b['push'](_0x393c56[_0x972f1e]);}return _0x5ec79b;}__name(getGroupedPropertyValuesByName,'getGroupedPropertyValuesByName');function getUniqueObjectPropertyValues(_0x30b7fc){const _0x49d269={};for(const _0x1df501 of _0x30b7fc){if(isWithId(_0x1df501))_0x49d269[_0x1df501['id']]=_0x1df501;else throw createError(metaErrorMessages['valueIsNotObjectWithId']);}return Object['values'](_0x49d269);}__name(getUniqueObjectPropertyValues,'getUniqueObjectPropertyValues');function getUniqueSimplePropertyValues(_0x39b012){const _0x2cdc72=[];for(const _0x5bb0a3 of _0x39b012){const _0x35083d=_0x2cdc72['some'](_0x94d78b=>{if(_0x5bb0a3 instanceof Date&&_0x94d78b instanceof Date)return _0x94d78b['getTime']()===_0x5bb0a3['getTime']();return _0x94d78b===_0x5bb0a3;});!_0x35083d&&_0x2cdc72['push'](_0x5bb0a3);}return _0x2cdc72;}__name(getUniqueSimplePropertyValues,'getUniqueSimplePropertyValues');
+var __defProp=Object['defineProperty'],__name=(_0x4d50e0,_0x214e57)=>__defProp(_0x4d50e0,'name',{'value':_0x214e57,'configurable':!![]});function getODataConfig(_0x363632,_0x272be9,_0xf76dc6,_0x5d8573,_0x1fc1d5,_0x4f5ef3){if(!hasAnyParams(_0x363632,_0x272be9,_0xf76dc6,_0x5d8573,_0x1fc1d5,_0x4f5ef3))return {};return {'filters':_0x363632?parseODataFilter(_0x363632):[],'expands':_0x272be9?parseExpand(_0x272be9):[],'orderBys':_0xf76dc6?parseSorts(_0xf76dc6):[],'selects':_0x4f5ef3?parseSelects(_0x4f5ef3):[],'skip':_0x5d8573,'top':_0x1fc1d5};}__name(getODataConfig,'getODataConfig');async function filterODataSelectOrExpandTree(_0x17e2d0,_0x2e4449,_0x150f85){const _0xf8980f=await getResourceMeta(_0x17e2d0),_0x52dceb={'resourceMeta':_0xf8980f,'children':_0x150f85?getNotExpandblePropertyChidren(_0xf8980f):{}};if(_0x2e4449['children'])for(const [_0x554c9e,_0x565c4c]of Object['entries'](_0x2e4449['children'])){await processProperty(_0x554c9e,_0xf8980f,_0x565c4c,_0x52dceb,_0x150f85);}return _0x52dceb;}__name(filterODataSelectOrExpandTree,'filterODataSelectOrExpandTree');function groupODataResults(_0xd89780,_0x3aab5d,_0x260716){const _0xd36313=new Map();for(const _0xe6d32f of _0xd89780){const _0x2bd196=_0xe6d32f[metas['idConstant']];isString(_0x2bd196)&&(!_0xd36313['has'](_0x2bd196)&&_0xd36313['set'](_0x2bd196,[]),_0xd36313['get'](_0x2bd196)['push'](_0xe6d32f));}const _0x530004=[];for(const _0x36ca75 of _0xd36313['values']()){const _0x25c6c2=processGroupElements(_0x36ca75,_0x3aab5d,_0x260716);_0x530004['push'](_0x25c6c2);}return _0x530004;}__name(groupODataResults,'groupODataResults');function getEmptyODataConfig(){const _0x22177b={'filters':[],'expands':[],'orderBys':[],'selects':[]};return _0x22177b;}__name(getEmptyODataConfig,'getEmptyODataConfig');async function getODataConfigFromRequest(_0x5db2bc){const {searchParams:_0x46693a}=new URL(_0x5db2bc['url']),_0x4262b7=new URL(_0x5db2bc['url'])['pathname']['split']('/'),_0x5c6b47=_0x46693a['get'](oDataQueryParams['filter']),_0x1b5e8b=_0x46693a['get'](oDataQueryParams['expand']),_0x53035e=_0x46693a['get'](oDataQueryParams['orderBys'])??await checkForDefaultSorting(_0x4262b7[_0x4262b7['length']-(0x20f7+0xabb*0x1+0x2bb1*-0x1)],_0x46693a),_0x5cde95=_0x46693a['get'](oDataQueryParams['select']),_0x498128=_0x46693a['get'](oDataQueryParams['skip']),_0x306312=_0x46693a['get'](oDataQueryParams['top']),_0x38236d=_0x498128?Number(_0x498128):void(0x167+0x1e2a+0x1f91*-0x1),_0x4dd9ef=_0x306312?Number(_0x306312):void(-0x278*0x9+0x1729+0xf1*-0x1),_0x2873cd=getODataConfig(_0x5c6b47,_0x1b5e8b,_0x53035e,_0x38236d,_0x4dd9ef,_0x5cde95);return _0x2873cd;}__name(getODataConfigFromRequest,'getODataConfigFromRequest');function getODataFilterParams(_0x28c0a5){if(!_0x28c0a5['filters']||_0x28c0a5['filters']['length']===0x146*-0x8+-0x9ff*0x1+-0x142f*-0x1)return [];const _0x12da50={'name':oDataQueryParams['filter'],'value':buildFilterString(_0x28c0a5['filters'])};return [_0x12da50];}__name(getODataFilterParams,'getODataFilterParams');function getBaseAndRelatedFilters(_0x41ded5){const _0x450751=_0x41ded5['filters'],{defaultFilters:_0x4e3f25,relatedFilters:_0x183107}=groupQueryFilters(_0x450751);return {'defaultFilters':_0x4e3f25,'relatedFilters':_0x183107};}__name(getBaseAndRelatedFilters,'getBaseAndRelatedFilters');function buildFilterString(_0x49ae29){return _0x49ae29['map'](_0x15674e=>{const _0x35b251=_0x15674e['leftSide'],_0x30deef=_0x15674e['rightSide'];return _0x15674e['type']===oDataFilterTypes['guid']?_0x35b251+'\x20eq\x20guid\x27'+_0x30deef+'\x27':_0x35b251+'\x20eq\x20\x27'+_0x30deef+'\x27';})['join']('\x20'+oDataQueryParams['and']+'\x20');}__name(buildFilterString,'buildFilterString');function groupQueryFilters(_0x188d77){const _0x4521b4=[],_0x54cc01=[];for(const _0x322129 of _0x188d77){relatedFilterRegex['test'](_0x322129['leftSide'])?_0x54cc01['push'](_0x322129):_0x4521b4['push'](_0x322129);}return {'defaultFilters':_0x4521b4,'relatedFilters':_0x54cc01};}__name(groupQueryFilters,'groupQueryFilters');async function checkForDefaultSorting(_0x317c88,_0x2faa20){const _0x5ec292=await getResourceMeta(_0x317c88),_0x2e2c22=_0x2faa20['get'](oDataQueryParams['select']);let _0x420d1f;return _0x5ec292?.['orderBys']&&_0x5ec292['orderBys']['forEach'](_0x25fc2a=>{if(_0x25fc2a['propertyName']===_0x2e2c22)_0x420d1f=_0x25fc2a['propertyName'];}),_0x420d1f;}__name(checkForDefaultSorting,'checkForDefaultSorting');function hasAnyParams(..._0x497aed){return _0x497aed['some'](_0x60111c=>_0x60111c!==void(-0x6*0x59c+0x1e6a+0xa6*0x5));}__name(hasAnyParams,'hasAnyParams');function getNotExpandblePropertyChidren(_0x24333a){const _0x3669f4={};return Object['keys'](_0x24333a['properties'])['forEach'](_0x10e379=>{const _0x4ba04f=_0x24333a['properties'][_0x10e379];!isPropertyExpandable(_0x4ba04f)&&!_0x4ba04f['isDynamic']&&(_0x3669f4[_0x10e379]={});}),_0x3669f4;}__name(getNotExpandblePropertyChidren,'getNotExpandblePropertyChidren');async function processProperty(_0x37918e,_0x6d97a4,_0x192a4e,_0x2c47e3,_0x3c521c){const _0x166ad5=_0x6d97a4['properties'][_0x37918e];if(_0x166ad5){if(isPropertyExpandable(_0x166ad5)){const _0x3f1db8=await filterODataSelectOrExpandTree(_0x166ad5['relation']['relatedResourceName'],_0x192a4e,_0x3c521c);_0x3f1db8&&(_0x2c47e3['children'][_0x37918e]=_0x3f1db8);}else _0x2c47e3['children'][_0x37918e]={};}else logWarning(warningMessages['odataSelectNoProperty']['replace']('{0}',_0x6d97a4['resourceName'])['replace']('{1}',_0x37918e));}__name(processProperty,'processProperty');function processElement(_0x55d584,_0x2af846,_0x451846){let _0x1f4ceb;const _0x981972=processGroupElements([_0x55d584],_0x2af846,_0x451846);return _0x1f4ceb=_0x981972,_0x1f4ceb;}__name(processElement,'processElement');function processGroupElements(_0x2cfd39,_0x14789f,_0x599ca2){const _0x21f9f8=_0x14789f['children']??{},_0x410980={};for(const [_0x2650b4,_0xfcd91a]of Object['entries'](_0x21f9f8)){const _0x9889fc=_0x599ca2['properties'][_0x2650b4],_0x11a2fc=getGroupedPropertyValuesByName(_0x2cfd39,_0x2650b4);if(Object['keys'](_0xfcd91a)['length']>0x87d+-0x131e*0x2+-0x1dbf*-0x1){const _0x27d500=getUniqueObjectPropertyValues(_0x11a2fc);switch(_0x9889fc['type']){case propertyTypes['array']:{_0x410980[_0x2650b4]=processArray(_0x27d500,_0xfcd91a,_0xfcd91a['resourceMeta']);break;}case propertyTypes['object']:{_0x410980[_0x2650b4]=processObject(_0x27d500,_0xfcd91a,_0xfcd91a['resourceMeta']);break;}default:{throw createError(metaErrorMessages['typeMismatch']);}}}else _0x410980[_0x2650b4]=getSingleOrEmpty(getUniqueSimplePropertyValues(_0x11a2fc));}return _0x410980;}__name(processGroupElements,'processGroupElements');function processArray(_0x5b08ae,_0x17907d,_0x15a9f4){return _0x5b08ae['map'](_0x3d6ed2=>{const _0x3f98c0=processElement(_0x3d6ed2,_0x17907d,_0x15a9f4);return _0x3f98c0;});}__name(processArray,'processArray');function processObject(_0x25e628,_0x2508f1,_0x1d8238){let _0x561a77;const _0xa0638d=getSingleOrEmpty(_0x25e628);return _0xa0638d&&(_0x561a77=processElement(_0xa0638d,_0x2508f1,_0x1d8238)),_0x561a77;}__name(processObject,'processObject');function getGroupedPropertyValuesByName(_0x2a425d,_0x31eb44){const _0x987449=[];for(const _0x3cf1a1 of _0x2a425d){!isNullOrUndefined(_0x3cf1a1[_0x31eb44])&&_0x987449['push'](_0x3cf1a1[_0x31eb44]);}return _0x987449;}__name(getGroupedPropertyValuesByName,'getGroupedPropertyValuesByName');function getUniqueObjectPropertyValues(_0x4a6437){const _0x4746d5={};for(const _0x56d6b8 of _0x4a6437){if(isWithId(_0x56d6b8))_0x4746d5[_0x56d6b8['id']]=_0x56d6b8;else throw createError(metaErrorMessages['valueIsNotObjectWithId']);}return Object['values'](_0x4746d5);}__name(getUniqueObjectPropertyValues,'getUniqueObjectPropertyValues');function getUniqueSimplePropertyValues(_0x1680d6){const _0x2b650=[];for(const _0x3a58dc of _0x1680d6){const _0x29a750=_0x2b650['some'](_0x3e85dc=>{if(_0x3a58dc instanceof Date&&_0x3e85dc instanceof Date)return _0x3e85dc['getTime']()===_0x3a58dc['getTime']();return _0x3e85dc===_0x3a58dc;});!_0x29a750&&_0x2b650['push'](_0x3a58dc);}return _0x2b650;}__name(getUniqueSimplePropertyValues,'getUniqueSimplePropertyValues');
 export { filterODataSelectOrExpandTree, getBaseAndRelatedFilters, getEmptyODataConfig, getODataConfig, getODataConfigFromRequest, getODataFilterParams, groupODataResults };

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

@@ -8,6 +8,6 @@ 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=(_0x3e89d2,_0x594379)=>__defProp(_0x3e89d2,'name',{'value':_0x594379,'configurable':!![]});async function apiAuthorize(){const _0x469781=await getSessionToken();if(isEmptyNullOrUndefined(_0x469781))throw apiUnauthorizedError();const _0x5945e8=await validateSessionToken(_0x469781);if(isEmptyNullOrUndefined(_0x5945e8['userId']))throw apiUnauthorizedError();return _0x5945e8;}__name(apiAuthorize,'apiAuthorize');async function requirePageAuth(){const _0x52d0a8=await pageAuthorize();!_0x52d0a8&&fdRedirect('/'+routes['login']);}__name(requirePageAuth,'requirePageAuth');async function pageAuthorize(){const _0x4b4da6=await getSessionToken();if(!_0x4b4da6)return ![];const _0x26a8cb=await tryGetFromCoreCache(fdServerCacheKeys['pageAuth']);if(_0x26a8cb)return _0x26a8cb['isAuthorized'];const _0x4bb714=await validateSessionToken(_0x4b4da6),_0x1fb253=!!_0x4bb714['userId'];return await setCoreCache(fdServerCacheKeys['pageAuth'],{'isAuthorized':_0x1fb253},{'slidingExpirationSeconds':fdServerCacheKeys['secondsInFifteenMinutes']}),_0x1fb253;}__name(pageAuthorize,'pageAuthorize');
+var __defProp=Object['defineProperty'],__name=(_0x336d0f,_0x4d779b)=>__defProp(_0x336d0f,'name',{'value':_0x4d779b,'configurable':!![]});async function apiAuthorize(){const _0x3d12a6=await getSessionToken();if(isEmptyNullOrUndefined(_0x3d12a6))throw apiUnauthorizedError();const _0xcc9715=await validateSessionToken(_0x3d12a6);if(isEmptyNullOrUndefined(_0xcc9715['userId']))throw apiUnauthorizedError();return _0xcc9715;}__name(apiAuthorize,'apiAuthorize');async function requirePageAuth(){const _0x2a5b7e=await pageAuthorize();!_0x2a5b7e&&fdRedirect('/'+routes['login']);}__name(requirePageAuth,'requirePageAuth');async function pageAuthorize(){const _0x209fa8=await getSessionToken();if(!_0x209fa8)return ![];const _0x31326a=await tryGetFromCoreCache(fdServerCacheKeys['pageAuth'],_0x209fa8);if(_0x31326a)return _0x31326a;const _0x1173e1=await validateSessionToken(_0x209fa8),_0x4628a4=!!_0x1173e1['userId'];return await setCoreCache(fdServerCacheKeys['pageAuth'],_0x4628a4,{'slidingExpirationSeconds':fdServerCacheKeys['secondsInFifteenMinutes']},_0x209fa8),_0x4628a4;}__name(pageAuthorize,'pageAuthorize');
 export { apiAuthorize, requirePageAuth };

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

@@ -8,6 +8,6 @@ import { millisecondsInSecond } from 'date-fns/constants';
 import { sessionCookieName } from './session-validation.js';
 import { createResource } from '../resources/crud-resources.js';
-var __defProp=Object['defineProperty'],__name=(_0x2507e3,_0x4ef73a)=>__defProp(_0x2507e3,'name',{'value':_0x4ef73a,'configurable':!![]});const sessionTtl=(0x329*-0x3+-0x2*0x11e6+0x2d55*0x1)*(-0x3e*-0x27+0x15fb+0x269*-0xd)*(-0x20c7+-0x1226+0x74f*0x7)*(0x1160+0x115f+-0x2283)*(0xd75+-0x11dd+0x4*0x214);async function createSession(_0x247f17,{homeWorkspaceId:_0x2c2625,currentWorkspaceId:_0x1b4234}){const _0x31a924=randomBytes(0x1693+0x1bb0+-0x47*0xb5)['toString']('base64url'),_0x298deb=parseToUtc(getNowUtc()['getTime']()+sessionTtl);return createResource({'id':_0x31a924,'userId':_0x247f17,'homeWorkspaceId':_0x2c2625,'currentWorkspaceId':_0x1b4234,'expiresAt':_0x298deb},resourceNames['session']);}__name(createSession,'createSession');async function invalidateSession(_0x392df5){await deleteResource(_0x392df5,resourceNames['session']);}__name(invalidateSession,'invalidateSession');function createSessionCookie(_0x591f6e){return createCookie(sessionCookieName,_0x591f6e,{[cookieAttributes['maxAge']]:(sessionTtl/millisecondsInSecond)['toString']()});}__name(createSessionCookie,'createSessionCookie');
+var __defProp=Object['defineProperty'],__name=(_0x543d5a,_0x4a69d6)=>__defProp(_0x543d5a,'name',{'value':_0x4a69d6,'configurable':!![]});const sessionTtl=(-0x1743+-0xe9*-0x26+-0xb45)*(0x649+0xbb*-0x35+0x2e*0xb5)*(0xa27+-0x4c3*0x4+0x13*0x7b)*(-0x1*0x86a+-0x2cd*0x3+0x110d)*(-0x2649+0x11*0x51+0x1f0*0x13);async function createSession(_0x2929d0,{homeWorkspaceId:_0x4bfc45,currentWorkspaceId:_0x55bff5}){const _0x83a482=randomBytes(0x3*-0x3af+-0x17eb+0x2308)['toString']('base64url'),_0x43e0f0=parseToUtc(getNowUtc()['getTime']()+sessionTtl);return createResource({'id':_0x83a482,'userId':_0x2929d0,'homeWorkspaceId':_0x4bfc45,'currentWorkspaceId':_0x55bff5,'expiresAt':_0x43e0f0},resourceNames['session']);}__name(createSession,'createSession');async function invalidateSession(_0x8c495f){await deleteResource(_0x8c495f,resourceNames['session']);}__name(invalidateSession,'invalidateSession');function createSessionCookie(_0x32082f){return createCookie(sessionCookieName,_0x32082f,{[cookieAttributes['maxAge']]:(sessionTtl/millisecondsInSecond)['toString']()});}__name(createSessionCookie,'createSessionCookie');
 export { createSession, createSessionCookie, invalidateSession };

package/packages/level2/meta/server/auth/permissions/resource-permission-checker-provider.d.ts CHANGED Viewed

@@ -1,3 +1,3 @@
-import { ResourcePermissionChecker } from "../../fd-meta-core/auth/permissions/resource-permission-checker";
+import { ResourcePermissionChecker } from "../../meta-core/auth/permissions/resource-permission-checker";
 export declare const permissionChecker = "PermissionChecker";
 export declare function getResourcePermissionChecker(resourceName: string): Promise<ResourcePermissionChecker>;

package/packages/level2/meta/server/auth/permissions/resource-permission-checker-provider.js CHANGED Viewed

@@ -1,6 +1,6 @@
 'use strict';
 import { tryGetFromMemoryCache } from '../../../../../fd-toolbox/server/cachings/fd-memory-cache.js';
-var __defProp=Object['defineProperty'],__name=(_0x597d6b,_0x3d916f)=>__defProp(_0x597d6b,'name',{'value':_0x3d916f,'configurable':!![]});const permissionChecker='PermissionChecker';async function getResourcePermissionChecker(_0x16eed9){const _0x476ca2=tryGetFromMemoryCache(permissionChecker+'_'+_0x16eed9);return _0x476ca2;}__name(getResourcePermissionChecker,'getResourcePermissionChecker');
+var __defProp=Object['defineProperty'],__name=(_0x44c8ef,_0x108e99)=>__defProp(_0x44c8ef,'name',{'value':_0x108e99,'configurable':!![]});const permissionChecker='PermissionChecker';async function getResourcePermissionChecker(_0x1cc31d){const _0x36885a=tryGetFromMemoryCache(permissionChecker+'_'+_0x1cc31d);return _0x36885a;}__name(getResourcePermissionChecker,'getResourcePermissionChecker');
 export { getResourcePermissionChecker, permissionChecker };

package/packages/level2/meta/server/auth/role-db/get-all-including-user-to-roles.js CHANGED Viewed

@@ -6,6 +6,6 @@ import { runQuery } from '../../../../db/drizzle-queries.js';
 import { roleSchema, userRoleSchema, userSchema } from '../../../../../../generated/schema.js';
 import { getOptionalPropertyValue } from '../../../../../fd-toolbox/objects/property-value.js';
-var __defProp=Object['defineProperty'],__name=(_0x2ce1b0,_0xc84c57)=>__defProp(_0x2ce1b0,'name',{'value':_0xc84c57,'configurable':!![]});async function getAllIncludingUserToRoles(){const _0x29641e=await getQuery(roleSchema),_0x3d3fd8=_0x29641e['query']['leftJoin'](userRoleSchema,eq(userRoleSchema['roleId'],roleSchema['id']))['leftJoin'](userSchema,eq(userRoleSchema['userId'],userSchema['id'])),_0x21e0b8=await runQuery(_0x3d3fd8),_0x582a94=new Map();for(const _0x1c00d8 of _0x21e0b8){const _0x23eacf=getOptionalPropertyValue(_0x1c00d8,resourceNames['role']);if(_0x23eacf){const _0x41d699=getOrCreateRole(_0x582a94,_0x23eacf),_0x53b73d=getOptionalPropertyValue(_0x1c00d8,resourceNames['userRole']),_0x194611=getOptionalPropertyValue(_0x1c00d8,resourceNames['user']);_0x53b73d&&_0x194611&&_0x41d699['userRoleList']?.['push']({..._0x53b73d,'role':_0x41d699,'user':_0x194611});}}return Array['from'](_0x582a94['values']());}__name(getAllIncludingUserToRoles,'getAllIncludingUserToRoles');function getOrCreateRole(_0x1f46ad,_0xeb2e94){return !_0x1f46ad['has'](_0xeb2e94['id'])&&(_0xeb2e94['userRoleList']=[],_0x1f46ad['set'](_0xeb2e94['id'],_0xeb2e94)),_0x1f46ad['get'](_0xeb2e94['id']);}__name(getOrCreateRole,'getOrCreateRole');
+var __defProp=Object['defineProperty'],__name=(_0x476c3f,_0x46b7fd)=>__defProp(_0x476c3f,'name',{'value':_0x46b7fd,'configurable':!![]});async function getAllIncludingUserToRoles(){const _0x295574=await getQuery(roleSchema),_0x938e75=_0x295574['query']['leftJoin'](userRoleSchema,eq(userRoleSchema['roleId'],roleSchema['id']))['leftJoin'](userSchema,eq(userRoleSchema['userId'],userSchema['id'])),_0x58ce27=await runQuery(_0x938e75),_0x9bdaa6=new Map();for(const _0x20adad of _0x58ce27){const _0x3aba60=getOptionalPropertyValue(_0x20adad,resourceNames['role']);if(_0x3aba60){const _0x50a6f8=getOrCreateRole(_0x9bdaa6,_0x3aba60),_0x1f0e4e=getOptionalPropertyValue(_0x20adad,resourceNames['userRole']),_0x136930=getOptionalPropertyValue(_0x20adad,resourceNames['user']);_0x1f0e4e&&_0x136930&&_0x50a6f8['userRoleList']?.['push']({..._0x1f0e4e,'role':_0x50a6f8,'user':_0x136930});}}return Array['from'](_0x9bdaa6['values']());}__name(getAllIncludingUserToRoles,'getAllIncludingUserToRoles');function getOrCreateRole(_0x314fb6,_0x2bb13a){return !_0x314fb6['has'](_0x2bb13a['id'])&&(_0x2bb13a['userRoleList']=[],_0x314fb6['set'](_0x2bb13a['id'],_0x2bb13a)),_0x314fb6['get'](_0x2bb13a['id']);}__name(getOrCreateRole,'getOrCreateRole');
 export { getAllIncludingUserToRoles };

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

@@ -1,13 +1,10 @@
-import { Session } from "../../resources/session/session.resource";
 export interface SessionValidationResult {
     userId: string;
     workspaceId?: string;
     currentWorkspaceId?: string;
 }
 export declare function getSessionToken(): Promise<string>;
-export declare function getCurrentWorkspaceIdFromSession(sessionId: string): Promise<string>;
-export declare function getSession(sessionId: string): Promise<Session>;
-export declare function getUserIdFromSession(sessionId: string): Promise<string>;
-export declare function getSessionFromCache(sessionId: string): Promise<Session & {
-    isValid?: boolean;
-}>;
+export declare function getCurrentWorkspaceIdFromSession(sessionId: string): Promise<any>;
+export declare function getSession(sessionId: string): Promise<any>;
+export declare function getUserIdFromSession(sessionId: string): Promise<any>;
+export declare function getSessionFromCache(sessionId: string): Promise<any>;

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

@@ -7,6 +7,6 @@ import { tryGetObjectFromCoreCache, setCoreCache } from '../../../../fd-toolbox/
 import { fdServerCacheKeys } from '../../../../fd-toolbox/server/constants/fd-server-cache-keys.js';
 import { readBearerToken, sessionCookieName, validateSession } from './session-validation.js';
-var __defProp=Object['defineProperty'],__name=(_0x281e4b,_0x3aad3e)=>__defProp(_0x281e4b,'name',{'value':_0x3aad3e,'configurable':!![]});async function getSessionToken(){if(getBooleanEnvSetting(metaEnvSettingKeys['storeSessionInHeader'])){const _0x468484=await fdHeaders(),_0x232308=_0x468484['get'](headerNames['authHeaderName']);return _0x232308?readBearerToken(_0x232308):void(0x2660+0x50*0x4c+-0x3e20);}const _0x5c4f7f=await fdCookies(),_0x486081=_0x5c4f7f['get'](sessionCookieName);return _0x486081?.['value'];}__name(getSessionToken,'getSessionToken');async function getCurrentWorkspaceIdFromSession(_0x49d0dd){const _0x4b6a68=await getSession(_0x49d0dd);return _0x4b6a68?.['currentWorkspaceId'];}__name(getCurrentWorkspaceIdFromSession,'getCurrentWorkspaceIdFromSession');async function getSession(_0x3e0788){const _0x3f17c8=await getSessionFromCache(_0x3e0788);if(_0x3f17c8)return _0x3f17c8;const _0x14e4f1=await validateAndCacheSession(_0x3e0788);return _0x14e4f1;}__name(getSession,'getSession');async function getUserIdFromSession(_0x515d17){const _0x3bdacc=await getSession(_0x515d17);return _0x3bdacc?.['userId'];}__name(getUserIdFromSession,'getUserIdFromSession');async function getSessionFromCache(_0x5e1fec){const _0xf63cf2=await tryGetObjectFromCoreCache(_0x5e1fec);if(_0xf63cf2===void(0x13a3+-0x9a9*-0x2+-0x1*0x26f5))return void(-0xaa5*0x1+0x1*-0x211f+-0xaf1*-0x4);if(_0xf63cf2['isValid']===![])return void(-0x3*-0x135+0x13eb*0x1+-0x178a);return _0xf63cf2;}__name(getSessionFromCache,'getSessionFromCache');async function validateAndCacheSession(_0x51fae0){const _0x144091=await validateSession(_0x51fae0);return await setCoreCache(_0x51fae0,_0x144091??{'isValid':![]},{'absoluteExpirationRelativeToNowSeconds':fdServerCacheKeys['secondsInFifteenMinutes']}),_0x144091;}__name(validateAndCacheSession,'validateAndCacheSession');
+var __defProp=Object['defineProperty'],__name=(_0xe67981,_0x453467)=>__defProp(_0xe67981,'name',{'value':_0x453467,'configurable':!![]});async function getSessionToken(){if(getBooleanEnvSetting(metaEnvSettingKeys['storeSessionInHeader'])){const _0x4ab1a9=await fdHeaders(),_0x470886=_0x4ab1a9['get'](headerNames['authHeaderName']);return _0x470886?readBearerToken(_0x470886):void(0x2239+0xd9*0x2b+-0x4*0x11ab);}const _0xece005=await fdCookies(),_0x15e325=_0xece005['get'](sessionCookieName);return _0x15e325?.['value'];}__name(getSessionToken,'getSessionToken');async function getCurrentWorkspaceIdFromSession(_0x1d51ac){const _0x9203ad=await getSession(_0x1d51ac);return _0x9203ad?.['currentWorkspaceId'];}__name(getCurrentWorkspaceIdFromSession,'getCurrentWorkspaceIdFromSession');async function getSession(_0x12bcd7){const _0x485db4=await getSessionFromCache(_0x12bcd7);if(_0x485db4)return _0x485db4;const _0x2e97d1=await validateAndCacheSession(_0x12bcd7);return _0x2e97d1;}__name(getSession,'getSession');async function getUserIdFromSession(_0x313d16){const _0x292388=await getSession(_0x313d16);return _0x292388?.['userId'];}__name(getUserIdFromSession,'getUserIdFromSession');async function getSessionFromCache(_0x522b97){const _0x2d020a=await tryGetObjectFromCoreCache(_0x522b97);if(_0x2d020a===void(-0xa9d+0x173c+-0xc9f*0x1))return void(0x33*-0x5d+0x5*0x3d8+-0xb1);if(_0x2d020a['isValid']===![])return void(0x32*0x6b+-0xa31*-0x1+-0x1f17*0x1);return _0x2d020a;}__name(getSessionFromCache,'getSessionFromCache');async function validateAndCacheSession(_0x52a639){const _0xca9457=await validateSession(_0x52a639);return await setCoreCache(_0x52a639,_0xca9457??{'isValid':![]},{'absoluteExpirationRelativeToNowSeconds':fdServerCacheKeys['secondsInFifteenMinutes']}),_0xca9457;}__name(validateAndCacheSession,'validateAndCacheSession');
 export { getCurrentWorkspaceIdFromSession, getSession, getSessionFromCache, getSessionToken, getUserIdFromSession };

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

@@ -3,6 +3,6 @@ import { getResource } from '../db/db.js';
 import { resourceNames } from '../../../../fd-toolbox/resources/resource-names.js';
 import { parseUtcStringToDate, getNowUtc } from '../../../../fd-toolbox/dates/date-time.js';
-var __defProp=Object['defineProperty'],__name=(_0x4c6527,_0x29a2ac)=>__defProp(_0x4c6527,'name',{'value':_0x29a2ac,'configurable':!![]});const sessionCookieName='auth_session';const bearer='Bearer\x20';async function validateSession(_0x80bc7d){const _0x4f173f=await getResource({'resourceName':resourceNames['session'],'id':_0x80bc7d},![]);if(_0x4f173f&&parseUtcStringToDate(_0x4f173f['expiresAt'])['getTime']()>getNowUtc()['getTime']())return _0x4f173f;return void(0x1d37+-0x2657+0x2*0x490);}__name(validateSession,'validateSession');function readBearerToken(_0x19b28d){return _0x19b28d['replace'](bearer,'');}__name(readBearerToken,'readBearerToken');
+var __defProp=Object['defineProperty'],__name=(_0x160776,_0xce85de)=>__defProp(_0x160776,'name',{'value':_0xce85de,'configurable':!![]});const sessionCookieName='auth_session';const bearer='Bearer\x20';async function validateSession(_0x1c1239){const _0x53eed4=await getResource({'resourceName':resourceNames['session'],'id':_0x1c1239},![]);if(_0x53eed4&&parseUtcStringToDate(_0x53eed4['expiresAt'])['getTime']()>getNowUtc()['getTime']())return _0x53eed4;return void(0x19*-0x17e+0x13*0x5b+0x1e8d);}__name(validateSession,'validateSession');function readBearerToken(_0x422a3f){return _0x422a3f['replace'](bearer,'');}__name(readBearerToken,'readBearerToken');
 export { readBearerToken, sessionCookieName, validateSession };