@cellaware/utils 8.16.0 → 8.17.1

package/dist/chatwms/alert.d.ts

@@ -49,8 +49,6 @@ export interface AlertContentInfo extends DatagridStateBase {
     contextName: DataContext;
     specification: string;
     query: string;
-    /** Parsed & optimized database version of ChatWMS query. */
-    jitQuery?: string;
     summary: string;
     reviewOk?: boolean;
     reviewConfidence?: string;

package/dist/chatwms/cosmos.js

@@ -340,7 +340,7 @@ function injectParameters(query, parameters) {
     if (parameters.length > 0) {
         let whereBuf = '1 = 1';
         for (const parameter of parameters) {
-            whereBuf += ` AND ${codifyCondition(parameter)}`;
+            whereBuf += ` AND ${codifyCondition(parameter, 'cosmos')}`;
         }
         const subquery = `SELECT * FROM ${SUBQUERY_QUERY_PLACEHOLDER} param_sq WHERE ${whereBuf}`;
         queryMut = injectSubquery(queryMut, subquery);

package/dist/chatwms/dashboard.d.ts

@@ -44,8 +44,6 @@ export interface DashboardWidgetContentInfo extends DatagridStateBase {
     contextName: DataContext;
     specification: string;
     query: string;
-    /** Parsed & optimized database version of ChatWMS query. */
-    jitQuery?: string;
     summary: string;
     reviewOk?: boolean;
     reviewConfidence?: string;

package/dist/chatwms/datagrid.d.ts

@@ -147,7 +147,8 @@ export declare function initDatagridCondition(): DatagridCondition;
 export declare function summarizeCondition(condition: DatagridCondition, localeMessageFn: (language: string, messageId: string) => Promise<string>): Promise<string>;
 export declare function summarizeConditionMarkdown(condition: DatagridCondition, localeMessageFn: (language: string, messageId: string) => Promise<string>): Promise<string>;
 export declare function summarizeConditionHtml(condition: DatagridCondition, localeMessageFn: (language: string, messageId: string) => Promise<string>): Promise<string>;
-export declare function codifyCondition(condition: DatagridCondition): string;
+/** Supported dialects: `mssql` | `oracle` | `snowflake` | `sqlite` | `cosmos` */
+export declare function codifyCondition(condition: DatagridCondition, sqlDialect: string): string;
 /**
  * Equivalent of `parseNumeric` in front end
  *

package/dist/chatwms/datagrid.js

@@ -379,7 +379,15 @@ export async function summarizeConditionHtml(condition, localeMessageFn) {
     }
     return `<code>${condition.columnName}</code> ${ruleStr}`;
 }
-export function codifyCondition(condition) {
+const DATE_FORMATTERS = {
+    mssql: column => `CONVERT(VARCHAR(10), ${column}, 23)`,
+    oracle: column => `TO_CHAR(${column}, 'YYYY-MM-DD')`,
+    snowflake: column => `TO_CHAR(${column}, 'YYYY-MM-DD')`,
+    sqlite: column => `strftime('%Y-%m-%d', ${column})`,
+    cosmos: column => `SUBSTRING(${column}, 0, 10`,
+};
+/** Supported dialects: `mssql` | `oracle` | `snowflake` | `sqlite` | `cosmos` */
+export function codifyCondition(condition, sqlDialect) {
     // NOTE: since we check for action/unsafe SQL with every query, we do not need to check for SQL injection here.
     if (condition.dataType === 'number') {
         const v1 = !condition.value || condition.value == '' ? 0 : condition.value;
@@ -413,7 +421,9 @@ export function codifyCondition(condition) {
         const v1 = !condition.value || condition.value == '' ? 0 : condition.value;
         const v2 = !condition.value2 || condition.value2 == '' ? 0 : condition.value2;
         // Need to wrap in quotes due to how ChatWMS will alias columns (ex: location_id -> Location ID).
-        const quotedColumnName = `"${condition.columnName}"`;
+        // Also need to make sure we are using a consistent date format.
+        // **Important:** since we do not currently support times, we will use a simple date format (YYYY-MM-DD).
+        const quotedColumnName = DATE_FORMATTERS[sqlDialect](`"${condition.columnName}"`);
         switch (condition.rule) {
             case ConditionalFormatRule.EQUALS:
                 return `${quotedColumnName} = '${v1}'`;

package/dist/chatwms/report.d.ts

@@ -54,8 +54,6 @@ export interface ReportLineContentInfo extends DatagridStateBase {
     contextName: DataContext;
     specification: string;
     query: string;
-    /** Parsed & optimized database version of ChatWMS query. */
-    jitQuery?: string;
     summary: string;
     reviewOk?: boolean;
     reviewConfidence?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cellaware/utils",
-    "version": "8.16.0",
+    "version": "8.17.1",
     "description": "Cellaware Utilities for Node.js",
     "author": "Cellaware Technologies",
     "type": "module",