Fixing bug for filenames not escaped in compiled graph taget and cann…

…onical target (#1551)
dataform-co · Oct 18, 2023 · 4ee558e · 4ee558e
1 parent 2ce51b4
commit 4ee558e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/core/compilers.ts b/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}\`;
@@ -128,7 +128,7 @@ function compileSqlx(rootNode: SyntaxTreeNode, path: string) {
 
   return `dataform.sqlxAction({
   sqlxConfig: {
-    name: "${utils.baseFilename(path)}",
+    name: "${utils.getEscapedFileName(path)}",
     type: "operations",
     ...${config || "{}"}
   },

diff --git a/core/utils.ts b/core/utils.ts
@@ -33,6 +33,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 => {
@@ -270,6 +274,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) {