@malloydata/malloy 0.0.10-dev221124165006 → 0.0.10-dev221128232158

package/dist/dialect/dialect.d.ts

@@ -54,6 +54,7 @@ export declare abstract class Dialect {
     ignoreInProject(_fieldName: string): boolean;
     abstract sqlCast(cast: TypecastFragment): Expr;
     abstract sqlLiteralTime(timeString: string, type: TimeFieldType, timezone: string): string;
+    abstract sqlLiteralString(literak: string): string;
     abstract sqlRegexpMatch(expr: Expr, regex: string): Expr;
     getFunctionInfo(functionName: string): FunctionInfo | undefined;
     dialectExpr(df: DialectFragment): Expr;

package/dist/dialect/dialect.js

@@ -58,6 +58,8 @@ class Dialect {
             }
             case "timeLiteral":
                 return [this.sqlLiteralTime(df.literal, df.literalType, df.timezone)];
+            case "stringLiteral":
+                return [this.sqlLiteralString(df.literal)];
         }
     }
     sqlSumDistinct(_key, _value) {

package/dist/dialect/duckdb.d.ts

@@ -46,4 +46,5 @@ export declare class DuckDBDialect extends Dialect {
     sqlSumDistinct(key: string, value: string): string;
     sqlSampleTable(tableSQL: string, sample: Sampling | undefined): string;
     sqlOrderBy(orderTerms: string[]): string;
+    sqlLiteralString(literal: string): string;
 }

package/dist/dialect/duckdb.js

@@ -342,6 +342,9 @@ class DuckDBDialect extends dialect_1.Dialect {
     sqlOrderBy(orderTerms) {
         return `ORDER BY ${orderTerms.map((t) => `${t} NULLS LAST`).join(",")}`;
     }
+    sqlLiteralString(literal) {
+        return "'" + literal.replace(/'/g, "''") + "'";
+    }
 }
 exports.DuckDBDialect = DuckDBDialect;
 //# sourceMappingURL=duckdb.js.map

package/dist/dialect/postgres.d.ts

@@ -46,4 +46,5 @@ export declare class PostgresDialect extends Dialect {
     sqlSumDistinct(key: string, value: string): string;
     sqlSampleTable(tableSQL: string, sample: Sampling | undefined): string;
     sqlOrderBy(orderTerms: string[]): string;
+    sqlLiteralString(literal: string): string;
 }

package/dist/dialect/postgres.js

@@ -310,6 +310,9 @@ class PostgresDialect extends dialect_1.Dialect {
     sqlOrderBy(orderTerms) {
         return `ORDER BY ${orderTerms.map((t) => `${t} NULLS LAST`).join(",")}`;
     }
+    sqlLiteralString(literal) {
+        return "'" + literal.replace(/'/g, "''") + "'";
+    }
 }
 exports.PostgresDialect = PostgresDialect;
 //# sourceMappingURL=postgres.js.map

package/dist/dialect/standardsql.d.ts

@@ -43,4 +43,5 @@ export declare class StandardSQLDialect extends Dialect {
     sqlLiteralTime(timeString: string, type: "date" | "timestamp", timezone: string): string;
     sqlMeasureTime(from: TimeValue, to: TimeValue, units: string): Expr;
     sqlSampleTable(tableSQL: string, sample: Sampling | undefined): string;
+    sqlLiteralString(literal: string): string;
 }

package/dist/dialect/standardsql.js

@@ -357,6 +357,10 @@ ${(0, utils_1.indent)(sql)}
         }
         return tableSQL;
     }
+    sqlLiteralString(literal) {
+        const noVirgule = literal.replace(/\\/g, "\\\\");
+        return "'" + noVirgule.replace(/'/g, "\\'") + "'";
+    }
 }
 exports.StandardSQLDialect = StandardSQLDialect;
 //# sourceMappingURL=standardsql.js.map

package/dist/lang/ast/ast-expr.d.ts

@@ -71,9 +71,9 @@ export declare class FieldDeclaration extends MalloyElement {
 export declare class TypeMistmatch extends Error {
 }
 export declare class ExprString extends ExpressionDef {
-    readonly value: string;
     elementType: string;
-    constructor(value: string);
+    value: string;
+    constructor(src: string);
     getExpression(_fs: FieldSpace): ExprValue;
 }
 export declare class ExprNumber extends ExpressionDef {

package/dist/lang/ast/ast-expr.js

@@ -221,13 +221,24 @@ class TypeMistmatch extends Error {
 }
 exports.TypeMistmatch = TypeMistmatch;
 class ExprString extends ExpressionDef {
-    constructor(value) {
+    constructor(src) {
         super();
-        this.value = value;
         this.elementType = "string literal";
+        const bareStr = src.slice(1, -1);
+        const val = bareStr.replace(/\\(.)/g, "$1");
+        this.value = val;
     }
     getExpression(_fs) {
-        return { ...index_1.FT.stringT, value: [this.value] };
+        return {
+            ...index_1.FT.stringT,
+            value: [
+                {
+                    type: "dialect",
+                    function: "stringLiteral",
+                    literal: this.value,
+                },
+            ],
+        };
     }
 }
 exports.ExprString = ExprString;

package/dist/model/malloy_query.js

@@ -1269,6 +1269,8 @@ class QueryQuery extends QueryField {
                         break;
                     case "timeLiteral":
                         break;
+                    case "stringLiteral":
+                        break;
                     case "timeDiff":
                         expressions.push(expr.left.value, expr.right.value);
                         break;

package/dist/model/malloy_types.d.ts

@@ -184,7 +184,11 @@ export interface TimeLiteralFragment extends DialectFragmentBase {
     literalType: TimeFieldType;
     timezone: string;
 }
-export declare type DialectFragment = DivFragment | TimeLiteralFragment | NowFragment | TimeDeltaFragment | TimeDiffFragment | TimeTruncFragment | TypecastFragment | TimeExtractFragment | RegexpMatchFragment;
+export interface StringLiteralFragment extends DialectFragmentBase {
+    function: "stringLiteral";
+    literal: string;
+}
+export declare type DialectFragment = DivFragment | TimeLiteralFragment | NowFragment | TimeDeltaFragment | TimeDiffFragment | TimeTruncFragment | TypecastFragment | TimeExtractFragment | StringLiteralFragment | RegexpMatchFragment;
 export declare type Fragment = string | ApplyFragment | ApplyValueFragment | FieldFragment | ParameterFragment | FilterFragment | AggregateFragment | UngroupFragment | DialectFragment;
 export declare type Expr = Fragment[];
 export interface TypedValue {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.10-dev221124165006",
+  "version": "0.0.10-dev221128232158",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",