@databricks/appkit 0.15.0 → 0.16.0

package/dist/type-generator/query-registry.js

@@ -3,12 +3,29 @@ import { CACHE_VERSION, hashSQL, loadCache, saveCache } from "./cache.js";
 import { Spinner } from "./spinner.js";
 import { sqlTypeToHelper, sqlTypeToMarker } from "./types.js";
 import { WorkspaceClient } from "@databricks/sdk-experimental";
+import fs from "node:fs/promises";
 import path from "node:path";
-import fs from "node:fs";
+import pc from "picocolors";
 
 //#region src/type-generator/query-registry.ts
 const logger = createLogger("type-generator:query-registry");
 /**
+* Parse a raw API/SDK error into a structured code + message.
+* Handles Databricks-style JSON bodies embedded in the message string,
+* e.g. `Response from server (Bad Request) {"error_code":"...","message":"..."}`.
+*/
+function parseError(raw) {
+	const jsonMatch = raw.match(/\{[\s\S]*\}/);
+	if (jsonMatch) try {
+		const parsed = JSON.parse(jsonMatch[0]);
+		if (parsed.error_code || parsed.message) return {
+			code: parsed.error_code,
+			message: parsed.message || raw
+		};
+	} catch {}
+	return { message: raw };
+}
+/**
 * Extract parameters from a SQL query
 * @param sql - the SQL query to extract parameters from
 * @returns an array of parameter names
@@ -69,19 +86,6 @@ function generateUnknownResultQuery(sql, queryName) {
     result: unknown;
   }`;
 }
-function cacheFailedQuery(cache, querySchemas, sql, queryName, sqlHash) {
-	const type = generateUnknownResultQuery(sql, queryName);
-	querySchemas.push({
-		name: queryName,
-		type
-	});
-	cache.queries[queryName] = {
-		hash: sqlHash,
-		type,
-		retry: true
-	};
-	saveCache(cache);
-}
 function extractParameterTypes(sql) {
 	const paramTypes = {};
 	const matches = sql.matchAll(/--\s*@param\s+(\w+)\s+(STRING|NUMERIC|BOOLEAN|DATE|TIMESTAMP|BINARY)/gi);
@@ -101,67 +105,176 @@ function extractParameterTypes(sql) {
 * @returns an array of query schemas
 */
 async function generateQueriesFromDescribe(queryFolder, warehouseId, options = {}) {
-	const { noCache = false } = options;
-	const queryFiles = fs.readdirSync(queryFolder).filter((file) => file.endsWith(".sql"));
-	logger.debug("Found %d SQL queries", queryFiles.length);
-	const cache = noCache ? {
+	const { noCache = false, concurrency: rawConcurrency = 10 } = options;
+	const concurrency = typeof rawConcurrency === "number" && Number.isFinite(rawConcurrency) ? Math.max(1, Math.floor(rawConcurrency)) : 10;
+	const [allFiles, cache] = await Promise.all([fs.readdir(queryFolder), noCache ? {
 		version: CACHE_VERSION,
 		queries: {}
-	} : loadCache();
+	} : loadCache()]);
+	const queryFiles = allFiles.filter((file) => file.endsWith(".sql"));
+	logger.debug("Found %d SQL queries", queryFiles.length);
 	const client = new WorkspaceClient({});
-	const querySchemas = [];
 	const spinner = new Spinner();
+	const sqlContents = await Promise.all(queryFiles.map((file) => fs.readFile(path.join(queryFolder, file), "utf8")));
+	const startTime = performance.now();
+	const cachedResults = [];
+	const uncachedQueries = [];
+	const logEntries = [];
 	for (let i = 0; i < queryFiles.length; i++) {
 		const file = queryFiles[i];
 		const queryName = normalizeQueryName(path.basename(file, ".sql"));
-		const sql = fs.readFileSync(path.join(queryFolder, file), "utf8");
+		const sql = sqlContents[i];
 		const sqlHash = hashSQL(sql);
 		const cached = cache.queries[queryName];
 		if (cached && cached.hash === sqlHash && !cached.retry) {
-			querySchemas.push({
-				name: queryName,
-				type: cached.type
+			cachedResults.push({
+				index: i,
+				schema: {
+					name: queryName,
+					type: cached.type
+				}
+			});
+			logEntries.push({
+				queryName,
+				status: "HIT"
+			});
+		} else {
+			const cleanedSql = sql.replace(/:([a-zA-Z_]\w*)/g, "''").trim().replace(/;\s*$/, "");
+			uncachedQueries.push({
+				index: i,
+				queryName,
+				sql,
+				sqlHash,
+				cleanedSql
 			});
-			spinner.start(`Processing ${queryName} (${i + 1}/${queryFiles.length})`);
-			spinner.stop(`✓ ${queryName} (cached)`);
-			continue;
 		}
-		spinner.start(`Processing ${queryName} (${i + 1}/${queryFiles.length})`);
-		const cleanedSql = sql.replace(/:([a-zA-Z_]\w*)/g, "''").trim().replace(/;\s*$/, "");
-		try {
+	}
+	const freshResults = [];
+	if (uncachedQueries.length > 0) {
+		let completed = 0;
+		const total = uncachedQueries.length;
+		spinner.start(`Describing ${total} ${total === 1 ? "query" : "queries"} (0/${total})`);
+		const describeOne = async ({ index, queryName, sql, sqlHash, cleanedSql }) => {
 			const result = await client.statementExecution.executeStatement({
 				statement: `DESCRIBE QUERY ${cleanedSql}`,
 				warehouse_id: warehouseId
 			});
+			completed++;
+			spinner.update(`Describing ${total} ${total === 1 ? "query" : "queries"} (${completed}/${total})`);
+			logger.debug("DESCRIBE result for %s: state=%s, rows=%d", queryName, result.status.state, result.result?.data_array?.length ?? 0);
 			if (result.status.state === "FAILED") {
 				const sqlError = result.status.error?.message || "Query execution failed";
-				cacheFailedQuery(cache, querySchemas, sql, queryName, sqlHash);
-				spinner.stop(`✗ ${queryName} - failed`);
-				spinner.printDetail(`SQL Error: ${sqlError}`);
-				spinner.printDetail(`Query: ${cleanedSql.slice(0, 200)}`);
-				continue;
+				logger.warn("DESCRIBE failed for %s: %s", queryName, sqlError);
+				const type = generateUnknownResultQuery(sql, queryName);
+				return {
+					status: "fail",
+					index,
+					schema: {
+						name: queryName,
+						type
+					},
+					cacheEntry: {
+						hash: sqlHash,
+						type,
+						retry: true
+					},
+					error: parseError(sqlError)
+				};
 			}
 			const { type, hasResults } = convertToQueryType(result, sql, queryName);
-			querySchemas.push({
-				name: queryName,
-				type
-			});
-			const retry = !hasResults;
-			cache.queries[queryName] = {
-				hash: sqlHash,
-				type,
-				retry
+			return {
+				status: "ok",
+				index,
+				schema: {
+					name: queryName,
+					type
+				},
+				cacheEntry: {
+					hash: sqlHash,
+					type,
+					retry: !hasResults
+				}
 			};
-			saveCache(cache);
-			spinner.stop(`✓ ${queryName}`);
-		} catch (error) {
-			const errorMessage = error instanceof Error ? error.message : "Unknown error";
-			spinner.stop(`✗ ${queryName}`);
-			spinner.printDetail(errorMessage);
-			cacheFailedQuery(cache, querySchemas, sql, queryName, sqlHash);
+		};
+		const processBatchResults = (settled, batchOffset) => {
+			for (let i = 0; i < settled.length; i++) {
+				const entry = settled[i];
+				const { queryName } = uncachedQueries[batchOffset + i];
+				if (entry.status === "fulfilled") {
+					const res = entry.value;
+					freshResults.push({
+						index: res.index,
+						schema: res.schema
+					});
+					cache.queries[queryName] = res.cacheEntry;
+					logEntries.push({
+						queryName,
+						status: "MISS",
+						failed: res.status === "fail",
+						error: res.status === "fail" ? res.error : void 0
+					});
+				} else {
+					const { sql, sqlHash, index } = uncachedQueries[batchOffset + i];
+					const reason = entry.reason instanceof Error ? entry.reason.message : String(entry.reason);
+					logger.warn("DESCRIBE rejected for %s: %s", queryName, reason);
+					const type = generateUnknownResultQuery(sql, queryName);
+					freshResults.push({
+						index,
+						schema: {
+							name: queryName,
+							type
+						}
+					});
+					cache.queries[queryName] = {
+						hash: sqlHash,
+						type,
+						retry: true
+					};
+					logEntries.push({
+						queryName,
+						status: "MISS",
+						failed: true,
+						error: parseError(reason)
+					});
+				}
+			}
+		};
+		if (uncachedQueries.length > concurrency) for (let b = 0; b < uncachedQueries.length; b += concurrency) {
+			const batch = uncachedQueries.slice(b, b + concurrency);
+			processBatchResults(await Promise.allSettled(batch.map(describeOne)), b);
+			await saveCache(cache);
+		}
+		else {
+			processBatchResults(await Promise.allSettled(uncachedQueries.map(describeOne)), 0);
+			await saveCache(cache);
+		}
+		spinner.stop("");
+	}
+	const elapsed = ((performance.now() - startTime) / 1e3).toFixed(2);
+	if (logEntries.length > 0) {
+		const maxNameLen = Math.max(...logEntries.map((e) => e.queryName.length));
+		const separator = pc.dim("─".repeat(50));
+		console.log("");
+		console.log(`  ${pc.bold("Typegen Queries")} ${pc.dim(`(${logEntries.length})`)}`);
+		console.log(`  ${separator}`);
+		for (const entry of logEntries) {
+			const tag = entry.failed ? pc.bold(pc.red("ERROR")) : entry.status === "HIT" ? `cache ${pc.bold(pc.green("HIT  "))}` : `cache ${pc.bold(pc.yellow("MISS "))}`;
+			const rawName = entry.queryName.padEnd(maxNameLen);
+			const name = entry.failed ? pc.dim(pc.strikethrough(rawName)) : rawName;
+			const errorCode = entry.error?.message.match(/\[([^\]]+)\]/)?.[1];
+			const reason = errorCode ? `  ${pc.dim(errorCode)}` : "";
+			console.log(`  ${tag}  ${name}${reason}`);
 		}
+		const newCount = logEntries.filter((e) => e.status === "MISS" && !e.failed).length;
+		const cacheCount = logEntries.filter((e) => e.status === "HIT" && !e.failed).length;
+		const errorCount = logEntries.filter((e) => e.failed).length;
+		console.log(`  ${separator}`);
+		const parts = [`${newCount} new`, `${cacheCount} from cache`];
+		if (errorCount > 0) parts.push(`${errorCount} ${errorCount === 1 ? "error" : "errors"}`);
+		console.log(`  ${parts.join(", ")}. ${pc.dim(`${elapsed}s`)}`);
+		console.log("");
 	}
-	return querySchemas;
+	return [...cachedResults, ...freshResults].sort((a, b) => a.index - b.index).map((r) => r.schema);
 }
 /**
 * Normalize query name by removing the .obo extension

package/dist/type-generator/query-registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"query-registry.js","names":[],"sources":["../../src/type-generator/query-registry.ts"],"sourcesContent":["import fs from \"node:fs\";\nimport path from \"node:path\";\nimport { WorkspaceClient } from \"@databricks/sdk-experimental\";\nimport { createLogger } from \"../logging/logger\";\nimport { CACHE_VERSION, hashSQL, loadCache, saveCache } from \"./cache\";\nimport { Spinner } from \"./spinner\";\nimport {\n  type DatabricksStatementExecutionResponse,\n  type QuerySchema,\n  sqlTypeToHelper,\n  sqlTypeToMarker,\n} from \"./types\";\n\nconst logger = createLogger(\"type-generator:query-registry\");\n\n/**\n * Extract parameters from a SQL query\n * @param sql - the SQL query to extract parameters from\n * @returns an array of parameter names\n */\nexport function extractParameters(sql: string): string[] {\n  const matches = sql.matchAll(/:([a-zA-Z_]\\w*)/g);\n  const params = new Set<string>();\n  for (const match of matches) {\n    params.add(match[1]);\n  }\n  return Array.from(params);\n}\n\n// parameters that are injected by the server\nexport const SERVER_INJECTED_PARAMS = [\"workspaceId\"];\n\n/**\n * Generates the TypeScript type literal for query parameters from SQL.\n * Shared by both the success and failure paths.\n */\nfunction formatParametersType(sql: string): string {\n  const params = extractParameters(sql).filter(\n    (p) => !SERVER_INJECTED_PARAMS.includes(p),\n  );\n  const paramTypes = extractParameterTypes(sql);\n\n  return params.length > 0\n    ? `{\\n      ${params\n        .map((p) => {\n          const sqlType = paramTypes[p];\n          const markerType = sqlType\n            ? sqlTypeToMarker[sqlType]\n            : \"SQLTypeMarker\";\n          const helper = sqlType ? sqlTypeToHelper[sqlType] : \"sql.*()\";\n          return `/** ${sqlType || \"any\"} - use ${helper} */\\n      ${p}: ${markerType}`;\n        })\n        .join(\";\\n      \")};\\n    }`\n    : \"Record<string, never>\";\n}\n\nexport function convertToQueryType(\n  result: DatabricksStatementExecutionResponse,\n  sql: string,\n  queryName: string,\n): { type: string; hasResults: boolean } {\n  const dataRows = result.result?.data_array || [];\n  const columns = dataRows.map((row) => ({\n    name: row[0] || \"\",\n    type_name: row[1]?.toUpperCase() || \"STRING\",\n    comment: row[2] || undefined,\n  }));\n\n  const paramsType = formatParametersType(sql);\n\n  // generate result fields with JSDoc\n  const resultFields = columns.map((column) => {\n    const normalizedType = normalizeTypeName(column.type_name);\n    const mappedType = typeMap[normalizedType] || \"unknown\";\n    // validate column name is a valid identifier\n    const name = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(column.name)\n      ? column.name\n      : `\"${column.name}\"`;\n\n    // generate comment for column\n    const comment = column.comment\n      ? `/** ${column.comment} */\\n      `\n      : `/** @sqlType ${column.type_name} */\\n      `;\n\n    return `${comment}${name}: ${mappedType}`;\n  });\n\n  const hasResults = resultFields.length > 0;\n\n  const type = `{\n    name: \"${queryName}\";\n    parameters: ${paramsType};\n    result: ${\n      hasResults\n        ? `Array<{\n      ${resultFields.join(\";\\n      \")};\n    }>`\n        : \"unknown\"\n    };\n  }`;\n\n  return { type, hasResults };\n}\n\n/**\n * Used when DESCRIBE QUERY fails so the query still appears in QueryRegistry.\n * Generates a type with unknown result from SQL alone (no warehouse call).\n */\nfunction generateUnknownResultQuery(sql: string, queryName: string): string {\n  const paramsType = formatParametersType(sql);\n\n  return `{\n    name: \"${queryName}\";\n    parameters: ${paramsType};\n    result: unknown;\n  }`;\n}\n\nfunction cacheFailedQuery(\n  cache: ReturnType<typeof loadCache>,\n  querySchemas: QuerySchema[],\n  sql: string,\n  queryName: string,\n  sqlHash: string,\n): void {\n  const type = generateUnknownResultQuery(sql, queryName);\n  querySchemas.push({ name: queryName, type });\n  cache.queries[queryName] = { hash: sqlHash, type, retry: true };\n  saveCache(cache);\n}\n\nexport function extractParameterTypes(sql: string): Record<string, string> {\n  const paramTypes: Record<string, string> = {};\n  const regex =\n    /--\\s*@param\\s+(\\w+)\\s+(STRING|NUMERIC|BOOLEAN|DATE|TIMESTAMP|BINARY)/gi;\n  const matches = sql.matchAll(regex);\n  for (const match of matches) {\n    const [, paramName, paramType] = match;\n    paramTypes[paramName] = paramType.toUpperCase();\n  }\n\n  return paramTypes;\n}\n\n/**\n * Generate query schemas from a folder of SQL files\n * It uses DESCRIBE QUERY to get the schema without executing the query\n * @param queryFolder - the folder containing the SQL files\n * @param warehouseId - the warehouse id to use for schema analysis\n * @param options - options for the query generation\n * @param options.noCache - if true, skip the cache and regenerate all types\n * @returns an array of query schemas\n */\nexport async function generateQueriesFromDescribe(\n  queryFolder: string,\n  warehouseId: string,\n  options: { noCache?: boolean } = {},\n): Promise<QuerySchema[]> {\n  const { noCache = false } = options;\n\n  // read all query files in the folder\n  const queryFiles = fs\n    .readdirSync(queryFolder)\n    .filter((file) => file.endsWith(\".sql\"));\n\n  logger.debug(\"Found %d SQL queries\", queryFiles.length);\n\n  // load cache\n  const cache = noCache ? { version: CACHE_VERSION, queries: {} } : loadCache();\n\n  const client = new WorkspaceClient({});\n  const querySchemas: QuerySchema[] = [];\n  const spinner = new Spinner();\n\n  // process each query file\n  for (let i = 0; i < queryFiles.length; i++) {\n    const file = queryFiles[i];\n    const rawName = path.basename(file, \".sql\");\n    const queryName = normalizeQueryName(rawName);\n\n    // read query file content\n    const sql = fs.readFileSync(path.join(queryFolder, file), \"utf8\");\n    const sqlHash = hashSQL(sql);\n\n    // check cache (skip if marked for retry after a failed DESCRIBE)\n    const cached = cache.queries[queryName];\n    if (cached && cached.hash === sqlHash && !cached.retry) {\n      querySchemas.push({ name: queryName, type: cached.type });\n      spinner.start(`Processing ${queryName} (${i + 1}/${queryFiles.length})`);\n      spinner.stop(`✓ ${queryName} (cached)`);\n      continue;\n    }\n\n    spinner.start(`Processing ${queryName} (${i + 1}/${queryFiles.length})`);\n\n    const sqlWithDefaults = sql.replace(/:([a-zA-Z_]\\w*)/g, \"''\");\n\n    // strip trailing semicolon for DESCRIBE QUERY\n    const cleanedSql = sqlWithDefaults.trim().replace(/;\\s*$/, \"\");\n\n    // execute DESCRIBE QUERY to get schema without running the actual query\n    try {\n      const result = (await client.statementExecution.executeStatement({\n        statement: `DESCRIBE QUERY ${cleanedSql}`,\n        warehouse_id: warehouseId,\n      })) as DatabricksStatementExecutionResponse;\n\n      if (result.status.state === \"FAILED\") {\n        const sqlError =\n          result.status.error?.message || \"Query execution failed\";\n        cacheFailedQuery(cache, querySchemas, sql, queryName, sqlHash);\n        spinner.stop(`✗ ${queryName} - failed`);\n        spinner.printDetail(`SQL Error: ${sqlError}`);\n        spinner.printDetail(`Query: ${cleanedSql.slice(0, 200)}`);\n        continue;\n      }\n\n      // convert result to query schema\n      const { type, hasResults } = convertToQueryType(result, sql, queryName);\n      querySchemas.push({ name: queryName, type });\n\n      // update cache immediately so successful results survive partial failures\n      // retry if DESCRIBE returned no columns (result: unknown)\n      const retry = !hasResults;\n      cache.queries[queryName] = { hash: sqlHash, type, retry };\n      saveCache(cache);\n\n      spinner.stop(`✓ ${queryName}`);\n    } catch (error) {\n      const errorMessage =\n        error instanceof Error ? error.message : \"Unknown error\";\n      spinner.stop(`✗ ${queryName}`);\n      spinner.printDetail(errorMessage);\n      cacheFailedQuery(cache, querySchemas, sql, queryName, sqlHash);\n    }\n  }\n\n  return querySchemas;\n}\n\n/**\n * Normalize query name by removing the .obo extension\n * @param queryName - the query name to normalize\n * @returns the normalized query name\n */\nexport function normalizeQueryName(fileName: string): string {\n  return fileName.replace(/\\.obo$/, \"\");\n}\n\n/**\n * Normalize SQL type name by removing parameters/generics\n * Examples:\n *   DECIMAL(38,6) -> DECIMAL\n *   ARRAY<STRING> -> ARRAY\n *   MAP<STRING,INT> -> MAP\n *   STRUCT<name:STRING> -> STRUCT\n *   INTERVAL DAY TO SECOND -> INTERVAL\n *   GEOGRAPHY(4326) -> GEOGRAPHY\n */\nexport function normalizeTypeName(typeName: string): string {\n  return typeName\n    .replace(/\\(.*\\)$/, \"\") // remove (p, s) eg: DECIMAL(38,6) -> DECIMAL\n    .replace(/<.*>$/, \"\") // remove <T> eg: ARRAY<STRING> -> ARRAY\n    .split(\" \")[0]; // take first word eg: INTERVAL DAY TO SECOND -> INTERVAL\n}\n\n/** Type Map for Databricks data types to JavaScript types */\nconst typeMap: Record<string, string> = {\n  // string types\n  STRING: \"string\",\n  BINARY: \"string\",\n  // boolean\n  BOOLEAN: \"boolean\",\n  // numeric types\n  TINYINT: \"number\",\n  SMALLINT: \"number\",\n  INT: \"number\",\n  BIGINT: \"number\",\n  FLOAT: \"number\",\n  DOUBLE: \"number\",\n  DECIMAL: \"number\",\n  // date/time types\n  DATE: \"string\",\n  TIMESTAMP: \"string\",\n  TIMESTAMP_NTZ: \"string\",\n  INTERVAL: \"string\",\n  // complex types\n  ARRAY: \"unknown[]\",\n  MAP: \"Record<string, unknown>\",\n  STRUCT: \"Record<string, unknown>\",\n  OBJECT: \"Record<string, unknown>\",\n  VARIANT: \"unknown\",\n  // spatial types\n  GEOGRAPHY: \"unknown\",\n  GEOMETRY: \"unknown\",\n  // null type\n  VOID: \"null\",\n};\n"],"mappings":";;;;;;;;;AAaA,MAAM,SAAS,aAAa,gCAAgC;;;;;;AAO5D,SAAgB,kBAAkB,KAAuB;CACvD,MAAM,UAAU,IAAI,SAAS,mBAAmB;CAChD,MAAM,yBAAS,IAAI,KAAa;AAChC,MAAK,MAAM,SAAS,QAClB,QAAO,IAAI,MAAM,GAAG;AAEtB,QAAO,MAAM,KAAK,OAAO;;AAI3B,MAAa,yBAAyB,CAAC,cAAc;;;;;AAMrD,SAAS,qBAAqB,KAAqB;CACjD,MAAM,SAAS,kBAAkB,IAAI,CAAC,QACnC,MAAM,CAAC,uBAAuB,SAAS,EAAE,CAC3C;CACD,MAAM,aAAa,sBAAsB,IAAI;AAE7C,QAAO,OAAO,SAAS,IACnB,YAAY,OACT,KAAK,MAAM;EACV,MAAM,UAAU,WAAW;EAC3B,MAAM,aAAa,UACf,gBAAgB,WAChB;EACJ,MAAM,SAAS,UAAU,gBAAgB,WAAW;AACpD,SAAO,OAAO,WAAW,MAAM,SAAS,OAAO,aAAa,EAAE,IAAI;GAClE,CACD,KAAK,YAAY,CAAC,YACrB;;AAGN,SAAgB,mBACd,QACA,KACA,WACuC;CAEvC,MAAM,WADW,OAAO,QAAQ,cAAc,EAAE,EACvB,KAAK,SAAS;EACrC,MAAM,IAAI,MAAM;EAChB,WAAW,IAAI,IAAI,aAAa,IAAI;EACpC,SAAS,IAAI,MAAM;EACpB,EAAE;CAEH,MAAM,aAAa,qBAAqB,IAAI;CAG5C,MAAM,eAAe,QAAQ,KAAK,WAAW;EAE3C,MAAM,aAAa,QADI,kBAAkB,OAAO,UAAU,KACZ;EAE9C,MAAM,OAAO,6BAA6B,KAAK,OAAO,KAAK,GACvD,OAAO,OACP,IAAI,OAAO,KAAK;AAOpB,SAAO,GAJS,OAAO,UACnB,OAAO,OAAO,QAAQ,eACtB,gBAAgB,OAAO,UAAU,eAEjB,KAAK,IAAI;GAC7B;CAEF,MAAM,aAAa,aAAa,SAAS;AAczC,QAAO;EAAE,MAZI;aACF,UAAU;kBACL,WAAW;cAEvB,aACI;QACF,aAAa,KAAK,YAAY,CAAC;UAE7B,UACL;;EAGY;EAAY;;;;;;AAO7B,SAAS,2BAA2B,KAAa,WAA2B;AAG1E,QAAO;aACI,UAAU;kBAHF,qBAAqB,IAAI,CAIjB;;;;AAK7B,SAAS,iBACP,OACA,cACA,KACA,WACA,SACM;CACN,MAAM,OAAO,2BAA2B,KAAK,UAAU;AACvD,cAAa,KAAK;EAAE,MAAM;EAAW;EAAM,CAAC;AAC5C,OAAM,QAAQ,aAAa;EAAE,MAAM;EAAS;EAAM,OAAO;EAAM;AAC/D,WAAU,MAAM;;AAGlB,SAAgB,sBAAsB,KAAqC;CACzE,MAAM,aAAqC,EAAE;CAG7C,MAAM,UAAU,IAAI,SADlB,yEACiC;AACnC,MAAK,MAAM,SAAS,SAAS;EAC3B,MAAM,GAAG,WAAW,aAAa;AACjC,aAAW,aAAa,UAAU,aAAa;;AAGjD,QAAO;;;;;;;;;;;AAYT,eAAsB,4BACpB,aACA,aACA,UAAiC,EAAE,EACX;CACxB,MAAM,EAAE,UAAU,UAAU;CAG5B,MAAM,aAAa,GAChB,YAAY,YAAY,CACxB,QAAQ,SAAS,KAAK,SAAS,OAAO,CAAC;AAE1C,QAAO,MAAM,wBAAwB,WAAW,OAAO;CAGvD,MAAM,QAAQ,UAAU;EAAE,SAAS;EAAe,SAAS,EAAE;EAAE,GAAG,WAAW;CAE7E,MAAM,SAAS,IAAI,gBAAgB,EAAE,CAAC;CACtC,MAAM,eAA8B,EAAE;CACtC,MAAM,UAAU,IAAI,SAAS;AAG7B,MAAK,IAAI,IAAI,GAAG,IAAI,WAAW,QAAQ,KAAK;EAC1C,MAAM,OAAO,WAAW;EAExB,MAAM,YAAY,mBADF,KAAK,SAAS,MAAM,OAAO,CACE;EAG7C,MAAM,MAAM,GAAG,aAAa,KAAK,KAAK,aAAa,KAAK,EAAE,OAAO;EACjE,MAAM,UAAU,QAAQ,IAAI;EAG5B,MAAM,SAAS,MAAM,QAAQ;AAC7B,MAAI,UAAU,OAAO,SAAS,WAAW,CAAC,OAAO,OAAO;AACtD,gBAAa,KAAK;IAAE,MAAM;IAAW,MAAM,OAAO;IAAM,CAAC;AACzD,WAAQ,MAAM,cAAc,UAAU,IAAI,IAAI,EAAE,GAAG,WAAW,OAAO,GAAG;AACxE,WAAQ,KAAK,KAAK,UAAU,WAAW;AACvC;;AAGF,UAAQ,MAAM,cAAc,UAAU,IAAI,IAAI,EAAE,GAAG,WAAW,OAAO,GAAG;EAKxE,MAAM,aAHkB,IAAI,QAAQ,oBAAoB,KAAK,CAG1B,MAAM,CAAC,QAAQ,SAAS,GAAG;AAG9D,MAAI;GACF,MAAM,SAAU,MAAM,OAAO,mBAAmB,iBAAiB;IAC/D,WAAW,kBAAkB;IAC7B,cAAc;IACf,CAAC;AAEF,OAAI,OAAO,OAAO,UAAU,UAAU;IACpC,MAAM,WACJ,OAAO,OAAO,OAAO,WAAW;AAClC,qBAAiB,OAAO,cAAc,KAAK,WAAW,QAAQ;AAC9D,YAAQ,KAAK,KAAK,UAAU,WAAW;AACvC,YAAQ,YAAY,cAAc,WAAW;AAC7C,YAAQ,YAAY,UAAU,WAAW,MAAM,GAAG,IAAI,GAAG;AACzD;;GAIF,MAAM,EAAE,MAAM,eAAe,mBAAmB,QAAQ,KAAK,UAAU;AACvE,gBAAa,KAAK;IAAE,MAAM;IAAW;IAAM,CAAC;GAI5C,MAAM,QAAQ,CAAC;AACf,SAAM,QAAQ,aAAa;IAAE,MAAM;IAAS;IAAM;IAAO;AACzD,aAAU,MAAM;AAEhB,WAAQ,KAAK,KAAK,YAAY;WACvB,OAAO;GACd,MAAM,eACJ,iBAAiB,QAAQ,MAAM,UAAU;AAC3C,WAAQ,KAAK,KAAK,YAAY;AAC9B,WAAQ,YAAY,aAAa;AACjC,oBAAiB,OAAO,cAAc,KAAK,WAAW,QAAQ;;;AAIlE,QAAO;;;;;;;AAQT,SAAgB,mBAAmB,UAA0B;AAC3D,QAAO,SAAS,QAAQ,UAAU,GAAG;;;;;;;;;;;;AAavC,SAAgB,kBAAkB,UAA0B;AAC1D,QAAO,SACJ,QAAQ,WAAW,GAAG,CACtB,QAAQ,SAAS,GAAG,CACpB,MAAM,IAAI,CAAC;;;AAIhB,MAAM,UAAkC;CAEtC,QAAQ;CACR,QAAQ;CAER,SAAS;CAET,SAAS;CACT,UAAU;CACV,KAAK;CACL,QAAQ;CACR,OAAO;CACP,QAAQ;CACR,SAAS;CAET,MAAM;CACN,WAAW;CACX,eAAe;CACf,UAAU;CAEV,OAAO;CACP,KAAK;CACL,QAAQ;CACR,QAAQ;CACR,SAAS;CAET,WAAW;CACX,UAAU;CAEV,MAAM;CACP"}
+{"version":3,"file":"query-registry.js","names":[],"sources":["../../src/type-generator/query-registry.ts"],"sourcesContent":["import fs from \"node:fs/promises\";\nimport path from \"node:path\";\nimport { WorkspaceClient } from \"@databricks/sdk-experimental\";\nimport pc from \"picocolors\";\nimport { createLogger } from \"../logging/logger\";\nimport { CACHE_VERSION, hashSQL, loadCache, saveCache } from \"./cache\";\nimport { Spinner } from \"./spinner\";\nimport {\n  type DatabricksStatementExecutionResponse,\n  type QuerySchema,\n  sqlTypeToHelper,\n  sqlTypeToMarker,\n} from \"./types\";\n\nconst logger = createLogger(\"type-generator:query-registry\");\n\n/**\n * Parse a raw API/SDK error into a structured code + message.\n * Handles Databricks-style JSON bodies embedded in the message string,\n * e.g. `Response from server (Bad Request) {\"error_code\":\"...\",\"message\":\"...\"}`.\n */\nfunction parseError(raw: string): { code?: string; message: string } {\n  const jsonMatch = raw.match(/\\{[\\s\\S]*\\}/);\n  if (jsonMatch) {\n    try {\n      const parsed = JSON.parse(jsonMatch[0]);\n      if (parsed.error_code || parsed.message) {\n        return {\n          code: parsed.error_code,\n          message: parsed.message || raw,\n        };\n      }\n    } catch {\n      // not valid JSON, fall through\n    }\n  }\n  return { message: raw };\n}\n\n/**\n * Extract parameters from a SQL query\n * @param sql - the SQL query to extract parameters from\n * @returns an array of parameter names\n */\nexport function extractParameters(sql: string): string[] {\n  const matches = sql.matchAll(/:([a-zA-Z_]\\w*)/g);\n  const params = new Set<string>();\n  for (const match of matches) {\n    params.add(match[1]);\n  }\n  return Array.from(params);\n}\n\n// parameters that are injected by the server\nexport const SERVER_INJECTED_PARAMS = [\"workspaceId\"];\n\n/**\n * Generates the TypeScript type literal for query parameters from SQL.\n * Shared by both the success and failure paths.\n */\nfunction formatParametersType(sql: string): string {\n  const params = extractParameters(sql).filter(\n    (p) => !SERVER_INJECTED_PARAMS.includes(p),\n  );\n  const paramTypes = extractParameterTypes(sql);\n\n  return params.length > 0\n    ? `{\\n      ${params\n        .map((p) => {\n          const sqlType = paramTypes[p];\n          const markerType = sqlType\n            ? sqlTypeToMarker[sqlType]\n            : \"SQLTypeMarker\";\n          const helper = sqlType ? sqlTypeToHelper[sqlType] : \"sql.*()\";\n          return `/** ${sqlType || \"any\"} - use ${helper} */\\n      ${p}: ${markerType}`;\n        })\n        .join(\";\\n      \")};\\n    }`\n    : \"Record<string, never>\";\n}\n\nexport function convertToQueryType(\n  result: DatabricksStatementExecutionResponse,\n  sql: string,\n  queryName: string,\n): { type: string; hasResults: boolean } {\n  const dataRows = result.result?.data_array || [];\n  const columns = dataRows.map((row) => ({\n    name: row[0] || \"\",\n    type_name: row[1]?.toUpperCase() || \"STRING\",\n    comment: row[2] || undefined,\n  }));\n\n  const paramsType = formatParametersType(sql);\n\n  // generate result fields with JSDoc\n  const resultFields = columns.map((column) => {\n    const normalizedType = normalizeTypeName(column.type_name);\n    const mappedType = typeMap[normalizedType] || \"unknown\";\n    // validate column name is a valid identifier\n    const name = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(column.name)\n      ? column.name\n      : `\"${column.name}\"`;\n\n    // generate comment for column\n    const comment = column.comment\n      ? `/** ${column.comment} */\\n      `\n      : `/** @sqlType ${column.type_name} */\\n      `;\n\n    return `${comment}${name}: ${mappedType}`;\n  });\n\n  const hasResults = resultFields.length > 0;\n\n  const type = `{\n    name: \"${queryName}\";\n    parameters: ${paramsType};\n    result: ${\n      hasResults\n        ? `Array<{\n      ${resultFields.join(\";\\n      \")};\n    }>`\n        : \"unknown\"\n    };\n  }`;\n\n  return { type, hasResults };\n}\n\n/**\n * Used when DESCRIBE QUERY fails so the query still appears in QueryRegistry.\n * Generates a type with unknown result from SQL alone (no warehouse call).\n */\nfunction generateUnknownResultQuery(sql: string, queryName: string): string {\n  const paramsType = formatParametersType(sql);\n\n  return `{\n    name: \"${queryName}\";\n    parameters: ${paramsType};\n    result: unknown;\n  }`;\n}\n\nexport function extractParameterTypes(sql: string): Record<string, string> {\n  const paramTypes: Record<string, string> = {};\n  const regex =\n    /--\\s*@param\\s+(\\w+)\\s+(STRING|NUMERIC|BOOLEAN|DATE|TIMESTAMP|BINARY)/gi;\n  const matches = sql.matchAll(regex);\n  for (const match of matches) {\n    const [, paramName, paramType] = match;\n    paramTypes[paramName] = paramType.toUpperCase();\n  }\n\n  return paramTypes;\n}\n\n/**\n * Generate query schemas from a folder of SQL files\n * It uses DESCRIBE QUERY to get the schema without executing the query\n * @param queryFolder - the folder containing the SQL files\n * @param warehouseId - the warehouse id to use for schema analysis\n * @param options - options for the query generation\n * @param options.noCache - if true, skip the cache and regenerate all types\n * @returns an array of query schemas\n */\nexport async function generateQueriesFromDescribe(\n  queryFolder: string,\n  warehouseId: string,\n  options: { noCache?: boolean; concurrency?: number } = {},\n): Promise<QuerySchema[]> {\n  const { noCache = false, concurrency: rawConcurrency = 10 } = options;\n  const concurrency =\n    typeof rawConcurrency === \"number\" && Number.isFinite(rawConcurrency)\n      ? Math.max(1, Math.floor(rawConcurrency))\n      : 10;\n\n  // read all query files and cache in parallel\n  const [allFiles, cache] = await Promise.all([\n    fs.readdir(queryFolder),\n    noCache\n      ? ({ version: CACHE_VERSION, queries: {} } as Awaited<\n          ReturnType<typeof loadCache>\n        >)\n      : loadCache(),\n  ]);\n\n  const queryFiles = allFiles.filter((file) => file.endsWith(\".sql\"));\n  logger.debug(\"Found %d SQL queries\", queryFiles.length);\n\n  const client = new WorkspaceClient({});\n  const spinner = new Spinner();\n\n  // Read all SQL files in parallel\n  const sqlContents = await Promise.all(\n    queryFiles.map((file) => fs.readFile(path.join(queryFolder, file), \"utf8\")),\n  );\n\n  const startTime = performance.now();\n\n  // Phase 1: Check cache, separate cached vs uncached\n  const cachedResults: Array<{ index: number; schema: QuerySchema }> = [];\n  const uncachedQueries: Array<{\n    index: number;\n    queryName: string;\n    sql: string;\n    sqlHash: string;\n    cleanedSql: string;\n  }> = [];\n  const logEntries: Array<{\n    queryName: string;\n    status: \"HIT\" | \"MISS\";\n    failed?: boolean;\n    error?: { code?: string; message: string };\n  }> = [];\n\n  for (let i = 0; i < queryFiles.length; i++) {\n    const file = queryFiles[i];\n    const rawName = path.basename(file, \".sql\");\n    const queryName = normalizeQueryName(rawName);\n\n    const sql = sqlContents[i];\n    const sqlHash = hashSQL(sql);\n\n    const cached = cache.queries[queryName];\n    if (cached && cached.hash === sqlHash && !cached.retry) {\n      cachedResults.push({\n        index: i,\n        schema: { name: queryName, type: cached.type },\n      });\n      logEntries.push({ queryName, status: \"HIT\" });\n    } else {\n      const sqlWithDefaults = sql.replace(/:([a-zA-Z_]\\w*)/g, \"''\");\n      const cleanedSql = sqlWithDefaults.trim().replace(/;\\s*$/, \"\");\n      uncachedQueries.push({ index: i, queryName, sql, sqlHash, cleanedSql });\n    }\n  }\n\n  // Phase 2: Execute all uncached DESCRIBE calls in parallel\n  type DescribeResult =\n    | {\n        status: \"ok\";\n        index: number;\n        schema: QuerySchema;\n        cacheEntry: { hash: string; type: string; retry: boolean };\n      }\n    | {\n        status: \"fail\";\n        index: number;\n        schema: QuerySchema;\n        cacheEntry: { hash: string; type: string; retry: boolean };\n        error: { code?: string; message: string };\n      };\n\n  const freshResults: Array<{ index: number; schema: QuerySchema }> = [];\n\n  if (uncachedQueries.length > 0) {\n    let completed = 0;\n    const total = uncachedQueries.length;\n    spinner.start(\n      `Describing ${total} ${total === 1 ? \"query\" : \"queries\"} (0/${total})`,\n    );\n\n    const describeOne = async ({\n      index,\n      queryName,\n      sql,\n      sqlHash,\n      cleanedSql,\n    }: (typeof uncachedQueries)[number]): Promise<DescribeResult> => {\n      const result = (await client.statementExecution.executeStatement({\n        statement: `DESCRIBE QUERY ${cleanedSql}`,\n        warehouse_id: warehouseId,\n      })) as DatabricksStatementExecutionResponse;\n\n      completed++;\n      spinner.update(\n        `Describing ${total} ${total === 1 ? \"query\" : \"queries\"} (${completed}/${total})`,\n      );\n\n      logger.debug(\n        \"DESCRIBE result for %s: state=%s, rows=%d\",\n        queryName,\n        result.status.state,\n        result.result?.data_array?.length ?? 0,\n      );\n\n      if (result.status.state === \"FAILED\") {\n        const sqlError =\n          result.status.error?.message || \"Query execution failed\";\n        logger.warn(\"DESCRIBE failed for %s: %s\", queryName, sqlError);\n        const type = generateUnknownResultQuery(sql, queryName);\n        return {\n          status: \"fail\",\n          index,\n          schema: { name: queryName, type },\n          cacheEntry: { hash: sqlHash, type, retry: true },\n          error: parseError(sqlError),\n        };\n      }\n\n      const { type, hasResults } = convertToQueryType(result, sql, queryName);\n      return {\n        status: \"ok\",\n        index,\n        schema: { name: queryName, type },\n        cacheEntry: { hash: sqlHash, type, retry: !hasResults },\n      };\n    };\n\n    // Process in chunks, saving cache after each chunk\n    const processBatchResults = (\n      settled: PromiseSettledResult<DescribeResult>[],\n      batchOffset: number,\n    ) => {\n      for (let i = 0; i < settled.length; i++) {\n        const entry = settled[i];\n        const { queryName } = uncachedQueries[batchOffset + i];\n\n        if (entry.status === \"fulfilled\") {\n          const res = entry.value;\n          freshResults.push({ index: res.index, schema: res.schema });\n          cache.queries[queryName] = res.cacheEntry;\n          logEntries.push({\n            queryName,\n            status: \"MISS\",\n            failed: res.status === \"fail\",\n            error: res.status === \"fail\" ? res.error : undefined,\n          });\n        } else {\n          const { sql, sqlHash, index } = uncachedQueries[batchOffset + i];\n          const reason =\n            entry.reason instanceof Error\n              ? entry.reason.message\n              : String(entry.reason);\n          logger.warn(\"DESCRIBE rejected for %s: %s\", queryName, reason);\n          const type = generateUnknownResultQuery(sql, queryName);\n          freshResults.push({ index, schema: { name: queryName, type } });\n          cache.queries[queryName] = { hash: sqlHash, type, retry: true };\n          logEntries.push({\n            queryName,\n            status: \"MISS\",\n            failed: true,\n            error: parseError(reason),\n          });\n        }\n      }\n    };\n\n    if (uncachedQueries.length > concurrency) {\n      for (let b = 0; b < uncachedQueries.length; b += concurrency) {\n        const batch = uncachedQueries.slice(b, b + concurrency);\n        const batchResults = await Promise.allSettled(batch.map(describeOne));\n        processBatchResults(batchResults, b);\n        await saveCache(cache);\n      }\n    } else {\n      const settled = await Promise.allSettled(\n        uncachedQueries.map(describeOne),\n      );\n      processBatchResults(settled, 0);\n      await saveCache(cache);\n    }\n\n    spinner.stop(\"\");\n  }\n\n  const elapsed = ((performance.now() - startTime) / 1000).toFixed(2);\n\n  // Print formatted table\n  if (logEntries.length > 0) {\n    const maxNameLen = Math.max(...logEntries.map((e) => e.queryName.length));\n    const separator = pc.dim(\"─\".repeat(50));\n    console.log(\"\");\n    console.log(\n      `  ${pc.bold(\"Typegen Queries\")} ${pc.dim(`(${logEntries.length})`)}`,\n    );\n    console.log(`  ${separator}`);\n    for (const entry of logEntries) {\n      const tag = entry.failed\n        ? pc.bold(pc.red(\"ERROR\"))\n        : entry.status === \"HIT\"\n          ? `cache ${pc.bold(pc.green(\"HIT  \"))}`\n          : `cache ${pc.bold(pc.yellow(\"MISS \"))}`;\n      const rawName = entry.queryName.padEnd(maxNameLen);\n      const name = entry.failed ? pc.dim(pc.strikethrough(rawName)) : rawName;\n      const errorCode = entry.error?.message.match(/\\[([^\\]]+)\\]/)?.[1];\n      const reason = errorCode ? `  ${pc.dim(errorCode)}` : \"\";\n      console.log(`  ${tag}  ${name}${reason}`);\n    }\n    const newCount = logEntries.filter(\n      (e) => e.status === \"MISS\" && !e.failed,\n    ).length;\n    const cacheCount = logEntries.filter(\n      (e) => e.status === \"HIT\" && !e.failed,\n    ).length;\n    const errorCount = logEntries.filter((e) => e.failed).length;\n    console.log(`  ${separator}`);\n    const parts = [`${newCount} new`, `${cacheCount} from cache`];\n    if (errorCount > 0)\n      parts.push(`${errorCount} ${errorCount === 1 ? \"error\" : \"errors\"}`);\n    console.log(`  ${parts.join(\", \")}. ${pc.dim(`${elapsed}s`)}`);\n    console.log(\"\");\n  }\n\n  // Merge and sort by original file index for deterministic output\n  return [...cachedResults, ...freshResults]\n    .sort((a, b) => a.index - b.index)\n    .map((r) => r.schema);\n}\n\n/**\n * Normalize query name by removing the .obo extension\n * @param queryName - the query name to normalize\n * @returns the normalized query name\n */\nexport function normalizeQueryName(fileName: string): string {\n  return fileName.replace(/\\.obo$/, \"\");\n}\n\n/**\n * Normalize SQL type name by removing parameters/generics\n * Examples:\n *   DECIMAL(38,6) -> DECIMAL\n *   ARRAY<STRING> -> ARRAY\n *   MAP<STRING,INT> -> MAP\n *   STRUCT<name:STRING> -> STRUCT\n *   INTERVAL DAY TO SECOND -> INTERVAL\n *   GEOGRAPHY(4326) -> GEOGRAPHY\n */\nexport function normalizeTypeName(typeName: string): string {\n  return typeName\n    .replace(/\\(.*\\)$/, \"\") // remove (p, s) eg: DECIMAL(38,6) -> DECIMAL\n    .replace(/<.*>$/, \"\") // remove <T> eg: ARRAY<STRING> -> ARRAY\n    .split(\" \")[0]; // take first word eg: INTERVAL DAY TO SECOND -> INTERVAL\n}\n\n/** Type Map for Databricks data types to JavaScript types */\nconst typeMap: Record<string, string> = {\n  // string types\n  STRING: \"string\",\n  BINARY: \"string\",\n  // boolean\n  BOOLEAN: \"boolean\",\n  // numeric types\n  TINYINT: \"number\",\n  SMALLINT: \"number\",\n  INT: \"number\",\n  BIGINT: \"number\",\n  FLOAT: \"number\",\n  DOUBLE: \"number\",\n  DECIMAL: \"number\",\n  // date/time types\n  DATE: \"string\",\n  TIMESTAMP: \"string\",\n  TIMESTAMP_NTZ: \"string\",\n  INTERVAL: \"string\",\n  // complex types\n  ARRAY: \"unknown[]\",\n  MAP: \"Record<string, unknown>\",\n  STRUCT: \"Record<string, unknown>\",\n  OBJECT: \"Record<string, unknown>\",\n  VARIANT: \"unknown\",\n  // spatial types\n  GEOGRAPHY: \"unknown\",\n  GEOMETRY: \"unknown\",\n  // null type\n  VOID: \"null\",\n};\n"],"mappings":"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"}

package/dist/type-generator/spinner.js

@@ -21,6 +21,9 @@ var Spinner = class {
 			process.stdout.write(`\r  ${this.text}${this.frames[this.current]}`);
 		}, 300);
 	}
+	update(text) {
+		this.text = text;
+	}
 	stop(finalText) {
 		if (this.interval) {
 			clearInterval(this.interval);
@@ -29,7 +32,8 @@ var Spinner = class {
 		process.stdout.write(`\x1b[2K\r  ${finalText || this.text}\n`);
 	}
 	printDetail(text) {
-		process.stdout.write(`\x1b[2m    ${text}\x1b[0m\n`);
+		process.stdout.write(`\x1b[2K\r\x1b[2m    ${text}\x1b[0m\n`);
+		if (this.interval) process.stdout.write(`  ${this.text}${this.frames[this.current]}`);
 	}
 };
 

package/dist/type-generator/spinner.js.map

@@ -1 +1 @@
-{"version":3,"file":"spinner.js","names":[],"sources":["../../src/type-generator/spinner.ts"],"sourcesContent":["/**\n * Simple loading spinner for CLI\n */\nexport class Spinner {\n  private frames = [\"   \", \".  \", \".. \", \"...\"];\n  private current = 0;\n  private interval: NodeJS.Timeout | null = null;\n  private text = \"\";\n\n  start(text: string) {\n    this.text = text;\n    this.current = 0;\n    process.stdout.write(`  ${this.text}${this.frames[0]}`);\n    this.interval = setInterval(() => {\n      this.current = (this.current + 1) % this.frames.length;\n      process.stdout.write(`\\r  ${this.text}${this.frames[this.current]}`);\n    }, 300);\n  }\n\n  stop(finalText?: string) {\n    if (this.interval) {\n      clearInterval(this.interval);\n      this.interval = null;\n    }\n    // clear the line and write the final text\n    process.stdout.write(`\\x1b[2K\\r  ${finalText || this.text}\\n`);\n  }\n\n  printDetail(text: string) {\n    process.stdout.write(`\\x1b[2m    ${text}\\x1b[0m\\n`);\n  }\n}\n"],"mappings":";;;;AAGA,IAAa,UAAb,MAAqB;CACnB,AAAQ,SAAS;EAAC;EAAO;EAAO;EAAO;EAAM;CAC7C,AAAQ,UAAU;CAClB,AAAQ,WAAkC;CAC1C,AAAQ,OAAO;CAEf,MAAM,MAAc;AAClB,OAAK,OAAO;AACZ,OAAK,UAAU;AACf,UAAQ,OAAO,MAAM,KAAK,KAAK,OAAO,KAAK,OAAO,KAAK;AACvD,OAAK,WAAW,kBAAkB;AAChC,QAAK,WAAW,KAAK,UAAU,KAAK,KAAK,OAAO;AAChD,WAAQ,OAAO,MAAM,OAAO,KAAK,OAAO,KAAK,OAAO,KAAK,WAAW;KACnE,IAAI;;CAGT,KAAK,WAAoB;AACvB,MAAI,KAAK,UAAU;AACjB,iBAAc,KAAK,SAAS;AAC5B,QAAK,WAAW;;AAGlB,UAAQ,OAAO,MAAM,cAAc,aAAa,KAAK,KAAK,IAAI;;CAGhE,YAAY,MAAc;AACxB,UAAQ,OAAO,MAAM,cAAc,KAAK,WAAW"}
+{"version":3,"file":"spinner.js","names":[],"sources":["../../src/type-generator/spinner.ts"],"sourcesContent":["/**\n * Simple loading spinner for CLI\n */\nexport class Spinner {\n  private frames = [\"   \", \".  \", \".. \", \"...\"];\n  private current = 0;\n  private interval: NodeJS.Timeout | null = null;\n  private text = \"\";\n\n  start(text: string) {\n    this.text = text;\n    this.current = 0;\n    process.stdout.write(`  ${this.text}${this.frames[0]}`);\n    this.interval = setInterval(() => {\n      this.current = (this.current + 1) % this.frames.length;\n      process.stdout.write(`\\r  ${this.text}${this.frames[this.current]}`);\n    }, 300);\n  }\n\n  update(text: string) {\n    this.text = text;\n  }\n\n  stop(finalText?: string) {\n    if (this.interval) {\n      clearInterval(this.interval);\n      this.interval = null;\n    }\n    // clear the line and write the final text\n    process.stdout.write(`\\x1b[2K\\r  ${finalText || this.text}\\n`);\n  }\n\n  printDetail(text: string) {\n    // Clear spinner line, print detail, then redraw spinner\n    process.stdout.write(`\\x1b[2K\\r\\x1b[2m    ${text}\\x1b[0m\\n`);\n    if (this.interval) {\n      process.stdout.write(`  ${this.text}${this.frames[this.current]}`);\n    }\n  }\n}\n"],"mappings":";;;;AAGA,IAAa,UAAb,MAAqB;CACnB,AAAQ,SAAS;EAAC;EAAO;EAAO;EAAO;EAAM;CAC7C,AAAQ,UAAU;CAClB,AAAQ,WAAkC;CAC1C,AAAQ,OAAO;CAEf,MAAM,MAAc;AAClB,OAAK,OAAO;AACZ,OAAK,UAAU;AACf,UAAQ,OAAO,MAAM,KAAK,KAAK,OAAO,KAAK,OAAO,KAAK;AACvD,OAAK,WAAW,kBAAkB;AAChC,QAAK,WAAW,KAAK,UAAU,KAAK,KAAK,OAAO;AAChD,WAAQ,OAAO,MAAM,OAAO,KAAK,OAAO,KAAK,OAAO,KAAK,WAAW;KACnE,IAAI;;CAGT,OAAO,MAAc;AACnB,OAAK,OAAO;;CAGd,KAAK,WAAoB;AACvB,MAAI,KAAK,UAAU;AACjB,iBAAc,KAAK,SAAS;AAC5B,QAAK,WAAW;;AAGlB,UAAQ,OAAO,MAAM,cAAc,aAAa,KAAK,KAAK,IAAI;;CAGhE,YAAY,MAAc;AAExB,UAAQ,OAAO,MAAM,uBAAuB,KAAK,WAAW;AAC5D,MAAI,KAAK,SACP,SAAQ,OAAO,MAAM,KAAK,KAAK,OAAO,KAAK,OAAO,KAAK,WAAW"}

package/dist/type-generator/vite-plugin.d.ts

@@ -1,7 +1,6 @@
 import { Plugin } from "vite";
 
 //#region src/type-generator/vite-plugin.d.ts
-
 /**
  * Options for the AppKit types plugin.
  */

package/dist/type-generator/vite-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin.d.ts","names":[],"sources":["../../src/type-generator/vite-plugin.ts"],"sourcesContent":[],"mappings":";;;;;;AAEmC;AAsBnC,UAbU,wBAAA,CAauB;EAAA,OAAA,CAAA,EAAA,MAAA;;cAAsC,CAAA,EAAA,MAAA,EAAA;;;;;;;;iBAAvD,iBAAA,WAA4B,2BAA2B"}
+{"version":3,"file":"vite-plugin.d.ts","names":[],"sources":["../../src/type-generator/vite-plugin.ts"],"mappings":";;;;;AAEmC;UASzB,wBAAA;EAER,OAAA;EAAA;EAEA,YAAA;AAAA;;;;;;;iBASc,iBAAA,CAAkB,OAAA,GAAU,wBAAA,GAA2B,MAAA"}

package/dist/type-generator/vite-plugin.js

@@ -1,7 +1,7 @@
 import { createLogger } from "../logging/logger.js";
 import { generateFromEntryPoint } from "./index.js";
 import path from "node:path";
-import fs from "node:fs";
+import { existsSync } from "node:fs";
 
 //#region src/type-generator/vite-plugin.ts
 const logger = createLogger("type-generator:vite-plugin");
@@ -40,7 +40,7 @@ function appKitTypesPlugin(options) {
 				logger.debug("Warehouse ID not found. Skipping type generation.");
 				return false;
 			}
-			if (!fs.existsSync(path.join(process.cwd(), "config", "queries"))) return false;
+			if (!existsSync(path.join(process.cwd(), "config", "queries"))) return false;
 			return true;
 		},
 		configResolved(config) {

package/dist/type-generator/vite-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin.js","names":[],"sources":["../../src/type-generator/vite-plugin.ts"],"sourcesContent":["import fs from \"node:fs\";\nimport path from \"node:path\";\nimport type { Plugin } from \"vite\";\nimport { createLogger } from \"../logging/logger\";\nimport { generateFromEntryPoint } from \"./index\";\n\nconst logger = createLogger(\"type-generator:vite-plugin\");\n\n/**\n * Options for the AppKit types plugin.\n */\ninterface AppKitTypesPluginOptions {\n  /* Path to the output d.ts file (relative to client folder). */\n  outFile?: string;\n  /** Folders to watch for changes. */\n  watchFolders?: string[];\n}\n\n/**\n * Vite plugin to generate types for AppKit queries.\n * Calls generateFromEntryPoint under the hood.\n * @param options - Options to override default values.\n * @returns Vite plugin to generate types for AppKit queries.\n */\nexport function appKitTypesPlugin(options?: AppKitTypesPluginOptions): Plugin {\n  let root: string;\n  let outFile: string;\n  let watchFolders: string[];\n\n  async function generate() {\n    try {\n      const warehouseId = process.env.DATABRICKS_WAREHOUSE_ID || \"\";\n\n      if (!warehouseId) {\n        logger.debug(\"Warehouse ID not found. Skipping type generation.\");\n        return;\n      }\n\n      await generateFromEntryPoint({\n        outFile,\n        queryFolder: watchFolders[0],\n        warehouseId,\n        noCache: false,\n      });\n    } catch (error) {\n      // throw in production to fail the build\n      if (process.env.NODE_ENV === \"production\") {\n        throw error;\n      }\n      logger.error(\"Error generating types: %O\", error);\n    }\n  }\n\n  return {\n    name: \"appkit-types\",\n\n    apply() {\n      const warehouseId = process.env.DATABRICKS_WAREHOUSE_ID || \"\";\n\n      if (!warehouseId) {\n        logger.debug(\"Warehouse ID not found. Skipping type generation.\");\n        return false;\n      }\n\n      if (!fs.existsSync(path.join(process.cwd(), \"config\", \"queries\"))) {\n        return false;\n      }\n\n      return true;\n    },\n\n    configResolved(config) {\n      root = config.root;\n      outFile = path.resolve(root, options?.outFile ?? \"src/appKitTypes.d.ts\");\n      watchFolders = options?.watchFolders ?? [\n        path.join(process.cwd(), \"config\", \"queries\"),\n      ];\n    },\n\n    buildStart() {\n      generate();\n    },\n\n    configureServer(server) {\n      server.watcher.add(watchFolders);\n\n      server.watcher.on(\"change\", (changedFile) => {\n        const isWatchedFile = watchFolders.some((folder) =>\n          changedFile.startsWith(folder),\n        );\n\n        if (isWatchedFile && changedFile.endsWith(\".sql\")) {\n          generate();\n        }\n      });\n    },\n  };\n}\n"],"mappings":";;;;;;AAMA,MAAM,SAAS,aAAa,6BAA6B;;;;;;;AAkBzD,SAAgB,kBAAkB,SAA4C;CAC5E,IAAI;CACJ,IAAI;CACJ,IAAI;CAEJ,eAAe,WAAW;AACxB,MAAI;GACF,MAAM,cAAc,QAAQ,IAAI,2BAA2B;AAE3D,OAAI,CAAC,aAAa;AAChB,WAAO,MAAM,oDAAoD;AACjE;;AAGF,SAAM,uBAAuB;IAC3B;IACA,aAAa,aAAa;IAC1B;IACA,SAAS;IACV,CAAC;WACK,OAAO;AAEd,OAAI,QAAQ,IAAI,aAAa,aAC3B,OAAM;AAER,UAAO,MAAM,8BAA8B,MAAM;;;AAIrD,QAAO;EACL,MAAM;EAEN,QAAQ;AAGN,OAAI,EAFgB,QAAQ,IAAI,2BAA2B,KAEzC;AAChB,WAAO,MAAM,oDAAoD;AACjE,WAAO;;AAGT,OAAI,CAAC,GAAG,WAAW,KAAK,KAAK,QAAQ,KAAK,EAAE,UAAU,UAAU,CAAC,CAC/D,QAAO;AAGT,UAAO;;EAGT,eAAe,QAAQ;AACrB,UAAO,OAAO;AACd,aAAU,KAAK,QAAQ,MAAM,SAAS,WAAW,uBAAuB;AACxE,kBAAe,SAAS,gBAAgB,CACtC,KAAK,KAAK,QAAQ,KAAK,EAAE,UAAU,UAAU,CAC9C;;EAGH,aAAa;AACX,aAAU;;EAGZ,gBAAgB,QAAQ;AACtB,UAAO,QAAQ,IAAI,aAAa;AAEhC,UAAO,QAAQ,GAAG,WAAW,gBAAgB;AAK3C,QAJsB,aAAa,MAAM,WACvC,YAAY,WAAW,OAAO,CAC/B,IAEoB,YAAY,SAAS,OAAO,CAC/C,WAAU;KAEZ;;EAEL"}
+{"version":3,"file":"vite-plugin.js","names":[],"sources":["../../src/type-generator/vite-plugin.ts"],"sourcesContent":["import { existsSync } from \"node:fs\";\nimport path from \"node:path\";\nimport type { Plugin } from \"vite\";\nimport { createLogger } from \"../logging/logger\";\nimport { generateFromEntryPoint } from \"./index\";\n\nconst logger = createLogger(\"type-generator:vite-plugin\");\n\n/**\n * Options for the AppKit types plugin.\n */\ninterface AppKitTypesPluginOptions {\n  /* Path to the output d.ts file (relative to client folder). */\n  outFile?: string;\n  /** Folders to watch for changes. */\n  watchFolders?: string[];\n}\n\n/**\n * Vite plugin to generate types for AppKit queries.\n * Calls generateFromEntryPoint under the hood.\n * @param options - Options to override default values.\n * @returns Vite plugin to generate types for AppKit queries.\n */\nexport function appKitTypesPlugin(options?: AppKitTypesPluginOptions): Plugin {\n  let root: string;\n  let outFile: string;\n  let watchFolders: string[];\n\n  async function generate() {\n    try {\n      const warehouseId = process.env.DATABRICKS_WAREHOUSE_ID || \"\";\n\n      if (!warehouseId) {\n        logger.debug(\"Warehouse ID not found. Skipping type generation.\");\n        return;\n      }\n\n      await generateFromEntryPoint({\n        outFile,\n        queryFolder: watchFolders[0],\n        warehouseId,\n        noCache: false,\n      });\n    } catch (error) {\n      // throw in production to fail the build\n      if (process.env.NODE_ENV === \"production\") {\n        throw error;\n      }\n      logger.error(\"Error generating types: %O\", error);\n    }\n  }\n\n  return {\n    name: \"appkit-types\",\n\n    apply() {\n      const warehouseId = process.env.DATABRICKS_WAREHOUSE_ID || \"\";\n\n      if (!warehouseId) {\n        logger.debug(\"Warehouse ID not found. Skipping type generation.\");\n        return false;\n      }\n\n      if (!existsSync(path.join(process.cwd(), \"config\", \"queries\"))) {\n        return false;\n      }\n\n      return true;\n    },\n\n    configResolved(config) {\n      root = config.root;\n      outFile = path.resolve(root, options?.outFile ?? \"src/appKitTypes.d.ts\");\n      watchFolders = options?.watchFolders ?? [\n        path.join(process.cwd(), \"config\", \"queries\"),\n      ];\n    },\n\n    buildStart() {\n      generate();\n    },\n\n    configureServer(server) {\n      server.watcher.add(watchFolders);\n\n      server.watcher.on(\"change\", (changedFile) => {\n        const isWatchedFile = watchFolders.some((folder) =>\n          changedFile.startsWith(folder),\n        );\n\n        if (isWatchedFile && changedFile.endsWith(\".sql\")) {\n          generate();\n        }\n      });\n    },\n  };\n}\n"],"mappings":";;;;;;AAMA,MAAM,SAAS,aAAa,6BAA6B;;;;;;;AAkBzD,SAAgB,kBAAkB,SAA4C;CAC5E,IAAI;CACJ,IAAI;CACJ,IAAI;CAEJ,eAAe,WAAW;AACxB,MAAI;GACF,MAAM,cAAc,QAAQ,IAAI,2BAA2B;AAE3D,OAAI,CAAC,aAAa;AAChB,WAAO,MAAM,oDAAoD;AACjE;;AAGF,SAAM,uBAAuB;IAC3B;IACA,aAAa,aAAa;IAC1B;IACA,SAAS;IACV,CAAC;WACK,OAAO;AAEd,OAAI,QAAQ,IAAI,aAAa,aAC3B,OAAM;AAER,UAAO,MAAM,8BAA8B,MAAM;;;AAIrD,QAAO;EACL,MAAM;EAEN,QAAQ;AAGN,OAAI,EAFgB,QAAQ,IAAI,2BAA2B,KAEzC;AAChB,WAAO,MAAM,oDAAoD;AACjE,WAAO;;AAGT,OAAI,CAAC,WAAW,KAAK,KAAK,QAAQ,KAAK,EAAE,UAAU,UAAU,CAAC,CAC5D,QAAO;AAGT,UAAO;;EAGT,eAAe,QAAQ;AACrB,UAAO,OAAO;AACd,aAAU,KAAK,QAAQ,MAAM,SAAS,WAAW,uBAAuB;AACxE,kBAAe,SAAS,gBAAgB,CACtC,KAAK,KAAK,QAAQ,KAAK,EAAE,UAAU,UAAU,CAC9C;;EAGH,aAAa;AACX,aAAU;;EAGZ,gBAAgB,QAAQ;AACtB,UAAO,QAAQ,IAAI,aAAa;AAEhC,UAAO,QAAQ,GAAG,WAAW,gBAAgB;AAK3C,QAJsB,aAAa,MAAM,WACvC,YAAY,WAAW,OAAO,CAC/B,IAEoB,YAAY,SAAS,OAAO,CAC/C,WAAU;KAEZ;;EAEL"}

package/docs/development/project-setup.md

@@ -61,7 +61,7 @@ The AppKit `server()` plugin automatically serves:
     "@types/react": "^19.0.0",
     "@types/react-dom": "^19.0.0",
     "@vitejs/plugin-react": "^5.1.1",
-    "tsdown": "^0.15.7",
+    "tsdown": "^0.20.3",
     "tsx": "^4.19.0",
     "typescript": "~5.6.0",
     "vite": "^7.2.4"

package/docs/plugins/plugin-management.md

@@ -2,6 +2,8 @@
 
 AppKit includes a CLI for managing plugins. All commands are available under `npx @databricks/appkit plugin`.
 
+**Manifest convention:** `manifest.json` is the default and recommended format for CLI commands (`sync`, `list`, `validate`). For zero-trust safety, JS manifests (`manifest.js`/`manifest.cjs`) are ignored unless you pass `--allow-js-manifest`, which executes plugin code and should be used only with trusted sources. The **add-resource** command only edits `manifest.json` in place.
+
 ## Create a plugin[​](#create-a-plugin "Direct link to Create a plugin")
 
 Scaffold a new plugin interactively:
@@ -18,7 +20,7 @@ The wizard walks you through:
 * **Resources**: Which Databricks resources the plugin needs (SQL Warehouse, Secret, etc.) and whether each is required or optional
 * **Optional fields**: Author, version, license
 
-The command generates a complete plugin scaffold with `manifest.json`, TypeScript class, and barrel exports — ready to register in your app.
+The command generates a complete plugin scaffold with `manifest.json` and a TypeScript plugin class that imports the manifest directly — ready to register in your app.
 
 ## Sync plugin manifests[​](#sync-plugin-manifests "Direct link to Sync plugin manifests")
 
@@ -31,6 +33,13 @@ npx @databricks/appkit plugin sync --write
 
 This discovers plugin manifests from installed packages and local imports, then writes a consolidated manifest used by deployment tooling. Plugins referenced in your `createApp({ plugins: [...] })` call are automatically marked as required.
 
+Trusted installed Databricks packages (for example `@databricks/appkit`) are allowed to load bundled JS manifests during `plugin sync`. For other sources, if you intentionally rely on JS manifests, opt in explicitly:
+
+```bash
+npx @databricks/appkit plugin sync --write --allow-js-manifest
+
+```
+
 Use the `--silent` flag in build hooks to suppress output:
 
 ```json
@@ -59,6 +68,8 @@ npx @databricks/appkit plugin validate plugins/my-plugin appkit.plugins.json
 
 The validator auto-detects whether a file is a plugin manifest or a template manifest (from `$schema`) and reports errors with humanized paths and expected values.
 
+To include JS manifests in validation, pass `--allow-js-manifest`.
+
 ## List plugins[​](#list-plugins "Direct link to List plugins")
 
 View registered plugins from `appkit.plugins.json` or scan a directory:
@@ -70,6 +81,9 @@ npx @databricks/appkit plugin list
 # Scan a directory for plugin folders
 npx @databricks/appkit plugin list --dir plugins/
 
+# Scan a directory and include JS manifests (trusted code only)
+npx @databricks/appkit plugin list --dir plugins/ --allow-js-manifest
+
 # JSON output for scripting
 npx @databricks/appkit plugin list --json
 
@@ -77,7 +91,7 @@ npx @databricks/appkit plugin list --json
 
 ## Add a resource to a plugin[​](#add-a-resource-to-a-plugin "Direct link to Add a resource to a plugin")
 
-Interactively add a new resource requirement to an existing plugin manifest:
+Interactively add a new resource requirement to an existing plugin manifest. **Requires `manifest.json`** in the plugin directory (the command edits it in place; it does not modify `manifest.js`):
 
 ```bash
 npx @databricks/appkit plugin add-resource

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@databricks/appkit",
   "type": "module",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "packageManager": "pnpm@10.21.0",
+  "license": "Apache-2.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/databricks/appkit.git"
@@ -16,6 +17,7 @@
     "docs",
     "docs.md",
     "CLAUDE.md",
+    "LICENSE",
     "llms.txt",
     "README.md",
     "DCO",

package/dist/plugins/analytics/manifest.json

@@ -1,36 +0,0 @@
-{
-  "$schema": "https://databricks.github.io/appkit/schemas/plugin-manifest.schema.json",
-  "name": "analytics",
-  "displayName": "Analytics Plugin",
-  "description": "SQL query execution against Databricks SQL Warehouses",
-  "resources": {
-    "required": [
-      {
-        "type": "sql_warehouse",
-        "alias": "SQL Warehouse",
-        "resourceKey": "sql-warehouse",
-        "description": "SQL Warehouse for executing analytics queries",
-        "permission": "CAN_USE",
-        "fields": {
-          "id": {
-            "env": "DATABRICKS_WAREHOUSE_ID",
-            "description": "SQL Warehouse ID"
-          }
-        }
-      }
-    ],
-    "optional": []
-  },
-  "config": {
-    "schema": {
-      "type": "object",
-      "properties": {
-        "timeout": {
-          "type": "number",
-          "default": 30000,
-          "description": "Query execution timeout in milliseconds"
-        }
-      }
-    }
-  }
-}

package/dist/plugins/genie/manifest.json

@@ -1,43 +0,0 @@
-{
-  "name": "genie",
-  "displayName": "Genie Plugin",
-  "description": "AI/BI Genie space integration for natural language data queries",
-  "resources": {
-    "required": [
-      {
-        "type": "genie_space",
-        "alias": "Genie Space",
-        "resourceKey": "genie-space",
-        "description": "Genie Space for AI-powered data queries. Space IDs configured via plugin config.",
-        "permission": "CAN_RUN",
-        "fields": {
-          "id": {
-            "env": "DATABRICKS_GENIE_SPACE_ID",
-            "description": "Default Genie Space ID"
-          }
-        }
-      }
-    ],
-    "optional": []
-  },
-  "config": {
-    "schema": {
-      "type": "object",
-      "properties": {
-        "spaces": {
-          "type": "object",
-          "description": "Map of alias names to Genie Space IDs",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
-        "timeout": {
-          "type": "number",
-          "default": 120000,
-          "description": "Genie polling timeout in ms. Set to 0 for indefinite."
-        }
-      },
-      "required": ["spaces"]
-    }
-  }
-}

package/dist/plugins/lakebase/manifest.json

@@ -1,12 +0,0 @@
-{
-  "$schema": "https://databricks.github.io/appkit/schemas/plugin-manifest.schema.json",
-  "name": "lakebase",
-  "displayName": "Lakebase",
-  "description": "SQL query execution against Databricks Lakebase Autoscaling",
-  "onSetupMessage": "Configure environment variables before running or deploying the app.\nSee: https://databricks.github.io/appkit/docs/plugins/lakebase",
-  "hidden": false,
-  "resources": {
-    "required": [],
-    "optional": []
-  }
-}