@malloydata/malloy 0.0.359 → 0.0.361

package/dist/annotation.js

@@ -39,7 +39,7 @@ function annotationToTag(annote, spec = {}) {
             startLine: note.at.range.start.line,
             startColumn: note.at.range.start.character,
         };
-        const noteParse = session.parse(note.text, origin);
+        const noteParse = session.parseAnnotation(note.text, origin);
         allErrs.push(...noteParse.log.map((e) => mapMalloyError(e, note)));
     }
     const tag = session.finish();
@@ -54,10 +54,10 @@ function annotationToTag(annote, spec = {}) {
     return { tag, log: allErrs };
 }
 function mapMalloyError(e, note) {
-    // Calculate prefix length (same logic as parseTagLine)
+    // Calculate prefix length (same logic as stripPrefix in malloy-tag)
     let prefixLen = 0;
     if (note.text[0] === '#') {
-        const skipTo = note.text.indexOf(' ');
+        const skipTo = note.text.search(/[ \n]/);
         if (skipTo > 0) {
             prefixLen = skipTo;
         }
@@ -65,6 +65,9 @@ function mapMalloyError(e, note) {
     // Map error position to source location
     // e.line is 0-based line within the (stripped) input
     // e.offset is 0-based column within that line
+    // TODO: For block annotations, lines > 0 have indentation stripped by
+    // stripBlockIndent, so e.offset doesn't account for the removed columns.
+    // This makes error squigglies misaligned on block annotation body lines.
     const line = note.at.range.start.line + e.line;
     const character = e.line === 0
         ? note.at.range.start.character + prefixLen + e.offset

package/dist/connection/registry.d.ts

@@ -6,7 +6,7 @@ export type ConnectionTypeFactory = (config: ConnectionConfig) => Promise<Connec
 /**
  * The type of a connection property value.
  */
-export type ConnectionPropertyType = 'string' | 'number' | 'boolean' | 'password' | 'secret' | 'file' | 'text';
+export type ConnectionPropertyType = 'string' | 'number' | 'boolean' | 'password' | 'secret' | 'file' | 'json' | 'text';
 /**
  * Describes a single configuration property for a connection type.
  */
@@ -35,9 +35,16 @@ export type ValueRef = {
     env: string;
 };
 /**
- * The type of a config property value: a literal, an env reference, or undefined.
+ * A JSON-compatible value for structured config properties (e.g. SSL options).
  */
-export type ConfigValue = string | number | boolean | ValueRef | undefined;
+export type JsonConfigValue = string | number | boolean | null | JsonConfigValue[] | {
+    [key: string]: JsonConfigValue;
+};
+/**
+ * The type of a config property value: a literal, an env reference, a JSON
+ * object, or undefined.
+ */
+export type ConfigValue = string | number | boolean | ValueRef | JsonConfigValue | undefined;
 /**
  * Type guard for ValueRef.
  */

package/dist/connection/registry.js

@@ -18,7 +18,11 @@ exports.createConnectionsFromConfig = createConnectionsFromConfig;
  * Type guard for ValueRef.
  */
 function isValueRef(value) {
-    return typeof value === 'object' && value !== null && 'env' in value;
+    return (typeof value === 'object' &&
+        value !== null &&
+        !Array.isArray(value) &&
+        Object.keys(value).length === 1 &&
+        'env' in value);
 }
 /**
  * Resolve a ValueRef to a string by looking up the environment variable.
@@ -115,12 +119,13 @@ function createConnectionsFromConfig(config) {
                 throw new Error(`No registered connection type "${entry.is}" for connection "${connectionName}". ` +
                     'Did you forget to import the connection package?');
             }
+            const jsonKeys = new Set(typeDef.properties.filter(p => p.type === 'json').map(p => p.name));
             const connConfig = { name: connectionName };
             for (const [key, value] of Object.entries(entry)) {
                 if (key === 'is')
                     continue;
-                if (value !== undefined) {
-                    if (isValueRef(value)) {
+                if (value !== undefined && value !== null) {
+                    if (!jsonKeys.has(key) && isValueRef(value)) {
                         const resolved = resolveValue(value);
                         if (resolved !== undefined) {
                             connConfig[key] = resolved;

package/dist/connection/types.d.ts

@@ -47,7 +47,9 @@ export interface InfoConnection {
      */
     getDigest(): string;
 }
-export type ConnectionParameterValue = string | number | boolean | Array<ConnectionParameterValue>;
+export type ConnectionParameterValue = string | number | boolean | null | Array<ConnectionParameterValue> | {
+    [key: string]: ConnectionParameterValue;
+};
 export interface ConnectionConfig {
     name: string;
     [key: string]: ConnectionParameterValue | undefined;

package/dist/index.d.ts

@@ -10,7 +10,7 @@ export type { QueryOptionsReader, RunSQLOptions } from './run_sql_options';
 export type { EventStream, ModelString, ModelURL, QueryString, QueryURL, URLReader, InvalidationKey, } from './runtime_types';
 export type { Connection, ConnectionConfig, ConnectionParameterValue, FetchSchemaOptions, InfoConnection, LookupConnection, PersistSQLResults, PooledConnection, TestableConnection, StreamingConnection, } from './connection/types';
 export { registerConnectionType, getConnectionProperties, getConnectionTypeDisplayName, getRegisteredConnectionTypes, isValueRef, resolveValue, } from './connection/registry';
-export type { ConnectionTypeFactory, ConnectionPropertyType, ConnectionPropertyDefinition, ConnectionTypeDef, ConnectionConfigEntry, ConnectionsConfig, ConfigValue, ValueRef, } from './connection/registry';
+export type { ConnectionTypeFactory, ConnectionPropertyType, ConnectionPropertyDefinition, ConnectionTypeDef, ConnectionConfigEntry, ConnectionsConfig, ConfigValue, JsonConfigValue, ValueRef, } from './connection/registry';
 export { toAsyncGenerator } from './connection_utils';
 export { modelDefToModelInfo, sourceDefToSourceInfo } from './to_stable';
 export * as API from './api';

package/dist/lang/lib/Malloy/MalloyLexer.d.ts

@@ -1,6 +1,7 @@
 import { ATN } from "antlr4ts/atn/ATN";
 import { CharStream } from "antlr4ts/CharStream";
 import { Lexer } from "antlr4ts/Lexer";
+import { RuleContext } from "antlr4ts/RuleContext";
 import { Vocabulary } from "antlr4ts/Vocabulary";
 export declare class MalloyLexer extends Lexer {
     static readonly ACCEPT = 1;
@@ -122,61 +123,66 @@ export declare class MalloyLexer extends Lexer {
     static readonly SQ_STRING = 117;
     static readonly DQ_STRING = 118;
     static readonly BQ_STRING = 119;
-    static readonly DOC_ANNOTATION = 120;
-    static readonly ANNOTATION = 121;
-    static readonly AMPER = 122;
-    static readonly ARROW = 123;
-    static readonly FAT_ARROW = 124;
-    static readonly OPAREN = 125;
-    static readonly CPAREN = 126;
-    static readonly OBRACK = 127;
-    static readonly CBRACK = 128;
-    static readonly OCURLY = 129;
-    static readonly CCURLY = 130;
-    static readonly DOUBLECOLON = 131;
-    static readonly TRIPLECOLON = 132;
-    static readonly EXCLAM = 133;
-    static readonly COLON = 134;
-    static readonly COMMA = 135;
-    static readonly DOT = 136;
-    static readonly LT = 137;
-    static readonly GT = 138;
-    static readonly EQ = 139;
-    static readonly NE = 140;
-    static readonly LTE = 141;
-    static readonly GTE = 142;
-    static readonly PLUS = 143;
-    static readonly MINUS = 144;
-    static readonly STAR = 145;
-    static readonly STARSTAR = 146;
-    static readonly SLASH = 147;
-    static readonly BAR = 148;
-    static readonly SEMI = 149;
-    static readonly NOT_MATCH = 150;
-    static readonly MATCH = 151;
-    static readonly PERCENT = 152;
-    static readonly DOUBLE_QMARK = 153;
-    static readonly QMARK = 154;
-    static readonly LITERAL_TIMESTAMP = 155;
-    static readonly LITERAL_HOUR = 156;
-    static readonly LITERAL_DAY = 157;
-    static readonly LITERAL_QUARTER = 158;
-    static readonly LITERAL_MONTH = 159;
-    static readonly LITERAL_WEEK = 160;
-    static readonly LITERAL_YEAR = 161;
-    static readonly IDENTIFIER = 162;
-    static readonly PERCENT_LITERAL = 163;
-    static readonly NUMERIC_LITERAL = 164;
-    static readonly INTEGER_LITERAL = 165;
-    static readonly BLOCK_COMMENT = 166;
-    static readonly COMMENT_TO_EOL = 167;
-    static readonly WHITE_SPACE = 168;
-    static readonly SQL_BEGIN = 169;
-    static readonly UNWATED_CHARS_TRAILING_NUMBERS = 170;
-    static readonly UNEXPECTED_CHAR = 171;
-    static readonly OPEN_CODE = 172;
-    static readonly SQL_END = 173;
+    static readonly DOC_BLOCK_ANNOTATION_BEGIN = 120;
+    static readonly BLOCK_ANNOTATION_BEGIN = 121;
+    static readonly DOC_ANNOTATION = 122;
+    static readonly ANNOTATION = 123;
+    static readonly AMPER = 124;
+    static readonly ARROW = 125;
+    static readonly FAT_ARROW = 126;
+    static readonly OPAREN = 127;
+    static readonly CPAREN = 128;
+    static readonly OBRACK = 129;
+    static readonly CBRACK = 130;
+    static readonly OCURLY = 131;
+    static readonly CCURLY = 132;
+    static readonly DOUBLECOLON = 133;
+    static readonly TRIPLECOLON = 134;
+    static readonly EXCLAM = 135;
+    static readonly COLON = 136;
+    static readonly COMMA = 137;
+    static readonly DOT = 138;
+    static readonly LT = 139;
+    static readonly GT = 140;
+    static readonly EQ = 141;
+    static readonly NE = 142;
+    static readonly LTE = 143;
+    static readonly GTE = 144;
+    static readonly PLUS = 145;
+    static readonly MINUS = 146;
+    static readonly STAR = 147;
+    static readonly STARSTAR = 148;
+    static readonly SLASH = 149;
+    static readonly BAR = 150;
+    static readonly SEMI = 151;
+    static readonly NOT_MATCH = 152;
+    static readonly MATCH = 153;
+    static readonly PERCENT = 154;
+    static readonly DOUBLE_QMARK = 155;
+    static readonly QMARK = 156;
+    static readonly LITERAL_TIMESTAMP = 157;
+    static readonly LITERAL_HOUR = 158;
+    static readonly LITERAL_DAY = 159;
+    static readonly LITERAL_QUARTER = 160;
+    static readonly LITERAL_MONTH = 161;
+    static readonly LITERAL_WEEK = 162;
+    static readonly LITERAL_YEAR = 163;
+    static readonly IDENTIFIER = 164;
+    static readonly PERCENT_LITERAL = 165;
+    static readonly NUMERIC_LITERAL = 166;
+    static readonly INTEGER_LITERAL = 167;
+    static readonly BLOCK_COMMENT = 168;
+    static readonly COMMENT_TO_EOL = 169;
+    static readonly WHITE_SPACE = 170;
+    static readonly SQL_BEGIN = 171;
+    static readonly UNWATED_CHARS_TRAILING_NUMBERS = 172;
+    static readonly UNEXPECTED_CHAR = 173;
+    static readonly OPEN_CODE = 174;
+    static readonly SQL_END = 175;
+    static readonly BLOCK_ANNOTATION_END = 176;
+    static readonly BLOCK_ANNOTATION_TEXT = 177;
     static readonly SQL_MODE = 1;
+    static readonly BLOCK_ANNOTATION_MODE = 2;
     static readonly channelNames: string[];
     static readonly modeNames: string[];
     static readonly ruleNames: string[];
@@ -184,17 +190,26 @@ export declare class MalloyLexer extends Lexer {
     private static readonly _SYMBOLIC_NAMES;
     static readonly VOCABULARY: Vocabulary;
     get vocabulary(): Vocabulary;
+    _blockAnnotationColumn: number;
+    _blockAnnotationCloser: string;
+    isBlockAnnotationCloseLine(): boolean;
     constructor(input: CharStream);
     get grammarFileName(): string;
     get ruleNames(): string[];
     get serializedATN(): string;
     get channelNames(): string[];
     get modeNames(): string[];
+    action(_localctx: RuleContext, ruleIndex: number, actionIndex: number): void;
+    private DOC_BLOCK_ANNOTATION_BEGIN_action;
+    private BLOCK_ANNOTATION_BEGIN_action;
+    sempred(_localctx: RuleContext, ruleIndex: number, predIndex: number): boolean;
+    private BLOCK_ANNOTATION_END_sempred;
     private static readonly _serializedATNSegments;
     private static readonly _serializedATNSegment0;
     private static readonly _serializedATNSegment1;
     private static readonly _serializedATNSegment2;
     private static readonly _serializedATNSegment3;
+    private static readonly _serializedATNSegment4;
     static readonly _serializedATN: string;
     static __ATN: ATN;
     static get _ATN(): ATN;