remult 0.25.4 → 0.25.5-exp.1

package/esm/graphql.js

@@ -6,7 +6,7 @@ const andImplementation = false;
 let _removeComments = false;
 export function remultGraphql(options) {
     if (!options.getRemultFromRequest) {
-        options.getRemultFromRequest = () => remult;
+        options.getRemultFromRequest = async () => remult;
     }
     const { removeComments } = {
         removeComments: false,
@@ -153,7 +153,7 @@ export function remultGraphql(options) {
             };
             const handleRequestWithDataApiContext = (work) => {
                 return createResultPromise(async (response, setResult, arg1, req) => {
-                    const remult = options.getRemultFromRequest(req);
+                    const remult = await options.getRemultFromRequest(req);
                     const repo = remult.repo(meta.entityType);
                     const dApi = new DataApi(repo, remult);
                     await work(dApi, response, setResult, arg1, meta);
@@ -205,69 +205,10 @@ export function remultGraphql(options) {
                     }, setResult, arg1, req);
                 });
             };
-            const queryArgsConnection = [
-                {
-                    key: 'limit',
-                    value: 'Int',
-                    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.
-Select a dedicated page.`,
-                },
-                {
-                    key: 'offset',
-                    value: 'Int',
-                    comment: `
-For **page by page** pagination.
-Set the offset needed.
-_Side node: if \`page\` arg is set, \`offset\` will be ignored._`,
-                },
-                {
-                    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
-        Takes the \`first\`: \`n\` elements from the list.`,
-                }, {
-                    key: 'after',
-                    value: 'String',
-                    comment: `
-        For **forward cursor** pagination
-        \`after\` this \`cursor\`.`,
-                }, {
-                    key: 'last',
-                    value: 'Int',
-                    comment: `
-        For **backward cursor** pagination
-        Takes the \`last\`: \`n\` elements from the list.`,
-                }, {
-                    key: 'before',
-                    value: 'String',
-                    comment: `
-        For **backward cursor** pagination
-        \`before\` this \`cursor\`.`,
-                });
-            }
-            const getSingleEntityKey = toCamelCase(getMetaType(meta));
+            const queryArgsConnection = getQueryArgsConnection(key);
+            let getSingleEntityKey = toCamelCase(getMetaType(meta));
+            if (getSingleEntityKey === toCamelCase(key))
+                getSingleEntityKey = 'single' + key;
             root_query.fields.push({
                 key: getSingleEntityKey,
                 args: [argId],
@@ -458,9 +399,6 @@ _Side node: if \`page\` arg is set, \`offset\` will be ignored._`,
             for (const f of meta.fields) {
                 const ri = getRelationInfo(f.options);
                 // let's not consider toMany relations for now
-                if (ri?.type === 'toMany') {
-                    break;
-                }
                 if (f.options.includeInApi === false)
                     continue;
                 let type = 'String';
@@ -478,11 +416,66 @@ _Side node: if \`page\` arg is set, \`offset\` will be ignored._`,
                         }
                         break;
                 }
-                const ref = entities.find((i) => i.entityType === f.valueType);
                 currentType.query.resultProcessors.push((r) => {
                     r[nodeIdKey] = () => getMetaType(meta) + ':' + meta.idMetadata.getId(r);
                 });
-                if (ref !== undefined) {
+                let ref = entities.find((i) => i.entityType === f.valueType);
+                let notARealField = false;
+                if (ri) {
+                    {
+                        const refType = ri.toType();
+                        ref = entities.find((i) => i.entityType === refType);
+                    }
+                    notARealField = ri.type === 'toOne' || ri.type === 'toMany';
+                    const refKey = ref.key;
+                    switch (ri.type) {
+                        case 'reference':
+                        case 'toOne':
+                            currentType.fields.push({
+                                key: f.key,
+                                value: `${getMetaType(ref)}${f.allowNull ? '' : '!'}`,
+                                comment: f.caption,
+                            });
+                            currentType.query.resultProcessors.push((r) => {
+                                const val = r[ri.type == 'reference' ? f.key : f.options.field]; //p1 - fix
+                                if (val === null || val === undefined)
+                                    return null;
+                                r[f.key] = async (args, req, gqlInfo) => {
+                                    const queryResult = await (await root[refKey]({
+                                        ...args.where,
+                                        where: { id: { eq: val } },
+                                        options: { limit: 1 },
+                                    }, req, gqlInfo)).items();
+                                    if (queryResult.length > 0)
+                                        return queryResult[0];
+                                    return null;
+                                };
+                            });
+                            break;
+                        case 'toMany':
+                            // will do: Category.tasks (actually: Category.tasksOfcategory & tasksOfcategory2)
+                            currentType.fields.push({
+                                key: f.key,
+                                args: getQueryArgsConnection(refKey),
+                                value: `${getMetaType(ref)}Connection`,
+                                order: 10,
+                                comment: `List all \`${getMetaType(meta)}\` of \`${refKey}\``,
+                            });
+                            currentType.query.resultProcessors.push((r) => {
+                                const val = r.id;
+                                r[f.key] = async (args, req, gqlInfo) => {
+                                    return await root[ref.key]({
+                                        where: {
+                                            ...args.where,
+                                            [f.options.field /*//p1 to fix*/]: { eq: val },
+                                        },
+                                        options: { ...args.limit, ...args.page, ...args.orderBy },
+                                    }, req, gqlInfo);
+                                };
+                            });
+                    }
+                }
+                else if (ref !== undefined) {
                     // will do: Task.category
                     currentType.fields.push({
                         key: f.key,
@@ -538,10 +531,10 @@ _Side node: if \`page\` arg is set, \`offset\` will be ignored._`,
                 // helper
                 const it_is_not_at_ref = ref === undefined;
                 // where
-                if (it_is_not_at_ref && !f.isServerExpression) {
+                if (it_is_not_at_ref && !f.isServerExpression && !notARealField) {
                     whereTypeFields.push(`${f.key}: Where${type}${f.allowNull ? 'Nullable' : ''}`);
                 }
-                const includeInUpdateOrInsert = f.options.allowApiUpdate !== false;
+                const includeInUpdateOrInsert = f.options.allowApiUpdate !== false && !notARealField;
                 const updateType = it_is_not_at_ref ? type : 'ID';
                 if (includeInUpdateOrInsert) {
                     // create
@@ -687,6 +680,71 @@ _Side node: if \`page\` arg is set, \`offset\` will be ignored._`,
 `,
     };
 }
+function getQueryArgsConnection(key) {
+    const queryArgsConnection = [
+        {
+            key: 'limit',
+            value: 'Int',
+            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.
+Select a dedicated page.`,
+        },
+        {
+            key: 'offset',
+            value: 'Int',
+            comment: `
+For **page by page** pagination.
+Set the offset needed.
+_Side node: if \`page\` arg is set, \`offset\` will be ignored._`,
+        },
+        {
+            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
+        Takes the \`first\`: \`n\` elements from the list.`,
+        }, {
+            key: 'after',
+            value: 'String',
+            comment: `
+        For **forward cursor** pagination
+        \`after\` this \`cursor\`.`,
+        }, {
+            key: 'last',
+            value: 'Int',
+            comment: `
+        For **backward cursor** pagination
+        Takes the \`last\`: \`n\` elements from the list.`,
+        }, {
+            key: 'before',
+            value: 'String',
+            comment: `
+        For **backward cursor** pagination
+        \`before\` this \`cursor\`.`,
+        });
+    }
+    return queryArgsConnection;
+}
 // For cursor pagination (v2)
 // function checkPaginationArgs(args: any) {
 //   let paginationPage = !!args.limit ? 1 : 0

package/esm/src/remult3/remult3.js

@@ -17,6 +17,7 @@ export {};
 //p2 -   allow find options preprocessor for api calls, to use for authorization
 //p1 - write doc about controlling updates of rows...
 //p1 - need a way to extract the fields from the relation - for generating relation based sql
+//p1 - when doing this, work on graphql relation with fields not just field
 //p1 - add docs for apply changes
 //p1 - when subscribe is forbidden - the query still runs after the renew process
 //p1 - 'update tasks set  where id = $1
@@ -43,14 +44,12 @@ remult.apiClient.url='localhost:3007/api
 
 
 */
-//p1 - investigate angular starter kit init request error
-//p1 - fix angular starter kit await set password
-//p1 - fix angular starter kit to latest version as well
-//p1 -check if checouknt doesn't respect allow read (I think)
-//p1 - fix multiple instances of remult: the defaultRemult and async local hook - and columnsOfType - all can be tests with a vite project loading `remult-admin`
 //p1 - crm demo graphql error
+//p1 - fix multiple instances of remult: the defaultRemult and async local hook - and columnsOfType - all can be tests with a vite project loading `remult-admin`
+//p1 -check if checouknt doesn't respect allow read (I think)
 //p1 - allow api update only for new rows
 //p1 - getFields didn't work for kobi in the home component
+//p1 - https://codesandbox.io/p/devbox/demo-sql-expression-wqvj4g
 //p2 - document validators
 //p2 - and validators to reference
 //y2 - discuss a default date formatter

package/graphql.d.ts

@@ -3,7 +3,7 @@ import { Remult } from './index.js';
 export declare function remultGraphql(options: {
     removeComments?: boolean;
     entities: ClassType<any>[];
-    getRemultFromRequest?: (req: any) => Remult;
+    getRemultFromRequest?: (req: any) => Promise<Remult>;
 }): {
     resolvers: {
         Query: Record<string, unknown>;

package/graphql.js

@@ -13,7 +13,9 @@ function remultGraphql(options) {
     var _this = this;
     var _f, _g;
     if (!options.getRemultFromRequest) {
-        options.getRemultFromRequest = function () { return index_js_1.remult; };
+        options.getRemultFromRequest = function () { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+            return [2 /*return*/, index_js_1.remult];
+        }); }); };
     }
     var removeComments = tslib_1.__assign({ removeComments: false }, options).removeComments;
     if (removeComments) {
@@ -206,12 +208,13 @@ function remultGraphql(options) {
                     var remult, repo, dApi;
                     return tslib_1.__generator(this, function (_a) {
                         switch (_a.label) {
-                            case 0:
-                                remult = options.getRemultFromRequest(req);
+                            case 0: return [4 /*yield*/, options.getRemultFromRequest(req)];
+                            case 1:
+                                remult = _a.sent();
                                 repo = remult.repo(meta.entityType);
                                 dApi = new data_api_js_1.DataApi(repo, remult);
                                 return [4 /*yield*/, work(dApi, response, setResult, arg1, meta)];
-                            case 1:
+                            case 2:
                                 _a.sent();
                                 return [2 /*return*/];
                         }
@@ -259,53 +262,10 @@ function remultGraphql(options) {
                     });
                 }); });
             };
-            var queryArgsConnection = [
-                {
-                    key: 'limit',
-                    value: 'Int',
-                    comment: "\nFor **page by page** pagination.\nLimit the number of result. \n_Side note: `Math.ceil(totalCount / limit)` to determine how many pages there are._",
-                },
-                {
-                    key: 'page',
-                    value: 'Int',
-                    comment: "\nFor **page by page** pagination.\nSelect a dedicated page.",
-                },
-                {
-                    key: 'offset',
-                    value: 'Int',
-                    comment: "\nFor **page by page** pagination.\nSet the offset needed.\n_Side node: if `page` arg is set, `offset` will be ignored._",
-                },
-                {
-                    key: 'orderBy',
-                    value: "".concat(key, "OrderBy"),
-                    comment: "Remult sorting options",
-                },
-                {
-                    key: 'where',
-                    value: "".concat(key, "Where"),
-                    comment: "Remult filtering options",
-                },
-            ];
-            if (v2ConnectionAndPagination) {
-                queryArgsConnection.push({
-                    key: 'first',
-                    value: 'Int',
-                    comment: "\n        For **forward cursor** pagination\n        Takes the `first`: `n` elements from the list.",
-                }, {
-                    key: 'after',
-                    value: 'String',
-                    comment: "\n        For **forward cursor** pagination\n        `after` this `cursor`.",
-                }, {
-                    key: 'last',
-                    value: 'Int',
-                    comment: "\n        For **backward cursor** pagination\n        Takes the `last`: `n` elements from the list.",
-                }, {
-                    key: 'before',
-                    value: 'String',
-                    comment: "\n        For **backward cursor** pagination\n        `before` this `cursor`.",
-                });
-            }
+            var queryArgsConnection = getQueryArgsConnection(key);
             var getSingleEntityKey_1 = toCamelCase(getMetaType(meta));
+            if (getSingleEntityKey_1 === toCamelCase(key))
+                getSingleEntityKey_1 = 'single' + key;
             root_query.fields.push({
                 key: getSingleEntityKey_1,
                 args: [argId],
@@ -530,9 +490,6 @@ function remultGraphql(options) {
             var _loop_2 = function (f) {
                 var ri = (0, internals_js_1.getRelationInfo)(f.options);
                 // let's not consider toMany relations for now
-                if ((ri === null || ri === void 0 ? void 0 : ri.type) === 'toMany') {
-                    return "break";
-                }
                 if (f.options.includeInApi === false)
                     return "continue";
                 var type = 'String';
@@ -550,20 +507,82 @@ function remultGraphql(options) {
                         }
                         break;
                 }
-                var ref = entities.find(function (i) { return i.entityType === f.valueType; });
                 currentType.query.resultProcessors.push(function (r) {
                     r[nodeIdKey] = function () {
                         return getMetaType(meta) + ':' + meta.idMetadata.getId(r);
                     };
                 });
-                if (ref !== undefined) {
+                var ref = entities.find(function (i) { return i.entityType === f.valueType; });
+                var notARealField = false;
+                if (ri) {
+                    {
+                        var refType_1 = ri.toType();
+                        ref = entities.find(function (i) { return i.entityType === refType_1; });
+                    }
+                    notARealField = ri.type === 'toOne' || ri.type === 'toMany';
+                    var refKey_1 = ref.key;
+                    switch (ri.type) {
+                        case 'reference':
+                        case 'toOne':
+                            currentType.fields.push({
+                                key: f.key,
+                                value: "".concat(getMetaType(ref)).concat(f.allowNull ? '' : '!'),
+                                comment: f.caption,
+                            });
+                            currentType.query.resultProcessors.push(function (r) {
+                                var val = r[ri.type == 'reference' ? f.key : f.options.field]; //p1 - fix
+                                if (val === null || val === undefined)
+                                    return null;
+                                r[f.key] = function (args, req, gqlInfo) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                    var queryResult;
+                                    return tslib_1.__generator(this, function (_a) {
+                                        switch (_a.label) {
+                                            case 0: return [4 /*yield*/, root[refKey_1](tslib_1.__assign(tslib_1.__assign({}, args.where), { where: { id: { eq: val } }, options: { limit: 1 } }), req, gqlInfo)];
+                                            case 1: return [4 /*yield*/, (_a.sent()).items()];
+                                            case 2:
+                                                queryResult = _a.sent();
+                                                if (queryResult.length > 0)
+                                                    return [2 /*return*/, queryResult[0]];
+                                                return [2 /*return*/, null];
+                                        }
+                                    });
+                                }); };
+                            });
+                            break;
+                        case 'toMany':
+                            // will do: Category.tasks (actually: Category.tasksOfcategory & tasksOfcategory2)
+                            currentType.fields.push({
+                                key: f.key,
+                                args: getQueryArgsConnection(refKey_1),
+                                value: "".concat(getMetaType(ref), "Connection"),
+                                order: 10,
+                                comment: "List all `".concat(getMetaType(meta), "` of `").concat(refKey_1, "`"),
+                            });
+                            currentType.query.resultProcessors.push(function (r) {
+                                var val = r.id;
+                                r[f.key] = function (args, req, gqlInfo) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                    var _a;
+                                    return tslib_1.__generator(this, function (_b) {
+                                        switch (_b.label) {
+                                            case 0: return [4 /*yield*/, root[ref.key]({
+                                                    where: tslib_1.__assign(tslib_1.__assign({}, args.where), (_a = {}, _a[f.options.field /*//p1 to fix*/] = { eq: val }, _a)),
+                                                    options: tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, args.limit), args.page), args.orderBy),
+                                                }, req, gqlInfo)];
+                                            case 1: return [2 /*return*/, _b.sent()];
+                                        }
+                                    });
+                                }); };
+                            });
+                    }
+                }
+                else if (ref !== undefined) {
                     // will do: Task.category
                     currentType.fields.push({
                         key: f.key,
                         value: "".concat(getMetaType(ref)).concat(f.allowNull ? '' : '!'),
                         comment: f.caption,
                     });
-                    var refKey_1 = ref.key;
+                    var refKey_2 = ref.key;
                     currentType.query.resultProcessors.push(function (r) {
                         var val = r[f.key];
                         if (val === null || val === undefined)
@@ -572,7 +591,7 @@ function remultGraphql(options) {
                             var queryResult;
                             return tslib_1.__generator(this, function (_a) {
                                 switch (_a.label) {
-                                    case 0: return [4 /*yield*/, root[refKey_1](tslib_1.__assign(tslib_1.__assign({}, args.where), { where: { id: { eq: val } }, options: { limit: 1 } }), req, gqlInfo)];
+                                    case 0: return [4 /*yield*/, root[refKey_2](tslib_1.__assign(tslib_1.__assign({}, args.where), { where: { id: { eq: val } }, options: { limit: 1 } }), req, gqlInfo)];
                                     case 1: return [4 /*yield*/, (_a.sent()).items()];
                                     case 2:
                                         queryResult = _a.sent();
@@ -591,7 +610,7 @@ function remultGraphql(options) {
                         args: queryArgsConnection,
                         value: connectionKey,
                         order: 10,
-                        comment: "List all `".concat(getMetaType(meta), "` of `").concat(refKey_1, "`"),
+                        comment: "List all `".concat(getMetaType(meta), "` of `").concat(refKey_2, "`"),
                     });
                     refT.query.resultProcessors.push(function (r) {
                         var val = r.id;
@@ -622,10 +641,10 @@ function remultGraphql(options) {
                 // helper
                 var it_is_not_at_ref = ref === undefined;
                 // where
-                if (it_is_not_at_ref && !f.isServerExpression) {
+                if (it_is_not_at_ref && !f.isServerExpression && !notARealField) {
                     whereTypeFields.push("".concat(f.key, ": Where").concat(type).concat(f.allowNull ? 'Nullable' : ''));
                 }
-                var includeInUpdateOrInsert = f.options.allowApiUpdate !== false;
+                var includeInUpdateOrInsert = f.options.allowApiUpdate !== false && !notARealField;
                 var updateType = it_is_not_at_ref ? type : 'ID';
                 if (includeInUpdateOrInsert) {
                     // create
@@ -645,9 +664,7 @@ function remultGraphql(options) {
             try {
                 for (var _s = (e_6 = void 0, tslib_1.__values(meta.fields)), _t = _s.next(); !_t.done; _t = _s.next()) {
                     var f = _t.value;
-                    var state_1 = _loop_2(f);
-                    if (state_1 === "break")
-                        break;
+                    _loop_2(f);
                 }
             }
             catch (e_6_1) { e_6 = { error: e_6_1 }; }
@@ -808,6 +825,55 @@ function remultGraphql(options) {
     };
 }
 exports.remultGraphql = remultGraphql;
+function getQueryArgsConnection(key) {
+    var queryArgsConnection = [
+        {
+            key: 'limit',
+            value: 'Int',
+            comment: "\nFor **page by page** pagination.\nLimit the number of result. \n_Side note: `Math.ceil(totalCount / limit)` to determine how many pages there are._",
+        },
+        {
+            key: 'page',
+            value: 'Int',
+            comment: "\nFor **page by page** pagination.\nSelect a dedicated page.",
+        },
+        {
+            key: 'offset',
+            value: 'Int',
+            comment: "\nFor **page by page** pagination.\nSet the offset needed.\n_Side node: if `page` arg is set, `offset` will be ignored._",
+        },
+        {
+            key: 'orderBy',
+            value: "".concat(key, "OrderBy"),
+            comment: "Remult sorting options",
+        },
+        {
+            key: 'where',
+            value: "".concat(key, "Where"),
+            comment: "Remult filtering options",
+        },
+    ];
+    if (v2ConnectionAndPagination) {
+        queryArgsConnection.push({
+            key: 'first',
+            value: 'Int',
+            comment: "\n        For **forward cursor** pagination\n        Takes the `first`: `n` elements from the list.",
+        }, {
+            key: 'after',
+            value: 'String',
+            comment: "\n        For **forward cursor** pagination\n        `after` this `cursor`.",
+        }, {
+            key: 'last',
+            value: 'Int',
+            comment: "\n        For **backward cursor** pagination\n        Takes the `last`: `n` elements from the list.",
+        }, {
+            key: 'before',
+            value: 'String',
+            comment: "\n        For **backward cursor** pagination\n        `before` this `cursor`.",
+        });
+    }
+    return queryArgsConnection;
+}
 // For cursor pagination (v2)
 // function checkPaginationArgs(args: any) {
 //   let paginationPage = !!args.limit ? 1 : 0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.25.4",
+    "version": "0.25.5-exp.1",
     "description": "A CRUD framework for full-stack TypeScript",
     "homepage": "https://remult.dev",
     "repository": {

package/src/remult3/remult3.js

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 //p2 -   allow find options preprocessor for api calls, to use for authorization
 //p1 - write doc about controlling updates of rows...
 //p1 - need a way to extract the fields from the relation - for generating relation based sql
+//p1 - when doing this, work on graphql relation with fields not just field
 //p1 - add docs for apply changes
 //p1 - when subscribe is forbidden - the query still runs after the renew process
 //p1 - 'update tasks set  where id = $1
@@ -44,14 +45,12 @@ remult.apiClient.url='localhost:3007/api
 
 
 */
-//p1 - investigate angular starter kit init request error
-//p1 - fix angular starter kit await set password
-//p1 - fix angular starter kit to latest version as well
-//p1 -check if checouknt doesn't respect allow read (I think)
-//p1 - fix multiple instances of remult: the defaultRemult and async local hook - and columnsOfType - all can be tests with a vite project loading `remult-admin`
 //p1 - crm demo graphql error
+//p1 - fix multiple instances of remult: the defaultRemult and async local hook - and columnsOfType - all can be tests with a vite project loading `remult-admin`
+//p1 -check if checouknt doesn't respect allow read (I think)
 //p1 - allow api update only for new rows
 //p1 - getFields didn't work for kobi in the home component
+//p1 - https://codesandbox.io/p/devbox/demo-sql-expression-wqvj4g
 //p2 - document validators
 //p2 - and validators to reference
 //y2 - discuss a default date formatter