@lilaquadrat/studio 5.0.0 → 5.1.0
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.
- package/lib/interfaces.d.ts +4 -1
- package/lib/interfaces.js.map +1 -1
- package/lib/src/AzureBlobStorage.share.js +8 -33
- package/lib/src/AzureBlobStorage.share.js.map +1 -1
- package/lib/src/AzureFileStorage.share.js +12 -55
- package/lib/src/AzureFileStorage.share.js.map +1 -1
- package/lib/src/Immutable.class.js +13 -11
- package/lib/src/Immutable.class.js.map +1 -1
- package/lib/src/classes/ControllerBase.class.d.ts +1 -0
- package/lib/src/classes/ControllerBase.class.js +5 -3
- package/lib/src/classes/ControllerBase.class.js.map +1 -1
- package/lib/src/classes/models.class.d.ts +1 -1
- package/lib/src/classes/modelv2.class.d.ts +2 -2
- package/lib/src/classes/modelv2.class.js +10 -6
- package/lib/src/classes/modelv2.class.js.map +1 -1
- package/lib/src/classes/mongo.class.js +3 -5
- package/lib/src/classes/mongo.class.js.map +1 -1
- package/lib/src/filterMergeModules.js +3 -3
- package/lib/src/filterMergeModules.js.map +1 -1
- package/lib/src/functions/optionsHelper.js +1 -1
- package/lib/src/functions/optionsHelper.js.map +1 -1
- package/lib/src/helpers/companyRights.js +1 -2
- package/lib/src/helpers/companyRights.js.map +1 -1
- package/lib/src/helpers/isValidObjectId.js +1 -1
- package/lib/src/helpers/isValidObjectId.js.map +1 -1
- package/lib/src/interfaces/Agreement.interface.d.ts +1 -0
- package/lib/src/interfaces/AvailableVariant.interface.d.ts +8 -0
- package/lib/src/interfaces/AvailableVariant.interface.js +3 -0
- package/lib/src/interfaces/AvailableVariant.interface.js.map +1 -0
- package/lib/src/interfaces/DesignModule.interface.d.ts +10 -6
- package/lib/src/interfaces/ListParticipantsDetails.interface.d.ts +7 -0
- package/lib/src/interfaces/ListParticipantsDetails.interface.js +3 -0
- package/lib/src/interfaces/ListParticipantsDetails.interface.js.map +1 -0
- package/lib/src/interfaces/ModuleSettings.interface.d.ts +7 -0
- package/lib/src/interfaces/ModuleSettings.interface.js +3 -0
- package/lib/src/interfaces/ModuleSettings.interface.js.map +1 -0
- package/lib/src/logger.js +1 -2
- package/lib/src/logger.js.map +1 -1
- package/lib/src/models/customers.model.js +35 -8
- package/lib/src/models/customers.model.js.map +1 -1
- package/lib/src/models/lists.model.d.ts +3 -1
- package/lib/src/models/lists.model.js +11 -5
- package/lib/src/models/lists.model.js.map +1 -1
- package/lib/src/models/listsParticipants.model.d.ts +1 -0
- package/lib/src/models/listsParticipants.model.js +12 -5
- package/lib/src/models/listsParticipants.model.js.map +1 -1
- package/lib/src/prepareContent.js +20 -23
- package/lib/src/prepareContent.js.map +1 -1
- package/lib/src/services/certificatesAction.service.js +7 -5
- package/lib/src/services/certificatesAction.service.js.map +1 -1
- package/lib/src/services/conf.service.js +6 -8
- package/lib/src/services/conf.service.js.map +1 -1
- package/lib/src/services/customers.service.js +11 -6
- package/lib/src/services/customers.service.js.map +1 -1
- package/lib/src/services/domains.service.js +17 -21
- package/lib/src/services/domains.service.js.map +1 -1
- package/lib/src/services/editor.service.js +1 -2
- package/lib/src/services/editor.service.js.map +1 -1
- package/lib/src/services/editorBase.service.js +1 -1
- package/lib/src/services/editorBase.service.js.map +1 -1
- package/lib/src/services/history.service.js +10 -7
- package/lib/src/services/history.service.js.map +1 -1
- package/lib/src/services/hosting.service.js +3 -5
- package/lib/src/services/hosting.service.js.map +1 -1
- package/lib/src/services/id.service.js +1 -1
- package/lib/src/services/id.service.js.map +1 -1
- package/lib/src/services/listParticipants.service.d.ts +3 -3
- package/lib/src/services/listParticipants.service.js +36 -17
- package/lib/src/services/listParticipants.service.js.map +1 -1
- package/lib/src/services/lists.service.d.ts +6 -0
- package/lib/src/services/lists.service.js +85 -2
- package/lib/src/services/lists.service.js.map +1 -1
- package/lib/src/services/media.service.js +6 -8
- package/lib/src/services/media.service.js.map +1 -1
- package/lib/src/services/publish.service.js +3 -4
- package/lib/src/services/publish.service.js.map +1 -1
- package/lib/src/services/universal.service.js +2 -2
- package/lib/src/services/universal.service.js.map +1 -1
- package/lib/tests/editorService.spec.js +5 -7
- package/lib/tests/editorService.spec.js.map +1 -1
- package/package.json +2 -2
package/lib/interfaces.d.ts
CHANGED
|
@@ -70,4 +70,7 @@ import AgreementResponse from './src/interfaces/AgreementResponse.interface';
|
|
|
70
70
|
import GenericData, { CompatibleGenericDataType } from './src/interfaces/GenericData.interface';
|
|
71
71
|
import ModulePDFOptions from './src/interfaces/ModulePDFOptions.interface';
|
|
72
72
|
import GenericDataWithContent from './src/interfaces/GenericDataWithContent.interface';
|
|
73
|
-
|
|
73
|
+
import ModuleSettings from './src/interfaces/ModuleSettings.interface';
|
|
74
|
+
import AvailableVariant, { EditorMode } from './src/interfaces/AvailableVariant.interface';
|
|
75
|
+
import ListPartiticpantsDetails from './src/interfaces/ListParticipantsDetails.interface';
|
|
76
|
+
export { BasicDataInterface, Scope, SingleScope, ScopeObjectWithAdmin, ScopeObject, HttpStatusCode, AppPermissions, DatabaseQuery, DatabaseQueryOptions, DatabaseQuerySites, HistoryReason, ListOfModels, ShareClientInterface, ShareClientOptions, Settings, Project, Me, History, HistoryWithType, Editor, EditorBase, Media, MediaInfo, MediaViewInfo, MediaStats, MediaContentFiles, VersionInfo, ProjectScope, CompanyScope, UniversalScope, Permissions, ModuleGeneric, Modelv2 as IModelv2, Company, CompanyAttribute, Partner, Contract, Action, Publish, PublishContentGroup, PublishMethod, PublishMethodFtp, PublishMethodWebhook, PublishMethodInternal, PublishMethodPdf, UniversalInterface, EditorLegacy, PublishResult, DataObject, CallResponse, Secret, Content, ContentWithPositions, StudioIframeMessage, EditorActiveModule, ChildData, Wildcardcertificates, HostingPorts, DesignModule, ModuleIndexOptions, AdditionalContentInformation, HostingCommand, Hosting, HostingWithSettings, Domain, DomainConf, Command, Options, CompanyProject, ApiResponses, UserApp, UserAppOptionsRequired, AppFilter, App, BaseFilterOptions, HostingSettings, AvailableStorageTypes, Tracker, TrackerInput, TrackerStatistics, TrackerStatisticsDay, TrackerData, TrackerCategories, MulterFile, RenderContext, Customers, CustomerCompany, CustomerPerson, List, ListCategory, SkipLimitSort, ListCustomQueries, ListParticipants, ListParticipantWithUser, Agreement, AgreementResponse, GenericData, CompatibleGenericDataType, GenericDataWithContent, ModulePDFOptions, ModuleSettings, EditorMode, AvailableVariant, ListPartiticpantsDetails };
|
package/lib/interfaces.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../interfaces.ts"],"names":[],"mappings":";;;;;;AASA,+FAAkE;
|
|
1
|
+
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../interfaces.ts"],"names":[],"mappings":";;;;;;AASA,+FAAkE;AA2EhE,yBA3EK,6BAAc,CA2EL;AAjEhB,sEAAyG;AAwFvG,6FAxFO,gCAAY,OAwFP;AADZ,6FAvFqB,gCAAY,OAuFrB;AAEZ,+FAzFgD,kCAAc,OAyFhD"}
|
|
@@ -1,11 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __asyncValues = (this && this.__asyncValues) || function (o) {
|
|
3
|
-
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
4
|
-
var m = o[Symbol.asyncIterator], i;
|
|
5
|
-
return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
|
|
6
|
-
function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
|
|
7
|
-
function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
|
|
8
|
-
};
|
|
9
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
10
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
11
4
|
};
|
|
@@ -104,30 +97,12 @@ class AzureBlobClient {
|
|
|
104
97
|
});
|
|
105
98
|
}
|
|
106
99
|
async list(folder, filter) {
|
|
107
|
-
var _a, e_1, _b, _c;
|
|
108
100
|
const files = [];
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
try {
|
|
115
|
-
const blob = _c;
|
|
116
|
-
const matched = blob.name.match(filter);
|
|
117
|
-
if (matched)
|
|
118
|
-
files.push(blob.name.substr(blob.name.lastIndexOf('/') + 1));
|
|
119
|
-
}
|
|
120
|
-
finally {
|
|
121
|
-
_d = true;
|
|
122
|
-
}
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
|
-
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
126
|
-
finally {
|
|
127
|
-
try {
|
|
128
|
-
if (!_d && !_a && (_b = _e.return)) await _b.call(_e);
|
|
129
|
-
}
|
|
130
|
-
finally { if (e_1) throw e_1.error; }
|
|
101
|
+
// eslint-disable-next-line no-restricted-syntax
|
|
102
|
+
for await (const blob of this.client.listBlobsFlat({ prefix: folder })) {
|
|
103
|
+
const matched = blob.name.match(filter);
|
|
104
|
+
if (matched)
|
|
105
|
+
files.push(blob.name.substr(blob.name.lastIndexOf('/') + 1));
|
|
131
106
|
}
|
|
132
107
|
return new Promise((resolve, reject) => resolve(files));
|
|
133
108
|
}
|
|
@@ -137,13 +112,13 @@ class AzureBlobClient {
|
|
|
137
112
|
return new Promise((resolve, reject) => {
|
|
138
113
|
const stream = bundleClientResponse.readableStreamBody;
|
|
139
114
|
const chunks = [];
|
|
140
|
-
stream
|
|
115
|
+
stream?.on('data', (data) => {
|
|
141
116
|
chunks.push(data);
|
|
142
117
|
});
|
|
143
|
-
stream
|
|
118
|
+
stream?.on('end', () => {
|
|
144
119
|
resolve(Buffer.from(chunks.join('')));
|
|
145
120
|
});
|
|
146
|
-
stream
|
|
121
|
+
stream?.on('error', () => {
|
|
147
122
|
logger_1.default.error(`error loading blob ${filename}`);
|
|
148
123
|
reject(new Error(`error loading blob ${filename}`));
|
|
149
124
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AzureBlobStorage.share.js","sourceRoot":"","sources":["../../src/AzureBlobStorage.share.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AzureBlobStorage.share.js","sourceRoot":"","sources":["../../src/AzureBlobStorage.share.ts"],"names":[],"mappings":";;;;;AAAA,sDAAyE;AACzE,0DAAiC;AAGjC,sDAA8B;AAE9B,MAAqB,eAAe;IAIlC,YAAY,OAA2B;QAErC,gBAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACtB,MAAM,aAAa,GAAG,IAAI,gCAAiB,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAEtE,IAAI,CAAC,MAAM,GAAG,aAAa,CAAC,kBAAkB,CAAC,OAAO,CAAC,SAAS,IAAI,MAAM,CAAC,CAAC;IAE9E,CAAC;IAED,YAAY,CAAC,QAAgB,EAAE,MAAc;QAE3C,OAAO,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAElE,CAAC;IAED,YAAY;QAEV,OAAO,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAElE,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,QAAiB,EAAE,MAAe,EAAE,QAAiB;QAElE,IAAI,IAAI,GAAkB,IAAI,CAAC;QAC/B,IAAI,UAA2C,CAAC;QAEhD,IAAI,CAAC,QAAQ,EAAE;YAEb,IAAI,QAAQ,EAAE;gBAEZ,UAAU,GAAG,MAAM,mBAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;aAEhD;YAED,IAAI,MAAM,EAAE;gBAEV,UAAU,GAAG,MAAM,mBAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;aAEhD;YAED,IAAI,CAAC,UAAU,EAAE;gBAEf,IAAI,QAAQ,EAAE;oBAEZ,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;oBAE3C,IAAI,GAAG,EAAE;wBAEP,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE;4BAEV,IAAI,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;yBAEzB;qBAEF;iBAEF;aAEF;iBAAM;gBAEL,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;aAExB;SAEF;aAAM;YAEL,IAAI,GAAG,QAAQ,CAAC;SAEjB;QAED,IAAI,CAAC,IAAI;YAAE,IAAI,GAAG,YAAY,CAAC;QAE/B,OAAO,IAAI,CAAC;IAEd,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,WAAmB,EAAE,QAAgB,EAAE,QAAgB,EAAE,QAAiB;QAElF,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,GAAG,WAAW,IAAI,QAAQ,EAAE,CAAC,CAAC;QAErF,OAAO,eAAe,CAAC,UAAU,CAC/B,QAAQ,EACR,EAAE,eAAe,EAAE,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,EAAE,CAC7F;aACE,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;aAChB,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YAEX,gBAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAChB,OAAO,KAAK,CAAC;QAEf,CAAC,CAAC,CAAC;IAEP,CAAC;IAED,MAAM,CAAC,MAAc,EAAE,IAAY;QAEjC,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,GAAG,MAAM,IAAI,IAAI,EAAE,CAAC,CAAC;QAC5E,OAAO,eAAe,CAAC,MAAM,EAAE;aAC5B,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YAEjB,gBAAM,CAAC,KAAK,CAAC,YAAY,MAAM,IAAI,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC;YACrD,OAAO,IAAI,CAAC;QAEd,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YAEX,gBAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAChB,OAAO,KAAK,CAAC;QAEf,CAAC,CAAC,CAAC;IAEP,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,WAAmB,EAAE,QAAgB,EAAE,IAAqB,EAAE,QAAiB;QAE1F,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAEtC,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,GAAG,WAAW,IAAI,QAAQ,EAAE,CAAC,CAAC;QAErF,OAAO,eAAe,CAAC,MAAM,CAC3B,IAAI,EACJ,KAAK,EACL,EAAE,eAAe,EAAE,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,EAAE,EAAE,CACtG;aACE,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YAEjB,gBAAM,CAAC,KAAK,CAAC,aAAa,WAAW,IAAI,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC;YAC/D,OAAO,IAAI,CAAC;QAEd,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YAEX,gBAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAChB,OAAO,KAAK,CAAC;QAEf,CAAC,CAAC,CAAC;IAEP,CAAC;IAED,MAAM,CAAC,MAAc,EAAE,QAAgB,EAAE,IAAY;QAEnD,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAEtC,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,GAAG,MAAM,IAAI,QAAQ,EAAE,CAAC,CAAC;QAEhF,OAAO,eAAe,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC;aACvC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YAEjB,gBAAM,CAAC,KAAK,CAAC,YAAY,MAAM,IAAI,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC;YACzD,OAAO,IAAI,CAAC;QAEd,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YAEX,gBAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAChB,OAAO,KAAK,CAAC;QAEf,CAAC,CAAC,CAAC;IAEP,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,MAAc,EAAE,MAAc;QAEvC,MAAM,KAAK,GAAa,EAAE,CAAC;QAE3B,gDAAgD;QAChD,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE;YAEtE,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAExC,IAAI,OAAO;gBAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SAE3E;QAED,OAAO,IAAI,OAAO,CAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAEpE,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,MAAc,EAAE,QAAgB;QAExC,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,GAAG,MAAM,IAAI,QAAQ,EAAE,CAAC,CAAC;QAC7E,MAAM,oBAAoB,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAE5D,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAE7C,MAAM,MAAM,GAAG,oBAAoB,CAAC,kBAAkB,CAAC;YACvD,MAAM,MAAM,GAAU,EAAE,CAAC;YAEzB,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAE1B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEpB,CAAC,CAAC,CAAC;YAEH,MAAM,EAAE,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBAErB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAExC,CAAC,CAAC,CAAC;YAEH,MAAM,EAAE,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBAEvB,gBAAM,CAAC,KAAK,CAAC,sBAAsB,QAAQ,EAAE,CAAC,CAAC;gBAC/C,MAAM,CAAC,IAAI,KAAK,CAAC,sBAAsB,QAAQ,EAAE,CAAC,CAAC,CAAC;YAEtD,CAAC,CAAC,CAAC;QAEL,CAAC,CAAC,CAAC;IAEL,CAAC;IAED,IAAI,CAAC,KAAe,EAAE,YAAoB,EAAE,iBAAyB;QAEnE,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAEtC,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,GAAG,iBAAiB,IAAI,IAAI,EAAE,CAAC,CAAC;YACpF,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,GAAG,YAAY,IAAI,IAAI,EAAE,CAAC,CAAC;YAE/E,OAAO,YAAY,CAAC,gBAAgB,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAEzD,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;aAC7B,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;aAChB,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;IAExB,CAAC;CAEF;AAxOD,kCAwOC"}
|
|
@@ -1,11 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __asyncValues = (this && this.__asyncValues) || function (o) {
|
|
3
|
-
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
4
|
-
var m = o[Symbol.asyncIterator], i;
|
|
5
|
-
return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
|
|
6
|
-
function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
|
|
7
|
-
function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
|
|
8
|
-
};
|
|
9
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
10
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
11
4
|
};
|
|
@@ -35,7 +28,7 @@ class AzureStorageClient {
|
|
|
35
28
|
* if the last character of base is a slash, no delimiter is necessary
|
|
36
29
|
* this prevents the generation of paths with double slashes
|
|
37
30
|
*/
|
|
38
|
-
delimiter =
|
|
31
|
+
delimiter = base?.lastIndexOf('/') === base?.length - 1
|
|
39
32
|
? ''
|
|
40
33
|
: '/';
|
|
41
34
|
folderToCreate = `${base}${delimiter}${folder}`;
|
|
@@ -67,35 +60,17 @@ class AzureStorageClient {
|
|
|
67
60
|
return this.createSingleFolder(pathArray);
|
|
68
61
|
}
|
|
69
62
|
async removeFolder(folder) {
|
|
70
|
-
var _a, e_1, _b, _c;
|
|
71
63
|
const directoryClient = this.client.getDirectoryClient(folder);
|
|
72
64
|
directoryClient.listFilesAndDirectories();
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
try {
|
|
79
|
-
const entity = _c;
|
|
80
|
-
if (entity.kind === 'file') {
|
|
81
|
-
await directoryClient.getFileClient(entity.name)
|
|
82
|
-
.delete();
|
|
83
|
-
}
|
|
84
|
-
if (entity.kind === 'directory') {
|
|
85
|
-
await this.removeFolder(`${folder}/${entity.name}`);
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
finally {
|
|
89
|
-
_d = true;
|
|
90
|
-
}
|
|
65
|
+
// eslint-disable-next-line no-restricted-syntax
|
|
66
|
+
for await (const entity of directoryClient.listFilesAndDirectories()) {
|
|
67
|
+
if (entity.kind === 'file') {
|
|
68
|
+
await directoryClient.getFileClient(entity.name)
|
|
69
|
+
.delete();
|
|
91
70
|
}
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
finally {
|
|
95
|
-
try {
|
|
96
|
-
if (!_d && !_a && (_b = _e.return)) await _b.call(_e);
|
|
71
|
+
if (entity.kind === 'directory') {
|
|
72
|
+
await this.removeFolder(`${folder}/${entity.name}`);
|
|
97
73
|
}
|
|
98
|
-
finally { if (e_1) throw e_1.error; }
|
|
99
74
|
}
|
|
100
75
|
return directoryClient.delete()
|
|
101
76
|
.then(() => true);
|
|
@@ -131,31 +106,13 @@ class AzureStorageClient {
|
|
|
131
106
|
});
|
|
132
107
|
}
|
|
133
108
|
async list(folder, filter) {
|
|
134
|
-
var _a, e_2, _b, _c;
|
|
135
109
|
const files = [];
|
|
136
110
|
const directoryClient = this.client.getDirectoryClient(folder);
|
|
137
111
|
directoryClient.listFilesAndDirectories();
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
_d = false;
|
|
143
|
-
try {
|
|
144
|
-
const entity = _c;
|
|
145
|
-
if (entity.kind === 'file' && entity.name.match(filter))
|
|
146
|
-
files.push(entity.name);
|
|
147
|
-
}
|
|
148
|
-
finally {
|
|
149
|
-
_d = true;
|
|
150
|
-
}
|
|
151
|
-
}
|
|
152
|
-
}
|
|
153
|
-
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
154
|
-
finally {
|
|
155
|
-
try {
|
|
156
|
-
if (!_d && !_a && (_b = _e.return)) await _b.call(_e);
|
|
157
|
-
}
|
|
158
|
-
finally { if (e_2) throw e_2.error; }
|
|
112
|
+
// eslint-disable-next-line no-restricted-syntax
|
|
113
|
+
for await (const entity of directoryClient.listFilesAndDirectories()) {
|
|
114
|
+
if (entity.kind === 'file' && entity.name.match(filter))
|
|
115
|
+
files.push(entity.name);
|
|
159
116
|
}
|
|
160
117
|
return new Promise((resolve, reject) => resolve(files));
|
|
161
118
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AzureFileStorage.share.js","sourceRoot":"","sources":["../../src/AzureFileStorage.share.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AzureFileStorage.share.js","sourceRoot":"","sources":["../../src/AzureFileStorage.share.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,6 @@ class Immutable {
|
|
|
14
14
|
* **IMPORTANT** dont query fields that would be changed on update, that will mess up the history
|
|
15
15
|
*/
|
|
16
16
|
async immutable(_idOrFilterQuery, data, user, reason, app, additionalHistoryData, bulk, partial) {
|
|
17
|
-
var _a;
|
|
18
17
|
const validationType = partial || 'change';
|
|
19
18
|
const filterQuery = (0, isValidObjectId_1.default)(_idOrFilterQuery)
|
|
20
19
|
? { _id: _idOrFilterQuery }
|
|
@@ -28,7 +27,7 @@ class Immutable {
|
|
|
28
27
|
if (Object.keys(data).length) {
|
|
29
28
|
basicUpdateQuery.$set = data;
|
|
30
29
|
}
|
|
31
|
-
if (!partial ||
|
|
30
|
+
if (!partial || this.model.compiledOptions[validationType]?.unsetWithinPartial) {
|
|
32
31
|
const unset = this.model.getUnsetObject(data);
|
|
33
32
|
if (Object.keys(unset).length) {
|
|
34
33
|
basicUpdateQuery.$unset = unset;
|
|
@@ -64,20 +63,22 @@ class Immutable {
|
|
|
64
63
|
* creates or updates data
|
|
65
64
|
*/
|
|
66
65
|
async immutableUpsert(_idOrFilterQuery, data, user, reason, app, additionalHistoryData, bulk, partial) {
|
|
67
|
-
var _a, _b;
|
|
68
66
|
const filterQuery = !(0, isValidObjectId_1.default)(_idOrFilterQuery)
|
|
69
67
|
? _idOrFilterQuery
|
|
70
68
|
: { _id: _idOrFilterQuery };
|
|
71
69
|
const databaseData = await this.model.db.findOne(filterQuery, { projection: { _id: 1 } });
|
|
72
70
|
if (databaseData) {
|
|
73
71
|
/** if update, remove immutable keys */
|
|
74
|
-
if (
|
|
75
|
-
|
|
72
|
+
if (this.model.immutable?.length) {
|
|
73
|
+
this.model.immutable?.forEach((single) => {
|
|
76
74
|
delete data[single];
|
|
77
75
|
});
|
|
78
76
|
}
|
|
79
77
|
const immutable = await this.immutable(_idOrFilterQuery, data, user, reason, app, additionalHistoryData, bulk, partial);
|
|
80
|
-
return
|
|
78
|
+
return {
|
|
79
|
+
...immutable,
|
|
80
|
+
_id: databaseData._id,
|
|
81
|
+
};
|
|
81
82
|
}
|
|
82
83
|
return this.create(data, user, app, additionalHistoryData, bulk, partial);
|
|
83
84
|
}
|
|
@@ -93,7 +94,7 @@ class Immutable {
|
|
|
93
94
|
*/
|
|
94
95
|
async history(_id, user, reason, app, additionalHistoryData, bulk) {
|
|
95
96
|
const history = await this.model.db.findOne({ _id });
|
|
96
|
-
if (!
|
|
97
|
+
if (!history?._id)
|
|
97
98
|
throw new Immutable_error_1.default('PARENT_DOCUMENT_NOT_FOUND');
|
|
98
99
|
return history_service_1.default.create(history, user, reason, app, this.model.name, additionalHistoryData, undefined, bulk);
|
|
99
100
|
}
|
|
@@ -101,7 +102,6 @@ class Immutable {
|
|
|
101
102
|
* create new data
|
|
102
103
|
*/
|
|
103
104
|
async create(data, user, source, additionalHistoryData, bulk, partial) {
|
|
104
|
-
var _a, _b;
|
|
105
105
|
let type = 'create';
|
|
106
106
|
const validationType = partial || 'create';
|
|
107
107
|
let inheritedVersion = 0;
|
|
@@ -110,7 +110,7 @@ class Immutable {
|
|
|
110
110
|
if (!this.model.validate(data, validationType)) {
|
|
111
111
|
throw new Immutable_error_1.default('VALIDATION_FAILED', this.model.compiledTypes[validationType].errors);
|
|
112
112
|
}
|
|
113
|
-
if (
|
|
113
|
+
if (this.model.historyMatch?.length) {
|
|
114
114
|
const query = {};
|
|
115
115
|
this.model.historyMatch.forEach((key) => {
|
|
116
116
|
query[key] = data[key];
|
|
@@ -118,7 +118,7 @@ class Immutable {
|
|
|
118
118
|
const document = await models_1.HistoryModel.db.find(query).limit(1).sort({ _id: -1 }).toArray();
|
|
119
119
|
const lastEntry = document[0];
|
|
120
120
|
if (lastEntry) {
|
|
121
|
-
if (
|
|
121
|
+
if (lastEntry.history?.reason !== 'delete')
|
|
122
122
|
throw new Immutable_error_1.default('DOCUMENT_ALREADY_EXISTS', undefined, query);
|
|
123
123
|
inheritedVersion = lastEntry.history.version + 1;
|
|
124
124
|
type = 'recreate';
|
|
@@ -130,7 +130,9 @@ class Immutable {
|
|
|
130
130
|
source,
|
|
131
131
|
};
|
|
132
132
|
if (additionalHistoryData) {
|
|
133
|
-
data.history.additional =
|
|
133
|
+
data.history.additional = {
|
|
134
|
+
...additionalHistoryData,
|
|
135
|
+
};
|
|
134
136
|
}
|
|
135
137
|
if (this.model.uniqueId && !data.id) {
|
|
136
138
|
data.id = await id_service_1.default.getUnique(data.company, data.project, this.model.uniqueIdApp || data.app, data.model);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Immutable.class.js","sourceRoot":"","sources":["../../src/Immutable.class.ts"],"names":[],"mappings":";;;;;AAMA,sCAAyC;AACzC,uFAA8D;AAC9D,iFAAwD;AAExD,uEAA8C;AAE9C,gFAAwD;AAIxD,MAA8B,SAAS;IAIrC;;;MAGE;IACF,KAAK,CAAC,SAAS,CACb,gBAA+C,EAC/C,IAAoB,EACpB,IAAY,EACZ,MAAqB,EACrB,GAAW,EACX,
|
|
1
|
+
{"version":3,"file":"Immutable.class.js","sourceRoot":"","sources":["../../src/Immutable.class.ts"],"names":[],"mappings":"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"}
|
|
@@ -163,7 +163,7 @@ class ControllerBase {
|
|
|
163
163
|
* @memberof ControllerBase
|
|
164
164
|
*/
|
|
165
165
|
buildQuery(query, company, project, options) {
|
|
166
|
-
const realQuery =
|
|
166
|
+
const realQuery = { ...query };
|
|
167
167
|
const orArray = [];
|
|
168
168
|
let tags;
|
|
169
169
|
let category;
|
|
@@ -254,7 +254,7 @@ class ControllerBase {
|
|
|
254
254
|
const skipLimitSort = ControllerBase.getSkipLimitSort(site, limit, sort, order);
|
|
255
255
|
realSelect = this.selectDefault;
|
|
256
256
|
if (select) {
|
|
257
|
-
realSelect =
|
|
257
|
+
realSelect = { ...select, ...realSelect };
|
|
258
258
|
}
|
|
259
259
|
const all = await model.db.countDocuments(query);
|
|
260
260
|
const data = await model.db.find(query, { projection: realSelect })
|
|
@@ -294,7 +294,9 @@ class ControllerBase {
|
|
|
294
294
|
else {
|
|
295
295
|
realSort = { _id: 1 };
|
|
296
296
|
}
|
|
297
|
-
return
|
|
297
|
+
return {
|
|
298
|
+
sort: realSort, ...skipLimit,
|
|
299
|
+
};
|
|
298
300
|
}
|
|
299
301
|
}
|
|
300
302
|
exports.default = ControllerBase;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ControllerBase.class.js","sourceRoot":"","sources":["../../../src/classes/ControllerBase.class.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ControllerBase.class.js","sourceRoot":"","sources":["../../../src/classes/ControllerBase.class.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,5 +8,5 @@ export default class Models {
|
|
|
8
8
|
constructor();
|
|
9
9
|
register(name: string, model: Modelv2<any>): void;
|
|
10
10
|
unregister(name: string): void;
|
|
11
|
-
injectDatabaseConnection(mongo: MongoClient, mongoClass?: MongoClass, noIndexes?: boolean):
|
|
11
|
+
injectDatabaseConnection(mongo: MongoClient, mongoClass?: MongoClass, noIndexes?: boolean): Promise<boolean>[];
|
|
12
12
|
}
|
|
@@ -60,12 +60,12 @@ export default class Modelv2<T extends mongo.Document> {
|
|
|
60
60
|
* @param mongoClass
|
|
61
61
|
* @param noIndexes disables the creation of indexes
|
|
62
62
|
*/
|
|
63
|
-
setMongoConnection(mongoClient: MongoClient, mongoClass?: MongoClass, noIndexes?: boolean): Promise<boolean
|
|
63
|
+
setMongoConnection(mongoClient: MongoClient, mongoClass?: MongoClass, noIndexes?: boolean): Promise<boolean>;
|
|
64
64
|
setSchema(schema: Schema, type?: IModelv2['SchemaType'], options?: Record<string, unknown>): void;
|
|
65
65
|
compileSchemas(): void;
|
|
66
66
|
compileSchema(schema: Schema, type: IModelv2['SchemaType'], options?: Record<string, unknown>): void;
|
|
67
67
|
addIndex(index: IndexDescription & CreateIndexesOptions, version: number): void;
|
|
68
|
-
handleIndexes(indexes: (IndexDescription & CreateIndexesOptions)[]): Promise<
|
|
68
|
+
handleIndexes(indexes: (IndexDescription & CreateIndexesOptions)[]): Promise<boolean>;
|
|
69
69
|
validate(data: T | Partial<T>, type: IModelv2['SchemaType']): boolean;
|
|
70
70
|
/**
|
|
71
71
|
* * validates against json schema
|
|
@@ -36,7 +36,7 @@ class Modelv2 {
|
|
|
36
36
|
* @param noIndexes disables the creation of indexes
|
|
37
37
|
*/
|
|
38
38
|
setMongoConnection(mongoClient, mongoClass, noIndexes) {
|
|
39
|
-
this.mongo = mongoClient
|
|
39
|
+
this.mongo = mongoClient?.db(mongoClass?.connectionUriObject.database);
|
|
40
40
|
if (typeof this.connected === 'function') {
|
|
41
41
|
this.connected();
|
|
42
42
|
}
|
|
@@ -65,12 +65,17 @@ class Modelv2 {
|
|
|
65
65
|
addIndex(index, version) {
|
|
66
66
|
if (this.indexes.find((single) => single.name === index.name))
|
|
67
67
|
return;
|
|
68
|
-
this.indexes.push(
|
|
68
|
+
this.indexes.push({ ...index, name: `${index.name}-v${version}` });
|
|
69
69
|
}
|
|
70
70
|
async handleIndexes(indexes) {
|
|
71
71
|
const collection = await this.mongo.listCollections({ name: this.db.collectionName }).toArray();
|
|
72
72
|
if (!collection.length) {
|
|
73
|
-
|
|
73
|
+
try {
|
|
74
|
+
await this.mongo.createCollection(this.db.collectionName);
|
|
75
|
+
}
|
|
76
|
+
catch (error) {
|
|
77
|
+
console.error(error);
|
|
78
|
+
}
|
|
74
79
|
}
|
|
75
80
|
const collectionIndexes = await this.db.listIndexes().toArray();
|
|
76
81
|
// //* * drop all indexed that are not created programatically */
|
|
@@ -90,7 +95,7 @@ class Modelv2 {
|
|
|
90
95
|
});
|
|
91
96
|
if (createdIndexes.length) {
|
|
92
97
|
logger_1.default.info(`model.index.create.${this.name}`, createdIndexes);
|
|
93
|
-
|
|
98
|
+
await this.db.createIndexes(createdIndexes);
|
|
94
99
|
}
|
|
95
100
|
return true;
|
|
96
101
|
}
|
|
@@ -107,9 +112,8 @@ class Modelv2 {
|
|
|
107
112
|
return this.db;
|
|
108
113
|
}
|
|
109
114
|
getUnsetObject(data) {
|
|
110
|
-
var _a;
|
|
111
115
|
const unsetObject = {};
|
|
112
|
-
|
|
116
|
+
this.removeWhenEmpty?.forEach((single) => {
|
|
113
117
|
// get data via string ```string.string``` from an object
|
|
114
118
|
const singleData = object_path_1.default.get(data, single);
|
|
115
119
|
// if empty array
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modelv2.class.js","sourceRoot":"","sources":["../../../src/classes/modelv2.class.ts"],"names":[],"mappings":";;;;;AAEA,qCAGiB;AACjB,8DAAqC;AAErC,uDAA+B;AAI/B,MAAqB,OAAO;IAgE1B,YAAY,IAAY,EAAE,UAAkB,EAAE,cAAuB,EAAE,OAAiB;QA5DxF,kBAAa,GAAwD,EAAyD,CAAC;QAE/H,oBAAe,GAA4D,EAA6D,CAAC;QAMzI,YAAO,GAAuB,EAAE,CAAC;QAEjC,YAAO,
|
|
1
|
+
{"version":3,"file":"modelv2.class.js","sourceRoot":"","sources":["../../../src/classes/modelv2.class.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,8 +21,7 @@ class MongoClass {
|
|
|
21
21
|
* Disconnect from MongoDB
|
|
22
22
|
*/
|
|
23
23
|
disconnect() {
|
|
24
|
-
|
|
25
|
-
return (_a = this.client) === null || _a === void 0 ? void 0 : _a.close();
|
|
24
|
+
return this.client?.close();
|
|
26
25
|
}
|
|
27
26
|
/**
|
|
28
27
|
* Connects to MongoDB
|
|
@@ -50,11 +49,10 @@ class MongoClass {
|
|
|
50
49
|
}
|
|
51
50
|
/** is fired if a server connection is lost */
|
|
52
51
|
this.client.on('serverDescriptionChanged', (d) => {
|
|
53
|
-
|
|
54
|
-
if (((_a = d.newDescription.error) === null || _a === void 0 ? void 0 : _a.name) === 'MongoNetworkError') {
|
|
52
|
+
if (d.newDescription.error?.name === 'MongoNetworkError') {
|
|
55
53
|
connectionError = true;
|
|
56
54
|
}
|
|
57
|
-
if (
|
|
55
|
+
if (d.newDescription.error?.name !== 'MongoNetworkError') {
|
|
58
56
|
connectionError = false;
|
|
59
57
|
}
|
|
60
58
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongo.class.js","sourceRoot":"","sources":["../../../src/classes/mongo.class.ts"],"names":[],"mappings":";;;;;;AAAA,qCAIiB;AACjB,qEAAiF;AACjF,uDAA+B;AAE/B;;GAEG;AACH,MAAa,UAAU;IAUrB,YAAY,aAAsB;QAEhC,IAAI,aAAa,EAAE;YAEjB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;YACnC,IAAI,CAAC,mBAAmB,GAAG,IAAI,0CAAgB,CAAC,aAAa,CAAC,CAAC;SAEhE;IAEH,CAAC;IAED;;OAEG;IACH,UAAU
|
|
1
|
+
{"version":3,"file":"mongo.class.js","sourceRoot":"","sources":["../../../src/classes/mongo.class.ts"],"names":[],"mappings":";;;;;;AAAA,qCAIiB;AACjB,qEAAiF;AACjF,uDAA+B;AAE/B;;GAEG;AACH,MAAa,UAAU;IAUrB,YAAY,aAAsB;QAEhC,IAAI,aAAa,EAAE;YAEjB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;YACnC,IAAI,CAAC,mBAAmB,GAAG,IAAI,0CAAgB,CAAC,aAAa,CAAC,CAAC;SAEhE;IAEH,CAAC;IAED;;OAEG;IACH,UAAU;QAER,OAAO,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;IAE9B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAAO;QAEX,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;QAE/B,IAAI,eAAe,GAAW,CAAC,CAAC;QAChC,IAAI,eAAe,GAAY,KAAK,CAAC;QAErC,MAAM,YAAY,GAAuB,EACxC,CAAC;QAEF;;WAEG;QACH,IAAI;YAEF,gBAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;YAEtC,MAAM,MAAM,GAAG,IAAI,qBAAW,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;YAC5D,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;YAEvB,gBAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;YAE7C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;YACrB,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;SAE7D;QAAC,OAAO,KAAK,EAAE;YAEd,gBAAM,CAAC,KAAK,CAAC,4BAA4B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC1D,gBAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;YAE1C,MAAM,KAAK,CAAC;SAEb;QAED,8CAA8C;QAC9C,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,0BAA0B,EAAE,CAAC,CAAC,EAAE,EAAE;YAE/C,IAAI,CAAC,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,KAAK,mBAAmB,EAAE;gBAExD,eAAe,GAAG,IAAI,CAAC;aAExB;YAED,IAAI,CAAC,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,KAAK,mBAAmB,EAAE;gBAExD,eAAe,GAAG,KAAK,CAAC;aAEzB;QAEH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,0BAA0B,EAAE,GAAG,EAAE;YAE9C,eAAe,GAAG,CAAC,CAAC;QAEtB,CAAC,CAAC,CAAC;QAEH;;UAEE;QACF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,uBAAuB,EAAE,GAAG,EAAE;YAE3C,eAAe,IAAI,CAAC,CAAC;YAErB,gBAAM,CAAC,KAAK,CAAC,EAAE,eAAe,EAAE,eAAe,EAAE,OAAO,EAAE,uBAAuB,EAAE,CAAC,CAAC;YAErF,IAAI,eAAe,IAAI,EAAE,IAAI,eAAe,EAAE;gBAE5C,gBAAM,CAAC,KAAK,CAAC,GAAG,EAAE,kDAAkD,CAAC,CAAC;gBACtE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aAElB;YAED,IAAI,eAAe,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE;gBAE7C,eAAe,GAAG,CAAC,CAAC;aAErB;QAEH,CAAC,CAAC,CAAC;IAEL,CAAC;CAEF;AApHD,gCAoHC;AAED,kBAAe,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,QAAkB,CAAC,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const filterModules = (modules, position, source) => {
|
|
4
4
|
const filteredModules = [];
|
|
5
|
-
modules
|
|
5
|
+
modules?.forEach((single) => {
|
|
6
6
|
if (source)
|
|
7
7
|
single.source = source;
|
|
8
8
|
if (position === 'content') {
|
|
@@ -19,8 +19,8 @@ const filterModules = (modules, position, source) => {
|
|
|
19
19
|
exports.default = (baseModules, position, layoutModules, source) => {
|
|
20
20
|
const modules = layoutModules ? filterModules(layoutModules, position, source) : [];
|
|
21
21
|
const mergeModules = filterModules(baseModules, position);
|
|
22
|
-
const prepend = modules
|
|
23
|
-
const append = modules
|
|
22
|
+
const prepend = modules?.filter((single) => single.layout === 'first' || !single.layout);
|
|
23
|
+
const append = modules?.filter((single) => single.layout === 'last');
|
|
24
24
|
if (prepend)
|
|
25
25
|
mergeModules.unshift(...prepend);
|
|
26
26
|
if (append)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterMergeModules.js","sourceRoot":"","sources":["../../src/filterMergeModules.ts"],"names":[],"mappings":";;AAEA,MAAM,aAAa,GAAG,CAA0C,OAAY,EAAE,QAAsC,EAAE,MAAe,EAAE,EAAE;IAEvI,MAAM,eAAe,GAAQ,EAAE,CAAC;IAEhC,OAAO,
|
|
1
|
+
{"version":3,"file":"filterMergeModules.js","sourceRoot":"","sources":["../../src/filterMergeModules.ts"],"names":[],"mappings":";;AAEA,MAAM,aAAa,GAAG,CAA0C,OAAY,EAAE,QAAsC,EAAE,MAAe,EAAE,EAAE;IAEvI,MAAM,eAAe,GAAQ,EAAE,CAAC;IAEhC,OAAO,EAAE,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QAE1B,IAAI,MAAM;YAAE,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QAEnC,IAAI,QAAQ,KAAK,SAAS,EAAE;YAE1B,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,KAAK,SAAS,EAAE;gBAErD,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAE9B;SAEF;aAAM,IAAI,MAAM,CAAC,QAAQ,KAAK,QAAQ,EAAE;YAEvC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAE9B;IAEH,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC;AAEzB,CAAC,CAAC;AAEF,kBAAe,CACb,WAAgB,EAChB,QAAsC,EACtC,aAAmB,EACnB,MAAe,EACV,EAAE;IAEP,MAAM,OAAO,GAAG,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,aAAa,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAEpF,MAAM,YAAY,GAAG,aAAa,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAE1D,MAAM,OAAO,GAAG,OAAO,EAAE,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEzF,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;IAErE,IAAI,OAAO;QAAE,YAAY,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,CAAC;IAE9C,IAAI,MAAM;QAAE,YAAY,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;IAEzC,OAAO,YAAY,CAAC;AAEtB,CAAC,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
function optionsHelper(req, moreOptions) {
|
|
4
|
-
const options = moreOptions ?
|
|
4
|
+
const options = moreOptions ? { ...moreOptions } : {};
|
|
5
5
|
if (req.params.company)
|
|
6
6
|
options.company = req.params.company;
|
|
7
7
|
if (req.params.project)
|