remult 0.21.1-exp.9 → 0.22.0

package/SseSubscriptionServer.js

@@ -31,7 +31,7 @@ var SseSubscriptionServer = /** @class */ (function () {
                             delete c.channels[channel];
                         else
                             c.channels[channel] = true;
-                        res.success({ status: "ok" });
+                        res.success({ status: 'ok' });
                         this.debug();
                         return;
                     }
@@ -84,14 +84,14 @@ var SseSubscriptionServer = /** @class */ (function () {
         res.writeHead(200, {
             'Content-Type': 'text/event-stream',
             'Cache-Control': 'no-cache',
-            'Connection': 'keep-alive'
+            Connection: 'keep-alive',
         });
         var cc = new clientConnection(res);
         //const lastEventId = req.headers['last-event-id'];
         this.connections.push(cc);
         this.debug();
         //@ts-ignore
-        req.on("close", function () {
+        req.on('close', function () {
             cc.close();
             _this.connections = _this.connections.filter(function (s) { return s !== cc; });
             _this.debug();
@@ -102,7 +102,7 @@ var SseSubscriptionServer = /** @class */ (function () {
     SseSubscriptionServer.prototype.debug = function () {
         this.debugFileSaver(this.connections.map(function (x) { return ({
             id: x.connectionId,
-            channels: x.channels
+            channels: x.channels,
         }); }));
     };
     return SseSubscriptionServer;
@@ -114,7 +114,7 @@ var clientConnection = /** @class */ (function () {
         this.channels = {};
         this.closed = false;
         this.connectionId = uuid_1.v4();
-        this.write(this.connectionId, "connectionId");
+        this.write(this.connectionId, 'connectionId');
         this.sendLiveMessage();
     }
     clientConnection.prototype.close = function () {
@@ -123,11 +123,11 @@ var clientConnection = /** @class */ (function () {
         this.closed = true;
     };
     clientConnection.prototype.write = function (eventData, eventType) {
-        if (eventType === void 0) { eventType = "message"; }
-        var event = "event:" + eventType;
+        if (eventType === void 0) { eventType = 'message'; }
+        var event = 'event:' + eventType;
         // if (id != undefined)
         //     event += "\nid:" + id;
-        this.response.write(event + "\ndata:" + eventData + "\n\n");
+        this.response.write(event + '\ndata:' + eventData + '\n\n');
         if (this.response.flush)
             this.response.flush();
     };
@@ -135,7 +135,7 @@ var clientConnection = /** @class */ (function () {
         var _this = this;
         if (this.closed)
             return;
-        this.write("", "keep-alive");
+        this.write('', 'keep-alive');
         this.timeOutRef = setTimeout(function () {
             _this.sendLiveMessage();
         }, 45000);

package/ably.js

@@ -30,7 +30,7 @@ var AblySubscriptionClient = /** @class */ (function () {
                                             }];
                                 }
                             });
-                        }); }
+                        }); },
                     }];
             });
         });

package/esm/SseSubscriptionServer.js

@@ -22,7 +22,7 @@ export class SseSubscriptionServer {
                         delete c.channels[channel];
                     else
                         c.channels[channel] = true;
-                    res.success({ status: "ok" });
+                    res.success({ status: 'ok' });
                     this.debug();
                     return;
                 }
@@ -49,25 +49,25 @@ export class SseSubscriptionServer {
         res.writeHead(200, {
             'Content-Type': 'text/event-stream',
             'Cache-Control': 'no-cache',
-            'Connection': 'keep-alive'
+            Connection: 'keep-alive',
         });
         const cc = new clientConnection(res);
         //const lastEventId = req.headers['last-event-id'];
         this.connections.push(cc);
         this.debug();
         //@ts-ignore
-        req.on("close", () => {
+        req.on('close', () => {
             cc.close();
-            this.connections = this.connections.filter(s => s !== cc);
+            this.connections = this.connections.filter((s) => s !== cc);
             this.debug();
         });
         return cc;
     }
     //@internal
     debug() {
-        this.debugFileSaver(this.connections.map(x => ({
+        this.debugFileSaver(this.connections.map((x) => ({
             id: x.connectionId,
-            channels: x.channels
+            channels: x.channels,
         })));
     }
 }
@@ -77,7 +77,7 @@ export class clientConnection {
         this.channels = {};
         this.closed = false;
         this.connectionId = uuid();
-        this.write(this.connectionId, "connectionId");
+        this.write(this.connectionId, 'connectionId');
         this.sendLiveMessage();
     }
     close() {
@@ -85,18 +85,18 @@ export class clientConnection {
             clearTimeout(this.timeOutRef);
         this.closed = true;
     }
-    write(eventData, eventType = "message") {
-        let event = "event:" + eventType;
+    write(eventData, eventType = 'message') {
+        let event = 'event:' + eventType;
         // if (id != undefined)
         //     event += "\nid:" + id;
-        this.response.write(event + "\ndata:" + eventData + "\n\n");
+        this.response.write(event + '\ndata:' + eventData + '\n\n');
         if (this.response.flush)
             this.response.flush();
     }
     sendLiveMessage() {
         if (this.closed)
             return;
-        this.write("", "keep-alive");
+        this.write('', 'keep-alive');
         this.timeOutRef = setTimeout(() => {
             this.sendLiveMessage();
         }, 45000);

package/esm/ably.js

@@ -9,12 +9,12 @@ export class AblySubscriptionClient {
             },
             subscribe: async (channel, handler) => {
                 let myHandler = (y) => handler(y.data);
-                await this.ably.channels.get(channel).subscribe(y => myHandler(y));
+                await this.ably.channels.get(channel).subscribe((y) => myHandler(y));
                 return () => {
                     myHandler = () => { };
                     this.ably.channels.get(channel).unsubscribe();
                 };
-            }
+            },
         };
     }
 }

package/esm/graphql.js

@@ -16,7 +16,7 @@ export function remultGraphql(options) {
     }
     const entities = (() => {
         const remult = new Remult();
-        return options.entities?.map(x => remult.repo(x).metadata) || [];
+        return options.entities?.map((x) => remult.repo(x).metadata) || [];
     })();
     const types = [];
     const root = {};
@@ -24,7 +24,7 @@ export function remultGraphql(options) {
     const resolversMutation = {};
     const resolvers = { Query: resolversQuery, Mutation: resolversMutation };
     function upsertTypes(key, kind = 'type', order = 0) {
-        let t = types.find(t => t.key === key);
+        let t = types.find((t) => t.key === key);
         if (!t) {
             types.push((t = {
                 key,
@@ -49,6 +49,13 @@ export function remultGraphql(options) {
         }
         return t;
     }
+    function upsertUnion(key, values, order) {
+        const u = upsertTypes(key, 'union', order);
+        u.fields = values.map((value) => {
+            return { key: value, value: { Union: true } };
+        });
+        return u;
+    }
     // Where - GraphQL primitives
     for (const whereType of ['String', 'Int', 'Float', 'Boolean', 'ID']) {
         const currentWhere = upsertTypes(`Where${whereType}`, 'input', 20);
@@ -59,13 +66,17 @@ export function remultGraphql(options) {
         for (const operator of [...operatorType, ...operatorTypeArray]) {
             const field = {
                 key: operator,
-                value: operatorTypeArray.includes(operator) ? `[${whereType}!]` : whereType,
+                value: operatorTypeArray.includes(operator)
+                    ? `[${whereType}!]`
+                    : whereType,
             };
             currentWhere.fields.push(field);
             currentWhereNullable.fields.push(field);
         }
         // only for specific types
-        if (whereType === 'String' || whereType === 'Int' || whereType === 'Float') {
+        if (whereType === 'String' ||
+            whereType === 'Int' ||
+            whereType === 'Float') {
             for (const operator of ['gt', 'gte', 'lt', 'lte']) {
                 const field = {
                     key: operator,
@@ -101,6 +112,7 @@ export function remultGraphql(options) {
         comment: `The globally unique \`ID\` _(_typename:id)_`,
     };
     const argClientMutationId = { key: 'clientMutationId', value: `String` };
+    const argErrorDetail = { key: 'error', value: `ErrorDetail` };
     for (const meta of entities) {
         const orderByFields = [];
         const key = meta.key;
@@ -126,7 +138,7 @@ export function remultGraphql(options) {
                             notFound: () => (err = 'not found'),
                             progress: () => { },
                         };
-                        work(response, x => (result = x), arg1, req)
+                        work(response, (x) => (result = x), arg1, req)
                             .then(() => {
                             if (err) {
                                 error(err);
@@ -134,7 +146,7 @@ export function remultGraphql(options) {
                             }
                             res(result);
                         })
-                            .catch(err => error(err));
+                            .catch((err) => error(err));
                     });
                 };
             };
@@ -146,49 +158,103 @@ export function remultGraphql(options) {
                     await work(dApi, response, setResult, arg1, meta);
                 });
             };
+            const handleMutationWithErrors = (work) => {
+                return handleRequestWithDataApiContext(async (dApi, response, origSetResult, arg1, req) => {
+                    const setResult = (item) => {
+                        origSetResult({
+                            clientMutationId: arg1.clientMutationId,
+                            ...item,
+                        });
+                    };
+                    return work(dApi, {
+                        ...response,
+                        forbidden: () => {
+                            setResult({
+                                error: {
+                                    __typename: 'ForbiddenError',
+                                    message: 'forbidden',
+                                },
+                            });
+                        },
+                        notFound: () => {
+                            setResult({
+                                error: {
+                                    __typename: 'NotFoundError',
+                                    message: 'not found',
+                                },
+                            });
+                        },
+                        error: (err) => {
+                            const modelState = [];
+                            if (err.modelState)
+                                for (const key in err.modelState) {
+                                    modelState.push({
+                                        field: key,
+                                        message: err.modelState[key],
+                                    });
+                                }
+                            setResult({
+                                error: {
+                                    __typename: 'ValidationError',
+                                    message: err.message,
+                                    modelState,
+                                },
+                            });
+                        },
+                    }, setResult, arg1, req);
+                });
+            };
             const queryArgsConnection = [
                 {
                     key: 'limit',
                     value: 'Int',
-                    comment: `
-For **page by page** pagination.
-Limit the number of result. 
+                    comment: `
+For **page by page** pagination.
+Limit the number of result. 
 _Side note: \`Math.ceil(totalCount / limit)\` to determine how many pages there are._`,
                 },
                 {
                     key: 'page',
                     value: 'Int',
-                    comment: `
-For **page by page** pagination.
+                    comment: `
+For **page by page** pagination.
 Select a dedicated page.`,
                 },
-                { key: 'orderBy', value: `${key}OrderBy`, comment: `Remult sorting options` },
-                { key: 'where', value: `${key}Where`, comment: `Remult filtering options` },
+                {
+                    key: 'orderBy',
+                    value: `${key}OrderBy`,
+                    comment: `Remult sorting options`,
+                },
+                {
+                    key: 'where',
+                    value: `${key}Where`,
+                    comment: `Remult filtering options`,
+                },
             ];
             if (v2ConnectionAndPagination) {
                 queryArgsConnection.push({
                     key: 'first',
                     value: 'Int',
-                    comment: `
-        For **forward cursor** pagination
+                    comment: `
+        For **forward cursor** pagination
         Takes the \`first\`: \`n\` elements from the list.`,
                 }, {
                     key: 'after',
                     value: 'String',
-                    comment: `
-        For **forward cursor** pagination
+                    comment: `
+        For **forward cursor** pagination
         \`after\` this \`cursor\`.`,
                 }, {
                     key: 'last',
                     value: 'Int',
-                    comment: `
-        For **backward cursor** pagination
+                    comment: `
+        For **backward cursor** pagination
         Takes the \`last\`: \`n\` elements from the list.`,
                 }, {
                     key: 'before',
                     value: 'String',
-                    comment: `
-        For **backward cursor** pagination
+                    comment: `
+        For **backward cursor** pagination
         \`before\` this \`cursor\`.`,
                 });
             }
@@ -202,8 +268,8 @@ Select a dedicated page.`,
             root[getSingleEntityKey] = handleRequestWithDataApiContext(async (dApi, response, setResult, arg1, req) => {
                 await dApi.get({
                     ...response,
-                    success: y => {
-                        currentType.query.resultProcessors.forEach(z => z(y));
+                    success: (y) => {
+                        currentType.query.resultProcessors.forEach((z) => z(y));
                         setResult(y);
                     },
                 }, arg1.id);
@@ -259,7 +325,7 @@ Select a dedicated page.`,
                             ...response,
                             success: (x) => {
                                 setResult(x.map((y) => {
-                                    currentType.query.resultProcessors.forEach(z => z(y));
+                                    currentType.query.resultProcessors.forEach((z) => z(y));
                                     return y;
                                 }));
                             },
@@ -270,7 +336,7 @@ Select a dedicated page.`,
                     [totalCountKey]: createResultPromise(async (response, setResult) => {
                         await dApi.count({
                             ...response,
-                            success: x => setResult(x.count),
+                            success: (x) => setResult(x.count),
                         }, {
                             get: bridgeQueryOptionsToDataApiGet(arg1),
                         }, translateWhereToRestBody(meta.fields, arg1));
@@ -282,15 +348,21 @@ Select a dedicated page.`,
             };
             // Mutation
             const root_mutation = upsertTypes('Mutation', 'type', -9);
-            const checkCanExist = (rule) => rule !== false && !(rule === undefined && (meta.options.allowApiCrud === false || meta.options.allowApiCrud === undefined));
+            const checkCanExist = (rule) => rule !== false &&
+                !(rule === undefined &&
+                    (meta.options.allowApiCrud === false ||
+                        meta.options.allowApiCrud === undefined));
             if (checkCanExist(meta.options.allowApiInsert)) {
                 // create
+                const createResolverKey = `create${getMetaType(meta)}`;
                 const createInput = `Create${getMetaType(meta)}Input`;
                 const createPayload = `Create${getMetaType(meta)}Payload`;
-                const createResolverKey = `create${getMetaType(meta)}`;
                 root_mutation.fields.push({
                     key: createResolverKey,
-                    args: [{ key: 'input', value: `${createInput}!` }, argClientMutationId],
+                    args: [
+                        { key: 'input', value: `${createInput}!` },
+                        argClientMutationId,
+                    ],
                     value: `${createPayload}`,
                     comment: `Create a new \`${getMetaType(meta)}\``,
                 });
@@ -298,13 +370,13 @@ Select a dedicated page.`,
                 currentType.mutation.create.payload = upsertTypes(createPayload);
                 currentType.mutation.create.payload.fields.push({
                     key: `${toCamelCase(getMetaType(meta))}`,
-                    value: `${getMetaType(meta)}`,
-                }, argClientMutationId);
-                root[createResolverKey] = handleRequestWithDataApiContext(async (dApi, response, setResult, arg1, req) => {
+                    value: getMetaType(meta),
+                }, argErrorDetail, argClientMutationId);
+                root[createResolverKey] = handleMutationWithErrors(async (dApi, response, setResult, arg1, req) => {
                     await dApi.post({
                         ...response,
-                        created: y => {
-                            currentType.query.resultProcessors.forEach(z => z(y));
+                        created: (y) => {
+                            currentType.query.resultProcessors.forEach((z) => z(y));
                             setResult({
                                 [toCamelCase(getMetaType(meta))]: y,
                             });
@@ -320,7 +392,11 @@ Select a dedicated page.`,
                 const updateResolverKey = `update${getMetaType(meta)}`;
                 root_mutation.fields.push({
                     key: updateResolverKey,
-                    args: [argId, { key: 'patch', value: `${updateInput}!` }, argClientMutationId],
+                    args: [
+                        argId,
+                        { key: 'patch', value: `${updateInput}!` },
+                        argClientMutationId,
+                    ],
                     value: `${updatePayload}`,
                     comment: `Update a \`${getMetaType(meta)}\``,
                 });
@@ -329,12 +405,12 @@ Select a dedicated page.`,
                 currentType.mutation.update.payload.fields.push({
                     key: `${toCamelCase(getMetaType(meta))}`,
                     value: `${getMetaType(meta)}`,
-                }, argClientMutationId);
-                root[updateResolverKey] = handleRequestWithDataApiContext(async (dApi, response, setResult, arg1, req) => {
+                }, argErrorDetail, argClientMutationId);
+                root[updateResolverKey] = handleMutationWithErrors(async (dApi, response, setResult, arg1, req) => {
                     await dApi.put({
                         ...response,
-                        success: y => {
-                            currentType.query.resultProcessors.forEach(z => z(y));
+                        success: (y) => {
+                            currentType.query.resultProcessors.forEach((z) => z(y));
                             setResult({
                                 [toCamelCase(getMetaType(meta))]: y,
                             });
@@ -358,8 +434,8 @@ Select a dedicated page.`,
                 currentType.mutation.delete.payload.fields.push({
                     key: deletedResultKey,
                     value: 'ID',
-                }, argClientMutationId);
-                root[deleteResolverKey] = handleRequestWithDataApiContext(async (dApi, response, setResult, arg1, req) => {
+                }, argErrorDetail, argClientMutationId);
+                root[deleteResolverKey] = handleMutationWithErrors(async (dApi, response, setResult, arg1, req) => {
                     await dApi.delete({
                         ...response,
                         deleted: () => {
@@ -389,7 +465,7 @@ Select a dedicated page.`,
                         break;
                 }
                 const ref = entities.find((i) => i.entityType === f.valueType);
-                currentType.query.resultProcessors.push(r => {
+                currentType.query.resultProcessors.push((r) => {
                     r[nodeIdKey] = () => getMetaType(meta) + ':' + meta.idMetadata.getId(r);
                 });
                 if (ref !== undefined) {
@@ -400,7 +476,7 @@ Select a dedicated page.`,
                         comment: f.caption,
                     });
                     const refKey = ref.key;
-                    currentType.query.resultProcessors.push(r => {
+                    currentType.query.resultProcessors.push((r) => {
                         const val = r[f.key];
                         if (val === null || val === undefined)
                             return null;
@@ -424,7 +500,7 @@ Select a dedicated page.`,
                         order: 10,
                         comment: `List all \`${getMetaType(meta)}\` of \`${refKey}\``,
                     });
-                    refT.query.resultProcessors.push(r => {
+                    refT.query.resultProcessors.push((r) => {
                         const val = r.id;
                         r[key] = async (args, req, gqlInfo) => {
                             return await root[key]({
@@ -522,6 +598,46 @@ Select a dedicated page.`,
     const nodeInterface = upsertTypes('Node', 'interface', 31);
     nodeInterface.comment = `Node interface of remult entities (eg: nodeId: \`Task:1\` so \`__typename:id\`)`;
     nodeInterface.fields.push(argNodeId);
+    upsertUnion(argErrorDetail.value, ['ValidationError', 'ForbiddenError', 'NotFoundError'], 32);
+    const errorInterface = upsertTypes('Error', 'interface', 33);
+    errorInterface.comment = `Error interface of remult entities`;
+    errorInterface.fields.push({
+        key: 'message',
+        value: 'String!',
+    });
+    const validationErrorInterface = upsertTypes('ValidationError', 'type_impl_error', 34);
+    validationErrorInterface.comment = `Validation Error`;
+    validationErrorInterface.fields.push({
+        key: 'message',
+        value: 'String!',
+    });
+    validationErrorInterface.fields.push({
+        key: 'modelState',
+        value: '[ValidationErrorModelState!]!',
+    });
+    const validationErrorModelStateInterface = upsertTypes('ValidationErrorModelState', 'type', 34);
+    validationErrorModelStateInterface.comment = `Validation Error Model State`;
+    validationErrorModelStateInterface.fields.push({
+        key: 'field',
+        value: 'String!',
+    });
+    validationErrorModelStateInterface.fields.push({
+        key: 'message',
+        value: 'String!',
+    });
+    // progress: () => { },
+    const forbiddenErrorInterface = upsertTypes('ForbiddenError', 'type_impl_error', 34);
+    forbiddenErrorInterface.comment = `Forbidden Error`;
+    forbiddenErrorInterface.fields.push({
+        key: 'message',
+        value: 'String!',
+    });
+    const notFoundErrorInterface = upsertTypes('NotFoundError', 'type_impl_error', 34);
+    notFoundErrorInterface.comment = `Not Found Error`;
+    notFoundErrorInterface.fields.push({
+        key: 'message',
+        value: 'String!',
+    });
     return {
         resolvers,
         rootValue: root,
@@ -533,19 +649,26 @@ Select a dedicated page.`,
             if (kind === 'type_impl_node') {
                 prefix = `type ${key} implements Node`;
             }
-            const type = blockFormat({
-                prefix,
-                data: fields
-                    .sort((a, b) => (a.order ? a.order : 0) - (b.order ? b.order : 0))
-                    .map(field => fieldFormat(field)),
-                comment: comment ?? `The ${kind} for \`${key}\``,
-            });
+            if (kind === 'type_impl_error') {
+                prefix = `type ${key} implements Error`;
+            }
+            const type = kind === 'union'
+                ? `union ${key} = ${fields.map((field) => field.key).join(' | ')}`
+                : blockFormat({
+                    prefix,
+                    data: fields
+                        .sort((a, b) => (a.order ? a.order : 0) - (b.order ? b.order : 0))
+                        .map((field) => fieldFormat(field)),
+                    comment: comment ?? `The ${kind} for \`${key}\``,
+                });
             const orderByStr = orderBy.length > 0 ? `\n\n${orderBy.join('\n\n')}` : ``;
             const whereTypeStr = whereType.length > 0 ? `\n\n${whereType.join('\n\n')}` : ``;
-            const whereTypeSubFieldsStr = whereTypeSubFields.length > 0 ? `\n\n${whereTypeSubFields.join('\n\n')}` : ``;
+            const whereTypeSubFieldsStr = whereTypeSubFields.length > 0
+                ? `\n\n${whereTypeSubFields.join('\n\n')}`
+                : ``;
             return `${type}${orderByStr}${whereTypeStr}${whereTypeSubFieldsStr}`;
         })
-            .join(`\n\n`)}
+            .join(`\n\n`)}
 `,
     };
 }
@@ -567,12 +690,12 @@ function blockFormat(obj) {
     if (obj.data.length === 0) {
         return ``;
     }
-    const str = `${obj.prefix} {
-  ${obj.data.join('\n  ')}
+    const str = `${obj.prefix} {
+  ${obj.data.join('\n  ')}
 }`;
-    let commentsStr = `"""
-${obj.comment}
-"""
+    let commentsStr = `"""
+${obj.comment}
+"""
 `;
     if (_removeComments) {
         commentsStr = ``;
@@ -582,17 +705,17 @@ ${obj.comment}
 function argsFormat(args) {
     if (args) {
         return `(${args
-            .map(arg => {
-            let strComment = `
-    """
-    ${arg.comment}
-    """
+            .map((arg) => {
+            let strComment = `
+    """
+    ${arg.comment}
+    """
 `;
             if (_removeComments || !arg.comment) {
                 strComment = ``;
             }
             if (strComment) {
-                return `${strComment}    ${arg.key}: ${arg.value}
+                return `${strComment}    ${arg.key}: ${arg.value}
   `;
             }
             return `${arg.key}: ${arg.value}`;
@@ -603,9 +726,9 @@ function argsFormat(args) {
 }
 function fieldFormat(field) {
     // First, the comment
-    let strComment = `"""
-  ${field.comment}
-  """
+    let strComment = `"""
+  ${field.comment}
+  """
 `;
     if (_removeComments || !field.comment) {
         strComment = ``;
@@ -638,7 +761,7 @@ function bridgeQueryOptionsToDataApiGet(arg1) {
         if (orderBy) {
             if (key === '_sort') {
                 const sort_keys = [];
-                Object.keys(orderBy).forEach(sort_key => {
+                Object.keys(orderBy).forEach((sort_key) => {
                     sort_keys.push(sort_key);
                 });
                 if (sort_keys.length > 0) {
@@ -647,7 +770,7 @@ function bridgeQueryOptionsToDataApiGet(arg1) {
             }
             else if (key === '_order') {
                 const sort_directions = [];
-                Object.keys(orderBy).forEach(sort_key => {
+                Object.keys(orderBy).forEach((sort_key) => {
                     const direction = orderBy[sort_key].toLowerCase();
                     sort_directions.push(direction);
                 });
@@ -674,10 +797,10 @@ export function translateWhereToRestBody(fields, { where }) {
                     what(val);
             };
             for (const op of ['gt', 'gte', 'lt', 'lte', 'ne', 'in']) {
-                tr(op, val => (result[field.key + '.' + op] = val));
+                tr(op, (val) => (result[field.key + '.' + op] = val));
             }
-            tr('nin', x => (result[field.key + '.ne'] = x));
-            tr('eq', x => (result[field.key] = x));
+            tr('nin', (x) => (result[field.key + '.ne'] = x));
+            tr('eq', (x) => (result[field.key] = x));
         }
     }
     if (where.OR) {