@malloydata/malloy 0.0.391 → 0.0.392

package/dist/model/utils.js

@@ -23,6 +23,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenerateState = exports.AndChain = void 0;
+exports.typeDefToString = typeDefToString;
 exports.indent = indent;
 exports.generateSQLStringLiteral = generateSQLStringLiteral;
 exports.generateHash = generateHash;
@@ -42,6 +43,46 @@ const uuid_1 = require("uuid");
 const sha256_1 = require("@noble/hashes/sha256");
 const utils_1 = require("@noble/hashes/utils");
 const malloy_types_1 = require("./malloy_types");
+/**
+ * Format a typeDef as user-readable Malloy type syntax. Used in error
+ * messages where we want to echo a compound type back to the user in the
+ * same form they wrote it.
+ *
+ *   `string`               → `string`
+ *   `string[]`             → `string[]`
+ *   `{a::string, b::number}` → `{a :: string, b :: number}`
+ *   `{a::string}[]`        → `{a :: string}[]`
+ *   `filter<string>`       → `filter<string>`
+ *   sql-native rawType     → `sql native: jsonb`
+ */
+function typeDefToString(td) {
+    switch (td.type) {
+        case 'array':
+            // Repeated record (`elementTypeDef.type === 'record_element'`) carries
+            // its schema in `fields` on the array itself; basic arrays carry it
+            // in `elementTypeDef`.
+            if (td.elementTypeDef.type === 'record_element' && 'fields' in td) {
+                return `${recordFieldsToString(td.fields)}[]`;
+            }
+            if (td.elementTypeDef.type !== 'record_element') {
+                return `${typeDefToString(td.elementTypeDef)}[]`;
+            }
+            return 'array';
+        case 'record':
+            return recordFieldsToString(td.fields);
+        case 'filter expression':
+            return `filter<${td.filterType}>`;
+        case 'sql native':
+            return td.rawType ? `sql native: ${td.rawType}` : 'sql native';
+        default:
+            return td.type;
+    }
+}
+function recordFieldsToString(fields) {
+    return `{${fields
+        .map(f => `${f.name} :: ${typeDefToString(f)}`)
+        .join(', ')}}`;
+}
 /** simple indent function */
 function indent(s) {
     const re = /(^|\n)/g;

package/dist/to_stable.js

@@ -349,7 +349,7 @@ function getResultStructMetadataAnnotation(field, resultMetadata) {
         for (let i = 0; i < resultMetadata.orderBy.length; i++) {
             const orderBy = resultMetadata.orderBy[i];
             const orderByField = typeof orderBy.field === 'number'
-                ? (_a = field.fields[orderBy.field - 1].as) !== null && _a !== void 0 ? _a : field.fields[orderBy.field - 1].name
+                ? ((_a = field.fields[orderBy.field - 1].as) !== null && _a !== void 0 ? _a : field.fields[orderBy.field - 1].name)
                 : orderBy.field;
             const direction = (_b = orderBy.dir) !== null && _b !== void 0 ? _b : null;
             tag.set(['ordered_by', i, orderByField], direction);

package/dist/util/closest_match.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Return the candidate string closest to `input` by Levenshtein distance,
+ * case-insensitively, or `undefined` if nothing is close enough. The
+ * threshold is `floor(max(input.length, candidate.length) / 3)` (minimum 1),
+ * so very different strings don't produce confusing "did you mean..."
+ * suggestions. Used for unknown-name diagnostics (config keys, given
+ * surface names, etc.).
+ */
+export declare function closestMatch(input: string, candidates: string[]): string | undefined;

package/dist/util/closest_match.js

@@ -0,0 +1,47 @@
+"use strict";
+/*
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.closestMatch = closestMatch;
+/**
+ * Return the candidate string closest to `input` by Levenshtein distance,
+ * case-insensitively, or `undefined` if nothing is close enough. The
+ * threshold is `floor(max(input.length, candidate.length) / 3)` (minimum 1),
+ * so very different strings don't produce confusing "did you mean..."
+ * suggestions. Used for unknown-name diagnostics (config keys, given
+ * surface names, etc.).
+ */
+function closestMatch(input, candidates) {
+    if (candidates.length === 0)
+        return undefined;
+    let best = candidates[0];
+    let bestDist = Infinity;
+    for (const c of candidates) {
+        const dist = levenshtein(input.toLowerCase(), c.toLowerCase());
+        if (dist < bestDist) {
+            bestDist = dist;
+            best = c;
+        }
+    }
+    const maxDist = Math.max(1, Math.floor(Math.max(input.length, best.length) / 3));
+    return bestDist <= maxDist ? best : undefined;
+}
+function levenshtein(a, b) {
+    const m = a.length;
+    const n = b.length;
+    const dp = Array.from({ length: m + 1 }, () => Array(n + 1).fill(0));
+    for (let i = 0; i <= m; i++)
+        dp[i][0] = i;
+    for (let j = 0; j <= n; j++)
+        dp[0][j] = j;
+    for (let i = 1; i <= m; i++) {
+        for (let j = 1; j <= n; j++) {
+            const cost = a[i - 1] === b[j - 1] ? 0 : 1;
+            dp[i][j] = Math.min(dp[i - 1][j] + 1, dp[i][j - 1] + 1, dp[i - 1][j - 1] + cost);
+        }
+    }
+    return dp[m][n];
+}
+//# sourceMappingURL=closest_match.js.map

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.391";
+export declare const MALLOY_VERSION = "0.0.392";

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.391';
+exports.MALLOY_VERSION = '0.0.392';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.391",
+  "version": "0.0.392",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -51,9 +51,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.391",
-    "@malloydata/malloy-interfaces": "0.0.391",
-    "@malloydata/malloy-tag": "0.0.391",
+    "@malloydata/malloy-filter": "0.0.392",
+    "@malloydata/malloy-interfaces": "0.0.392",
+    "@malloydata/malloy-tag": "0.0.392",
     "@noble/hashes": "^1.8.0",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",