@gravity-ui/app-builder 0.41.0 → 0.42.0-beta.0

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

@@ -8,7 +8,4 @@ export declare function displayFilename(originalFunc: (path: string, encoding?:
     enableDisplay(): void;
     disableDisplay(): number;
 };
-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;
 export declare function resolveTypescript(): string;

package/dist/common/typescript/utils.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTsProjectConfigPath = getTsProjectConfigPath;
 exports.getTsProjectConfig = getTsProjectConfig;
 exports.displayFilename = displayFilename;
-exports.onHostEvent = onHostEvent;
 exports.resolveTypescript = resolveTypescript;
 const node_path_1 = __importDefault(require("node:path"));
 const paths_1 = __importDefault(require("../paths"));
@@ -61,24 +60,6 @@ function displayFilename(originalFunc, operationName, logger) {
     };
     return displayFunction;
 }
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function onHostEvent(host, functionName, before, after) {
-    const originalFunction = host[functionName];
-    // eslint-disable-next-line no-param-reassign
-    host[functionName] = ((...args) => {
-        if (before) {
-            before(...args);
-        }
-        let result;
-        if (typeof originalFunction === 'function') {
-            result = originalFunction(...args);
-        }
-        if (after) {
-            after(result);
-        }
-        return result;
-    });
-}
 function resolveTypescript() {
     try {
         return require.resolve(node_path_1.default.resolve(paths_1.default.appNodeModules, 'typescript'));

package/dist/common/typescript/watch.js

@@ -9,37 +9,52 @@ function watch(ts, projectPath, { logger, onAfterFilesEmitted, enableSourceMap,
     logger.message(`Typescript v${ts.version}`);
     const configPath = (0, utils_1.getTsProjectConfigPath)(ts, projectPath);
     const createProgram = ts.createEmitAndSemanticDiagnosticsBuilderProgram;
-    const host = ts.createWatchCompilerHost(configPath, {
+    const host = ts.createSolutionBuilderWithWatchHost(ts.sys, createProgram, reportDiagnostic, reportDiagnostic, reportWatchStatusChanged);
+    const transformPathsToLocalModules = (0, transformers_1.createTransformPathsToLocalModules)(ts);
+    // `createSolutionBuilderWithWatch` creates an initial program, watches files, and updates
+    // the program over time.
+    const solutionBuilder = ts.createSolutionBuilderWithWatch(host, [configPath], {
         noEmit: false,
         noEmitOnError: false,
         inlineSourceMap: enableSourceMap,
         inlineSources: enableSourceMap,
         ...(enableSourceMap ? { sourceMap: false } : undefined),
-    }, ts.sys, createProgram, reportDiagnostic, reportWatchStatusChanged);
-    host.readFile = (0, utils_1.displayFilename)(host.readFile, 'Reading', logger);
-    (0, utils_1.onHostEvent)(host, 'createProgram', () => {
-        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`);
-    });
-    (0, utils_1.onHostEvent)(host, 'afterProgramCreate', (program) => {
-        logger.verbose('We finished making the program! Emitting...');
-        const transformPathsToLocalModules = (0, transformers_1.createTransformPathsToLocalModules)(ts);
-        program.emit(undefined, undefined, undefined, undefined, {
-            after: [transformPathsToLocalModules],
-            afterDeclarations: [transformPathsToLocalModules],
-        });
-        logger.verbose('Emit completed!');
-    }, () => {
-        onAfterFilesEmitted?.();
     });
-    // `createWatchProgram` creates an initial program, watches files, and updates
-    // the program over time.
-    ts.createWatchProgram(host);
+    let project = solutionBuilder.getNextInvalidatedProject();
+    do {
+        if (project?.kind === ts.InvalidatedProjectKind.Build) {
+            const projectConfigPath = project.project.replace(process.cwd(), '');
+            const originalReadFile = host.readFile;
+            host.readFile = (0, utils_1.displayFilename)(originalReadFile, 'Reading', logger);
+            logger.verbose("We're about to create the program");
+            // @ts-expect-error We invoke method from overrided function
+            host.readFile.enableDisplay();
+            const program = project.getProgram();
+            if (!program) {
+                logger.verbose(`Program was not created, skip emitting for ${projectConfigPath}`);
+                // @ts-expect-error We invoke method from overrided function
+                host.readFile.disableDisplay();
+                host.readFile = originalReadFile;
+                logger.verbose(`We finished making the program for ${projectConfigPath}! Emitting...`);
+                next();
+                continue;
+            }
+            // @ts-expect-error
+            const count = host.readFile.disableDisplay();
+            host.readFile = originalReadFile;
+            logger.verbose(`Program created, read ${count} files`);
+            project.emit(undefined, undefined, undefined, undefined, {
+                after: [transformPathsToLocalModules],
+                afterDeclarations: [transformPathsToLocalModules],
+            });
+            logger.verbose('Emit completed!');
+            next();
+        }
+    } while (project);
+    onAfterFilesEmitted?.();
+    function next() {
+        project = solutionBuilder.getNextInvalidatedProject();
+    }
     function reportDiagnostic(diagnostic) {
         const formatHost = {
             getCanonicalFileName: (path) => path,

package/package.json

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