@graphenedata/cli 0.0.8 → 0.0.9

package/cli.ts

@@ -24,8 +24,7 @@ program.hook('preAction', async () => {
   loadConfig(process.cwd())
 })
 
-program
-  .command('compile')
+program.command('compile')
   .description('Translate a query to SQL and print it')
   .argument('[input]', 'Path to file, a raw string, or "-" for stdin')
   .action(async (input: string | undefined) => {
@@ -36,8 +35,7 @@ program
     console.log(toSql(queries[0]))
   })
 
-program
-  .command('run')
+program.command('run')
   .description('Run a query against your database')
   .argument('[input]', 'Path to file, a raw string, or "-" for stdin')
   .action(async (input: string | undefined) => {
@@ -84,8 +82,7 @@ program.command('schema')
     console.log(')')
   })
 
-program
-  .command('serve')
+program.command('serve')
   .description('Run the local server')
   .option('--bg', 'Run the server in the background')
   .action(async (options: {bg?: boolean}) => {
@@ -103,8 +100,7 @@ program.command('stop')
   .description('Stop the local server')
   .action(async () => { await stopGrapheneIfRunning() })
 
-program
-  .command('check')
+program.command('check')
   .description('Check the project for errors, optionally capturing a page screenshot')
   .argument('[mdFile]', 'Markdown file to check (e.g., index.md)')
   .option('-c, --chart <chartTitle>', 'Title of a specific chart to capture')

package/dist/cli/cli.js

@@ -1506,63 +1506,33 @@ var init_markdown = __esm({
 });
 
 // ../lang/snowflake.ts
-function uppercaseMalloyQuery(query) {
-  query.baseTableName = uppercaseIdentifier(query.baseTableName);
-  for (let stage of query.pipeline || []) {
-    let fields = stage.queryFields || [];
-    fields.forEach((field) => uppercaseColumnField(field));
-    let filters = stage.filterList || [];
-    filters.forEach((filter) => uppercaseExpression(filter?.e));
-  }
-}
 function uppercaseTable(table2) {
   if (table2.upperCased) return;
   table2.upperCased = true;
-  table2.name = uppercaseIdentifier(table2.name);
-  if (table2.primaryKey) table2.primaryKey = uppercaseIdentifier(table2.primaryKey);
-  if (table2.tableName) table2.tableName = uppercaseQualified(table2.tableName);
-  if (table2.tablePath) table2.tablePath = uppercaseQualified(table2.tablePath);
-  table2.fields?.forEach((field) => uppercaseField(field));
-  if (table2.query) uppercaseMalloyQuery(table2.query);
+  if (table2.query) return;
+  table2.tablePath = uppercaseIdentifier(table2.tablePath);
+  table2.fields.forEach(uppercaseField);
 }
 function uppercaseField(field) {
-  if (!field) return;
-  if (isJoinField(field)) {
-    field.name = uppercaseIdentifier(field.name);
-    if (field.tableName) field.tableName = uppercaseQualified(field.tableName);
-    if (field.tablePath) field.tablePath = uppercaseQualified(field.tablePath);
-    if (field.structPath) field.structPath = field.structPath.map(uppercaseIdentifier);
-    if (field.path) field.path = field.path.map(uppercaseIdentifier);
-    if (field.onExpression) uppercaseExpression(field.onExpression);
-    uppercaseTable(field);
-  } else {
-    uppercaseColumnField(field);
-  }
-}
-function uppercaseColumnField(field) {
-  if (!field) return;
+  if (isJoinField(field)) return uppercaseTable(field);
+  if (field.upperCased) return;
+  field.upperCased = true;
+  if (field.e) return uppercaseExpression(field.e);
+  field.as = field.name;
   field.name = uppercaseIdentifier(field.name);
-  if (field.path) field.path = field.path.map(uppercaseIdentifier);
-  if (field.structPath) field.structPath = field.structPath.map(uppercaseIdentifier);
-  if (field.tableName) field.tableName = uppercaseQualified(field.tableName);
-  if (field.tablePath) field.tablePath = uppercaseQualified(field.tablePath);
-  if (field.e) uppercaseExpression(field.e);
 }
 function uppercaseExpression(expr) {
   if (!expr) return;
   walkExpression(expr, (node) => {
-    if (Array.isArray(node.path)) node.path = node.path.map(uppercaseIdentifier);
-    if (Array.isArray(node.structPath)) node.structPath = node.structPath.map(uppercaseIdentifier);
+    if (node.type == "field") {
+      node.path = node.path.map(uppercaseIdentifier);
+    }
   });
 }
 function uppercaseIdentifier(value) {
   if (!value) return value || "";
   return value.toString().toUpperCase();
 }
-function uppercaseQualified(value) {
-  if (!value) return value;
-  return value.split(".").map((part) => part.startsWith('"') && part.endsWith('"') ? part : uppercaseIdentifier(part)).join(".");
-}
 function isJoinField(field) {
   return !!field?.join;
 }
@@ -1635,7 +1605,6 @@ function toSql(query, params = {}) {
   }));
   query = structuredClone(query);
   fillInParams(query, params);
-  if (config.dialect == "snowflake") uppercaseMalloyQuery(query);
   let visited = /* @__PURE__ */ new Set();
   function setStructRefs(obj) {
     if (!obj || typeof obj !== "object" || visited.has(obj)) return;
@@ -2489,7 +2458,7 @@ var init_snowflake2 = __esm({
       order by ordinal_position
     `);
         return res.rows.map((row) => {
-          return { name: String(row["column_name"]), dataType: String(row["data_type"]) };
+          return { name: String(row["column_name"]).toLowerCase(), dataType: String(row["data_type"]) };
         });
       }
     };
@@ -2685,6 +2654,7 @@ async function createConfig() {
     optimizeDeps: {
       noDiscovery: process.env.NODE_ENV == "test",
       // tests manually optimize before starting test workers
+      exclude: ["virtual:nav"],
       include: [
         "@graphenedata/cli > svelte",
         "@graphenedata/cli > ssf",

package/dist/docs/graphene.md

@@ -575,8 +575,8 @@ Here's an example:
 |----------|-------------|----------|---------|---------|
 | data | Query name, wrapped in curly braces | true | query name | - |
 | x | Column or expression to use for the x-axis of the chart | false | column name, stored expression name, GSQL expression | First column |
-| y | Column(s) or expression(s) to use for the y-axis of the chart. Each will create its own series. Consider a split axis with `y2` if there is a difference of scale or unit of measure between the series. | false | column name, stored expression name, GSQL expression, list of any combination of these | Any non-assigned numeric columns |
-| y2 | Column(s) or expression(s) to include on a secondary y-axis. | false | column name, stored expression name, GSQL expression, list of any combination of these | - |
+| y | Column(s) or expression(s) to use for the y-axis of the chart. Each will create its own series. Consider a split axis with `y2` if there is a difference of scale or unit of measure between the series. | false | column name, stored expression name, GSQL expression, list of any combination of these e.g. `"col1, my_expr"` | Any non-assigned numeric columns |
+| y2 | Column(s) or expression(s) to include on a secondary y-axis. | false | column name, stored expression name, GSQL expression, list of any combination of these e.g. `"col1, my_expr"` | - |
 | y2SeriesType | Chart type to apply to the series on the y2 axis | false | `bar`, `line`, `scatter` | `bar` |
 | series | Column or expression to use to define the series (groups) in a multi-series chart. Use when values of a particular column dictate the multiple series to plot, eg. `country` would create a series for every distinct country in the column. | false | column name, stored expression name, GSQL expression | - |
 | sort | Whether to apply default sort to your data. Default sort is x ascending for number and date x-axes, and y descending for category x-axes | false | `true`, `false` | `true` |
@@ -598,7 +598,7 @@ Here's an example:
 | outlineWidth | Width of line surrounding each bar | number | `0` |
 | outlineColor | Color to use for outline if outlineWidth > 0 | CSS name, hexademical, RGB, HSL | - |
 | colorPalette | List of custom colors to use for the chart | list of color strings (CSS name, hexademical, RGB, HSL) e.g. `"#cf0d06, #eb5752, #e88a87"` | built-in color palette |
-| seriesOrder | Apply a specific order to the series in a multi-series chart. | list of series names in the order they should be used in the chart `"Canada, US"` | default order implied by the data |
+| seriesOrder | Apply a specific order to the series in a multi-series chart. | list of series names in the order they should be used in the chart e.g. `"Canada, US"` | default order implied by the data |
 | leftPadding | Number representing the padding (whitespace) on the left side of the chart. Useful to avoid labels getting cut off | number | - |
 | rightPadding | Number representing the padding (whitespace) on the left side of the chart. Useful to avoid labels getting cut off | number | - |
 | xLabelWrap | Whether to wrap x-axis labels when there is not enough space. Default behaviour is to truncate the labels. | `true`, `false` | `false` |
@@ -723,8 +723,8 @@ Here's an example:
 |------|-------------|----------|---------|---------|
 | data | Query name, wrapped in curly braces | true | query name | - |
 | x | Column or expression to use for the x-axis of the chart | true | column name, stored expression name, GSQL expression | - |
-| y | Column(s) or expression(s) to use for the y-axis of the chart. Each will create its own series. Consider a split axis with `y2` if there is a difference of scale or unit of measure between the series. | true | column name, stored expression name, GSQL expression, list of any combination of these | - |
-| y2 | Column(s) or expression(s) to include on a secondary y-axis. | false | column name, stored expression name, GSQL expression, list of any combination of these | - |
+| y | Column(s) or expression(s) to use for the y-axis of the chart. Each will create its own series. Consider a split axis with `y2` if there is a difference of scale or unit of measure between the series. | true | column name, stored expression name, GSQL expression, list of any combination of these e.g. `"col1, my_expr"` | - |
+| y2 | Column(s) or expression(s) to include on a secondary y-axis. | false | column name, stored expression name, GSQL expression, list of any combination of these e.g. `"col1, my_expr"` | - |
 | y2SeriesType | Chart type to apply to the series on the y2 axis | false | `line`, `bar`, `scatter` | `line` |
 | series | Column or expression to use to define the series (groups) in a multi-series chart. Use when values of a particular column dictate the multiple series to plot, eg. `country` would create a series for every distinct country in the column. | false | column name, stored expression name, GSQL expression | - |
 | sort | Whether to apply default sort to your data. Default is x ascending for number and date x-axes, and y descending for category x-axes | false | `true`, `false` | `true` |
@@ -750,7 +750,7 @@ Here's an example:
 | markerShape | Shape to use if markers=true | false | `circle`, `emptyCircle`, `rect`, `triangle`, `diamond` | `circle` |
 | markerSize | Size of each shape (in pixels) | false | number | `8` |
 | colorPalette | List of custom colors to use for the chart | false | list of color strings (CSS name, hexademical, RGB, HSL) e.g. `"#cf0d06, #eb5752, #e88a87"` | - |
-| seriesOrder | Apply a specific order to the series in a multi-series chart. | false | list of series names in the order they should be used in the chart `"Canada, US"` | default order implied by the data |
+| seriesOrder | Apply a specific order to the series in a multi-series chart. | false | list of series names in the order they should be used in the chart e.g. `"Canada, US"` | default order implied by the data |
 | labels | Show value labels | false | `true`, `false` | `false` |
 | labelSize | Font size of value labels | false | number | `11` |
 | labelPosition | Where label will appear on your series | false | `above`, `middle`, `below` | `above` |
@@ -832,7 +832,7 @@ Here's an example:
 |------|-------------|----------|---------|---------|
 | data | Query name, wrapped in curly braces | true | query name | - |
 | x | Column or expression to use for the x-axis of the chart | true | column name, stored expression name, GSQL expression | First column |
-| y | Column(s) or expression(s) to use for the y-axis of the chart. Each will create its own series. Consider a split axis with `y2` if there is a difference of scale or unit of measure between the series. | true | column name, stored expression name, GSQL expression, list of any combination of these | Any non-assigned numeric columns |
+| y | Column(s) or expression(s) to use for the y-axis of the chart. Each will create its own series. Consider a split axis with `y2` if there is a difference of scale or unit of measure between the series. | true | column name, stored expression name, GSQL expression, list of any combination of these e.g. `"col1, my_expr"` | Any non-assigned numeric columns |
 | series | Column or expression to use to define the series (groups) in a multi-series chart. Use when values of a particular column dictate the multiple series to plot, eg. `country` would create a series for every distinct country in the column. | false | column name, stored expression name, GSQL expression | - |
 | sort | Whether to apply default sort to your data. Default sort is x ascending for number and date x-axes, and y descending for category x-axes | false | `true`, `false` | `true` |
 | type | Grouping method to use for multi-series charts | false | `stacked`, `stacked100` | `stacked` |
@@ -854,7 +854,7 @@ Here's an example:
 | fillOpacity | % of the full color that should be rendered, with remainder being transparent | false | number (0 to 1) | `0.7` |
 | line | Show line on top of the area | false | `true`, `false` | `true` |
 | colorPalette | List of custom colors to use for the chart | false | list of color strings (CSS name, hexademical, RGB, HSL) e.g. `"#cf0d06, #eb5752, #e88a87"` | built-in color palette |
-| seriesOrder | Apply a specific order to the series in a multi-series chart. | false | list of series names in the order they should be used in the chart `"Canada, US"` | default order implied by the data |
+| seriesOrder | Apply a specific order to the series in a multi-series chart. | false | list of series names in the order they should be used in the chart e.g. `"Canada, US"` | default order implied by the data |
 | leftPadding | Number representing the padding (whitespace) on the left side of the chart. Useful to avoid labels getting cut off | false | number | - |
 | rightPadding | Number representing the padding (whitespace) on the left side of the chart. Useful to avoid labels getting cut off | false | number | - |
 | xLabelWrap | Whether to wrap x-axis labels when there is not enough space. Default behaviour is to truncate the labels. | false | `true`, `false` | `false` |

package/package.json

@@ -3,7 +3,7 @@
   "main": "cli.ts",
   "type": "module",
   "author": "Graphene Systems Inc",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "license": "Elastic-2.0",
   "engines": {
     "node": ">=16"