@malloydata/malloy 0.0.358 → 0.0.360

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/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.358";
+export declare const MALLOY_VERSION = "0.0.360";

package/dist/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MALLOY_VERSION = void 0;
 // generated with 'generate-version-file' script; do not edit manually
-exports.MALLOY_VERSION = '0.0.358';
+exports.MALLOY_VERSION = '0.0.360';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.358",
+  "version": "0.0.360",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -47,9 +47,9 @@
     "generate-version-file": "VERSION=$(npm pkg get version --workspaces=false | tr -d \\\")\necho \"// generated with 'generate-version-file' script; do not edit manually\\nexport const MALLOY_VERSION = '$VERSION';\" > src/version.ts"
   },
   "dependencies": {
-    "@malloydata/malloy-filter": "0.0.358",
-    "@malloydata/malloy-interfaces": "0.0.358",
-    "@malloydata/malloy-tag": "0.0.358",
+    "@malloydata/malloy-filter": "0.0.360",
+    "@malloydata/malloy-interfaces": "0.0.360",
+    "@malloydata/malloy-tag": "0.0.360",
     "@noble/hashes": "^1.8.0",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",