@gravity-ui/app-builder 0.42.0-beta.1 → 0.42.0-beta.2

package/dist/common/typescript/utils.d.ts

@@ -10,5 +10,5 @@ export declare function displayFilename(originalFunc: (path: string, encoding?:
 };
 export declare function onHostEvent<F extends string, T extends {
     [key in F]?: (...args: any[]) => any;
-}>(host: T, functionName: F, before?: (...args: Parameters<NonNullable<T[F]>>) => void, after?: (res: ReturnType<NonNullable<T[F]>>) => void): void;
+}>(host: T, functionName: F, before?: (...args: Parameters<NonNullable<T[F]>>) => void, after?: (res: ReturnType<NonNullable<T[F]>>, ...args: Parameters<NonNullable<T[F]>>) => void): void;
 export declare function resolveTypescript(): string;

package/dist/common/typescript/utils.js

@@ -74,7 +74,7 @@ function onHostEvent(host, functionName, before, after) {
             result = originalFunction(...args);
         }
         if (after) {
-            after(result);
+            after(result, ...args);
         }
         return result;
     });

package/dist/common/typescript/watch.js

@@ -10,20 +10,23 @@ function watch(ts, projectPath, { logger, onAfterFilesEmitted, enableSourceMap,
     const configPath = (0, utils_1.getTsProjectConfigPath)(ts, projectPath);
     const createProgram = ts.createEmitAndSemanticDiagnosticsBuilderProgram;
     const host = ts.createSolutionBuilderWithWatchHost(ts.sys, createProgram, reportDiagnostic, reportDiagnostic, reportWatchStatusChanged);
-    host.readFile = (0, utils_1.displayFilename)(host.readFile, 'Reading', logger);
-    (0, utils_1.onHostEvent)(host, 'createProgram', () => {
+    (0, utils_1.onHostEvent)(host, 'createProgram', (_rootnames, _options, host) => {
         logger.verbose("We're about to create the program");
-        // @ts-expect-error
-        host.readFile.enableDisplay();
-    }, () => {
-        // @ts-expect-error
-        const count = host.readFile.disableDisplay();
-        logger.verbose(`Program created, read ${count} files`);
+        if (host) {
+            host.readFile = (0, utils_1.displayFilename)(host.readFile, 'Reading', logger);
+            // @ts-expect-error
+            host.readFile.enableDisplay();
+        }
+    }, (_result, _rootnames, _options, host) => {
+        if (host) {
+            // @ts-expect-error
+            const count = host.readFile.disableDisplay();
+            logger.verbose(`Program created, read ${count} files`);
+        }
     });
-    (0, utils_1.onHostEvent)(host, 'afterProgramEmitAndDiagnostics', () => {
-        logger.verbose('Emit completed!');
-    }, () => {
-        onAfterFilesEmitted?.();
+    (0, utils_1.onHostEvent)(host, 'afterProgramEmitAndDiagnostics', (program) => {
+        const project = program.getCompilerOptions().project;
+        logger.verbose(`Emit completed for ${project}!`);
     });
     // `createSolutionBuilderWithWatch` creates an initial program, watches files, and updates
     // the program over time.
@@ -60,5 +63,8 @@ function watch(ts, projectPath, { logger, onAfterFilesEmitted, enableSourceMap,
         if (diagnostic.messageText) {
             logger.message(ts.flattenDiagnosticMessageText(diagnostic.messageText, ts.sys.newLine));
         }
+        if (diagnostic.code === 6194 || diagnostic.code === 6193) {
+            onAfterFilesEmitted?.();
+        }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/app-builder",
-  "version": "0.42.0-beta.1",
+  "version": "0.42.0-beta.2",
   "description": "Develop and build your React client-server projects, powered by typescript and webpack",
   "license": "MIT",
   "type": "commonjs",