Merge main to v3

cli/api/BUILD

@@ -18,7 +18,7 @@ ts_library(
         "//core",
         "//protos:ts",
         "//cli/vm:compile_loader",
-        "//sqlx",
+        "//sqlx:lexer",
         "//cli/vm:vm",
         "@npm//@google-cloud/bigquery",
         "@npm//@types/glob",

core/BUILD

@@ -26,7 +26,7 @@ ts_library(
         "//common/protos",
         "//common/strings",
         "//protos:ts",
-        "//sqlx:sqlx",
+        "//sqlx:lexer",
         "@npm//@types/node",
         "@npm//@types/semver",
         "@npm//protobufjs",

core/compilers.ts

@@ -32,7 +32,7 @@ function compileTableSql(code: string, path: string) {
   );
 
   return `
-  publish("${utils.baseFilename(path)}").query(ctx => {
+  publish("${utils.getEscapedFileName(path)}").query(ctx => {
     ${functionsBindings.join("\n")}
     ${js}
     return \`${sql}\`;
@@ -46,7 +46,7 @@ function compileOperationSql(code: string, path: string) {
   );
 
   return `
-  operate("${utils.baseFilename(path)}").queries(ctx => {
+  operate("${utils.getEscapedFileName(path)}").queries(ctx => {
     ${functionsBindings.join("\n")}
     ${js}
     return \`${sql}\`.split("\\n---\\n");
@@ -60,7 +60,7 @@ function compileAssertionSql(code: string, path: string) {
   );
 
   return `
-  assert("${utils.baseFilename(path)}").query(ctx => {
+  assert("${utils.getEscapedFileName(path)}").query(ctx => {
     ${functionsBindings.join("\n")}
     ${js}
     return \`${sql}\`;
@@ -122,13 +122,22 @@ function compileSqlx(rootNode: SyntaxTreeNode, path: string) {
     rootNode
   );
 
-  const contextFunctions = ["self", "ref", "resolve", "name", "when", "incremental", "schema", "database"]
+  const contextFunctions = [
+    "self",
+    "ref",
+    "resolve",
+    "name",
+    "when",
+    "incremental",
+    "schema",
+    "database"
+  ]
     .map(name => `const ${name} = ctx.${name} ? ctx.${name}.bind(ctx) : undefined;`)
     .join("\n");
 
   return `dataform.sqlxAction({
   sqlxConfig: {
-    name: "${utils.baseFilename(path)}",
+    name: "${utils.getEscapedFileName(path)}",
     type: "operations",
     ...${config || "{}"}
   },

core/utils.ts

@@ -32,6 +32,10 @@ export function baseFilename(fullPath: string) {
     .split(".")[0];
 }
 
+export function getEscapedFileName(path: string) {
+  return baseFilename(path).replace(/\\/g, '\\\\')
+}
+
 export function matchPatterns(patterns: string[], values: string[]) {
   const fullyQualifiedActions: string[] = [];
   patterns.forEach(pattern => {
@@ -262,6 +266,7 @@ export function tableTypeEnumToString(enumType: dataform.TableType) {
   return dataform.TableType[enumType].toLowerCase();
 }
 
+
 export function setOrValidateTableEnumType(table: dataform.ITable) {
   let enumTypeFromStr: dataform.TableType | null = null;
   if (table.type !== "" && table.type !== undefined) {

examples/BUILD

@@ -1,8 +1,35 @@
-package(default_visibility = ["//visibility:public"])
+load("//testing:index.bzl", "ts_test_suite")
+load("//tools:node_modules.bzl", "node_modules")
+
+package(default_visibility = ["//visibility:private"])
 
 filegroup(
-    name = "examples",
+    name = "all_projects",
     srcs = glob([
         "**/*.*",
-    ]),
+    ], exclude = ["BUILD", "examples_test.ts"]),
+)
+
+ts_test_suite(
+    name = "tests",
+    srcs = ["examples_test.ts"],
+    data = [
+        ":all_projects",
+        ":node_modules",
+    ],
+    deps = [
+        "//cli/api",
+        "//testing",
+        "//tests/utils",
+        "@npm//@types/chai",
+        "@npm//chai",
+    ],
+)
+
+node_modules(
+    name = "node_modules",
+    deps = [
+        "//packages/@dataform/core:package_tar",
+    ],
+    for_subdirectory = "stackoverflow_reporter",
 )

examples/examples_test.ts

@@ -0,0 +1,11 @@
+import { expect } from "chai";
+
+import { compile } from "df/cli/api";
+import { suite, test } from "df/testing";
+
+suite("examples", () => {
+  test("example Dataform projects compile", async () => {
+    const graph = await compile({ projectDir: "examples/stackoverflow_reporter" });
+    expect(graph.graphErrors.compilationErrors.length).equals(0);
+  });
+});

examples/stackoverflow_reporter/dataform.json

@@ -0,0 +1,7 @@
+{
+  "defaultSchema": "dataform",
+  "assertionSchema": "dataform_assertions",
+  "warehouse": "bigquery",
+  "defaultDatabase": "dataform-demos",
+  "defaultLocation": "us"
+}

examples/stackoverflow_reporter/definitions/reporting/posts_combined.sqlx

@@ -0,0 +1,36 @@
+config {
+  type: "table",
+  schema: "reporting",
+  tags: ["daily"],
+  bigquery: {
+    partitionBy: "date(created_at)"
+  },
+  description: "Combine both questions and answers into a single posts_all table",
+  assertions: {
+    uniqueKey: ["post_id"]
+  }
+}
+
+select
+  post_id,
+  created_at,
+  type,
+  title,
+  body,
+  owner_user_id,
+  parent_id
+from
+  ${ref("stg_posts_answers")}
+
+union all
+
+select
+  post_id,
+  created_at,
+  type,
+  title,
+  body,
+  owner_user_id,
+  parent_id
+from
+  ${ref("stg_posts_questions")}