@typespec/compiler 0.47.0-dev.2 → 0.47.0-dev.21

package/dist/src/core/cli/actions/compile/args.d.ts

@@ -13,6 +13,7 @@ export interface CompileCliArgs {
     config?: string;
     "warn-as-error"?: boolean;
     "no-emit"?: boolean;
+    "ignore-deprecated"?: boolean;
     args?: string[];
 }
 export declare function getCompilerOptions(host: CompilerHost, entrypoint: string, cwd: string, args: CompileCliArgs, env: Record<string, string | undefined>): Promise<[CompilerOptions | undefined, readonly Diagnostic[]]>;

package/dist/src/core/cli/actions/compile/args.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"args.d.ts","sourceRoot":"","sources":["../../../../../../src/core/cli/actions/compile/args.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAG7D,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,YAAY,EAClB,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,cAAc,EACpB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GACtC,OAAO,CAAC,CAAC,eAAe,GAAG,SAAS,EAAE,SAAS,UAAU,EAAE,CAAC,CAAC,CAuD/D"}
+{"version":3,"file":"args.d.ts","sourceRoot":"","sources":["../../../../../../src/core/cli/actions/compile/args.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAG7D,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,YAAY,EAClB,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,cAAc,EACpB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GACtC,OAAO,CAAC,CAAC,eAAe,GAAG,SAAS,EAAE,SAAS,UAAU,EAAE,CAAC,CAAC,CAkC/D"}

package/dist/src/core/cli/actions/compile/args.js

@@ -1,56 +1,36 @@
-import { expandConfigVariables } from "../../../../config/config-interpolation.js";
-import { loadTypeSpecConfigForPath, validateConfigPathsAbsolute, } from "../../../../config/config-loader.js";
-import { createDiagnosticCollector } from "../../../index.js";
-import { getDirectoryPath, normalizePath, resolvePath } from "../../../path-utils.js";
-import { deepClone, omitUndefined } from "../../../util.js";
+import { resolveCompilerOptions } from "../../../../config/config-to-options.js";
+import { createDiagnosticCollector } from "../../../diagnostics.js";
+import { resolvePath } from "../../../path-utils.js";
+import { omitUndefined } from "../../../util.js";
 export async function getCompilerOptions(host, entrypoint, cwd, args, env) {
-    var _a, _b, _c, _d, _e;
-    cwd = normalizePath(cwd);
+    var _a;
     const diagnostics = createDiagnosticCollector();
     const pathArg = (_a = args["output-dir"]) !== null && _a !== void 0 ? _a : args["output-path"];
-    const configPath = args["config"]
-        ? resolvePath(cwd, args["config"])
-        : getDirectoryPath(entrypoint);
-    const config = await loadTypeSpecConfigForPath(host, configPath, "config" in args);
-    if (config.diagnostics.length > 0) {
-        if (config.diagnostics.some((d) => d.severity === "error")) {
-            return [undefined, config.diagnostics];
-        }
-        config.diagnostics.forEach((x) => diagnostics.add(x));
-    }
+    const cliOutputDir = pathArg
+        ? pathArg.startsWith("{")
+            ? pathArg
+            : resolvePath(cwd, pathArg)
+        : undefined;
     const cliOptions = resolveCliOptions(args);
-    const configWithCliArgs = {
-        ...config,
-        outputDir: config.outputDir,
-        imports: (_b = args["import"]) !== null && _b !== void 0 ? _b : config["imports"],
-        warnAsError: (_c = args["warn-as-error"]) !== null && _c !== void 0 ? _c : config.warnAsError,
-        trace: (_d = args.trace) !== null && _d !== void 0 ? _d : config.trace,
-        emit: (_e = args.emit) !== null && _e !== void 0 ? _e : config.emit,
-        options: resolveEmitterOptions(config, cliOptions),
-    };
-    const cliOutputDir = pathArg ? resolvePath(cwd, pathArg) : undefined;
-    const expandedConfig = diagnostics.pipe(expandConfigVariables(configWithCliArgs, {
-        cwd: cwd,
-        outputDir: cliOutputDir,
-        env,
+    const resolvedOptions = diagnostics.pipe(await resolveCompilerOptions(host, {
+        entrypoint,
+        configPath: args["config"] && resolvePath(cwd, args["config"]),
+        cwd,
         args: resolveConfigArgs(args),
+        env,
+        overrides: omitUndefined({
+            outputDir: cliOutputDir,
+            imports: args["import"],
+            warnAsError: args["warn-as-error"],
+            trace: args.trace,
+            emit: args.emit,
+            options: cliOptions.options,
+        }),
     }));
-    validateConfigPathsAbsolute(expandedConfig).forEach((x) => diagnostics.add(x));
-    const options = omitUndefined({
-        nostdlib: args["nostdlib"],
-        watchForChanges: args["watch"],
-        noEmit: args["no-emit"],
+    return diagnostics.wrap(omitUndefined({
+        ...resolvedOptions,
         miscOptions: cliOptions.miscOptions,
-        outputDir: expandedConfig.outputDir,
-        config: config.filename,
-        additionalImports: expandedConfig["imports"],
-        warningAsError: expandedConfig.warnAsError,
-        trace: expandedConfig.trace,
-        emit: expandedConfig.emit,
-        options: expandedConfig.options,
-        linterRuleSet: expandedConfig.linter,
-    });
-    return diagnostics.wrap(options);
+    }));
 }
 function resolveConfigArgs(args) {
     var _a;
@@ -66,6 +46,7 @@ function resolveConfigArgs(args) {
 }
 function resolveCliOptions(args) {
     var _a;
+    let miscOptions;
     const options = {};
     for (const option of (_a = args.options) !== null && _a !== void 0 ? _a : []) {
         const optionParts = option.split("=");
@@ -75,10 +56,10 @@ function resolveCliOptions(args) {
         let optionKeyParts = optionParts[0].split(".");
         if (optionKeyParts.length === 1) {
             const key = optionKeyParts[0];
-            if (!("miscOptions" in options)) {
-                options.miscOptions = {};
+            if (miscOptions === undefined) {
+                miscOptions = {};
             }
-            options.miscOptions[key] = optionParts[1];
+            miscOptions[key] = optionParts[1];
             continue;
         }
         else if (optionKeyParts.length > 2) {
@@ -95,20 +76,6 @@ function resolveCliOptions(args) {
         }
         options[emitterName][key] = optionParts[1];
     }
-    return options;
-}
-function resolveEmitterOptions(config, cliOptions) {
-    var _a, _b;
-    const configuredEmitters = deepClone((_a = config.options) !== null && _a !== void 0 ? _a : {});
-    for (const [emitterName, cliOptionOverride] of Object.entries(cliOptions)) {
-        if (emitterName === "miscOptions") {
-            continue;
-        }
-        configuredEmitters[emitterName] = {
-            ...((_b = configuredEmitters[emitterName]) !== null && _b !== void 0 ? _b : {}),
-            ...cliOptionOverride,
-        };
-    }
-    return configuredEmitters;
+    return { options, miscOptions };
 }
 //# sourceMappingURL=args.js.map

package/dist/src/core/cli/actions/compile/args.js.map

@@ -1 +1 @@
-{"version":3,"file":"args.js","sourceRoot":"","sources":["../../../../../../src/core/cli/actions/compile/args.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"args.js","sourceRoot":"","sources":["../../../../../../src/core/cli/actions/compile/args.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAEpE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAmBjD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,IAAkB,EAClB,UAAkB,EAClB,GAAW,EACX,IAAoB,EACpB,GAAuC;;IAEvC,MAAM,WAAW,GAAG,yBAAyB,EAAE,CAAC;IAEhD,MAAM,OAAO,GAAG,MAAA,IAAI,CAAC,YAAY,CAAC,mCAAI,IAAI,CAAC,aAAa,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,OAAO;QAC1B,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;YACvB,CAAC,CAAC,OAAO;YACT,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,CAAC;QAC7B,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,UAAU,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,eAAe,GAAG,WAAW,CAAC,IAAI,CACtC,MAAM,sBAAsB,CAAC,IAAI,EAAE;QACjC,UAAU;QACV,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9D,GAAG;QACH,IAAI,EAAE,iBAAiB,CAAC,IAAI,CAAC;QAC7B,GAAG;QACH,SAAS,EAAE,aAAa,CAAC;YACvB,SAAS,EAAE,YAAY;YACvB,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC;YACvB,WAAW,EAAE,IAAI,CAAC,eAAe,CAAC;YAClC,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,OAAO,EAAE,UAAU,CAAC,OAAO;SAC5B,CAAC;KACH,CAAC,CACH,CAAC;IACF,OAAO,WAAW,CAAC,IAAI,CACrB,aAAa,CAAC;QACZ,GAAG,eAAe;QAClB,WAAW,EAAE,UAAU,CAAC,WAAW;KACpC,CAAC,CACH,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAoB;;IAC7C,MAAM,GAAG,GAA2B,EAAE,CAAC;IACvC,KAAK,MAAM,GAAG,IAAI,MAAA,IAAI,CAAC,IAAI,mCAAI,EAAE,EAAE;QACjC,MAAM,WAAW,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,8BAA8B,GAAG,yCAAyC,CAAC,CAAC;SAC7F;QAED,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;KACtC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AACD,SAAS,iBAAiB,CAAC,IAAoB;;IAI7C,IAAI,WAA+C,CAAC;IACpD,MAAM,OAAO,GAA2C,EAAE,CAAC;IAC3D,KAAK,MAAM,MAAM,IAAI,MAAA,IAAI,CAAC,OAAO,mCAAI,EAAE,EAAE;QACvC,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5B,MAAM,IAAI,KAAK,CACb,iCAAiC,MAAM,2DAA2D,CACnG,CAAC;SACH;QACD,IAAI,cAAc,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/C,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/B,MAAM,GAAG,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;YAC9B,IAAI,WAAW,KAAK,SAAS,EAAE;gBAC7B,WAAW,GAAG,EAAE,CAAC;aAClB;YACD,WAAW,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;YAClC,SAAS;SACV;aAAM,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YACpC,0CAA0C;YAC1C,cAAc,GAAG;gBACf,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;gBACrC,cAAc,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC;aAC1C,CAAC;SACH;QACD,MAAM,WAAW,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;QACtC,MAAM,GAAG,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;QAC9B,IAAI,CAAC,CAAC,WAAW,IAAI,OAAO,CAAC,EAAE;YAC7B,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;SAC3B;QACD,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;KAC5C;IACD,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;AAClC,CAAC"}

package/dist/src/core/cli/actions/compile/compile.d.ts

@@ -1,5 +1,6 @@
+import { CliCompilerHost } from "../../types.js";
 import { CompileCliArgs } from "./args.js";
-export declare function compileAction(args: CompileCliArgs & {
+export declare function compileAction(host: CliCompilerHost, args: CompileCliArgs & {
     path: string;
     pretty?: boolean;
 }): Promise<void>;

package/dist/src/core/cli/actions/compile/compile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../../../../src/core/cli/actions/compile/compile.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,cAAc,EAAsB,MAAM,WAAW,CAAC;AAE/D,wBAAsB,aAAa,CAAC,IAAI,EAAE,cAAc,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,iBAwB5F"}
+{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../../../../src/core/cli/actions/compile/compile.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,OAAO,EAAE,cAAc,EAAsB,MAAM,WAAW,CAAC;AAG/D,wBAAsB,aAAa,CACjC,IAAI,EAAE,eAAe,EACrB,IAAI,EAAE,cAAc,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,iBAmB1D"}

package/dist/src/core/cli/actions/compile/compile.js

@@ -1,13 +1,12 @@
-import watch from "node-watch";
 import { resolve } from "path";
 import { logDiagnostics } from "../../../diagnostics.js";
 import { resolveTypeSpecEntrypoint } from "../../../entrypoint-resolution.js";
-import { getAnyExtensionFromPath, resolvePath } from "../../../path-utils.js";
+import { resolvePath } from "../../../path-utils.js";
 import { compile as compileProgram } from "../../../program.js";
-import { createCLICompilerHost, handleInternalCompilerError, logDiagnosticCount, } from "../../utils.js";
+import { handleInternalCompilerError, logDiagnosticCount } from "../../utils.js";
 import { getCompilerOptions } from "./args.js";
-export async function compileAction(args) {
-    const host = createCLICompilerHost(args);
+import { createWatchHost, createWatcher } from "./watch.js";
+export async function compileAction(host, args) {
     const diagnostics = [];
     const entrypoint = await resolveTypeSpecEntrypoint(host, resolvePath(process.cwd(), args.path), (diag) => diagnostics.push(diag));
     if (entrypoint === undefined || diagnostics.length > 0) {
@@ -15,13 +14,11 @@ export async function compileAction(args) {
         process.exit(1);
     }
     const cliOptions = await getCompilerOptionsOrExit(host, entrypoint, args);
-    const program = await compileInput(host, entrypoint, cliOptions);
-    if (program.hasError()) {
-        process.exit(1);
+    if (args.watch) {
+        await compileWatch(host, entrypoint, cliOptions);
     }
-    if (program.emitters.length === 0 && !program.compilerOptions.noEmit) {
-        // eslint-disable-next-line no-console
-        console.log("No emitter was configured, no output was generated. Use `--emit <emitterName>` to pick emitter or specify it in the typespec config.");
+    else {
+        await compileOnce(host, entrypoint, cliOptions);
     }
 }
 async function getCompilerOptionsOrExit(host, entrypoint, args) {
@@ -35,22 +32,28 @@ async function getCompilerOptionsOrExit(host, entrypoint, args) {
     }
     return options;
 }
-function compileInput(host, path, compilerOptions, printSuccess = true) {
+async function compileOnce(host, path, compilerOptions) {
+    try {
+        const program = await compileProgram(host, resolve(path), compilerOptions);
+        logProgramResult(host, program);
+        if (program.hasError()) {
+            process.exit(1);
+        }
+    }
+    catch (e) {
+        handleInternalCompilerError(e);
+    }
+}
+function compileWatch(host, path, compilerOptions) {
     let compileRequested = false;
     let currentCompilePromise = undefined;
-    const log = (message, ...optionalParams) => {
-        const prefix = compilerOptions.watchForChanges ? `[${new Date().toLocaleTimeString()}] ` : "";
-        // eslint-disable-next-line no-console
-        console.log(`${prefix}${message}`, ...optionalParams);
-    };
     const runCompilePromise = () => {
         // Don't run the compiler if it's already running
-        if (!currentCompilePromise) {
+        if (currentCompilePromise === undefined) {
             // Clear the console before compiling in watch mode
-            if (compilerOptions.watchForChanges) {
-                // eslint-disable-next-line no-console
-                console.clear();
-            }
+            // eslint-disable-next-line no-console
+            console.clear();
+            watchHost === null || watchHost === void 0 ? void 0 : watchHost.forceJSReload();
             currentCompilePromise = compileProgram(host, resolve(path), compilerOptions)
                 .then(onCompileFinished)
                 .catch(handleInternalCompilerError);
@@ -60,47 +63,51 @@ function compileInput(host, path, compilerOptions, printSuccess = true) {
         }
         return currentCompilePromise;
     };
-    const runCompile = () => void runCompilePromise();
+    const scheduleCompile = () => void runCompilePromise();
+    const watcher = createWatcher((_name) => {
+        scheduleCompile();
+    });
+    const watchHost = (host = createWatchHost());
     const onCompileFinished = (program) => {
-        if (program.diagnostics.length > 0) {
-            log("Diagnostics were reported during compilation:\n");
-            logDiagnostics(program.diagnostics, host.logSink);
-            logDiagnosticCount(program.diagnostics);
-        }
-        else {
-            if (printSuccess) {
-                log("Compilation completed successfully.");
-            }
-        }
-        // eslint-disable-next-line no-console
-        console.log(); // Insert a newline
+        watcher === null || watcher === void 0 ? void 0 : watcher.updateWatchedFiles([...program.sourceFiles.keys(), ...program.jsSourceFiles.keys()]);
+        logProgramResult(host, program, { showTimestamp: true });
         currentCompilePromise = undefined;
-        if (compilerOptions.watchForChanges && compileRequested) {
+        if (compileRequested) {
             compileRequested = false;
-            runCompile();
+            scheduleCompile();
         }
         return program;
     };
-    if (compilerOptions.watchForChanges) {
-        runCompile();
-        return new Promise((resolve, reject) => {
-            const watcher = watch(path, {
-                recursive: true,
-                filter: (f) => [".js", ".tsp", ".cadl"].indexOf(getAnyExtensionFromPath(f)) > -1 &&
-                    !/node_modules/.test(f),
-            }, (e, name) => {
-                runCompile();
-            });
-            // Handle Ctrl+C for termination
-            process.on("SIGINT", () => {
-                watcher.close();
-                // eslint-disable-next-line no-console
-                console.info("Terminating watcher...\n");
-            });
+    scheduleCompile();
+    return new Promise((resolve, reject) => {
+        // Handle Ctrl+C for termination
+        process.on("SIGINT", () => {
+            watcher.close();
+            // eslint-disable-next-line no-console
+            console.info("Terminating watcher...\n");
+            resolve();
         });
+    });
+}
+function logProgramResult(host, program, { showTimestamp } = {}) {
+    const log = (message, ...optionalParams) => {
+        const timestamp = showTimestamp ? `[${new Date().toLocaleTimeString()}] ` : "";
+        // eslint-disable-next-line no-console
+        console.log(`${timestamp}${message}`, ...optionalParams);
+    };
+    if (program.diagnostics.length > 0) {
+        log("Diagnostics were reported during compilation:\n");
+        logDiagnostics(program.diagnostics, host.logSink);
+        logDiagnosticCount(program.diagnostics);
     }
     else {
-        return runCompilePromise();
+        log("Compilation completed successfully.");
+    }
+    // eslint-disable-next-line no-console
+    console.log(); // Insert a newline
+    if (program.emitters.length === 0 && !program.compilerOptions.noEmit) {
+        // eslint-disable-next-line no-console
+        log("No emitter was configured, no output was generated. Use `--emit <emitterName>` to pick emitter or specify it in the typespec config.");
     }
 }
 //# sourceMappingURL=compile.js.map

package/dist/src/core/cli/actions/compile/compile.js.map

@@ -1 +1 @@
-{"version":3,"file":"compile.js","sourceRoot":"","sources":["../../../../../../src/core/cli/actions/compile/compile.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compile.js","sourceRoot":"","sources":["../../../../../../src/core/cli/actions/compile/compile.ts"],"names":[],"mappings":"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"}

package/dist/src/core/cli/actions/compile/watch.d.ts

@@ -0,0 +1,15 @@
+/// <reference types="node" resolution-mode="require"/>
+import { WatchEventType } from "fs";
+import { CompilerHost } from "../../../types.js";
+export interface ProjectWatcher {
+    /** Set the files to watch. */
+    readonly updateWatchedFiles: (files: string[]) => void;
+    /** Close the watcher. */
+    readonly close: () => void;
+}
+export interface WatchHost extends CompilerHost {
+    forceJSReload(): void;
+}
+export declare function createWatcher(onFileChanged: (event: WatchEventType, name: string) => void): ProjectWatcher;
+export declare function createWatchHost(): WatchHost;
+//# sourceMappingURL=watch.d.ts.map

package/dist/src/core/cli/actions/compile/watch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../../../../../src/core/cli/actions/compile/watch.ts"],"names":[],"mappings":";AAAA,OAAO,EAAa,cAAc,EAAS,MAAM,IAAI,CAAC;AAGtD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,WAAW,cAAc;IAC7B,8BAA8B;IAC9B,QAAQ,CAAC,kBAAkB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAEvD,yBAAyB;IACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,IAAI,CAAC;CAC5B;AAED,MAAM,WAAW,SAAU,SAAQ,YAAY;IAC7C,aAAa,IAAI,IAAI,CAAC;CACvB;AAED,wBAAgB,aAAa,CAC3B,aAAa,EAAE,CAAC,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,GAC3D,cAAc,CAmChB;AAED,wBAAgB,eAAe,IAAI,SAAS,CAU3C"}

package/dist/src/core/cli/actions/compile/watch.js

@@ -0,0 +1,59 @@
+import { watch } from "fs";
+import { pathToFileURL } from "url";
+import { NodeHost } from "../../../node-host.js";
+export function createWatcher(onFileChanged) {
+    const current = new Map();
+    const dupFilter = createDupsFilter();
+    return { updateWatchedFiles, close };
+    function watchFile(file) {
+        const watcher = watch(file, dupFilter((event, _name) => {
+            onFileChanged(event, file);
+        }));
+        return watcher;
+    }
+    function close() {
+        for (const watcher of current.values()) {
+            watcher.close();
+        }
+    }
+    function updateWatchedFiles(files) {
+        var _a;
+        const cleanup = new Set(current.keys());
+        for (const file of files) {
+            if (!current.has(file)) {
+                current.set(file, watchFile(file));
+            }
+            cleanup.delete(file);
+        }
+        for (const file of cleanup) {
+            (_a = current.get(file)) === null || _a === void 0 ? void 0 : _a.close();
+            current.delete(file);
+        }
+    }
+}
+export function createWatchHost() {
+    let count = 0;
+    return {
+        ...NodeHost,
+        forceJSReload,
+        getJsImport: (path) => import(pathToFileURL(path).href + `?=${count}`),
+    };
+    function forceJSReload() {
+        count++;
+    }
+}
+function createDupsFilter() {
+    let memo = {};
+    return function (fn) {
+        return function (event, name) {
+            memo[name] = [event, name];
+            setTimeout(function () {
+                Object.values(memo).forEach((args) => {
+                    fn(...args);
+                });
+                memo = {};
+            });
+        };
+    };
+}
+//# sourceMappingURL=watch.js.map

package/dist/src/core/cli/actions/compile/watch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"watch.js","sourceRoot":"","sources":["../../../../../../src/core/cli/actions/compile/watch.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,KAAK,EAAE,MAAM,IAAI,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAejD,MAAM,UAAU,aAAa,CAC3B,aAA4D;IAE5D,MAAM,OAAO,GAAG,IAAI,GAAG,EAAqB,CAAC;IAC7C,MAAM,SAAS,GAAG,gBAAgB,EAAE,CAAC;IACrC,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC;IAErC,SAAS,SAAS,CAAC,IAAY;QAC7B,MAAM,OAAO,GAAG,KAAK,CACnB,IAAI,EACJ,SAAS,CAAC,CAAC,KAAqB,EAAE,KAAa,EAAE,EAAE;YACjD,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC7B,CAAC,CAAC,CACH,CAAC;QACF,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,SAAS,KAAK;QACZ,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE;YACtC,OAAO,CAAC,KAAK,EAAE,CAAC;SACjB;IACH,CAAC;IAED,SAAS,kBAAkB,CAAC,KAAe;;QACzC,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QACxC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBACtB,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;aACpC;YACD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SACtB;QAED,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE;YAC1B,MAAA,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,0CAAE,KAAK,EAAE,CAAC;YAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SACtB;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,eAAe;IAC7B,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,OAAO;QACL,GAAG,QAAQ;QACX,aAAa;QACb,WAAW,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,GAAG,KAAK,KAAK,EAAE,CAAC;KAC/E,CAAC;IACF,SAAS,aAAa;QACpB,KAAK,EAAE,CAAC;IACV,CAAC;AACH,CAAC;AACD,SAAS,gBAAgB;IACvB,IAAI,IAAI,GAA6C,EAAE,CAAC;IACxD,OAAO,UAAU,EAA6C;QAC5D,OAAO,UAAU,KAAqB,EAAE,IAAY;YAClD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YAC3B,UAAU,CAAC;gBACT,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;oBACnC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;gBACd,CAAC,CAAC,CAAC;gBACH,IAAI,GAAG,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC"}

package/dist/src/core/cli/actions/format.d.ts

@@ -1,8 +1,9 @@
+import { CliCompilerHost } from "../types.js";
 export interface FormatArgs {
     include: string[];
     exclude?: string[];
     debug?: boolean;
     check?: boolean;
 }
-export declare function formatAction(args: FormatArgs): Promise<void>;
+export declare function formatAction(host: CliCompilerHost, args: FormatArgs): Promise<void>;
 //# sourceMappingURL=format.d.ts.map

package/dist/src/core/cli/actions/format.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../../../../src/core/cli/actions/format.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AACD,wBAAsB,YAAY,CAAC,IAAI,EAAE,UAAU,iBAqBlD"}
+{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../../../../src/core/cli/actions/format.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AACD,wBAAsB,YAAY,CAAC,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,UAAU,iBAqBzE"}

package/dist/src/core/cli/actions/format.js

@@ -1,5 +1,5 @@
 import { findUnformattedTypeSpecFiles, formatTypeSpecFiles } from "../../formatter-fs.js";
-export async function formatAction(args) {
+export async function formatAction(host, args) {
     if (args["check"]) {
         const unformatted = await findUnformattedTypeSpecFiles(args["include"], {
             exclude: args["exclude"],

package/dist/src/core/cli/actions/format.js.map

@@ -1 +1 @@
-{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../../src/core/cli/actions/format.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAQ1F,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAAgB;IACjD,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE;QACjB,MAAM,WAAW,GAAG,MAAM,4BAA4B,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;YACtE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC;YACxB,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CAAC;QACH,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;YAC1B,sCAAsC;YACtC,OAAO,CAAC,GAAG,CAAC,SAAS,WAAW,CAAC,MAAM,qBAAqB,CAAC,CAAC;YAC9D,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE;gBAC9B,sCAAsC;gBACtC,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;aAC3B;YACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;KACF;SAAM;QACL,MAAM,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;YACzC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC;YACxB,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CAAC;KACJ;AACH,CAAC"}
+{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../../src/core/cli/actions/format.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAS1F,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAAqB,EAAE,IAAgB;IACxE,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE;QACjB,MAAM,WAAW,GAAG,MAAM,4BAA4B,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;YACtE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC;YACxB,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CAAC;QACH,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;YAC1B,sCAAsC;YACtC,OAAO,CAAC,GAAG,CAAC,SAAS,WAAW,CAAC,MAAM,qBAAqB,CAAC,CAAC;YAC9D,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE;gBAC9B,sCAAsC;gBACtC,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;aAC3B;YACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;KACF;SAAM;QACL,MAAM,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;YACzC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC;YACxB,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CAAC;KACJ;AACH,CAAC"}

package/dist/src/core/cli/actions/info.d.ts

@@ -1,6 +1,6 @@
-import { CompilerHost } from "../../types.js";
+import { CompilerHost, Diagnostic } from "../../types.js";
 /**
  * Print the resolved TypeSpec configuration.
  */
-export declare function printInfoAction(host: CompilerHost): Promise<void>;
+export declare function printInfoAction(host: CompilerHost): Promise<readonly Diagnostic[]>;
 //# sourceMappingURL=info.d.ts.map

package/dist/src/core/cli/actions/info.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"info.d.ts","sourceRoot":"","sources":["../../../../../src/core/cli/actions/info.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C;;GAEG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,YAAY,iBAmBvD"}
+{"version":3,"file":"info.d.ts","sourceRoot":"","sources":["../../../../../src/core/cli/actions/info.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE1D;;GAEG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,SAAS,UAAU,EAAE,CAAC,CAexF"}

package/dist/src/core/cli/actions/info.js

@@ -1,8 +1,6 @@
 /* eslint-disable no-console */
 import { fileURLToPath } from "url";
 import { loadTypeSpecConfigForPath } from "../../../config/config-loader.js";
-import { logDiagnostics } from "../../diagnostics.js";
-import { logDiagnosticCount } from "../utils.js";
 /**
  * Print the resolved TypeSpec configuration.
  */
@@ -18,10 +16,6 @@ export async function printInfoAction(host) {
     console.log("-----------");
     console.log(jsyaml.dump(config, { replacer }));
     console.log("-----------");
-    logDiagnostics(config.diagnostics, host.logSink);
-    logDiagnosticCount(config.diagnostics);
-    if (config.diagnostics.some((d) => d.severity === "error")) {
-        process.exit(1);
-    }
+    return config.diagnostics;
 }
 //# sourceMappingURL=info.js.map

package/dist/src/core/cli/actions/info.js.map

@@ -1 +1 @@
-{"version":3,"file":"info.js","sourceRoot":"","sources":["../../../../../src/core/cli/actions/info.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,IAAkB;;IACtD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1B,OAAO,CAAC,GAAG,CAAC,WAAW,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEzD,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC1D,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC;IACvC,MAAM,QAAQ,GAAG,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG,CAAC,OAAe,EAAE,KAAU,EAAE,EAAE,CAC/C,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;IAEjD,OAAO,CAAC,GAAG,CAAC,gBAAgB,MAAA,MAAM,CAAC,QAAQ,mCAAI,sBAAsB,EAAE,CAAC,CAAC;IACzE,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC3B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IAC/C,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC3B,cAAc,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACjD,kBAAkB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACvC,IAAI,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAC,EAAE;QAC1D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC"}
+{"version":3,"file":"info.js","sourceRoot":"","sources":["../../../../../src/core/cli/actions/info.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAG7E;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,IAAkB;;IACtD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1B,OAAO,CAAC,GAAG,CAAC,WAAW,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEzD,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC1D,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC;IACvC,MAAM,QAAQ,GAAG,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG,CAAC,OAAe,EAAE,KAAU,EAAE,EAAE,CAC/C,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;IAEjD,OAAO,CAAC,GAAG,CAAC,gBAAgB,MAAA,MAAM,CAAC,QAAQ,mCAAI,sBAAsB,EAAE,CAAC,CAAC;IACzE,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC3B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IAC/C,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC3B,OAAO,MAAM,CAAC,WAAW,CAAC;AAC5B,CAAC"}

package/dist/src/core/cli/actions/init.d.ts

@@ -1,6 +1,7 @@
+import { Diagnostic } from "../../types.js";
+import { CliCompilerHost } from "../types.js";
 export interface InitArgs {
     templatesUrl?: string;
-    pretty?: boolean;
 }
-export declare function initAction(args: InitArgs): Promise<void>;
+export declare function initAction(host: CliCompilerHost, args: InitArgs): Promise<readonly Diagnostic[]>;
 //# sourceMappingURL=init.d.ts.map

package/dist/src/core/cli/actions/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../src/core/cli/actions/init.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,QAAQ;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,QAAQ,iBAW9C"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../src/core/cli/actions/init.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,WAAW,QAAQ;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,wBAAsB,UAAU,CAC9B,IAAI,EAAE,eAAe,EACrB,IAAI,EAAE,QAAQ,GACb,OAAO,CAAC,SAAS,UAAU,EAAE,CAAC,CAUhC"}

package/dist/src/core/cli/actions/init.js

@@ -1,15 +1,12 @@
 import { InitTemplateError, initTypeSpecProject } from "../../../init/init.js";
-import { logDiagnostics } from "../../diagnostics.js";
-import { createCLICompilerHost } from "../utils.js";
-export async function initAction(args) {
-    const host = createCLICompilerHost(args);
+export async function initAction(host, args) {
     try {
         await initTypeSpecProject(host, process.cwd(), args.templatesUrl);
+        return [];
     }
     catch (e) {
         if (e instanceof InitTemplateError) {
-            logDiagnostics(e.diagnostics, host.logSink);
-            process.exit(1);
+            return e.diagnostics;
         }
         throw e;
     }

package/dist/src/core/cli/actions/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../src/core/cli/actions/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAOpD,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,IAAc;IAC7C,MAAM,IAAI,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;IACzC,IAAI;QACF,MAAM,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;KACnE;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,CAAC,YAAY,iBAAiB,EAAE;YAClC,cAAc,CAAC,CAAC,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAC5C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;QACD,MAAM,CAAC,CAAC;KACT;AACH,CAAC"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../src/core/cli/actions/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAQ/E,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,IAAqB,EACrB,IAAc;IAEd,IAAI;QACF,MAAM,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAClE,OAAO,EAAE,CAAC;KACX;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,CAAC,YAAY,iBAAiB,EAAE;YAClC,OAAO,CAAC,CAAC,WAAW,CAAC;SACtB;QACD,MAAM,CAAC,CAAC;KACT;AACH,CAAC"}

package/dist/src/core/cli/actions/vs.d.ts

@@ -1,3 +1,5 @@
-export declare function installVSExtension(debug: boolean): Promise<void>;
-export declare function uninstallVSExtension(): Promise<void>;
+import { Diagnostic } from "../../types.js";
+import { CliCompilerHost } from "../types.js";
+export declare function installVSExtension(host: CliCompilerHost): Promise<readonly Diagnostic[]>;
+export declare function uninstallVSExtension(host: CliCompilerHost): Promise<readonly Diagnostic[]>;
 //# sourceMappingURL=vs.d.ts.map

package/dist/src/core/cli/actions/vs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vs.d.ts","sourceRoot":"","sources":["../../../../../src/core/cli/actions/vs.ts"],"names":[],"mappings":"AASA,wBAAsB,kBAAkB,CAAC,KAAK,EAAE,OAAO,iBAsBtD;AAED,wBAAsB,oBAAoB,kBAKzC"}
+{"version":3,"file":"vs.d.ts","sourceRoot":"","sources":["../../../../../src/core/cli/actions/vs.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAY,MAAM,gBAAgB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAQ9C,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,SAAS,UAAU,EAAE,CAAC,CA2B9F;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,SAAS,UAAU,EAAE,CAAC,CAShG"}