@lilaquadrat/studio 10.0.0-beta.5 → 10.0.0-beta.51

package/lib/src/ShareClientFactory.class.d.ts

@@ -1,7 +1,5 @@
 import FilesystemClient from './Filesystem.share.js';
-import AzureStorageClient from './AzureFileStorage.share.js';
-import AzureBlobClient from './AzureBlobStorage.share.js';
 import { AvailableStorageTypes, ShareClientOptions, ShareClientInterface } from '@lilaquadrat/interfaces';
 declare function ShareClientFactory<T = ShareClientInterface>(type: AvailableStorageTypes, options: ShareClientOptions): T;
 export default ShareClientFactory;
-export { FilesystemClient, AzureStorageClient, AzureBlobClient, };
+export { FilesystemClient, };

package/lib/src/ShareClientFactory.class.js

@@ -1,6 +1,4 @@
 import FilesystemClient from './Filesystem.share.js';
-import AzureStorageClient from './AzureFileStorage.share.js';
-import AzureBlobClient from './AzureBlobStorage.share.js';
 import MockClient from './Mock.share.js';
 function ShareClientFactory(type, options) {
     let client;
@@ -10,17 +8,11 @@ function ShareClientFactory(type, options) {
     if (type === 'filesystem') {
         client = new FilesystemClient(options);
     }
-    if (type === 'azureStorage') {
-        client = new AzureStorageClient({ shareName: options.shareName, connectionString: options.connectionString });
-    }
-    if (type === 'azureBlob') {
-        client = new AzureBlobClient(options);
-    }
     if (!client) {
         console.warn(`no matching shareClientFactory for ${type}`);
     }
     return client;
 }
 export default ShareClientFactory;
-export { FilesystemClient, AzureStorageClient, AzureBlobClient, };
+export { FilesystemClient, };
 //# sourceMappingURL=ShareClientFactory.class.js.map

package/lib/src/ShareClientFactory.class.js.map

@@ -1 +1 @@
-{"version":3,"file":"ShareClientFactory.class.js","sourceRoot":"","sources":["../../src/ShareClientFactory.class.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,MAAM,uBAAuB,CAAC;AACrD,OAAO,kBAAkB,MAAM,6BAA6B,CAAC;AAC7D,OAAO,eAAe,MAAM,6BAA6B,CAAC;AAC1D,OAAO,UAAU,MAAM,iBAAiB,CAAC;AAGzC,SAAS,kBAAkB,CAA2B,IAA2B,EAAE,OAA2B;IAE5G,IAAI,MAAwC,CAAC;IAE7C,IAAI,IAAI,KAAK,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAE7B,MAAM,GAAG,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC;IAEnC,CAAC;IAED,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;QAE1B,MAAM,GAAG,IAAI,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAEzC,CAAC;IAED,IAAI,IAAI,KAAK,cAAc,EAAE,CAAC;QAE5B,MAAM,GAAG,IAAI,kBAAkB,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAEhH,CAAC;IAED,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;QAEzB,MAAM,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC;IAExC,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QAEZ,OAAO,CAAC,IAAI,CAAC,sCAAsC,IAAI,EAAE,CAAC,CAAC;IAE7D,CAAC;IAED,OAAO,MAAW,CAAC;AAErB,CAAC;AAED,eAAe,kBAAkB,CAAC;AAClC,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,eAAe,GAChB,CAAC"}
+{"version":3,"file":"ShareClientFactory.class.js","sourceRoot":"","sources":["../../src/ShareClientFactory.class.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,MAAM,uBAAuB,CAAC;AACrD,OAAO,UAAU,MAAM,iBAAiB,CAAC;AAGzC,SAAS,kBAAkB,CAA2B,IAA2B,EAAE,OAA2B;IAE5G,IAAI,MAAwC,CAAC;IAE7C,IAAI,IAAI,KAAK,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAE7B,MAAM,GAAG,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC;IAEnC,CAAC;IAED,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;QAE1B,MAAM,GAAG,IAAI,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAEzC,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QAEZ,OAAO,CAAC,IAAI,CAAC,sCAAsC,IAAI,EAAE,CAAC,CAAC;IAE7D,CAAC;IAED,OAAO,MAAW,CAAC;AAErB,CAAC;AAED,eAAe,kBAAkB,CAAC;AAClC,OAAO,EACL,gBAAgB,GACjB,CAAC"}

package/lib/src/classes/models.class.js.map

@@ -1 +1 @@
-{"version":3,"file":"models.class.js","sourceRoot":"","sources":["../../../src/classes/models.class.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,WAAW,MAAM,wCAAwC,CAAC;AACjE,OAAO,MAAM,MAAM,cAAc,CAAC;AAKlC,MAAM,CAAC,OAAO,OAAO,MAAM;IAMzB;QAJA,WAAM,GAAwD,EAAE,CAAC;QAM/D,IAAI,CAAC,GAAG,GAAG,IAAI,GAAG,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACjE,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAErB,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE;YACzB,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI;SAClC,CAAC,CAAC;IAEL,CAAC;IAED,QAAQ,CAAC,IAAY,EAAE,KAA0C;QAE/D,MAAM,CAAC,IAAI,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAC;QAEvC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YAEtB,MAAM,IAAI,KAAK,CAAC,SAAS,IAAI,qBAAqB,CAAC,CAAC;QAEtD,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;QAE1B,IAAG,QAAQ,IAAI,KAAK,EAAE,CAAC;YAErB,IAAG,KAAK,CAAC,MAAM;gBAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE9C,CAAC;QAEG,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAE7B,CAAC;IAED,UAAU,CAAC,IAAY;QAErB,MAAM,CAAC,IAAI,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC;QAEzC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAE3B,CAAC;IAED,wBAAwB,CAAC,KAAkB,EAAE,UAAuB,EAAE,SAAmB;QAEvF,MAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;QAEjD,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAE1D,MAAM,CAAC,IAAI,CAAC,qCAAqC,GAAG,iBAAiB,CAAC,SAAS,EAAE,CAAC,CAAC;YAEnF,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,kBAAkB,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;QAE3E,CAAC,CAAC,CAAC;QAEH,OAAO,cAAc,CAAC;IAExB,CAAC;CAEF"}
+{"version":3,"file":"models.class.js","sourceRoot":"","sources":["../../../src/classes/models.class.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,WAAW,MAAM,wCAAwC,CAAC;AACjE,OAAO,MAAM,MAAM,cAAc,CAAC;AAKlC,MAAM,CAAC,OAAO,OAAO,MAAM;IAMzB;QAJA,WAAM,GAAwD,EAAE,CAAC;QAM/D,IAAI,CAAC,GAAG,GAAG,IAAI,GAAG,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACjE,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAErB,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE;YACzB,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI;SAClC,CAAC,CAAC;IAEL,CAAC;IAED,QAAQ,CAAC,IAAY,EAAE,KAA0C;QAE/D,MAAM,CAAC,IAAI,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAC;QAEvC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YAEtB,MAAM,IAAI,KAAK,CAAC,SAAS,IAAI,qBAAqB,CAAC,CAAC;QAEtD,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;QAE1B,IAAG,QAAQ,IAAI,KAAK,EAAE,CAAC;YAErB,IAAG,KAAK,CAAC,MAAM;gBAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE1C,CAAC;QAED,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAE7B,CAAC;IAED,UAAU,CAAC,IAAY;QAErB,MAAM,CAAC,IAAI,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC;QAEzC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAE3B,CAAC;IAED,wBAAwB,CAAC,KAAkB,EAAE,UAAuB,EAAE,SAAmB;QAEvF,MAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;QAEjD,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAE1D,MAAM,CAAC,IAAI,CAAC,qCAAqC,GAAG,iBAAiB,CAAC,SAAS,EAAE,CAAC,CAAC;YAEnF,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,kBAAkB,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;QAE3E,CAAC,CAAC,CAAC;QAEH,OAAO,cAAc,CAAC;IAExB,CAAC;CAEF"}

package/lib/src/classes/modelv2.class.d.ts

@@ -26,6 +26,8 @@ export default class Modelv2<T extends mongo.Document, A extends string = Model[
     historyMatch: (keyof BasicData<T>)[];
     /** removes theses keys if no data is given */
     removeWhenEmpty: (keyof BasicData<T> | string)[];
+    /** this allows atomic updates on specified objects */
+    nestedUpdate: (keyof BasicData<T> | string)[];
     /** these keys will be removed from the update object */
     immutable: (keyof BasicData<T>)[];
     /** these keys will be projected when this model is used in a list */

package/lib/src/classes/modelv2.class.js

@@ -114,7 +114,7 @@ export default class Modelv2 {
         const unsetObject = {};
         this.removeWhenEmpty?.forEach((single) => {
             // get data via string ```string.string``` from an object
-            const singleData = objectPath.get(data, single);
+            const singleData = objectPath.get(data, single) || data[single];
             // if empty array
             if (Array.isArray(singleData)) {
                 if (!singleData.length) {

package/lib/src/classes/modelv2.class.js.map

@@ -1 +1 @@
-{"version":3,"file":"modelv2.class.js","sourceRoot":"","sources":["../../../src/classes/modelv2.class.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"modelv2.class.js","sourceRoot":"","sources":["../../../src/classes/modelv2.class.ts"],"names":[],"mappings":"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"}

package/lib/src/classes/mongo.class.js

@@ -1,7 +1,6 @@
 import { MongoClient, } from 'mongodb';
 import { ConnectionString } from 'mongo-connection-string';
 import logger from '../logger.js';
-import getSecrets from '../helpers/getSecrets.js';
 /**
  * Wrapper for the native MongoDB module
  */
@@ -15,21 +14,12 @@ export class MongoClass {
         }
     }
     async getConnectionString() {
-        if (this.connectionUri) {
-            logger.info('mongodb.connection.using.env');
-            this.connectionUriObject = new ConnectionString(this.connectionUri);
-            return this.connectionUri;
-        }
-        else if (this.vault) {
-            logger.info('mongodb.connection.using.secret');
-            const connectionString = await getSecrets('mongodbConnectionString', this.vault);
-            this.connectionUriObject = new ConnectionString(connectionString);
-            return connectionString;
-        }
-        if (!this.connectionUri && !this.vault) {
+        if (!this.connectionUri) {
             throw new Error('MONGODB_CONNECTION_STRING_MISSING');
         }
-        return '';
+        logger.info('mongodb.connection.using.env');
+        this.connectionUriObject = new ConnectionString(this.connectionUri);
+        return this.connectionUri;
     }
     /**
      * Disconnect from MongoDB

package/lib/src/classes/mongo.class.js.map

@@ -1 +1 @@
-{"version":3,"file":"mongo.class.js","sourceRoot":"","sources":["../../../src/classes/mongo.class.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mongo.class.js","sourceRoot":"","sources":["../../../src/classes/mongo.class.ts"],"names":[],"mappings":"AAAA,OAAc,EAEZ,WAAW,GAEZ,MAAM,SAAS,CAAC;AACjB,OAAO,EAAwB,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AACjF,OAAO,MAAM,MAAM,cAAc,CAAC;AAGlC;;GAEG;AACH,MAAM,OAAO,UAAU;IAYrB,YAAY,aAAsB,EAAE,KAAc;QAEhD,IAAI,aAAa,EAAE,CAAC;YAElB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QAErC,CAAC;QAED,IAAI,KAAK,EAAE,CAAC;YAEV,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QAErB,CAAC;IAEH,CAAC;IAED,KAAK,CAAC,mBAAmB;QAEvB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YAExB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QAEvD,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;QAE5C,IAAI,CAAC,mBAAmB,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAEpE,OAAO,IAAI,CAAC,aAAa,CAAC;IAE5B,CAAC;IAED;;OAEG;IACH,UAAU;QAER,OAAO,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;IAE9B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAAO;QAEX,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAE1D,IAAI,eAAe,GAAW,CAAC,CAAC;QAChC,IAAI,eAAe,GAAY,KAAK,CAAC;QAErC,MAAM,YAAY,GAAuB,EACxC,CAAC;QAEF;;WAEG;QACH,IAAI,CAAC;YAEH,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;YAEtC,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;YAC/D,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;YAEvB,MAAM,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;QAE9D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAEf,MAAM,CAAC,KAAK,CAAC,4BAA4B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC1D,MAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;YAE1C,MAAM,KAAK,CAAC;QAEd,CAAC;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,CAAC;gBAEzD,eAAe,GAAG,IAAI,CAAC;YAEzB,CAAC;YAED,IAAI,CAAC,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,KAAK,mBAAmB,EAAE,CAAC;gBAEzD,eAAe,GAAG,KAAK,CAAC;YAE1B,CAAC;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,MAAM,CAAC,KAAK,CAAC,EAAE,eAAe,EAAE,eAAe,EAAE,OAAO,EAAE,uBAAuB,EAAE,CAAC,CAAC;YAErF,IAAI,eAAe,IAAI,EAAE,IAAI,eAAe,EAAE,CAAC;gBAE7C,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,kDAAkD,CAAC,CAAC;gBACtE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAEnB,CAAC;YAED,IAAI,eAAe,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC;gBAE9C,eAAe,GAAG,CAAC,CAAC;YAEtB,CAAC;QAEH,CAAC,CAAC,CAAC;IAEL,CAAC;CAEF;AAED,eAAe,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,QAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,KAAe,CAAC,CAAC"}

package/lib/src/functions/handleError.d.ts

@@ -1,6 +1,5 @@
-import { Response } from 'express';
 import { MongoServerError } from 'mongodb';
+import { FastifyReply } from 'fastify';
 import ImmutableError from '../classes/errors/Immutable.error.js';
 import InvalidIdError from '../classes/errors/InvalidId.error.js';
-import ForbiddenError from '../classes/errors/Forbidden.error.js';
-export default function handleError(error: MongoServerError | ImmutableError | InvalidIdError | ForbiddenError, res: Response): void;
+export default function handleError(error: MongoServerError | ImmutableError | InvalidIdError, res: FastifyReply): void;

package/lib/src/functions/handleError.js

@@ -1,17 +1,13 @@
 import createError from '../helpers/createError.js';
-import { logger } from '../../main.js';
 import { HttpStatusCode } from '../helpers/HttpStatusCode.enum.js';
 export default function handleError(error, res) {
     let response = {};
-    let statusCode = HttpStatusCode.BAD_REQUEST;
-    console.log('handleError', error.constructor.name, error.message);
     if (error.constructor.name === 'MongoServerError') {
         const errorTyped = error;
         if (errorTyped.code === 11000) {
-            const mongoError = error;
             response = {
                 message: 'DOCUMENT_ALREADY_EXISTS',
-                key: mongoError.keyPattern,
+                key: errorTyped.keyPattern,
                 errors: [createError('DOCUMENT_ALREADY_EXISTS', undefined, errorTyped.keyPattern)],
             };
         }
@@ -29,10 +25,6 @@ export default function handleError(error, res) {
             errors: errorTyped.errors || [createError('invalidId', undefined, errorTyped.params)],
         };
     }
-    else if (error.constructor.name === 'ForbiddenError') {
-        response = undefined;
-        statusCode = HttpStatusCode.FORBIDDEN;
-    }
     else {
         const errorTyped = error;
         response = {
@@ -40,12 +32,7 @@ export default function handleError(error, res) {
             errors: errorTyped.errors || [createError(errorTyped.message, undefined, errorTyped.params)],
         };
     }
-    logger.error(error);
-    if (!response) {
-        res.status(statusCode).end();
-    }
-    else {
-        res.status(statusCode).json(response);
-    }
+    console.error(error);
+    res.status(HttpStatusCode.BAD_REQUEST).send(response);
 }
 //# sourceMappingURL=handleError.js.map

package/lib/src/functions/handleError.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleError.js","sourceRoot":"","sources":["../../../src/functions/handleError.ts"],"names":[],"mappings":"AAIA,OAAO,WAAW,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAInE,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,KAA0E,EAAE,GAAa;IAE3H,IAAI,QAAQ,GAAiD,EAAE,CAAC;IAChE,IAAI,UAAU,GAAG,cAAc,CAAC,WAAW,CAAC;IAE5C,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAElE,IAAI,KAAK,CAAC,WAAW,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;QAElD,MAAM,UAAU,GAAG,KAAyB,CAAC;QAE7C,IAAI,UAAU,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YAE9B,MAAM,UAAU,GAAG,KAAY,CAAC;YAEhC,QAAQ,GAAG;gBACT,OAAO,EAAE,yBAAyB;gBAClC,GAAG,EAAE,UAAU,CAAC,UAAU;gBAC1B,MAAM,EAAE,CAAC,WAAW,CAAC,yBAAyB,EAAE,SAAS,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;aACnF,CAAC;QAEJ,CAAC;QAED,IAAI,UAAU,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YAE9B,QAAQ,GAAG;gBACT,OAAO,EAAE,4BAA4B;gBACrC,MAAM,EAAE,KAAK,CAAC,OAAO;aACtB,CAAC;QAEJ,CAAC;IAEH,CAAC;SAAM,IAAI,KAAK,CAAC,WAAW,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;QAEvD,MAAM,UAAU,GAAG,KAAuB,CAAC;QAE3C,QAAQ,GAAG;YACT,OAAO,EAAE,mBAAmB;YAC5B,MAAM,EAAE,UAAU,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,SAAS,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;SACtF,CAAC;IAEJ,CAAC;SAAM,IAAI,KAAK,CAAC,WAAW,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;QAEvD,QAAQ,GAAG,SAAS,CAAC;QAErB,UAAU,GAAG,cAAc,CAAC,SAAS,CAAC;IAExC,CAAC;SAAM,CAAC;QAEN,MAAM,UAAU,GAAG,KAAuB,CAAC;QAE3C,QAAQ,GAAG;YACT,OAAO,EAAE,UAAU,CAAC,OAAO;YAC3B,MAAM,EAAE,UAAU,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;SAC7F,CAAC;IAEJ,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACpB,IAAI,CAAC,QAAQ,EAAE,CAAC;QAEd,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,CAAC;IAE/B,CAAC;SAAM,CAAC;QAEN,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAExC,CAAC;AAEH,CAAC"}
+{"version":3,"file":"handleError.js","sourceRoot":"","sources":["../../../src/functions/handleError.ts"],"names":[],"mappings":"AAMA,OAAO,WAAW,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAEnE,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,KAAyD,EAAE,GAAiB;IAE9G,IAAI,QAAQ,GAAqC,EAAE,CAAC;IAEpD,IAAI,KAAK,CAAC,WAAW,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;QAElD,MAAM,UAAU,GAAG,KAAyB,CAAC;QAE7C,IAAI,UAAU,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YAE9B,QAAQ,GAAG;gBACT,OAAO,EAAE,yBAAyB;gBAClC,GAAG,EAAE,UAAU,CAAC,UAAU;gBAC1B,MAAM,EAAE,CAAC,WAAW,CAAC,yBAAyB,EAAE,SAAS,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;aACnF,CAAC;QAEJ,CAAC;QAED,IAAI,UAAU,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YAE9B,QAAQ,GAAG;gBACT,OAAO,EAAE,4BAA4B;gBACrC,MAAM,EAAE,KAAK,CAAC,OAAO;aACtB,CAAC;QAEJ,CAAC;IAEH,CAAC;SAAM,IAAI,KAAK,CAAC,WAAW,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;QAEvD,MAAM,UAAU,GAAG,KAAuB,CAAC;QAE3C,QAAQ,GAAG;YACT,OAAO,EAAE,mBAAmB;YAC5B,MAAM,EAAE,UAAU,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,SAAS,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;SACtF,CAAC;IAEJ,CAAC;SAAM,CAAC;QAEN,MAAM,UAAU,GAAG,KAAuB,CAAC;QAE3C,QAAQ,GAAG;YACT,OAAO,EAAE,UAAU,CAAC,OAAO;YAC3B,MAAM,EAAE,UAAU,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;SAC7F,CAAC;IAEJ,CAAC;IAED,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACrB,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAExD,CAAC"}

package/lib/src/functions/optionsHelper.d.ts

@@ -1,6 +1,6 @@
 import { UserAppWithOptions } from '@lilaquadrat/interfaces';
-import { Request } from 'express';
-declare function optionsHelper(req: Request<any, any, any, any, Record<string, any>>): UserAppWithOptions;
-declare function optionsHelper<UserAppWithOptions>(req: Request<any, any, any, any, Record<string, any>>): Required<UserAppWithOptions>;
-declare function optionsHelper<T>(req: Request<any, any, any, any, Record<string, any>>, moreOptions?: T): UserAppWithOptions & T;
+import { FastifyRequest } from 'fastify';
+declare function optionsHelper(req: FastifyRequest): UserAppWithOptions;
+declare function optionsHelper<UserAppWithOptions>(req: FastifyRequest): Required<UserAppWithOptions>;
+declare function optionsHelper<T>(req: FastifyRequest, moreOptions?: T): UserAppWithOptions & T;
 export default optionsHelper;

package/lib/src/functions/optionsHelper.js

@@ -1,9 +1,10 @@
 function optionsHelper(req, moreOptions) {
     const options = moreOptions ? { ...moreOptions } : {};
-    if (req.params?.company)
-        options.company = req.params.company;
-    if (req.params?.project)
-        options.project = req.params.project;
+    const params = req.params;
+    if (params?.company)
+        options.company = params.company;
+    if (params?.project)
+        options.project = params.project;
     if (req.auth?.sub)
         options.user = req.auth.sub;
     if (req.studioApp)

package/lib/src/functions/optionsHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"optionsHelper.js","sourceRoot":"","sources":["../../../src/functions/optionsHelper.ts"],"names":[],"mappings":"AAMA,SAAS,aAAa,CAAI,GAAqD,EAAE,WAAe;IAE9F,MAAM,OAAO,GAA0B,WAAW,CAAC,CAAC,CAAC,EAAE,GAAG,WAAW,EAAE,CAAC,CAAC,CAAC,EAAiB,CAAC;IAE5F,IAAI,GAAG,CAAC,MAAM,EAAE,OAAO;QAAE,OAAO,CAAC,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC;IAC9D,IAAI,GAAG,CAAC,MAAM,EAAE,OAAO;QAAE,OAAO,CAAC,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC;IAC9D,IAAI,GAAG,CAAC,IAAI,EAAE,GAAG;QAAE,OAAO,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC;IAC/C,IAAI,GAAG,CAAC,SAAS;QAAE,OAAO,CAAC,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC;IAE/C,OAAO,OAAO,CAAC;AAEjB,CAAC;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"optionsHelper.js","sourceRoot":"","sources":["../../../src/functions/optionsHelper.ts"],"names":[],"mappings":"AAYA,SAAS,aAAa,CAAI,GAAmB,EAAE,WAAe;IAE5D,MAAM,OAAO,GAA0B,WAAW,CAAC,CAAC,CAAC,EAAE,GAAG,WAAW,EAAE,CAAC,CAAC,CAAC,EAAiB,CAAC;IAE5F,MAAM,MAAM,GAAG,GAAG,CAAC,MAAuB,CAAC;IAE3C,IAAI,MAAM,EAAE,OAAO;QAAE,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;IACtD,IAAI,MAAM,EAAE,OAAO;QAAE,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;IACtD,IAAI,GAAG,CAAC,IAAI,EAAE,GAAG;QAAE,OAAO,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC;IAC/C,IAAI,GAAG,CAAC,SAAS;QAAE,OAAO,CAAC,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC;IAE/C,OAAO,OAAO,CAAC;AAEjB,CAAC;AAED,eAAe,aAAa,CAAC"}

package/lib/src/functions/respondCode.d.ts

@@ -1,3 +1,4 @@
+import { FastifyReply } from 'fastify';
 import { HttpStatusCode } from '../helpers/HttpStatusCode.enum.js';
-declare const _default: (statusCode: keyof typeof HttpStatusCode, res: any) => any;
+declare const _default: (statusCode: keyof typeof HttpStatusCode, res: FastifyReply) => FastifyReply<import("fastify").RouteGenericInterface, import("fastify").RawServerDefault, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, unknown, import("fastify").FastifySchema, import("fastify").FastifyTypeProviderDefault, unknown>;
 export default _default;

package/lib/src/functions/respondCode.js

@@ -1,3 +1,3 @@
 import { HttpStatusCode } from '../helpers/HttpStatusCode.enum.js';
-export default (statusCode, res) => res.status(HttpStatusCode[statusCode]).end();
+export default (statusCode, res) => res.status(HttpStatusCode[statusCode]).send();
 //# sourceMappingURL=respondCode.js.map

package/lib/src/functions/respondCode.js.map

@@ -1 +1 @@
-{"version":3,"file":"respondCode.js","sourceRoot":"","sources":["../../../src/functions/respondCode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAEnE,eAAe,CAAC,UAAuC,EAAE,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC"}
+{"version":3,"file":"respondCode.js","sourceRoot":"","sources":["../../../src/functions/respondCode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAEnE,eAAe,CAAC,UAAuC,EAAE,GAAiB,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC"}

package/lib/src/helpers/ControllerHelper.d.ts

@@ -0,0 +1,73 @@
+import { Filter, SortDirection, WithId, Document } from 'mongodb';
+import { Modelv2 } from '../../main';
+import { DatabaseQuerySites, DatabaseQueryOptions, ListOfModels } from '@lilaquadrat/interfaces';
+import { ListCustomQueries } from '@lilaquadrat/interfaces';
+export default class ControllerHelper {
+    cleanErrors(errors: {
+        [key: string]: any;
+    }): {
+        [key: string]: any;
+    };
+    response(res: any, data: any, count?: number): void;
+    static buildResponse<M>(data: ListOfModels<M>, site: number, limit: number, hardLimit?: number): {
+        data: M[] | undefined;
+        all: number | undefined;
+        sites: DatabaseQuerySites;
+        count: number | undefined;
+    };
+    static getLimit(site: number, limit: number, hardLimit?: number): {
+        skip: number;
+        limit: number;
+    };
+    static getRealLimit(limit: number, hardLimit?: number): number;
+    /**
+       *
+       *
+       * @param {number} site
+       * @param {number} limit
+       * @param {number} count all data count regardless of site
+       * @param {number} current current count of documents
+       * @returns {DatabaseQuerySites}
+       * @memberof ControllerBase
+       */
+    static getSites(site: number, limit: number, count: number, current: number): DatabaseQuerySites;
+    /**
+       *
+       *
+       * @param {DatabaseQuery} query
+       * @param {string} [company]
+       * @param {string} [project]
+       * @param {DatabaseQueryOptions} [options]
+       * @returns
+       * @memberof ControllerBase
+       */
+    static buildQuery<M>(query: Filter<WithId<M>>, company?: string, project?: string | boolean, options?: DatabaseQueryOptions): Filter<WithId<M>>;
+    /**
+       *
+       *
+       * @param {DatabaseQuery} query
+       * @param {string} select
+       * @param {number} site start counting at 1 instead of zero. no site / zero will be the same as 1
+       * @param {number} limit
+       * @param {Model<Document>} model
+       * @param {string} [sort]
+       * @param {string} [order]
+       * @returns
+       * @memberof ControllerBase
+       */
+    static list<M extends Document>(query: Filter<M>, select: Record<string, number> | undefined, site: number, limit: number, model: Modelv2<M>, sort?: string, order?: number, selectDefault?: Record<keyof M, number>): Promise<{
+        data: WithId<M>[];
+        all: number;
+        count: number;
+    }>;
+    static listCustomQuery<M extends Document>(queries: ListCustomQueries<M>, model: Modelv2<M>): Promise<{
+        all: number;
+        data: M[];
+        count: number;
+    }>;
+    static getSkipLimitSort(site: number, limit: number, sort?: string, order?: number): {
+        skip: number;
+        limit: number;
+        sort: Record<string, SortDirection>;
+    };
+}

package/lib/src/helpers/ControllerHelper.js

@@ -0,0 +1,242 @@
+export default class ControllerHelper {
+    cleanErrors(errors) {
+        const errorObject = {};
+        if (errors.errors) {
+            Object.keys(errors.errors).forEach((key) => {
+                errorObject[key] = errors.errors[key].message;
+            });
+        }
+        else if (typeof errors === 'object') {
+            if (errors.code === 11000) {
+                const message = errors.message.match(/index: (.*)_/i);
+                errorObject[message[1]] = `${message[1]}_duplicate`;
+            }
+            else {
+                errorObject.error = errors.message;
+            }
+        }
+        return errorObject;
+    }
+    response(res, data, count) {
+        count || count === 0
+            ? res.json({ data, count })
+            : res.json({ data, count: data.length });
+    }
+    static buildResponse(data, site, limit, hardLimit = 30) {
+        return {
+            data: data.data,
+            all: data.all,
+            sites: ControllerHelper.getSites(+site, ControllerHelper.getRealLimit(limit, hardLimit), data.all, data.count),
+            count: data.count,
+        };
+    }
+    static getLimit(site, limit, hardLimit) {
+        const realLimit = ControllerHelper.getRealLimit(limit, hardLimit);
+        return {
+            skip: site * realLimit || 0,
+            limit: realLimit,
+        };
+    }
+    static getRealLimit(limit, hardLimit) {
+        let realLimit;
+        if (hardLimit) {
+            realLimit = limit > hardLimit ? hardLimit : limit;
+        }
+        else {
+            realLimit = limit;
+        }
+        return realLimit;
+    }
+    //   getSort(sort?: string, order?: '1' | 0) {
+    //     const sortObject = {};
+    //     if (sort && order) {
+    //       sortObject[sort] = order === '1' ? 1 : -1;
+    //       return sortObject;
+    //     }
+    //     return { _id: 1 };
+    //   }
+    /**
+       *
+       *
+       * @param {number} site
+       * @param {number} limit
+       * @param {number} count all data count regardless of site
+       * @param {number} current current count of documents
+       * @returns {DatabaseQuerySites}
+       * @memberof ControllerBase
+       */
+    static getSites(site, limit, count, current) {
+        const realSite = site - 1;
+        if (count === 0) {
+            return {
+                first: 0,
+                current: 0,
+                last: 0,
+                range: [0, 0],
+            };
+        }
+        return {
+            first: 1,
+            current: site || 1,
+            last: count ? Math.ceil(count / limit) : 1,
+            range: [
+                (realSite * limit) + 1 || 1,
+                realSite * limit + current || current,
+            ],
+        };
+    }
+    /**
+       *
+       *
+       * @param {DatabaseQuery} query
+       * @param {string} [company]
+       * @param {string} [project]
+       * @param {DatabaseQueryOptions} [options]
+       * @returns
+       * @memberof ControllerBase
+       */
+    static buildQuery(query, company, project, options) {
+        const realQuery = { ...query };
+        const orArray = [];
+        let tags;
+        let category;
+        let keepTags = false;
+        let keepSearch = false;
+        let keepSort = false;
+        if (company)
+            realQuery.company = company;
+        if (project)
+            realQuery.project = project;
+        if (project === false)
+            realQuery.project = { $exists: false };
+        if (options) {
+            if (options.keepTags)
+                keepTags = true;
+            if (options.keepSearch)
+                keepSearch = true;
+            if (options.keepSort)
+                keepSort = true;
+        }
+        if (!keepSort) {
+            delete realQuery.sort;
+            delete realQuery.order;
+        }
+        if (query.partial !== undefined) {
+            realQuery.partial = query.partial
+                ? true
+                : { $exists: false };
+        }
+        if (query.layout !== undefined) {
+            realQuery.layout = query.layout
+                ? true
+                : { $exists: false };
+        }
+        if (query.available) {
+            realQuery.available = query.available === true || (query.available === 'true');
+        }
+        /**
+             * make sure tags are an array
+            */
+        if (query.tags && !keepTags) {
+            if (!Array.isArray(query.tags)) {
+                tags = [query.tags];
+            }
+            else {
+                tags = query.tags;
+            }
+            realQuery.tags = { $in: tags };
+        }
+        if (query.category) {
+            if (!Array.isArray(query.category)) {
+                category = [query.category];
+            }
+            else {
+                category = query.category;
+            }
+            realQuery.category = { $in: category };
+        }
+        if (query.search && !keepSearch) {
+            if (options?.search) {
+                if (options.search.length > 1) {
+                    options.search.forEach((single) => {
+                        orArray.push({ [single]: { $regex: query.search.toString().toLowerCase().trim(), $options: 'i' } });
+                    });
+                    realQuery.$or = orArray;
+                }
+                else {
+                    realQuery[options.search[0]] = { $regex: query.search.toString().toLowerCase().trim(), $options: 'i' };
+                }
+            }
+            delete realQuery.search;
+        }
+        return realQuery;
+    }
+    /**
+       *
+       *
+       * @param {DatabaseQuery} query
+       * @param {string} select
+       * @param {number} site start counting at 1 instead of zero. no site / zero will be the same as 1
+       * @param {number} limit
+       * @param {Model<Document>} model
+       * @param {string} [sort]
+       * @param {string} [order]
+       * @returns
+       * @memberof ControllerBase
+       */
+    static async list(query, select, site, limit, model, sort, order, selectDefault) {
+        let projection;
+        const skipLimitSort = ControllerHelper.getSkipLimitSort(site, limit, sort, order);
+        if (select && selectDefault) {
+            projection = { projection: { ...select, ...selectDefault } };
+        }
+        else if (select) {
+            projection = { projection: select };
+        }
+        else if (selectDefault) {
+            projection = { projection: selectDefault };
+        }
+        const all = await model.db.countDocuments(query);
+        const data = await model.db.find(query, projection)
+            .limit(skipLimitSort.limit)
+            .skip(skipLimitSort.skip)
+            .sort(skipLimitSort.sort)
+            .toArray();
+        return { data, all, count: data.length };
+    }
+    static async listCustomQuery(queries, model) {
+        const all = await model.db.countDocuments(queries.countQuery);
+        const data = await model.db.aggregate(queries.aggregation)
+            .toArray();
+        return { all, data, count: data.length };
+    }
+    static getSkipLimitSort(site, limit, sort, order) {
+        let realSite = 0;
+        let realSort = {};
+        let sortKey;
+        /**
+             * see comment from this function
+            */
+        if (site)
+            realSite = site - 1;
+        const skipLimit = ControllerHelper.getLimit(realSite, limit, limit);
+        if (sort && order) {
+            if (sort === 'updated') {
+                sortKey = 'history.updated';
+            }
+            else if (sort === 'created') {
+                sortKey = 'history.created';
+            }
+            else
+                sortKey = sort;
+            realSort[sortKey] = +order;
+        }
+        else {
+            realSort = { _id: 1 };
+        }
+        return {
+            sort: realSort, ...skipLimit,
+        };
+    }
+}
+//# sourceMappingURL=ControllerHelper.js.map

package/lib/src/helpers/ControllerHelper.js.map

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

package/lib/src/helpers/EnvMapper.js

@@ -0,0 +1 @@
+//# sourceMappingURL=EnvMapper.js.map

package/lib/src/helpers/EnvMapper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EnvMapper.js","sourceRoot":"","sources":["../../../src/helpers/EnvMapper.ts"],"names":[],"mappings":""}

package/lib/src/helpers/auth0config.d.ts

@@ -0,0 +1,6 @@
+declare const _default: (app: string) => Promise<{
+    url: string;
+    issuer: string;
+    custom: boolean;
+}>;
+export default _default;

package/lib/src/helpers/auth0config.js

@@ -0,0 +1,23 @@
+import ProjectModel from "../models/project.model.js";
+export default async (app) => {
+    let settings = {
+        url: process.env.JWT_URL,
+        issuer: process.env.JWT_ISSUER,
+        custom: false,
+    };
+    if (app !== 'editor-app') {
+        const splitProject = app?.split('-');
+        if (splitProject) {
+            const project = await ProjectModel.db.findOne({ company: splitProject[0], id: splitProject[1] });
+            if (project?.auth0?.domain) {
+                settings = {
+                    url: `https://${project?.auth0?.domain}/.well-known/jwks.json`,
+                    issuer: `https://${project?.auth0?.domain}/`,
+                    custom: true,
+                };
+            }
+        }
+    }
+    return settings;
+};
+//# sourceMappingURL=auth0config.js.map