skir 1.1.28 → 1.1.29
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/dependency_manager.d.ts +1 -19
- package/dist/dependency_manager.d.ts.map +1 -1
- package/dist/dependency_manager.js +1 -175
- package/dist/dependency_manager.js.map +1 -1
- package/dist/doc_comment_parser.d.ts.map +1 -1
- package/dist/doc_comment_parser.js +3 -2
- package/dist/doc_comment_parser.js.map +1 -1
- package/dist/error_renderer.d.ts +3 -3
- package/dist/error_renderer.d.ts.map +1 -1
- package/dist/get_dependencies_flow.d.ts +40 -0
- package/dist/get_dependencies_flow.d.ts.map +1 -0
- package/dist/get_dependencies_flow.js +177 -0
- package/dist/get_dependencies_flow.js.map +1 -0
- package/dist/literals.d.ts.map +1 -1
- package/dist/literals.js +9 -2
- package/dist/literals.js.map +1 -1
- package/dist/module_set.d.ts.map +1 -1
- package/dist/module_set.js +38 -4
- package/dist/module_set.js.map +1 -1
- package/dist/package_downloader.d.ts.map +1 -1
- package/dist/package_downloader.js +87 -4
- package/dist/package_downloader.js.map +1 -1
- package/dist/parser.d.ts.map +1 -1
- package/dist/parser.js +24 -5
- package/dist/parser.js.map +1 -1
- package/package.json +1 -1
- package/src/dependency_manager.ts +1 -245
- package/src/doc_comment_parser.ts +3 -2
- package/src/error_renderer.ts +5 -5
- package/src/get_dependencies_flow.ts +252 -0
- package/src/literals.ts +12 -2
- package/src/module_set.ts +43 -6
- package/src/package_downloader.ts +129 -4
- package/src/parser.ts +26 -6
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
import type { Record } from "skir-internal";
|
|
2
1
|
import { AsyncFileReader } from "./io.js";
|
|
3
|
-
import {
|
|
4
|
-
import type { DependenciesResult, DependencyError, PackageDownloader, PackageIdToVersion } from "./package_types.js";
|
|
2
|
+
import type { DependenciesResult, PackageDownloader, PackageIdToVersion } from "./package_types.js";
|
|
5
3
|
export declare class DependencyManager {
|
|
6
4
|
private readonly rootDir;
|
|
7
5
|
private readonly githubToken;
|
|
@@ -13,20 +11,4 @@ export declare class DependencyManager {
|
|
|
13
11
|
private get externalDir();
|
|
14
12
|
private readDependenciesFile;
|
|
15
13
|
}
|
|
16
|
-
/**
|
|
17
|
-
* Resolves a GitHub blob URL to the first record declared at the referenced line.
|
|
18
|
-
*
|
|
19
|
-
* Expected URL shape:
|
|
20
|
-
* https://github.com/<owner>/<repo>/blob/<version>/skir-src/<path>.skir#L<line>
|
|
21
|
-
*
|
|
22
|
-
* Returns:
|
|
23
|
-
* - `{ kind: "success", record, moduleSet }` when a record is found.
|
|
24
|
-
* - `{ kind: "error", message }` for invalid URLs, dependency download issues,
|
|
25
|
-
* compilation failures, missing modules, or when no record starts at the line.
|
|
26
|
-
*/
|
|
27
|
-
export declare function getModuleFromGithubUrl(githubUrl: string, githubToken: string | undefined, packageDownloader?: PackageDownloader): Promise<{
|
|
28
|
-
kind: "success";
|
|
29
|
-
record: Record;
|
|
30
|
-
moduleSet: ModuleSet;
|
|
31
|
-
} | DependencyError>;
|
|
32
14
|
//# sourceMappingURL=dependency_manager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependency_manager.d.ts","sourceRoot":"","sources":["../src/dependency_manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dependency_manager.d.ts","sourceRoot":"","sources":["../src/dependency_manager.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAoB,MAAM,SAAS,CAAC;AAE5D,OAAO,KAAK,EACV,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,EAEnB,MAAM,oBAAoB,CAAC;AAE5B,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAHjB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,UAAU,GAAE,eAAkC,EAC9C,iBAAiB,GAAE,iBAAmC;IAGnE,eAAe,CACnB,YAAY,EAAE,kBAAkB,EAChC,WAAW,GAAE,OAAO,GAAG,UAAoB,GAC1C,OAAO,CAAC,kBAAkB,CAAC;YAiBhB,WAAW;IA4EzB,OAAO,KAAK,WAAW,GAEtB;YAEa,oBAAoB;CAanC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as fs from "fs/promises";
|
|
2
2
|
import path from "node:path";
|
|
3
|
+
import { GetDependenciesFlow } from "./get_dependencies_flow.js";
|
|
3
4
|
import { REAL_FILE_SYSTEM } from "./io.js";
|
|
4
|
-
import { ModuleSet } from "./module_set.js";
|
|
5
5
|
import { downloadPackage } from "./package_downloader.js";
|
|
6
6
|
export class DependencyManager {
|
|
7
7
|
constructor(rootDir, githubToken, fileReader = REAL_FILE_SYSTEM, packageDownloader = downloadPackage) {
|
|
@@ -105,179 +105,5 @@ export class DependencyManager {
|
|
|
105
105
|
}
|
|
106
106
|
}
|
|
107
107
|
}
|
|
108
|
-
class GetDependenciesFlow {
|
|
109
|
-
constructor(cachedPackages, githubToken, packageDownloader) {
|
|
110
|
-
this.cachedPackages = cachedPackages;
|
|
111
|
-
this.githubToken = githubToken;
|
|
112
|
-
this.packageDownloader = packageDownloader;
|
|
113
|
-
this.packageBundles = {};
|
|
114
|
-
this.dependencyChain = [];
|
|
115
|
-
this.errors = [];
|
|
116
|
-
this.allDependenciesOnDisk = true;
|
|
117
|
-
}
|
|
118
|
-
async run(dependencies) {
|
|
119
|
-
for (const [packageId, version] of Object.entries(dependencies)) {
|
|
120
|
-
await this.getDependency(packageId, version);
|
|
121
|
-
if (this.errors.length > 0) {
|
|
122
|
-
return this.errors[0];
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
|
-
const changed = !(this.allDependenciesOnDisk &&
|
|
126
|
-
Object.keys(dependencies).length ===
|
|
127
|
-
Object.keys(this.cachedPackages).length);
|
|
128
|
-
return {
|
|
129
|
-
kind: "success",
|
|
130
|
-
packages: Object.fromEntries(Object.entries(this.packageBundles).map(([packageId, bundle]) => [
|
|
131
|
-
packageId,
|
|
132
|
-
bundle.pkg,
|
|
133
|
-
])),
|
|
134
|
-
changed: changed,
|
|
135
|
-
};
|
|
136
|
-
}
|
|
137
|
-
async getDependency(packageId, version) {
|
|
138
|
-
this.dependencyChain.push({ packageId, version });
|
|
139
|
-
try {
|
|
140
|
-
const presentPackage = this.packageBundles[packageId];
|
|
141
|
-
if (presentPackage?.pkg.version === version) {
|
|
142
|
-
return;
|
|
143
|
-
}
|
|
144
|
-
else if (presentPackage) {
|
|
145
|
-
this.errors.push({
|
|
146
|
-
kind: "error",
|
|
147
|
-
message: [
|
|
148
|
-
`Version conflict for package ${packageId}:`,
|
|
149
|
-
`- ${formatDependencyChain(this.dependencyChain)}`,
|
|
150
|
-
`- ${formatDependencyChain(presentPackage.dependencyChain)}`,
|
|
151
|
-
].join("\n"),
|
|
152
|
-
});
|
|
153
|
-
return;
|
|
154
|
-
}
|
|
155
|
-
let pkg = this.getCachedPackage(packageId, version);
|
|
156
|
-
if (!pkg) {
|
|
157
|
-
this.allDependenciesOnDisk = false;
|
|
158
|
-
const downloadResult = await this.packageDownloader(packageId, version, this.githubToken);
|
|
159
|
-
if (downloadResult.kind === "success") {
|
|
160
|
-
pkg = downloadResult.package;
|
|
161
|
-
}
|
|
162
|
-
else {
|
|
163
|
-
this.errors.push(downloadResult);
|
|
164
|
-
return;
|
|
165
|
-
}
|
|
166
|
-
}
|
|
167
|
-
this.packageBundles[packageId] = {
|
|
168
|
-
pkg: pkg,
|
|
169
|
-
dependencyChain: [...this.dependencyChain],
|
|
170
|
-
};
|
|
171
|
-
for (const [depId, depVersion] of Object.entries(pkg.dependencies)) {
|
|
172
|
-
await this.getDependency(depId, depVersion);
|
|
173
|
-
}
|
|
174
|
-
}
|
|
175
|
-
finally {
|
|
176
|
-
this.dependencyChain.pop();
|
|
177
|
-
}
|
|
178
|
-
}
|
|
179
|
-
getCachedPackage(packageId, version) {
|
|
180
|
-
const pkg = this.cachedPackages[packageId];
|
|
181
|
-
return pkg?.version === version ? pkg : undefined;
|
|
182
|
-
}
|
|
183
|
-
}
|
|
184
|
-
function formatDependencyChain(chain) {
|
|
185
|
-
return ("main depends on " +
|
|
186
|
-
chain
|
|
187
|
-
.map((item) => `${item.packageId}:${item.version}`)
|
|
188
|
-
.join(" which depends on "));
|
|
189
|
-
}
|
|
190
108
|
const DEPENDENCIES_FILENAME = "dependencies.json";
|
|
191
|
-
/**
|
|
192
|
-
* Resolves a GitHub blob URL to the first record declared at the referenced line.
|
|
193
|
-
*
|
|
194
|
-
* Expected URL shape:
|
|
195
|
-
* https://github.com/<owner>/<repo>/blob/<version>/skir-src/<path>.skir#L<line>
|
|
196
|
-
*
|
|
197
|
-
* Returns:
|
|
198
|
-
* - `{ kind: "success", record, moduleSet }` when a record is found.
|
|
199
|
-
* - `{ kind: "error", message }` for invalid URLs, dependency download issues,
|
|
200
|
-
* compilation failures, missing modules, or when no record starts at the line.
|
|
201
|
-
*/
|
|
202
|
-
export async function getModuleFromGithubUrl(githubUrl, githubToken, packageDownloader = downloadPackage) {
|
|
203
|
-
const parsedUrl = parseGithubModuleUrl(githubUrl);
|
|
204
|
-
if (parsedUrl.kind === "error") {
|
|
205
|
-
return parsedUrl;
|
|
206
|
-
}
|
|
207
|
-
const { packageId, version, modulePath, lineNumber } = parsedUrl;
|
|
208
|
-
const flow = new GetDependenciesFlow({}, githubToken, packageDownloader);
|
|
209
|
-
const dependenciesResult = await flow.run({
|
|
210
|
-
[packageId]: version,
|
|
211
|
-
});
|
|
212
|
-
if (dependenciesResult.kind === "error") {
|
|
213
|
-
return dependenciesResult;
|
|
214
|
-
}
|
|
215
|
-
const modulePathToContent = new Map();
|
|
216
|
-
for (const pkg of Object.values(dependenciesResult.packages)) {
|
|
217
|
-
for (const [path, content] of Object.entries(pkg.modules)) {
|
|
218
|
-
modulePathToContent.set(path, content);
|
|
219
|
-
}
|
|
220
|
-
}
|
|
221
|
-
const moduleSet = ModuleSet.compile(modulePathToContent);
|
|
222
|
-
if (moduleSet.errors.length > 0) {
|
|
223
|
-
return {
|
|
224
|
-
kind: "error",
|
|
225
|
-
message: moduleSet.errors[0].message || "Compilation failed",
|
|
226
|
-
};
|
|
227
|
-
}
|
|
228
|
-
const moduleResult = moduleSet.modules.get(modulePath);
|
|
229
|
-
if (!moduleResult) {
|
|
230
|
-
return {
|
|
231
|
-
kind: "error",
|
|
232
|
-
message: `Module not found: ${modulePath}`,
|
|
233
|
-
};
|
|
234
|
-
}
|
|
235
|
-
const recordAtLine = moduleResult.result.records.find((record) => record.record.name.line.lineNumber === lineNumber);
|
|
236
|
-
if (!recordAtLine) {
|
|
237
|
-
return {
|
|
238
|
-
kind: "error",
|
|
239
|
-
message: `No record found at line ${lineNumber + 1} in ${modulePath}`,
|
|
240
|
-
};
|
|
241
|
-
}
|
|
242
|
-
return {
|
|
243
|
-
kind: "success",
|
|
244
|
-
record: recordAtLine.record,
|
|
245
|
-
moduleSet,
|
|
246
|
-
};
|
|
247
|
-
}
|
|
248
|
-
function parseGithubModuleUrl(githubUrl) {
|
|
249
|
-
const match = githubUrl.match(/^https:\/\/github\.com\/([^/]+)\/([^/]+)\/blob\/([^/]+)\/(.+)#L(\d+)$/);
|
|
250
|
-
if (!match) {
|
|
251
|
-
return {
|
|
252
|
-
kind: "error",
|
|
253
|
-
message: `Invalid GitHub URL: ${githubUrl}`,
|
|
254
|
-
};
|
|
255
|
-
}
|
|
256
|
-
const owner = match[1];
|
|
257
|
-
const repo = match[2];
|
|
258
|
-
const version = match[3];
|
|
259
|
-
const repoPath = match[4];
|
|
260
|
-
const lineNumberOneBased = Number(match[5]);
|
|
261
|
-
if (!repoPath.startsWith("skir-src/") || !repoPath.endsWith(".skir")) {
|
|
262
|
-
return {
|
|
263
|
-
kind: "error",
|
|
264
|
-
message: `URL must target a .skir file in skir-src: ${githubUrl}`,
|
|
265
|
-
};
|
|
266
|
-
}
|
|
267
|
-
if (!Number.isInteger(lineNumberOneBased) || lineNumberOneBased <= 0) {
|
|
268
|
-
return {
|
|
269
|
-
kind: "error",
|
|
270
|
-
message: `Invalid line number in URL: ${githubUrl}`,
|
|
271
|
-
};
|
|
272
|
-
}
|
|
273
|
-
const packageId = `@${owner}/${repo}`;
|
|
274
|
-
const modulePath = packageId + repoPath.substring("skir-src".length);
|
|
275
|
-
return {
|
|
276
|
-
kind: "success",
|
|
277
|
-
packageId,
|
|
278
|
-
version,
|
|
279
|
-
modulePath,
|
|
280
|
-
lineNumber: lineNumberOneBased - 1,
|
|
281
|
-
};
|
|
282
|
-
}
|
|
283
109
|
//# sourceMappingURL=dependency_manager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependency_manager.js","sourceRoot":"","sources":["../src/dependency_manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"dependency_manager.js","sourceRoot":"","sources":["../src/dependency_manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doc_comment_parser.d.ts","sourceRoot":"","sources":["../src/doc_comment_parser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"doc_comment_parser.d.ts","sourceRoot":"","sources":["../src/doc_comment_parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,GAAG,EAIH,UAAU,EAGV,MAAM,EAEN,KAAK,EACN,MAAM,eAAe,CAAC;AAEvB,wBAAgB,eAAe,CAC7B,UAAU,EAAE,KAAK,EACjB,cAAc,CAAC,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,GACpC,MAAM,CAAC,GAAG,CAAC,CAGb;AA2QD,wBAAgB,SAAS,CAAC,IAAI,EAAE,SAAS,GAAG,EAAE,GAAG,UAAU,CAqB1D"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { assert } from "node:console";
|
|
2
1
|
export function parseDocComment(docComment, completionMode) {
|
|
3
2
|
const parser = new DocCommentParser(docComment, completionMode);
|
|
4
3
|
return parser.parse();
|
|
@@ -221,7 +220,9 @@ class DocCommentParser {
|
|
|
221
220
|
expect = "identifier";
|
|
222
221
|
}
|
|
223
222
|
else {
|
|
224
|
-
|
|
223
|
+
if (token.text !== "]") {
|
|
224
|
+
throw new Error(`Unexpected token in doc reference: ${token.text}`);
|
|
225
|
+
}
|
|
225
226
|
expected = expect === "'.' or ']'";
|
|
226
227
|
}
|
|
227
228
|
if (!expected) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doc_comment_parser.js","sourceRoot":"","sources":["../src/doc_comment_parser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"doc_comment_parser.js","sourceRoot":"","sources":["../src/doc_comment_parser.ts"],"names":[],"mappings":"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"}
|
package/dist/error_renderer.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { SkirError } from "skir-internal";
|
|
2
|
-
import { BeforeAfter, BreakingChange } from "./compatibility_checker.js";
|
|
3
|
-
import { SkirConfigError } from "./config_parser.js";
|
|
4
|
-
import { ModuleSet } from "./module_set.js";
|
|
2
|
+
import { type BeforeAfter, type BreakingChange } from "./compatibility_checker.js";
|
|
3
|
+
import type { SkirConfigError } from "./config_parser.js";
|
|
4
|
+
import type { ModuleSet } from "./module_set.js";
|
|
5
5
|
export declare function renderErrors(errors: readonly SkirError[]): void;
|
|
6
6
|
export declare function formatError(error: SkirError): string;
|
|
7
7
|
export declare function renderSkirConfigErrors(errors: readonly SkirConfigError[], context: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error_renderer.d.ts","sourceRoot":"","sources":["../src/error_renderer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,SAAS,EAEV,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,WAAW,
|
|
1
|
+
{"version":3,"file":"error_renderer.d.ts","sourceRoot":"","sources":["../src/error_renderer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,SAAS,EAEV,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,cAAc,EAGpB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,wBAAgB,YAAY,CAAC,MAAM,EAAE,SAAS,SAAS,EAAE,GAAG,IAAI,CAgB/D;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAuBpD;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,SAAS,eAAe,EAAE,EAClC,OAAO,EAAE;IACP,cAAc,EAAE,MAAM,CAAC;IACvB,0BAA0B,EAAE,OAAO,GAAG,SAAS,CAAC;CACjD,GACA,IAAI,CAaN;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,eAAe,EACtB,OAAO,EAAE;IACP,cAAc,EAAE,MAAM,CAAC;CACxB,GACA,MAAM,CAaR;AAED,wBAAgB,qBAAqB,CACnC,eAAe,EAAE,SAAS,cAAc,EAAE,EAC1C,SAAS,EAAE,WAAW,CAAC,SAAS,CAAC,GAChC,IAAI,CAYN;AAiJD;;;GAGG;AACH,wBAAgB,gCAAgC,CAC9C,cAAc,EAAE,cAAc,EAC9B,MAAM,EAAE,SAAS,GAChB,MAAM,CAqCR;AA+DD,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE5C;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE7C"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import type { Record } from "skir-internal";
|
|
2
|
+
import { ModuleSet } from "./module_set.js";
|
|
3
|
+
import type { DependenciesResult, DependencyError, PackageDownloader, PackageIdToVersion, Packages } from "./package_types.js";
|
|
4
|
+
export declare class GetDependenciesFlow {
|
|
5
|
+
private readonly cachedPackages;
|
|
6
|
+
private readonly githubToken;
|
|
7
|
+
private readonly packageDownloader;
|
|
8
|
+
private readonly packageBundles;
|
|
9
|
+
private readonly dependencyChain;
|
|
10
|
+
private readonly errors;
|
|
11
|
+
private allDependenciesOnDisk;
|
|
12
|
+
constructor(cachedPackages: Packages, githubToken: string | undefined, packageDownloader: PackageDownloader);
|
|
13
|
+
run(dependencies: PackageIdToVersion): Promise<DependenciesResult>;
|
|
14
|
+
private getDependency;
|
|
15
|
+
private getCachedPackage;
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* Resolves a GitHub blob URL to the first record declared at the referenced line.
|
|
19
|
+
*
|
|
20
|
+
* Expected URL shape:
|
|
21
|
+
* https://github.com/<owner>/<repo>/blob/<version>/skir-src/<path>.skir#L<line>
|
|
22
|
+
*
|
|
23
|
+
* Returns:
|
|
24
|
+
* - `{ kind: "success", record, moduleSet }` when a record is found.
|
|
25
|
+
* - `{ kind: "error", message }` for invalid URLs, dependency download issues,
|
|
26
|
+
* compilation failures, missing modules, or when no record starts at the line.
|
|
27
|
+
*/
|
|
28
|
+
export declare function getModuleFromGithubUrl(githubUrl: string, githubToken: string | undefined, packageDownloader?: PackageDownloader): Promise<{
|
|
29
|
+
kind: "success";
|
|
30
|
+
record: Record;
|
|
31
|
+
moduleSet: ModuleSet;
|
|
32
|
+
} | DependencyError>;
|
|
33
|
+
export declare function parseGithubModuleUrl(githubUrl: string): {
|
|
34
|
+
kind: "success";
|
|
35
|
+
packageId: string;
|
|
36
|
+
version: string;
|
|
37
|
+
modulePath: string;
|
|
38
|
+
lineNumber: number;
|
|
39
|
+
} | DependencyError;
|
|
40
|
+
//# sourceMappingURL=get_dependencies_flow.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get_dependencies_flow.d.ts","sourceRoot":"","sources":["../src/get_dependencies_flow.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,KAAK,EACV,kBAAkB,EAClB,eAAe,EAEf,iBAAiB,EACjB,kBAAkB,EAClB,QAAQ,EACT,MAAM,oBAAoB,CAAC;AAE5B,qBAAa,mBAAmB;IAO5B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IARpC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA8C;IAC7E,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAwB;IACxD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyB;IAChD,OAAO,CAAC,qBAAqB,CAAQ;gBAGlB,cAAc,EAAE,QAAQ,EACxB,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,iBAAiB,EAAE,iBAAiB;IAGjD,GAAG,CAAC,YAAY,EAAE,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;YA0B1D,aAAa;IA+C3B,OAAO,CAAC,gBAAgB;CAOzB;AAqBD;;;;;;;;;;GAUG;AACH,wBAAsB,sBAAsB,CAC1C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,iBAAiB,GAAE,iBAAmC,GACrD,OAAO,CACN;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;CACtB,GACD,eAAe,CAClB,CAsDA;AAED,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAClD;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,GACD,eAAe,CAwClB"}
|
|
@@ -0,0 +1,177 @@
|
|
|
1
|
+
import { ModuleSet } from "./module_set.js";
|
|
2
|
+
import { downloadPackage } from "./package_downloader.js";
|
|
3
|
+
export class GetDependenciesFlow {
|
|
4
|
+
constructor(cachedPackages, githubToken, packageDownloader) {
|
|
5
|
+
this.cachedPackages = cachedPackages;
|
|
6
|
+
this.githubToken = githubToken;
|
|
7
|
+
this.packageDownloader = packageDownloader;
|
|
8
|
+
this.packageBundles = {};
|
|
9
|
+
this.dependencyChain = [];
|
|
10
|
+
this.errors = [];
|
|
11
|
+
this.allDependenciesOnDisk = true;
|
|
12
|
+
}
|
|
13
|
+
async run(dependencies) {
|
|
14
|
+
for (const [packageId, version] of Object.entries(dependencies)) {
|
|
15
|
+
await this.getDependency(packageId, version);
|
|
16
|
+
if (this.errors.length > 0) {
|
|
17
|
+
return this.errors[0];
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
const changed = !(this.allDependenciesOnDisk &&
|
|
21
|
+
Object.keys(dependencies).length ===
|
|
22
|
+
Object.keys(this.cachedPackages).length);
|
|
23
|
+
return {
|
|
24
|
+
kind: "success",
|
|
25
|
+
packages: Object.fromEntries(Object.entries(this.packageBundles).map(([packageId, bundle]) => [
|
|
26
|
+
packageId,
|
|
27
|
+
bundle.pkg,
|
|
28
|
+
])),
|
|
29
|
+
changed: changed,
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
async getDependency(packageId, version) {
|
|
33
|
+
this.dependencyChain.push({ packageId, version });
|
|
34
|
+
try {
|
|
35
|
+
const presentPackage = this.packageBundles[packageId];
|
|
36
|
+
if (presentPackage?.pkg.version === version) {
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
else if (presentPackage) {
|
|
40
|
+
this.errors.push({
|
|
41
|
+
kind: "error",
|
|
42
|
+
message: [
|
|
43
|
+
`Version conflict for package ${packageId}:`,
|
|
44
|
+
`- ${formatDependencyChain(this.dependencyChain)}`,
|
|
45
|
+
`- ${formatDependencyChain(presentPackage.dependencyChain)}`,
|
|
46
|
+
].join("\n"),
|
|
47
|
+
});
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
50
|
+
let pkg = this.getCachedPackage(packageId, version);
|
|
51
|
+
if (!pkg) {
|
|
52
|
+
this.allDependenciesOnDisk = false;
|
|
53
|
+
const downloadResult = await this.packageDownloader(packageId, version, this.githubToken);
|
|
54
|
+
if (downloadResult.kind === "success") {
|
|
55
|
+
pkg = downloadResult.package;
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
this.errors.push(downloadResult);
|
|
59
|
+
return;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
this.packageBundles[packageId] = {
|
|
63
|
+
pkg: pkg,
|
|
64
|
+
dependencyChain: [...this.dependencyChain],
|
|
65
|
+
};
|
|
66
|
+
for (const [depId, depVersion] of Object.entries(pkg.dependencies)) {
|
|
67
|
+
await this.getDependency(depId, depVersion);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
finally {
|
|
71
|
+
this.dependencyChain.pop();
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
getCachedPackage(packageId, version) {
|
|
75
|
+
const pkg = this.cachedPackages[packageId];
|
|
76
|
+
return pkg?.version === version ? pkg : undefined;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
function formatDependencyChain(chain) {
|
|
80
|
+
return ("main depends on " +
|
|
81
|
+
chain
|
|
82
|
+
.map((item) => `${item.packageId}:${item.version}`)
|
|
83
|
+
.join(" which depends on "));
|
|
84
|
+
}
|
|
85
|
+
/**
|
|
86
|
+
* Resolves a GitHub blob URL to the first record declared at the referenced line.
|
|
87
|
+
*
|
|
88
|
+
* Expected URL shape:
|
|
89
|
+
* https://github.com/<owner>/<repo>/blob/<version>/skir-src/<path>.skir#L<line>
|
|
90
|
+
*
|
|
91
|
+
* Returns:
|
|
92
|
+
* - `{ kind: "success", record, moduleSet }` when a record is found.
|
|
93
|
+
* - `{ kind: "error", message }` for invalid URLs, dependency download issues,
|
|
94
|
+
* compilation failures, missing modules, or when no record starts at the line.
|
|
95
|
+
*/
|
|
96
|
+
export async function getModuleFromGithubUrl(githubUrl, githubToken, packageDownloader = downloadPackage) {
|
|
97
|
+
const parsedUrl = parseGithubModuleUrl(githubUrl);
|
|
98
|
+
if (parsedUrl.kind === "error") {
|
|
99
|
+
return parsedUrl;
|
|
100
|
+
}
|
|
101
|
+
const { packageId, version, modulePath, lineNumber } = parsedUrl;
|
|
102
|
+
const flow = new GetDependenciesFlow({}, githubToken, packageDownloader);
|
|
103
|
+
const dependenciesResult = await flow.run({
|
|
104
|
+
[packageId]: version,
|
|
105
|
+
});
|
|
106
|
+
if (dependenciesResult.kind === "error") {
|
|
107
|
+
return dependenciesResult;
|
|
108
|
+
}
|
|
109
|
+
const modulePathToContent = new Map();
|
|
110
|
+
for (const pkg of Object.values(dependenciesResult.packages)) {
|
|
111
|
+
for (const [path, content] of Object.entries(pkg.modules)) {
|
|
112
|
+
modulePathToContent.set(path, content);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
const moduleSet = ModuleSet.compile(modulePathToContent);
|
|
116
|
+
if (moduleSet.errors.length > 0) {
|
|
117
|
+
return {
|
|
118
|
+
kind: "error",
|
|
119
|
+
message: moduleSet.errors[0].message || "Compilation failed",
|
|
120
|
+
};
|
|
121
|
+
}
|
|
122
|
+
const moduleResult = moduleSet.modules.get(modulePath);
|
|
123
|
+
if (!moduleResult) {
|
|
124
|
+
return {
|
|
125
|
+
kind: "error",
|
|
126
|
+
message: `Module not found: ${modulePath}`,
|
|
127
|
+
};
|
|
128
|
+
}
|
|
129
|
+
const recordAtLine = moduleResult.result.records.find((record) => record.record.name.line.lineNumber === lineNumber);
|
|
130
|
+
if (!recordAtLine) {
|
|
131
|
+
return {
|
|
132
|
+
kind: "error",
|
|
133
|
+
message: `No record found at line ${lineNumber + 1} in ${modulePath}`,
|
|
134
|
+
};
|
|
135
|
+
}
|
|
136
|
+
return {
|
|
137
|
+
kind: "success",
|
|
138
|
+
record: recordAtLine.record,
|
|
139
|
+
moduleSet,
|
|
140
|
+
};
|
|
141
|
+
}
|
|
142
|
+
export function parseGithubModuleUrl(githubUrl) {
|
|
143
|
+
const match = githubUrl.match(/^https:\/\/github\.com\/([^/]+)\/([^/]+)\/blob\/([^/]+)\/(.+)#L(\d+)$/);
|
|
144
|
+
if (!match) {
|
|
145
|
+
return {
|
|
146
|
+
kind: "error",
|
|
147
|
+
message: `Invalid GitHub URL: ${githubUrl}`,
|
|
148
|
+
};
|
|
149
|
+
}
|
|
150
|
+
const owner = match[1];
|
|
151
|
+
const repo = match[2];
|
|
152
|
+
const version = match[3];
|
|
153
|
+
const repoPath = match[4];
|
|
154
|
+
const lineNumberOneBased = Number(match[5]);
|
|
155
|
+
if (!repoPath.startsWith("skir-src/") || !repoPath.endsWith(".skir")) {
|
|
156
|
+
return {
|
|
157
|
+
kind: "error",
|
|
158
|
+
message: `URL must target a .skir file in skir-src: ${githubUrl}`,
|
|
159
|
+
};
|
|
160
|
+
}
|
|
161
|
+
if (!Number.isInteger(lineNumberOneBased) || lineNumberOneBased <= 0) {
|
|
162
|
+
return {
|
|
163
|
+
kind: "error",
|
|
164
|
+
message: `Invalid line number in URL: ${githubUrl}`,
|
|
165
|
+
};
|
|
166
|
+
}
|
|
167
|
+
const packageId = `@${owner}/${repo}`;
|
|
168
|
+
const modulePath = packageId + repoPath.substring("skir-src".length);
|
|
169
|
+
return {
|
|
170
|
+
kind: "success",
|
|
171
|
+
packageId,
|
|
172
|
+
version,
|
|
173
|
+
modulePath,
|
|
174
|
+
lineNumber: lineNumberOneBased - 1,
|
|
175
|
+
};
|
|
176
|
+
}
|
|
177
|
+
//# sourceMappingURL=get_dependencies_flow.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get_dependencies_flow.js","sourceRoot":"","sources":["../src/get_dependencies_flow.ts"],"names":[],"mappings":"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"}
|
package/dist/literals.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"literals.d.ts","sourceRoot":"","sources":["../src/literals.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,SAAS,EACf,MAAM,eAAe,CAAC;AAEvB,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,SAAS,GACtB,OAAO,CAiDT;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEtD;AAUD,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,SAAS,GACd,SAAS,
|
|
1
|
+
{"version":3,"file":"literals.d.ts","sourceRoot":"","sources":["../src/literals.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,SAAS,EACf,MAAM,eAAe,CAAC;AAEvB,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,SAAS,GACtB,OAAO,CAiDT;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEtD;AAUD,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,SAAS,GACd,SAAS,CAuBX;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,MAAM,CAG7E"}
|
package/dist/literals.js
CHANGED
|
@@ -57,8 +57,7 @@ export function literalValueToDenseJson(token, type) {
|
|
|
57
57
|
return token === "true" ? 1 : 0;
|
|
58
58
|
case "bytes": {
|
|
59
59
|
const string = unquoteAndUnescape(token);
|
|
60
|
-
|
|
61
|
-
return buffer.toString("base64");
|
|
60
|
+
return hexToBase64(string.substring(4));
|
|
62
61
|
}
|
|
63
62
|
case "timestamp": {
|
|
64
63
|
const dateTime = unquoteAndUnescape(token);
|
|
@@ -86,4 +85,12 @@ export function literalValueToIdentity(token, type) {
|
|
|
86
85
|
const denseJson = literalValueToDenseJson(token, type);
|
|
87
86
|
return typeof denseJson === "string" ? denseJson : JSON.stringify(denseJson);
|
|
88
87
|
}
|
|
88
|
+
function hexToBase64(hex) {
|
|
89
|
+
const bytes = new Uint8Array(hex.length / 2);
|
|
90
|
+
for (let i = 0; i < hex.length; i += 2) {
|
|
91
|
+
bytes[i / 2] = parseInt(hex.slice(i, i + 2), 16);
|
|
92
|
+
}
|
|
93
|
+
const binaryString = Array.from(bytes, (byte) => String.fromCharCode(byte)).join("");
|
|
94
|
+
return btoa(binaryString);
|
|
95
|
+
}
|
|
89
96
|
//# sourceMappingURL=literals.js.map
|
package/dist/literals.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"literals.js","sourceRoot":"","sources":["../src/literals.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,GAGnB,MAAM,eAAe,CAAC;AAEvB,MAAM,UAAU,qBAAqB,CACnC,KAAa,EACb,YAAuB;IAEvB,QAAQ,YAAY,EAAE,CAAC;QACrB,KAAK,MAAM;YACT,OAAO,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,MAAM,CAAC;QAC/C,KAAK,OAAO;YACV,OAAO,CACL,eAAe,CAAC,KAAK,CAAC;gBACtB,yBAAyB,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAC1D,CAAC;QACJ,KAAK,WAAW,CAAC,CAAC,CAAC;YACjB,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC5B,OAAO,KAAK,CAAC;YACf,CAAC;YACD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC;YACjD,OAAO;YACL,0BAA0B;YAC1B,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC;gBACnC,CAAC,gBAAgB,IAAI,SAAS;gBAC9B,SAAS,IAAI,gBAAgB;gBAC7B,SAAS,KAAK,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CACpC,CAAC;QACJ,CAAC;QACD,KAAK,OAAO;YACV,OAAO,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;QACtE,KAAK,OAAO;YACV,OAAO,YAAY,CACjB,KAAK,EACL,MAAM,CAAC,sBAAsB,CAAC,EAC9B,MAAM,CAAC,qBAAqB,CAAC,CAC9B,CAAC;QACJ,KAAK,QAAQ;YACX,OAAO,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,sBAAsB,CAAC,CAAC,CAAC;QACxE,KAAK,SAAS,CAAC;QACf,KAAK,SAAS,CAAC,CAAC,CAAC;YACf,IAAI,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC3B,MAAM,aAAa,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;gBAChD,OAAO,CACL,aAAa,KAAK,KAAK;oBACvB,aAAa,KAAK,UAAU;oBAC5B,aAAa,KAAK,WAAW,CAC9B,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,OAAO,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;QACD,KAAK,QAAQ;YACX,OAAO,eAAe,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAAa;IAC3C,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,YAAY,CAAC,KAAa,EAAE,GAAW,EAAE,GAAW;IAC3D,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC5B,OAAO,GAAG,IAAI,KAAK,IAAI,KAAK,IAAI,GAAG,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,KAAa,EACb,IAAe;IAEf,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,MAAM;YACT,OAAO,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAClC,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,MAAM,MAAM,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;YACzC,
|
|
1
|
+
{"version":3,"file":"literals.js","sourceRoot":"","sources":["../src/literals.ts"],"names":[],"mappings":"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"}
|
package/dist/module_set.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module_set.d.ts","sourceRoot":"","sources":["../src/module_set.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"module_set.d.ts","sourceRoot":"","sources":["../src/module_set.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,MAAM,EACX,KAAK,MAAM,EAQX,KAAK,SAAS,EACd,KAAK,cAAc,EAGnB,KAAK,MAAM,EACX,KAAK,SAAS,EAKf,MAAM,eAAe,CAAC;AAevB;;;;;;GAMG;AACH,qBAAa,SAAS;IA0BlB,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IAEpC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IA5BlC,MAAM,CAAC,OAAO,CACZ,mBAAmB,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,EAChD,KAAK,CAAC,EAAE,SAAS,EACjB,SAAS,GAAE,QAAQ,GAAG,SAAoB,GACzC,SAAS;IAIZ,MAAM,CAAC,oBAAoB,CACzB,iBAAiB,EAAE,MAAM,EACzB,eAAe,EAAE,MAAM,EACvB,mBAAmB,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,EAChD,KAAK,CAAC,EAAE,SAAS,GAChB,MAAM,CAAC,MAAM,CAAC;gBAYE,mBAAmB,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,EACjE,KAAK,EAAE,SAAS,GAAG,SAAS,EACX,SAAS,EAAE,QAAQ,GAAG,SAAS,EAC/B,cAAc,CAAC,EAAE;QAChC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;QAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;KAC3B,YAAA;IAkBH,OAAO,CAAC,eAAe;IAevB,6EAA6E;IAC7E,OAAO,CAAC,iBAAiB;IAoRzB,OAAO,CAAC,uBAAuB;IAa/B,OAAO,CAAC,qBAAqB;IAkB7B,OAAO,CAAC,eAAe;IAoDvB;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAiGzB,OAAO,CAAC,gBAAgB;IAyExB,OAAO,CAAC,sBAAsB;IAqF9B,OAAO,CAAC,oBAAoB;IAmI5B,OAAO,CAAC,cAAc;IAqCtB,QAAQ,IAAI,kBAAkB;IAyE9B,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAmC;IACjE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA6B;IACtD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAqB;IAGxD,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAMpE,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAM5D,IAAI,SAAS,IAAI,WAAW,CAAC,SAAS,EAAE,cAAc,CAAC,CAEtD;IAED,IAAI,MAAM,IAAI,SAAS,SAAS,EAAE,CAEjC;IAED,IAAI,OAAO,IAAI,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAEjD;CACF;AAucD,UAAU,kBAAkB;IAC1B,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IACtD,4CAA4C;IAC5C,QAAQ,CAAC,MAAM,EAAE,SAAS,SAAS,EAAE,CAAC;CACvC"}
|