mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Make loadModeledMethodFiles return relative paths from the extension pack

Browse Source
This commit is contained in:
Robert
2023-07-19 11:34:25 +01:00
parent d3a5a5e669
commit b5b606d486
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/ql-vscode/src/data-extensions-editor/modeled-method-fs.ts
View File

@@ -3,7 +3,7 @@ import { ExternalApiUsage } from "./external-api-usage";
import { ModeledMethod } from "./modeled-method";
import { Mode } from "./shared/mode";
import { createDataExtensionYamls, loadDataExtensionYaml } from "./yaml";
import { join } from "path";
import { join, relative } from "path";
import { ExtensionPack } from "./shared/extension-pack";
import {
Logger,
@@ -49,7 +49,7 @@ export async function loadModeledMethods(
const existingModeledMethods: Record<string, ModeledMethod> = {};
for (const modelFile of modelFiles) {
const yaml = await readFile(modelFile, "utf8");
const yaml = await readFile(join(extensionPack.path, modelFile), "utf8");
const data = loadYaml(yaml, {
filename: modelFile,
@@ -85,7 +85,7 @@ export async function listModelFiles(
for (const [path, extensions] of Object.entries(result.data)) {
if (pathsEqual(path, extensionPackPath)) {
for (const extension of extensions) {
modelFiles.add(extension.file);
modelFiles.add(relative(extensionPackPath, extension.file));
}
}
}

6
extensions/ql-vscode/test/vscode-tests/cli-integration/data-extensions-editor/modeled-method-fs.test.ts
View File

@@ -142,8 +142,8 @@ describe("modeled-method-fs", () => {
const modelFiles = await listModelFiles(extensionPackPath, cli);
expect(modelFiles).toEqual(
new Set([
join(extensionPackPath, "models", "library1.model.yml"),
join(extensionPackPath, "models", "library2.model.yml"),
join("models", "library1.model.yml"),
join("models", "library2.model.yml"),
]),
);
});
@@ -160,7 +160,7 @@ describe("modeled-method-fs", () => {
const modelFiles = await listModelFiles(extensionPackPath, cli);
expect(modelFiles).toEqual(
new Set([join(extensionPackPath, "models", "library1.model.yml")]),
new Set([join("models", "library1.model.yml")]),
);
});
});