@saltcorn/data 1.1.4-beta.8 → 1.1.4

package/dist/models/email.js

@@ -35,6 +35,7 @@ const uuid_1 = require("uuid");
 const mocks_1 = __importDefault(require("../tests/mocks"));
 const mjml_1 = __importDefault(require("mjml"));
 const { mockReqRes } = mocks_1.default;
+const simple_oauth2_1 = require("simple-oauth2");
 const emailMockReqRes = {
     req: {
         ...mockReqRes.req,
@@ -43,29 +44,108 @@ const emailMockReqRes = {
     },
     res: mockReqRes.res,
 };
+const isMicrosoftGraph = () => {
+    const smtpHost = getState().getConfig("smtp_host");
+    const apiOption = getState().getConfig("smtp_api_option");
+    return smtpHost === "outlook.office365.com" && apiOption === "Graph";
+};
 /**
  * @returns
  */
-const getMailTransport = () => {
-    const port = getState().getConfig("smtp_port");
-    const secure = getState().getConfig("smtp_secure", port === 465);
-    const smtp_allow_self_signed = getState().getConfig("smtp_allow_self_signed", false);
-    const username = getState().getConfig("smtp_username");
-    const transportOptions = {
-        host: getState().getConfig("smtp_host"),
-        port,
-        secure,
-        auth: username
-            ? {
-                user: username,
-                pass: getState().getConfig("smtp_password"),
-            }
-            : undefined,
+const getMailTransport = async () => {
+    if (isMicrosoftGraph())
+        return getMicrosoftGraphTransport();
+    else {
+        const port = getState().getConfig("smtp_port");
+        const secure = getState().getConfig("smtp_secure", port === 465);
+        const smtp_allow_self_signed = getState().getConfig("smtp_allow_self_signed", false);
+        const username = getState().getConfig("smtp_username");
+        const isOauth = getState().getConfig("smtp_auth_method") === "oauth2";
+        const transportOptions = {
+            host: getState().getConfig("smtp_host"),
+            port,
+            secure,
+            auth: username
+                ? {
+                    user: username,
+                    ...(!isOauth
+                        ? { pass: getState().getConfig("smtp_password") }
+                        : { type: "OAuth2", accessToken: await getTokenString() }),
+                }
+                : undefined,
+        };
+        if (smtp_allow_self_signed)
+            transportOptions.tls = { rejectUnauthorized: false };
+        return (0, nodemailer_1.createTransport)(transportOptions);
+    }
+};
+const getMicrosoftGraphTransport = async () => {
+    const tokenStr = await getTokenString();
+    return {
+        sendMail: async (mail) => {
+            const graphMail = convertToGraphMail(mail);
+            return await sendGraphMail(graphMail, tokenStr);
+        },
+    };
+};
+const convertToGraphMail = (mail) => {
+    return {
+        message: {
+            subject: mail.subject,
+            body: {
+                contentType: mail.html ? "HTML" : "Text",
+                content: mail.html ? mail.html : mail.text,
+            },
+            // semicolon separated list of to addresses
+            toRecipients: typeof mail.to === "string"
+                ? mail.to.split(/[,;]/).map((address) => ({
+                    emailAddress: {
+                        address,
+                    },
+                }))
+                : [],
+            // semicolon separated list of cc addresses
+            ccRecipients: typeof mail.cc === "string"
+                ? mail.cc.split(/[,;]/).map((address) => ({
+                    emailAddress: {
+                        address,
+                    },
+                }))
+                : [],
+            // semicolon separated list of bcc addresses
+            bccRecipients: typeof mail.bcc === "string"
+                ? mail.bcc.split(/[,;]/).map((address) => ({
+                    emailAddress: {
+                        address,
+                    },
+                }))
+                : [],
+        },
+        saveToSentItems: true,
     };
-    if (smtp_allow_self_signed)
-        transportOptions.tls = { rejectUnauthorized: false };
-    return (0, nodemailer_1.createTransport)(transportOptions);
 };
+async function sendGraphMail(mail, tokenStr) {
+    const response = await fetch("https://graph.microsoft.com/v1.0/me/sendMail", {
+        method: "POST",
+        headers: {
+            Authorization: `Bearer ${tokenStr}`,
+            "Content-Type": "application/json",
+        },
+        body: JSON.stringify(mail),
+    });
+    if (response.ok) {
+        return {
+            success: true,
+            status: response.status,
+            message: "Email sent successfully",
+            accepted: mail.message.toRecipients.map((recipient) => recipient.emailAddress.address),
+        };
+    }
+    else {
+        const error = await response.json();
+        throw new Error("Failed to send email: " + JSON.stringify(error));
+    }
+}
 const viewToMjml = async (view, state) => {
     const result = await view.run(state, emailMockReqRes);
     const faCss = link({
@@ -119,7 +199,7 @@ const send_verification_email = async (user, req, opts) => {
                     subject: "Please verify your email address",
                     html,
                 };
-                await getMailTransport().sendMail(email);
+                await (await getMailTransport()).sendMail(email);
                 if (req)
                     req.flash("success", req.__("An email has been sent to %s to verify your address", user.email));
                 return true;
@@ -207,6 +287,42 @@ const getFileAggregations = async (table) => {
     }
     return result;
 };
+const getOauth2Client = ({ tokenUrl, authorizeUrl, clientId, clientSecret, } = {
+    tokenUrl: getState().getConfig("smtp_token_url"),
+    authorizeUrl: getState().getConfig("smtp_authorize_url"),
+    clientId: getState().getConfig("smtp_client_id"),
+    clientSecret: getState().getConfig("smtp_client_secret"),
+}) => {
+    const url = new URL(tokenUrl);
+    const tokenHost = url.origin;
+    const tokenPath = url.pathname;
+    const authUrl = new URL(authorizeUrl);
+    const authHost = authUrl.origin;
+    const authPath = authUrl.pathname;
+    return new simple_oauth2_1.AuthorizationCode({
+        client: {
+            id: clientId,
+            secret: clientSecret,
+        },
+        auth: {
+            tokenHost: tokenHost,
+            tokenPath: tokenPath,
+            authorizeHost: authHost,
+            authorizePath: authPath,
+        },
+    });
+};
+const getTokenString = async () => {
+    const tokenData = getState().getConfig("smtp_oauth_token_data");
+    const client = getOauth2Client();
+    let wrapped = client.createToken(tokenData);
+    if (wrapped.expired()) {
+        const refreshed = await wrapped.refresh();
+        await getState().setConfig("smtp_oauth_token_data", refreshed.token);
+        wrapped = refreshed;
+    }
+    return wrapped.token.access_token;
+};
 module.exports = {
     getMailTransport,
     send_verification_email,
@@ -216,5 +332,7 @@ module.exports = {
     loadAttachments,
     getFileAggregations,
     mjml2html: mjml_1.default,
+    getOauth2Client,
+    getTokenString,
 };
 //# sourceMappingURL=email.js.map

package/dist/models/email.js.map

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

package/dist/models/index.d.ts

@@ -49,10 +49,12 @@ export declare namespace discovery {
         tables: import("@saltcorn/types/model-abstracts/abstract_table").TablePack[];
     }>, implement_discovery: (pack: {
         tables: import("@saltcorn/types/model-abstracts/abstract_table").TablePack[];
-    }) => Promise<void>, get_existing_views: (schema0?: string | undefined) => Promise<import("@saltcorn/db-common/internal").Row[]>, findType: (sql_name: string) => any;
+    }) => Promise<void>, get_existing_views: (schema0?: string | undefined) => Promise<import("@saltcorn/db-common/internal").Row[]>, findType: (sql_name: string) => string | undefined;
 }
 export declare namespace email {
-    const getMailTransport: () => import("nodemailer").Transporter, viewToEmailHtml: (view: View, state: any) => Promise<string>, send_verification_email: (user: User, req?: any, opts?: {
+    const getMailTransport: () => Promise<{
+        sendMail: (mail: import("nodemailer/lib/mailer").Options) => Promise<any>;
+    } | import("nodemailer").Transporter>, viewToEmailHtml: (view: View, state: any) => Promise<string>, send_verification_email: (user: User, req?: any, opts?: {
         new_verification_token?: string | undefined;
     } | undefined) => Promise<any>;
 }

package/dist/models/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../models/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,eAAe,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAC3C,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EACL,KAAK,EACL,QAAQ,EACR,KAAK,EACL,WAAW,EACX,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,SAAS,EACT,MAAM,EACN,IAAI,EACJ,eAAe,EACf,KAAK,EACL,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,aAAa,GACd,CAAC;AAEF,OAAO,YAAY,MAAM,UAAU,CAAC;AACpC,yBAAiB,MAAM,CAAC;IACf,MACL,SAAS,4CACT,YAAY,kDACZ,SAAS,8CACT,YAAY,kCACZ,WAAW,4BACX,gBAAgB;;;yBAChB,mBAAmB;;;;;;;;;;;;;;;;;;OACnB,sBAAsB,qEACtB,YAAY,yBACZ,eAAe,wCACf,gBAAgB,4BACF,CAAC;CAClB;AAGD,yBAAiB,SAAS,CAAC;IAClB,MACL,mBAAmB,2FACnB,eAAe;;QACf,mBAAmB;;yBACnB,kBAAkB,2FAClB,QAAQ,2BACS,CAAC;CACrB;AAGD,yBAAiB,KAAK,CAAC;IACd,MAAQ,gBAAgB,0CAAE,eAAe,+CAAE,uBAAuB;;kCAC5D,CAAC;CACf;AAGD,yBAAiB,UAAU,CAAC;IACnB,MACL,mBAAmB,gCACnB,uBAAuB,8JACvB,6BAA6B,mEAC7B,uBAAuB,qDACvB,eAAe,yFACf,sBAAsB,qGACtB,mBAAmB;;;OACnB,8BAA8B,2IAC9B,aAAa,wGACK,CAAC;CACtB;AAGD,yBAAiB,MAAM,CAAC;IACf,MACL,QAAQ,kFACR,QAAQ,2EACR,QAAQ;;yBACR,YAAY;;gBACZ,iBAAiB,qEACjB,eAAe,+EACD,CAAC;CAClB;AAGD,yBAAiB,MAAM,CAAC;IACf,MAAQ,YAAY,4EAAE,cAAc,mCAAE,YAAY,yDAAE,SAAS;;;;MACtD,CAAC;CAChB;AAGD,yBAAiB,SAAS,CAAC;IAClB,MAAM,YAAY;;;;KAAkB,CAAC;CAC7C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../models/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,eAAe,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAC3C,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EACL,KAAK,EACL,QAAQ,EACR,KAAK,EACL,WAAW,EACX,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,SAAS,EACT,MAAM,EACN,IAAI,EACJ,eAAe,EACf,KAAK,EACL,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,aAAa,GACd,CAAC;AAEF,OAAO,YAAY,MAAM,UAAU,CAAC;AACpC,yBAAiB,MAAM,CAAC;IACf,MACL,SAAS,4CACT,YAAY,kDACZ,SAAS,8CACT,YAAY,kCACZ,WAAW,4BACX,gBAAgB;;;yBAChB,mBAAmB;;;;;;;;;;;;;;;;;;OACnB,sBAAsB,qEACtB,YAAY,yBACZ,eAAe,wCACf,gBAAgB,4BACF,CAAC;CAClB;AAGD,yBAAiB,SAAS,CAAC;IAClB,MACL,mBAAmB,2FACnB,eAAe;;QACf,mBAAmB;;yBACnB,kBAAkB,2FAClB,QAAQ,0CACS,CAAC;CACrB;AAGD,yBAAiB,KAAK,CAAC;IACd,MAAQ,gBAAgB;;2CAAE,eAAe,+CAAE,uBAAuB;;kCAC5D,CAAC;CACf;AAGD,yBAAiB,UAAU,CAAC;IACnB,MACL,mBAAmB,gCACnB,uBAAuB,8JACvB,6BAA6B,mEAC7B,uBAAuB,qDACvB,eAAe,yFACf,sBAAsB,qGACtB,mBAAmB;;;OACnB,8BAA8B,2IAC9B,aAAa,wGACK,CAAC;CACtB;AAGD,yBAAiB,MAAM,CAAC;IACf,MACL,QAAQ,kFACR,QAAQ,2EACR,QAAQ;;yBACR,YAAY;;gBACZ,iBAAiB,qEACjB,eAAe,+EACD,CAAC;CAClB;AAGD,yBAAiB,MAAM,CAAC;IACf,MAAQ,YAAY,4EAAE,cAAc,mCAAE,YAAY,yDAAE,SAAS;;;;MACtD,CAAC;CAChB;AAGD,yBAAiB,SAAS,CAAC;IAClB,MAAM,YAAY;;;;KAAkB,CAAC;CAC7C"}

package/dist/models/notification.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"notification.d.ts","sourceRoot":"","sources":["../../models/notification.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,KAAK,EAAE,aAAa,EAAO,MAAM,8BAA8B,CAAC;AAO9E;;;GAGG;AAEH,cAAM,YAAY;IAChB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,IAAI,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;IAEd;;;OAGG;gBACS,CAAC,EAAE,eAAe,GAAG,YAAY;IAS7C;;;;OAIG;WACU,IAAI,CACf,KAAK,EAAE,KAAK,EACZ,UAAU,CAAC,EAAE,aAAa,GACzB,OAAO,CAAC,YAAY,EAAE,CAAC;IAK1B;;;OAGG;WACU,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC;WAK5C,MAAM,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BpD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;WAItB,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;WAIhB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAI1C,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;CAGlD;AAED,KAAK,eAAe,GAAG;IACrB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,SAAS,YAAY,CAAC"}
+{"version":3,"file":"notification.d.ts","sourceRoot":"","sources":["../../models/notification.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,KAAK,EAAE,aAAa,EAAO,MAAM,8BAA8B,CAAC;AAO9E;;;GAGG;AAEH,cAAM,YAAY;IAChB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,IAAI,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;IAEd;;;OAGG;gBACS,CAAC,EAAE,eAAe,GAAG,YAAY;IAS7C;;;;OAIG;WACU,IAAI,CACf,KAAK,EAAE,KAAK,EACZ,UAAU,CAAC,EAAE,aAAa,GACzB,OAAO,CAAC,YAAY,EAAE,CAAC;IAK1B;;;OAGG;WACU,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC;WAK5C,MAAM,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BpD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;WAItB,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;WAIhB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAI1C,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;CAGlD;AAED,KAAK,eAAe,GAAG;IACrB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,SAAS,YAAY,CAAC"}

package/dist/models/notification.js

@@ -68,8 +68,7 @@ class Notification {
         ${o.link}`,
                 html: `${o.body}<br/><a href="${o.link}">${o.link}</a>`,
             };
-            email_1.default
-                .getMailTransport()
+            (await email_1.default.getMailTransport())
                 .sendMail(email)
                 .catch((e) => getState()?.log(1, e.message));
         }

package/dist/models/notification.js.map

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

package/dist/models/table.d.ts

@@ -389,11 +389,11 @@ declare class Table implements AbstractTable {
     updateRow(v_in: Row, id: PrimaryKeyValue, user?: AbstractUser, noTrigger?: boolean | {
         noTrigger?: boolean;
         resultCollector?: object;
-        restore_of_version?: any;
+        restore_of_version?: number;
         syncTimestamp?: Date;
         additionalTriggerValues?: Row;
         autoRecalcIterations?: number;
-    }, resultCollector?: object, restore_of_version?: any, syncTimestamp?: Date, additionalTriggerValues?: Row, autoRecalcIterations?: number): Promise<string | void>;
+    }, resultCollector?: object, restore_of_version?: number, syncTimestamp?: Date, additionalTriggerValues?: Row, autoRecalcIterations?: number): Promise<string | void>;
     insert_history_row(v0: Row, retry?: number): Promise<void>;
     latestSyncInfo(id: PrimaryKeyValue): Promise<any>;
     latestSyncInfos(ids: PrimaryKeyValue[]): Promise<any>;
@@ -468,7 +468,7 @@ declare class Table implements AbstractTable {
     tryInsertRow(v: Row, user?: AbstractUser, resultCollector?: object): Promise<{
         error: string;
     } | {
-        success: any;
+        success: PrimaryKeyValue;
     }>;
     /**
      *

package/dist/models/table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../models/table.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../models/table.ts"],"names":[],"mappings":"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"}

package/dist/models/table.js

@@ -214,9 +214,9 @@ class Table {
         const provider = getState().table_providers[tbl.provider_name];
         if (!provider)
             return this;
-        const { getRows } = provider.get_table(tbl.provider_cfg, tbl);
+        const { getRows, countRows } = provider.get_table(tbl.provider_cfg, tbl);
         const { json_list_to_external_table } = require("../plugin-helper");
-        const t = json_list_to_external_table(getRows, tbl.fields);
+        const t = json_list_to_external_table(getRows, tbl.fields, { countRows });
         delete t.min_role_read; //it is a getter
         Object.assign(t, tbl);
         t.update = async (upd_rec) => {
@@ -1104,6 +1104,7 @@ class Table {
         if (typeof autoRecalcIterations === "number" && autoRecalcIterations > 5)
             return;
         let existing;
+        let changedFromCalc = new Set([]);
         let v = { ...v_in };
         //these may have changed
         let changedFieldNames = new Set([
@@ -1279,6 +1280,9 @@ class Table {
         state.log(6, `Updating ${this.name}: ${JSON.stringify(v)}, id=${id}`);
         if (!stringified)
             this.stringify_json_fields(v);
+        const really_changed_field_names = existing
+            ? new Set(Object.keys(v).filter((k) => v[k] !== existing[k]))
+            : changedFieldNames;
         await db_1.default.update(this.name, v, id, {
             pk_name,
             ...sqliteJsonCols,
@@ -1291,7 +1295,8 @@ class Table {
                 await this.insertSyncInfo(id, syncTimestamp);
         }
         const newRow = { ...existing, ...v, [pk_name]: id };
-        await this.auto_update_calc_aggregations(newRow, !existing, (autoRecalcIterations || 0) + 1, changedFieldNames);
+        if (really_changed_field_names.size > 0)
+            await this.auto_update_calc_aggregations(newRow, !existing, (autoRecalcIterations || 0) + 1, really_changed_field_names);
         if (!noTrigger) {
             const trigPromise = trigger_1.default.runTableTriggers("Update", this, { ...(additionalTriggerValues || {}), ...newRow }, resultCollector, role === 100 ? undefined : user, { old_row: existing, updated_fields: v_in });
             if (resultCollector)
@@ -2969,6 +2974,7 @@ ${rejectDetails}`,
         const whereObj = prefixFieldsInWhere(opts.where, "a");
         const { where, values } = (0, internal_1.mkWhere)(whereObj, db_1.default.isSQLite);
         (0, query_1.process_aggregations)(this, aggregations, fldNms, values, schema);
+        const odbUnderscore = typeof opts.orderBy === "string" ? opts.orderBy.replace(/\./g, "_") : "";
         const selectopts = this.processSelectOptions({
             limit: opts.limit,
             orderBy: opts.orderBy &&
@@ -2976,9 +2982,11 @@ ${rejectDetails}`,
                     ? opts.orderBy
                     : joinFields[opts.orderBy] || aggregations[opts.orderBy]
                         ? opts.orderBy
-                        : opts.orderBy.toLowerCase?.() === "random()"
-                            ? opts.orderBy
-                            : "a." + opts.orderBy),
+                        : joinFields[odbUnderscore]
+                            ? odbUnderscore
+                            : opts.orderBy.toLowerCase?.() === "random()"
+                                ? opts.orderBy
+                                : "a." + opts.orderBy),
             orderDesc: opts.orderDesc,
             offset: opts.offset,
         });