remult 0.25.5-exp.13 → 0.25.5-exp.14

package/esm/graphql.js

@@ -369,9 +369,10 @@ export function remultGraphql(options) {
                 });
                 currentType.mutation.delete.payload = upsertTypes(deletePayload);
                 const deletedResultKey = `id`;
+                const type = getGraphqlBaseType(meta.fields.find('id'));
                 currentType.mutation.delete.payload.fields.push({
                     key: deletedResultKey,
-                    value: 'ID',
+                    value: `${type}`,
                 }, argErrorDetail, argClientMutationId);
                 root[deleteResolverKey] = handleMutationWithErrors(async (dApi, response, setResult, arg1, req) => {
                     await dApi.delete({
@@ -388,21 +389,7 @@ export function remultGraphql(options) {
                 const ri = getRelationFieldInfo(f);
                 if (f.options.includeInApi === false)
                     continue;
-                let type = 'String';
-                switch (f.valueType) {
-                    case Boolean:
-                        type = 'Boolean';
-                        break;
-                    case Number:
-                        {
-                            if (f.valueConverter?.fieldTypeInDb === 'integer' ||
-                                f.valueConverter?.fieldTypeInDb === 'autoincrement')
-                                type = 'Int';
-                            else
-                                type = 'Float';
-                        }
-                        break;
-                }
+                const type = getGraphqlBaseType(f);
                 currentType.query.resultProcessors.push((r) => {
                     r[nodeIdKey] = () => getMetaType(meta) + ':' + meta.idMetadata.getId(r);
                 });
@@ -828,6 +815,24 @@ function fieldFormat(field) {
     }
     return `${strComment}  ${key_value}`;
 }
+function getGraphqlBaseType(field) {
+    let type = 'String';
+    switch (field.valueType) {
+        case Boolean:
+            type = 'Boolean';
+            break;
+        case Number:
+            {
+                if (field.valueConverter?.fieldTypeInDb === 'integer' ||
+                    field.valueConverter?.fieldTypeInDb === 'autoincrement')
+                    type = 'Int';
+                else
+                    type = 'Float';
+            }
+            break;
+    }
+    return type;
+}
 function getMetaType(entityMeta) {
     return entityMeta.entityType.name;
 }

package/esm/package.json

@@ -1,3 +1,3 @@
 {
-    "type": "module"
+  "type": "module"
 }

package/esm/remult-sveltekit.js

@@ -63,6 +63,7 @@ export function remultSveltekit(options) {
                     });
                 return new Response(JSON.stringify(responseFromRemultHandler.data), {
                     status: responseFromRemultHandler.statusCode,
+                    headers: (await resolve(event)).headers,
                 });
             }
         }

package/esm/src/remult3/remult3.js

@@ -1,16 +1,30 @@
 export {};
+/*y1 - workshop
+
+* Experiment with doing this with version control - so the students can follow changes
+* Prepare stackblitz
+
+
+# influencer:
+  * review react summit
+#
+
 //y1 - admin url!
 //y1 - number default storage in knex is decimal and it by default has 8,2 - meaning only 999,999 - I think it should be way bigger than that. in firefly we do at least 18 - https://discord.com/channels/975754286384418847/1195162533447876658
 //y1 - talk about the parameter issue with backend methods
 //y1 - tried to upgrade vitest, nuxt tests are failing with loading uuid - sounds familiar?
 //y1 - I think that the tests you've setup cover next app router - I added to the setup, but not sure where else
+//y1 - select data provider per entity https://discord.com/channels/975754286384418847/976006081748807690/1201415305885397003
+
+
 //p1 - Small thing, I get SvelteKitError: Not found: /vite.svg
-//p1 - live query with include
+//p1 - understand the to many relation for the admin, based on the to one
 //p1 - relation from order details to order gave a compound id info - and it is not true - same for the relation to product
-//p1 - include admin in remult
+//p1 - live query with include
 //p1 - new row when there are relations, looks funny (see product)
 //p1 - the + row in the bottom should extend to the full width
-//p1 - adjust angular starter kit for latest angular (as is in tutorial)
+//p1 - adjust angular tutorial starter kit for latest angular (as is in tutorial)
+
 /*y2 -
   @Fields.string<Category>({
     allowApiUpdate: (c) => getEntityRef(c).isNew(),

package/graphql.js

@@ -12,7 +12,6 @@ var _removeComments = false;
 function remultGraphql(options) {
     var e_1, _a, e_2, _b, e_3, _c, e_4, _d, e_5, _e;
     var _this = this;
-    var _f, _g;
     if (!options.getRemultFromRequest) {
         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];
@@ -69,16 +68,16 @@ function remultGraphql(options) {
     }
     try {
         // Where - GraphQL primitives
-        for (var _h = tslib_1.__values(['String', 'Int', 'Float', 'Boolean', 'ID']), _j = _h.next(); !_j.done; _j = _h.next()) {
-            var whereType = _j.value;
+        for (var _f = tslib_1.__values(['String', 'Int', 'Float', 'Boolean', 'ID']), _g = _f.next(); !_g.done; _g = _f.next()) {
+            var whereType = _g.value;
             var currentWhere = upsertTypes("Where".concat(whereType), 'input', 20);
             var currentWhereNullable = upsertTypes("Where".concat(whereType, "Nullable"), 'input', 20);
             // For everyone
             var operatorType = ['eq', 'ne'];
             var operatorTypeArray = ['in', 'nin'];
             try {
-                for (var _k = (e_2 = void 0, tslib_1.__values(tslib_1.__spreadArray(tslib_1.__spreadArray([], tslib_1.__read(operatorType), false), tslib_1.__read(operatorTypeArray), false))), _l = _k.next(); !_l.done; _l = _k.next()) {
-                    var operator = _l.value;
+                for (var _h = (e_2 = void 0, tslib_1.__values(tslib_1.__spreadArray(tslib_1.__spreadArray([], tslib_1.__read(operatorType), false), tslib_1.__read(operatorTypeArray), false))), _j = _h.next(); !_j.done; _j = _h.next()) {
+                    var operator = _j.value;
                     var field = {
                         key: operator,
                         value: operatorTypeArray.includes(operator)
@@ -92,7 +91,7 @@ function remultGraphql(options) {
             catch (e_2_1) { e_2 = { error: e_2_1 }; }
             finally {
                 try {
-                    if (_l && !_l.done && (_b = _k.return)) _b.call(_k);
+                    if (_j && !_j.done && (_b = _h.return)) _b.call(_h);
                 }
                 finally { if (e_2) throw e_2.error; }
             }
@@ -101,8 +100,8 @@ function remultGraphql(options) {
                 whereType === 'Int' ||
                 whereType === 'Float') {
                 try {
-                    for (var _m = (e_3 = void 0, tslib_1.__values(['gt', 'gte', 'lt', 'lte'])), _o = _m.next(); !_o.done; _o = _m.next()) {
-                        var operator = _o.value;
+                    for (var _k = (e_3 = void 0, tslib_1.__values(['gt', 'gte', 'lt', 'lte'])), _l = _k.next(); !_l.done; _l = _k.next()) {
+                        var operator = _l.value;
                         var field = {
                             key: operator,
                             value: whereType,
@@ -114,15 +113,15 @@ function remultGraphql(options) {
                 catch (e_3_1) { e_3 = { error: e_3_1 }; }
                 finally {
                     try {
-                        if (_o && !_o.done && (_c = _m.return)) _c.call(_m);
+                        if (_l && !_l.done && (_c = _k.return)) _c.call(_k);
                     }
                     finally { if (e_3) throw e_3.error; }
                 }
             }
             if (whereType === 'String') {
                 try {
-                    for (var _p = (e_4 = void 0, tslib_1.__values(['contains', 'notContains'])), _q = _p.next(); !_q.done; _q = _p.next()) {
-                        var operator = _q.value;
+                    for (var _m = (e_4 = void 0, tslib_1.__values(['contains', 'notContains'])), _o = _m.next(); !_o.done; _o = _m.next()) {
+                        var operator = _o.value;
                         var field = {
                             key: operator,
                             value: whereType,
@@ -134,7 +133,7 @@ function remultGraphql(options) {
                 catch (e_4_1) { e_4 = { error: e_4_1 }; }
                 finally {
                     try {
-                        if (_q && !_q.done && (_d = _p.return)) _d.call(_p);
+                        if (_o && !_o.done && (_d = _m.return)) _d.call(_m);
                     }
                     finally { if (e_4) throw e_4.error; }
                 }
@@ -149,7 +148,7 @@ function remultGraphql(options) {
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
     finally {
         try {
-            if (_j && !_j.done && (_a = _h.return)) _a.call(_h);
+            if (_g && !_g.done && (_a = _f.return)) _a.call(_f);
         }
         finally { if (e_1) throw e_1.error; }
     }
@@ -165,7 +164,7 @@ function remultGraphql(options) {
     var argClientMutationId = { key: 'clientMutationId', value: "String" };
     var argErrorDetail = { key: 'error', value: "ErrorDetail" };
     var _loop_1 = function (meta) {
-        var e_6, _r;
+        var e_6, _p;
         var orderByFields = [];
         var key = meta.key;
         var currentType = upsertTypes(getMetaType(meta), 'type_impl_node');
@@ -454,9 +453,10 @@ function remultGraphql(options) {
                 });
                 currentType.mutation.delete.payload = upsertTypes(deletePayload);
                 var deletedResultKey_1 = "id";
+                var type = getGraphqlBaseType(meta.fields.find('id'));
                 currentType.mutation.delete.payload.fields.push({
                     key: deletedResultKey_1,
-                    value: 'ID',
+                    value: "".concat(type),
                 }, argErrorDetail, argClientMutationId);
                 root[deleteResolverKey_1] = handleMutationWithErrors(function (dApi, response, setResult, arg1, req) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                     return tslib_1.__generator(this, function (_a) {
@@ -478,21 +478,7 @@ function remultGraphql(options) {
                 var ri = (0, internals_js_1.getRelationFieldInfo)(f);
                 if (f.options.includeInApi === false)
                     return "continue";
-                var type = 'String';
-                switch (f.valueType) {
-                    case Boolean:
-                        type = 'Boolean';
-                        break;
-                    case Number:
-                        {
-                            if (((_f = f.valueConverter) === null || _f === void 0 ? void 0 : _f.fieldTypeInDb) === 'integer' ||
-                                ((_g = f.valueConverter) === null || _g === void 0 ? void 0 : _g.fieldTypeInDb) === 'autoincrement')
-                                type = 'Int';
-                            else
-                                type = 'Float';
-                        }
-                        break;
-                }
+                var type = getGraphqlBaseType(f);
                 currentType.query.resultProcessors.push(function (r) {
                     r[nodeIdKey] = function () {
                         return getMetaType(meta) + ':' + meta.idMetadata.getId(r);
@@ -673,15 +659,15 @@ 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;
+                for (var _q = (e_6 = void 0, tslib_1.__values(meta.fields)), _r = _q.next(); !_r.done; _r = _q.next()) {
+                    var f = _r.value;
                     _loop_2(f);
                 }
             }
             catch (e_6_1) { e_6 = { error: e_6_1 }; }
             finally {
                 try {
-                    if (_t && !_t.done && (_r = _s.return)) _r.call(_s);
+                    if (_r && !_r.done && (_p = _q.return)) _p.call(_q);
                 }
                 finally { if (e_6) throw e_6.error; }
             }
@@ -976,6 +962,25 @@ function fieldFormat(field) {
     }
     return "".concat(strComment, "  ").concat(key_value);
 }
+function getGraphqlBaseType(field) {
+    var _a, _b;
+    var type = 'String';
+    switch (field.valueType) {
+        case Boolean:
+            type = 'Boolean';
+            break;
+        case Number:
+            {
+                if (((_a = field.valueConverter) === null || _a === void 0 ? void 0 : _a.fieldTypeInDb) === 'integer' ||
+                    ((_b = field.valueConverter) === null || _b === void 0 ? void 0 : _b.fieldTypeInDb) === 'autoincrement')
+                    type = 'Int';
+                else
+                    type = 'Float';
+            }
+            break;
+    }
+    return type;
+}
 function getMetaType(entityMeta) {
     return entityMeta.entityType.name;
 }

package/package.json

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

package/remult-sveltekit.js

@@ -20,12 +20,13 @@ function remultSveltekit(options) {
     var handler = function (_a) {
         var event = _a.event, resolve = _a.resolve;
         return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var sseResponse_1, response_1, responseFromRemultHandler;
+            var sseResponse_1, response_1, responseFromRemultHandler, _b, _c;
+            var _d;
             var _this = this;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
+            return tslib_1.__generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
-                        if (!event.url.pathname.startsWith(options.rootPath)) return [3 /*break*/, 2];
+                        if (!event.url.pathname.startsWith(options.rootPath)) return [3 /*break*/, 3];
                         sseResponse_1 = undefined;
                         event.locals['_tempOnClose'] = function () { };
                         response_1 = {
@@ -74,24 +75,27 @@ function remultSveltekit(options) {
                         };
                         return [4 /*yield*/, result.handle(event, response_1)];
                     case 1:
-                        responseFromRemultHandler = _b.sent();
+                        responseFromRemultHandler = _e.sent();
                         if (sseResponse_1 !== undefined) {
                             return [2 /*return*/, sseResponse_1];
                         }
-                        if (responseFromRemultHandler) {
-                            if (responseFromRemultHandler.html)
-                                return [2 /*return*/, new Response(responseFromRemultHandler.html, {
-                                        status: responseFromRemultHandler.statusCode,
-                                        headers: {
-                                            'Content-Type': 'text/html',
-                                        },
-                                    })];
-                            return [2 /*return*/, new Response(JSON.stringify(responseFromRemultHandler.data), {
+                        if (!responseFromRemultHandler) return [3 /*break*/, 3];
+                        if (responseFromRemultHandler.html)
+                            return [2 /*return*/, new Response(responseFromRemultHandler.html, {
                                     status: responseFromRemultHandler.statusCode,
+                                    headers: {
+                                        'Content-Type': 'text/html',
+                                    },
                                 })];
-                        }
-                        _b.label = 2;
-                    case 2: return [2 /*return*/, new Promise(function (res) {
+                        _b = Response.bind;
+                        _c = [void 0, JSON.stringify(responseFromRemultHandler.data)];
+                        _d = {
+                            status: responseFromRemultHandler.statusCode
+                        };
+                        return [4 /*yield*/, resolve(event)];
+                    case 2: return [2 /*return*/, new (_b.apply(Response, _c.concat([(_d.headers = (_e.sent()).headers,
+                                _d)])))()];
+                    case 3: return [2 /*return*/, new Promise(function (res) {
                             result.withRemult(event, undefined, function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                                 var _a;
                                 return tslib_1.__generator(this, function (_b) {

package/src/remult3/remult3.js

@@ -1,17 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/*y1 - workshop
+
+* Experiment with doing this with version control - so the students can follow changes
+* Prepare stackblitz
+
+
+# influencer:
+  * review react summit
+#
+
 //y1 - admin url!
 //y1 - number default storage in knex is decimal and it by default has 8,2 - meaning only 999,999 - I think it should be way bigger than that. in firefly we do at least 18 - https://discord.com/channels/975754286384418847/1195162533447876658
 //y1 - talk about the parameter issue with backend methods
 //y1 - tried to upgrade vitest, nuxt tests are failing with loading uuid - sounds familiar?
 //y1 - I think that the tests you've setup cover next app router - I added to the setup, but not sure where else
+//y1 - select data provider per entity https://discord.com/channels/975754286384418847/976006081748807690/1201415305885397003
+
+
 //p1 - Small thing, I get SvelteKitError: Not found: /vite.svg
-//p1 - live query with include
+//p1 - understand the to many relation for the admin, based on the to one
 //p1 - relation from order details to order gave a compound id info - and it is not true - same for the relation to product
-//p1 - include admin in remult
+//p1 - live query with include
 //p1 - new row when there are relations, looks funny (see product)
 //p1 - the + row in the bottom should extend to the full width
-//p1 - adjust angular starter kit for latest angular (as is in tutorial)
+//p1 - adjust angular tutorial starter kit for latest angular (as is in tutorial)
+
 /*y2 -
   @Fields.string<Category>({
     allowApiUpdate: (c) => getEntityRef(c).isNew(),