@dusted/anqst 0.1.1 → 0.1.2

package/dist/src/emit.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateOutputs = generateOutputs;
 exports.writeGeneratedOutputs = writeGeneratedOutputs;
-exports.installTypeScriptOutputs = installTypeScriptOutputs;
 exports.installEmbeddedWebBundle = installEmbeddedWebBundle;
 exports.installQtIntegrationCMake = installQtIntegrationCMake;
 exports.installQtDesignerPluginCMake = installQtDesignerPluginCMake;
@@ -13,6 +12,7 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const typescript_1 = __importDefault(require("typescript"));
 const pngjs_1 = require("pngjs");
+const layout_1 = require("./layout");
 function stripAnQstType(typeText) {
     return typeText
         .replace(/\bAnQst\.Type\.stringArray\b/g, "string[]")
@@ -349,7 +349,7 @@ function normalizeImportPathForGenerated(specFilePath, generatedFileRelPath, mod
         return moduleSpecifier;
     }
     const specDir = node_path_1.default.dirname(specFilePath);
-    const generatedAbs = node_path_1.default.resolve(node_path_1.default.dirname(specFilePath), "generated_output", generatedFileRelPath);
+    const generatedAbs = node_path_1.default.resolve(node_path_1.default.dirname(specFilePath), "generated", generatedFileRelPath);
     const generatedDir = node_path_1.default.dirname(generatedAbs);
     const resolvedModulePath = node_path_1.default.resolve(specDir, moduleSpecifier);
     const relative = node_path_1.default.relative(generatedDir, resolvedModulePath);
@@ -1226,7 +1226,7 @@ export declare class ${serviceName} {
 }
 function renderTsServices(spec) {
     const serviceClasses = spec.services.map((s) => renderTsService(spec, s.name)).join("\n");
-    const externalTypeImports = renderRequiredTypeImports(spec, "npmpackage/services.ts").trim();
+    const externalTypeImports = renderRequiredTypeImports(spec, `frontend/${(0, layout_1.generatedFrontendDirName)(spec.widgetName)}/services.ts`).trim();
     const localTypeImports = renderLocalTypeImports(spec).trim();
     const typeImports = [externalTypeImports, localTypeImports].filter((s) => s.length > 0).join("\n");
     const typeImportsBlock = typeImports.length > 0 ? `${typeImports}\n\n` : "";
@@ -1551,13 +1551,13 @@ ${serviceClasses}
 `;
 }
 function renderTsTypes(spec) {
-    const typeImports = renderRequiredTypeImports(spec, "npmpackage/types.ts").trim();
+    const typeImports = renderRequiredTypeImports(spec, `frontend/${(0, layout_1.generatedFrontendDirName)(spec.widgetName)}/types.ts`).trim();
     const typeDecls = renderTypeDeclarations(spec, true).trim();
     const sections = [typeImports, typeDecls].filter((s) => s.length > 0);
     return sections.length > 0 ? `${sections.join("\n\n")}\n` : "";
 }
 function renderTypeServicesDts(spec) {
-    const externalTypeImports = renderRequiredTypeImports(spec, "npmpackage/types/services.d.ts").trim();
+    const externalTypeImports = renderRequiredTypeImports(spec, `frontend/${(0, layout_1.generatedFrontendDirName)(spec.widgetName)}/types/services.d.ts`).trim();
     const localTypeImports = renderLocalTypeImports(spec).trim();
     const serviceDecls = spec.services
         .map((s) => renderTsServiceDts(spec, s.name))
@@ -1566,7 +1566,7 @@ function renderTypeServicesDts(spec) {
     return sections.length > 0 ? `${sections.join("\n\n")}\n` : "";
 }
 function renderTypeTypesDts(spec) {
-    const typeImports = renderRequiredTypeImports(spec, "npmpackage/types/types.d.ts").trim();
+    const typeImports = renderRequiredTypeImports(spec, `frontend/${(0, layout_1.generatedFrontendDirName)(spec.widgetName)}/types/types.d.ts`).trim();
     const typeDecls = renderTypeDeclarations(spec, true).trim();
     const sections = [typeImports, typeDecls].filter((s) => s.length > 0);
     return sections.length > 0 ? `${sections.join("\n\n")}\n` : "";
@@ -1632,13 +1632,13 @@ function nodeCap(value) {
     return value.length === 0 ? value : `${value.charAt(0).toUpperCase()}${value.slice(1)}`;
 }
 function renderNodeExpressWsTypes(spec) {
-    const typeImports = renderRequiredTypeImports(spec, `${generatedNodeExpressWsDirName(spec.widgetName)}/types/index.d.ts`).trim();
+    const typeImports = renderRequiredTypeImports(spec, `backend/node/express/${generatedNodeExpressWsDirName(spec.widgetName)}/types/index.d.ts`).trim();
     const typeDecls = renderTypeDeclarations(spec, true).trim();
     const sections = [typeImports, typeDecls].filter((s) => s.length > 0);
     return sections.length > 0 ? `${sections.join("\n\n")}\n` : "";
 }
 function renderNodeExpressWsIndex(spec) {
-    const typeImports = renderRequiredTypeImports(spec, `${generatedNodeExpressWsDirName(spec.widgetName)}/index.ts`);
+    const typeImports = renderRequiredTypeImports(spec, `backend/node/express/${generatedNodeExpressWsDirName(spec.widgetName)}/index.ts`);
     const typeDecls = renderTypeDeclarations(spec, true);
     const handlerBridgeTypeName = `${spec.widgetName}HandlerBridge`;
     const sessionBridgeTypeName = `${spec.widgetName}SessionBridge`;
@@ -2337,26 +2337,27 @@ function renderTypeRootIndexDts(spec) {
     return sections.length > 0 ? `${sections.join("\n\n")}\n` : "";
 }
 function generatedCppLibraryDirName(widgetName) {
-    return `${widgetName}_QtWidget`;
+    return (0, layout_1.generatedQtWidgetDirName)(widgetName);
 }
 function generatedNodeExpressWsDirName(widgetName) {
-    return `${widgetName}_node_express_ws`;
+    return (0, layout_1.generatedNodeExpressDirName)(widgetName);
 }
 function generateOutputs(spec, options = { emitQWidget: true, emitAngularService: true, emitNodeExpressWs: false }) {
-    const cppDir = generatedCppLibraryDirName(spec.widgetName);
-    const nodeDir = generatedNodeExpressWsDirName(spec.widgetName);
+    const frontendDir = `frontend/${(0, layout_1.generatedFrontendDirName)(spec.widgetName)}`;
+    const cppDir = `backend/cpp/qt/${generatedCppLibraryDirName(spec.widgetName)}`;
+    const nodeDir = `backend/node/express/${generatedNodeExpressWsDirName(spec.widgetName)}`;
     const outputs = {};
     if (options.emitAngularService) {
-        outputs["npmpackage/package.json"] = renderNpmPackage(spec);
-        outputs["npmpackage/index.ts"] = renderTsIndex();
-        outputs["npmpackage/services.ts"] = renderTsServices(spec);
-        outputs["npmpackage/types.ts"] = renderTsTypes(spec);
-        outputs["npmpackage/index.js"] = renderJsIndex();
-        outputs["npmpackage/services.js"] = renderJsServices();
-        outputs["npmpackage/types.js"] = renderJsTypes();
-        outputs["npmpackage/types/index.d.ts"] = renderTypeRootIndexDts(spec);
-        outputs["npmpackage/types/services.d.ts"] = renderTypeServicesDts(spec);
-        outputs["npmpackage/types/types.d.ts"] = renderTypeTypesDts(spec);
+        outputs[`${frontendDir}/package.json`] = renderNpmPackage(spec);
+        outputs[`${frontendDir}/index.ts`] = renderTsIndex();
+        outputs[`${frontendDir}/services.ts`] = renderTsServices(spec);
+        outputs[`${frontendDir}/types.ts`] = renderTsTypes(spec);
+        outputs[`${frontendDir}/index.js`] = renderJsIndex();
+        outputs[`${frontendDir}/services.js`] = renderJsServices();
+        outputs[`${frontendDir}/types.js`] = renderJsTypes();
+        outputs[`${frontendDir}/types/index.d.ts`] = renderTypeRootIndexDts(spec);
+        outputs[`${frontendDir}/types/services.d.ts`] = renderTypeServicesDts(spec);
+        outputs[`${frontendDir}/types/types.d.ts`] = renderTypeTypesDts(spec);
     }
     if (options.emitQWidget) {
         const cppTypes = buildCppTypeContext(spec);
@@ -2374,38 +2375,13 @@ function generateOutputs(spec, options = { emitQWidget: true, emitAngularService
     return outputs;
 }
 function writeGeneratedOutputs(cwd, outputs) {
-    const outputRoot = node_path_1.default.join(cwd, "generated_output");
+    const outputRoot = (0, layout_1.anqstGeneratedRootDir)(cwd);
     for (const [relPath, content] of Object.entries(outputs)) {
         const filePath = node_path_1.default.join(outputRoot, relPath);
         node_fs_1.default.mkdirSync(node_path_1.default.dirname(filePath), { recursive: true });
         node_fs_1.default.writeFileSync(filePath, withBuildStamp(relPath, content), "utf8");
     }
 }
-function installTypeScriptOutputs(cwd) {
-    const sourceDir = node_path_1.default.join(cwd, "generated_output", "npmpackage");
-    const targetDir = node_path_1.default.join(cwd, "src", "anqst-generated");
-    if (!node_fs_1.default.existsSync(sourceDir))
-        return;
-    node_fs_1.default.rmSync(targetDir, { recursive: true, force: true });
-    node_fs_1.default.mkdirSync(targetDir, { recursive: true });
-    const queue = [sourceDir];
-    while (queue.length > 0) {
-        const current = queue.shift();
-        for (const entry of node_fs_1.default.readdirSync(current, { withFileTypes: true })) {
-            const abs = node_path_1.default.join(current, entry.name);
-            const rel = node_path_1.default.relative(sourceDir, abs);
-            const dst = node_path_1.default.join(targetDir, rel);
-            if (entry.isDirectory()) {
-                node_fs_1.default.mkdirSync(dst, { recursive: true });
-                queue.push(abs);
-            }
-            else if (entry.isFile()) {
-                node_fs_1.default.mkdirSync(node_path_1.default.dirname(dst), { recursive: true });
-                node_fs_1.default.copyFileSync(abs, dst);
-            }
-        }
-    }
-}
 function listFilesRecursively(rootDir) {
     const output = [];
     const queue = [rootDir];
@@ -2539,7 +2515,7 @@ function installEmbeddedWebBundle(cwd, widgetName) {
     if (!node_fs_1.default.existsSync(node_path_1.default.join(distWebRoot, "index.html"))) {
         return false;
     }
-    const cppLibraryRoot = node_path_1.default.join(cwd, "generated_output", generatedCppLibraryDirName(widgetName));
+    const cppLibraryRoot = (0, layout_1.resolveGeneratedLayoutPaths)(cwd, widgetName).cppQtWidgetRoot;
     const cppLibraryWebRoot = node_path_1.default.join(cppLibraryRoot, "webapp");
     node_fs_1.default.rmSync(cppLibraryWebRoot, { recursive: true, force: true });
     node_fs_1.default.mkdirSync(cppLibraryWebRoot, { recursive: true });
@@ -2571,15 +2547,15 @@ function normalizeEmbeddedIndexHtml(indexPath, webRoot) {
     node_fs_1.default.writeFileSync(indexPath, html, "utf8");
 }
 function renderQtIntegrationCMake(widgetName) {
-    const generatedRootVar = "ANQST_GENERATED_CPP_DIR";
+    const generatedRootVar = "ANQST_GENERATED_WIDGET_DIR";
     const generatedIncludeVar = "ANQST_GENERATED_INCLUDE_DIR";
-    const webappRootVar = "ANQST_WEBAPP_ROOT";
+    const projectRootVar = "ANQST_PROJECT_ROOT";
     const widgetTarget = `${widgetName}Widget`;
     const autogenTarget = `${widgetTarget}_anqst_codegen`;
     return `cmake_minimum_required(VERSION 3.21)
 
-set(${webappRootVar} "\${CMAKE_CURRENT_LIST_DIR}/..")
-set(${generatedRootVar} "\${${webappRootVar}}/generated_output/${generatedCppLibraryDirName(widgetName)}")
+set(${projectRootVar} "\${CMAKE_CURRENT_LIST_DIR}/../../../../..")
+set(${generatedRootVar} "\${CMAKE_CURRENT_LIST_DIR}/../qt/${generatedCppLibraryDirName(widgetName)}")
 set(${generatedIncludeVar} "\${${generatedRootVar}}/include")
 
 if(TARGET ${widgetTarget})
@@ -2587,7 +2563,7 @@ if(TARGET ${widgetTarget})
 endif()
 
 if(NOT TARGET anqstwebhostbase)
-    message(FATAL_ERROR "Target 'anqstwebhostbase' must exist before including anqst-cmake for ${widgetName}.")
+    message(FATAL_ERROR "Target 'anqstwebhostbase' must exist before including generated AnQst CMake for ${widgetName}.")
 endif()
 
 find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
@@ -2607,7 +2583,7 @@ add_custom_command(
         "\${${generatedRootVar}}/webapp/index.html"
     COMMAND "\${ANQST_NPM_EXECUTABLE}" install
     COMMAND "\${ANQST_NPM_EXECUTABLE}" run anqst:build
-    WORKING_DIRECTORY "\${${webappRootVar}}"
+    WORKING_DIRECTORY "\${${projectRootVar}}"
     COMMENT "Generating AnQst widget library (${widgetTarget}) from Angular project"
     VERBATIM
 )
@@ -2648,9 +2624,9 @@ target_link_libraries(${widgetTarget}
 `;
 }
 function installQtIntegrationCMake(cwd, widgetName) {
-    const integrationDir = node_path_1.default.join(cwd, "anqst-cmake");
+    const integrationDir = (0, layout_1.resolveGeneratedLayoutPaths)(cwd, widgetName).cppCmakeRoot;
     node_fs_1.default.mkdirSync(integrationDir, { recursive: true });
-    node_fs_1.default.writeFileSync(node_path_1.default.join(integrationDir, "CMakeLists.txt"), withBuildStamp("anqst-cmake/CMakeLists.txt", renderQtIntegrationCMake(widgetName)), "utf8");
+    node_fs_1.default.writeFileSync(node_path_1.default.join(integrationDir, "CMakeLists.txt"), withBuildStamp("backend/cpp/cmake/CMakeLists.txt", renderQtIntegrationCMake(widgetName)), "utf8");
 }
 function normalizeIcoSize(dim) {
     return dim === 0 ? 256 : dim;
@@ -2881,8 +2857,8 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
-set(ANQST_WEBAPP_ROOT "\${CMAKE_CURRENT_LIST_DIR}/../..")
-set(ANQST_WIDGET_DIR "\${ANQST_WEBAPP_ROOT}/generated_output/${generatedCppLibraryDirName(widgetName)}")
+set(ANQST_PROJECT_ROOT "\${CMAKE_CURRENT_LIST_DIR}/../../../../../../..")
+set(ANQST_WIDGET_DIR "\${CMAKE_CURRENT_LIST_DIR}/..")
 set(ANQST_WEBBASE_DIR "" CACHE PATH "Path to AnQstWebBase source directory")
 
 if(NOT EXISTS "\${ANQST_WIDGET_DIR}/CMakeLists.txt")
@@ -2891,10 +2867,10 @@ endif()
 
 if(NOT ANQST_WEBBASE_DIR)
     foreach(candidate
-        "\${ANQST_WEBAPP_ROOT}/AnQstWidget/AnQstWebBase"
-        "\${ANQST_WEBAPP_ROOT}/../AnQstWidget/AnQstWebBase"
-        "\${ANQST_WEBAPP_ROOT}/../../AnQstWidget/AnQstWebBase"
-        "\${ANQST_WEBAPP_ROOT}/../../../AnQstWidget/AnQstWebBase")
+        "\${ANQST_PROJECT_ROOT}/AnQstWidget/AnQstWebBase"
+        "\${ANQST_PROJECT_ROOT}/../AnQstWidget/AnQstWebBase"
+        "\${ANQST_PROJECT_ROOT}/../../AnQstWidget/AnQstWebBase"
+        "\${ANQST_PROJECT_ROOT}/../../../AnQstWidget/AnQstWebBase")
         if(EXISTS "\${candidate}/CMakeLists.txt")
             set(ANQST_WEBBASE_DIR "\${candidate}")
             break()
@@ -2938,11 +2914,11 @@ set_target_properties(${pluginTarget} PROPERTIES
 `;
 }
 function installQtDesignerPluginCMake(cwd, widgetName, options = {}) {
-    const pluginDir = node_path_1.default.join(cwd, "anqst-cmake", "designerplugin");
+    const pluginDir = (0, layout_1.resolveGeneratedLayoutPaths)(cwd, widgetName).designerPluginRoot;
     node_fs_1.default.mkdirSync(pluginDir, { recursive: true });
     const assets = installDesignerPluginIconAssets(cwd, pluginDir);
     const pluginTarget = `${widgetName}DesignerPlugin`;
     const widgetCategory = options.widgetCategory ?? "AnQst Widgets";
-    node_fs_1.default.writeFileSync(node_path_1.default.join(pluginDir, "CMakeLists.txt"), withBuildStamp("anqst-cmake/designerplugin/CMakeLists.txt", renderQtDesignerPluginCMake(widgetName, assets.hasIcon)), "utf8");
-    node_fs_1.default.writeFileSync(node_path_1.default.join(pluginDir, `${pluginTarget}.cpp`), withBuildStamp(`anqst-cmake/designerplugin/${pluginTarget}.cpp`, renderQtDesignerPluginCpp(widgetName, widgetCategory, assets.hasIcon)), "utf8");
+    node_fs_1.default.writeFileSync(node_path_1.default.join(pluginDir, "CMakeLists.txt"), withBuildStamp(`backend/cpp/qt/${generatedCppLibraryDirName(widgetName)}/designerPlugin/CMakeLists.txt`, renderQtDesignerPluginCMake(widgetName, assets.hasIcon)), "utf8");
+    node_fs_1.default.writeFileSync(node_path_1.default.join(pluginDir, `${pluginTarget}.cpp`), withBuildStamp(`backend/cpp/qt/${generatedCppLibraryDirName(widgetName)}/designerPlugin/${pluginTarget}.cpp`, renderQtDesignerPluginCpp(widgetName, widgetCategory, assets.hasIcon)), "utf8");
 }

package/dist/src/layout.js

@@ -0,0 +1,70 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ANQST_LAYOUT_VERSION = exports.ANQST_GENERATED_DIRNAME = exports.ANQST_ROOT_DIRNAME = void 0;
+exports.normalizeSlashes = normalizeSlashes;
+exports.anqstRootDir = anqstRootDir;
+exports.anqstGeneratedRootDir = anqstGeneratedRootDir;
+exports.anqstDebugIntermediateRootDir = anqstDebugIntermediateRootDir;
+exports.anqstSpecFileName = anqstSpecFileName;
+exports.anqstSettingsFileName = anqstSettingsFileName;
+exports.anqstSettingsRelativePath = anqstSettingsRelativePath;
+exports.generatedFrontendDirName = generatedFrontendDirName;
+exports.generatedNodeExpressDirName = generatedNodeExpressDirName;
+exports.generatedQtWidgetDirName = generatedQtWidgetDirName;
+exports.resolveGeneratedLayoutPaths = resolveGeneratedLayoutPaths;
+exports.toProjectRelative = toProjectRelative;
+const node_path_1 = __importDefault(require("node:path"));
+exports.ANQST_ROOT_DIRNAME = "AnQst";
+exports.ANQST_GENERATED_DIRNAME = "generated";
+exports.ANQST_LAYOUT_VERSION = 2;
+function normalizeSlashes(inputPath) {
+    return inputPath.split(node_path_1.default.sep).join("/");
+}
+function anqstRootDir(cwd) {
+    return node_path_1.default.join(cwd, exports.ANQST_ROOT_DIRNAME);
+}
+function anqstGeneratedRootDir(cwd) {
+    return node_path_1.default.join(anqstRootDir(cwd), exports.ANQST_GENERATED_DIRNAME);
+}
+function anqstDebugIntermediateRootDir(cwd) {
+    return node_path_1.default.join(anqstGeneratedRootDir(cwd), "debug", "intermediate");
+}
+function anqstSpecFileName(widgetName) {
+    return `${widgetName}.AnQst.d.ts`;
+}
+function anqstSettingsFileName(widgetName) {
+    return `${widgetName}.settings.json`;
+}
+function anqstSettingsRelativePath(widgetName) {
+    return `./${exports.ANQST_ROOT_DIRNAME}/${anqstSettingsFileName(widgetName)}`;
+}
+function generatedFrontendDirName(widgetName) {
+    return `${widgetName}_Angular`;
+}
+function generatedNodeExpressDirName(widgetName) {
+    return `${widgetName}_anQst`;
+}
+function generatedQtWidgetDirName(widgetName) {
+    return `${widgetName}_widget`;
+}
+function resolveGeneratedLayoutPaths(cwd, widgetName) {
+    const generatedRoot = anqstGeneratedRootDir(cwd);
+    const cppQtWidgetRoot = node_path_1.default.join(generatedRoot, "backend", "cpp", "qt", generatedQtWidgetDirName(widgetName));
+    const designerPluginRoot = node_path_1.default.join(cppQtWidgetRoot, "designerPlugin");
+    return {
+        generatedRoot,
+        frontendRoot: node_path_1.default.join(generatedRoot, "frontend", generatedFrontendDirName(widgetName)),
+        nodeExpressRoot: node_path_1.default.join(generatedRoot, "backend", "node", "express", generatedNodeExpressDirName(widgetName)),
+        cppCmakeRoot: node_path_1.default.join(generatedRoot, "backend", "cpp", "cmake"),
+        cppQtWidgetRoot,
+        designerPluginRoot,
+        designerPluginBuildRoot: node_path_1.default.join(designerPluginRoot, "build"),
+        debugIntermediateRoot: anqstDebugIntermediateRootDir(cwd)
+    };
+}
+function toProjectRelative(cwd, absolutePath) {
+    return normalizeSlashes(node_path_1.default.relative(cwd, absolutePath));
+}

package/dist/src/parser.js

@@ -8,6 +8,9 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const typescript_1 = __importDefault(require("typescript"));
 const errors_1 = require("./errors");
+const program_1 = require("./program");
+const typegraph_1 = require("./typegraph");
+const debug_dump_1 = require("./debug-dump");
 function locFromNode(source, node) {
     const lc = source.getLineAndCharacterOfPosition(node.getStart(source));
     return {
@@ -207,7 +210,7 @@ function serviceBaseType(iface) {
     }
     return null;
 }
-function parseSpecFile(specFilePath) {
+function parseSpecFileAst(specFilePath) {
     if (!node_fs_1.default.existsSync(specFilePath))
         throw new errors_1.VerifyError(`Spec file does not exist: ${specFilePath}`);
     const text = node_fs_1.default.readFileSync(specFilePath, "utf8");
@@ -257,3 +260,15 @@ function parseSpecFile(specFilePath) {
         specImports: importInfo.specImports
     };
 }
+function parseSpecFile(specFilePath) {
+    (0, program_1.createTscProgramContext)(specFilePath);
+    const parsed = parseSpecFileAst(specFilePath);
+    if ((0, debug_dump_1.isDebugEnabled)()) {
+        (0, debug_dump_1.writeDebugFile)(process.cwd(), "anqstmodel/parsed-before-typegraph.txt", `${(0, debug_dump_1.inspectText)(parsed)}\n`);
+    }
+    const normalized = (0, typegraph_1.applyResolvedTypeGraph)(parsed);
+    if ((0, debug_dump_1.isDebugEnabled)()) {
+        (0, debug_dump_1.writeDebugFile)(process.cwd(), "anqstmodel/parsed-after-typegraph.txt", `${(0, debug_dump_1.inspectText)(normalized)}\n`);
+    }
+    return normalized;
+}

package/dist/src/{backend/tsc/program.js → program.js}

@@ -9,7 +9,7 @@ exports.getProgramDiagnostics = getProgramDiagnostics;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const typescript_1 = __importDefault(require("typescript"));
-const errors_1 = require("../../errors");
+const errors_1 = require("./errors");
 const debug_dump_1 = require("./debug-dump");
 const contextBySpecPath = new Map();
 function diagnosticText(diagnostic) {