Bump CLI to 228.1 and regenerate schema (#1369)

## Changes
CLI generates schema with additional string types added for almost
complex sub types (to support complex variables).
We usually work with `bundle validate` or `summary` outputs, which have
expanded variables, so we don't need to account for additional string
types.

Had to resort to typescript magic to strip down strings from all union
types.

Also moved to the `quicktype-core` dependency to generate the typescript
definitions, since the previous dependency wasn't handling recursive
types (and CLI now generate them).

## Tests
existing tests and typechecks

Author: ilia-db

packages/databricks-vscode/package.json

@@ -897,7 +897,7 @@
         "useYarn": false
     },
     "cli": {
-        "version": "0.228.0"
+        "version": "0.228.1"
     },
     "scripts": {
         "vscode:prepublish": "rm -rf out && yarn run package:compile && yarn run package:wrappers:write && yarn run package:jupyter-init-script:write && yarn run package:copy-webview-toolkit && yarn run generate-telemetry",
@@ -913,7 +913,7 @@
         "package:cli:link": "rm -f ./bin/databricks && mkdir -p bin && ln -s ../../../../cli/cli bin/databricks",
         "package:wrappers:write": "ts-node ./scripts/writeIpynbWrapper.ts -s ./resources/python/notebook.workflow-wrapper.py -o ./resources/python/generated/notebook.workflow-wrapper.json",
         "package:jupyter-init-script:write": "ts-node ./scripts/writeJupyterInitFileWithVersion.ts",
-        "package:bundle-schema:write": "yarn package:cli:fetch && ts-node ./scripts/writeBundleSchema.ts ./bin/databricks ./src/bundle/BundleSchema.d.ts",
+        "package:bundle-schema:write": "yarn package:cli:fetch && ts-node ./scripts/writeBundleSchema.ts ./bin/databricks ./src/bundle/BundleSchema.ts",
         "package:compile": "yarn run esbuild:base",
         "package:copy-webview-toolkit": "cp ./node_modules/@vscode/webview-ui-toolkit/dist/toolkit.js ./out/toolkit.js",
         "esbuild:base": "esbuild ./src/extension.ts --bundle --outfile=out/extension.js --external:vscode --format=cjs --platform=node --sourcemap --target=es2019",
@@ -944,6 +944,7 @@
         "ansi-to-html": "^0.7.2",
         "bcryptjs": "^2.4.3",
         "lodash": "^4.17.21",
+        "minimatch": "^10.0.1",
         "shell-quote": "^1.8.1",
         "triple-beam": "^1.4.1",
         "winston": "^3.11.0",
@@ -979,11 +980,11 @@
         "eslint-plugin-local-rules": "^2.0.1",
         "fs-extra": "^11.2.0",
         "glob": "^10.3.10",
-        "json-schema-to-typescript": "^13.1.1",
         "mocha": "^10.2.0",
         "mock-require": "^3.0.3",
         "nyc": "^15.1.0",
         "prettier": "^3.1.1",
+        "quicktype-core": "^23.0.0",
         "tmp-promise": "^3.0.3",
         "ts-mocha": "^10.0.0",
         "ts-mockito": "^2.6.1",
@@ -1012,4 +1013,4 @@
         ],
         "report-dir": "coverage"
     }
-}
+}

packages/databricks-vscode/scripts/writeBundleSchema.ts

@@ -1,25 +1,39 @@
 /**
- * This script generates the BundleSchema.d.ts file from the bundle schema.
+ * This script generates the BundleSchema.ts file from the bundle schema.
  * It MUST be run after a yarn package:cli:fetch
  */
 
 import * as cp from "child_process";
 import * as fs from "fs";
-import {compileFromFile} from "json-schema-to-typescript";
-import {tmpdir} from "os";
-import path from "path";
+import {
+    quicktype,
+    InputData,
+    JSONSchemaInput,
+    FetchingJSONSchemaStore,
+} from "quicktype-core";
 import {argv} from "process";
 
 const output = cp.execFileSync(argv[2], ["bundle", "schema"]);
 
-const tmpFile = path.join(tmpdir(), "BundleSchema.json");
-fs.writeFileSync(tmpFile, output);
+async function quicktypeJSONSchema(
+    targetLanguage: string,
+    typeName: string,
+    jsonSchemaString: string
+) {
+    const schemaInput = new JSONSchemaInput(new FetchingJSONSchemaStore());
+    await schemaInput.addSource({name: typeName, schema: jsonSchemaString});
+    const inputData = new InputData();
+    inputData.addInput(schemaInput);
+    const result = await quicktype({
+        inputData,
+        lang: targetLanguage,
+    });
+    fs.writeFileSync(
+        argv[3],
+        "/* eslint-disable */\n" + result.lines.join("\n")
+    );
+    // eslint-disable-next-line no-console
+    console.log("BundleSchema.d.ts written to", argv[3]);
+}
 
-// eslint-disable-next-line no-console
-console.log("Bundle schema written to", tmpFile);
-
-// compile from file
-compileFromFile(tmpFile).then((ts) => fs.writeFileSync(argv[3], ts));
-
-// eslint-disable-next-line no-console
-console.log("BundleSchema.d.ts written to", argv[3]);
+quicktypeJSONSchema("typescript", "BundleSchema", output.toString());

packages/databricks-vscode/src/bundle/BundleFileSet.ts

@@ -6,7 +6,7 @@ import path from "path";
 import {BundleSchema} from "./types";
 import {readFile, writeFile} from "fs/promises";
 import {CachedValue} from "../locking/CachedValue";
-import minimatch from "minimatch";
+import {minimatch} from "minimatch";
 import {WorkspaceFolderManager} from "../vscode-objs/WorkspaceFolderManager";
 
 const rootFilePattern: string = "{bundle,databricks}.{yaml,yml}";