@typespec/compiler 0.56.0-dev.20 → 0.56.0-dev.21
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/manifest.js +2 -2
- package/dist/src/core/node-host.d.ts.map +1 -1
- package/dist/src/core/node-host.js +1 -2
- package/dist/src/core/node-host.js.map +1 -1
- package/package.json +1 -3
- package/dist/src/core/fetch.d.ts +0 -11
- package/dist/src/core/fetch.d.ts.map +0 -1
- package/dist/src/core/fetch.js +0 -38
- package/dist/src/core/fetch.js.map +0 -1
package/dist/manifest.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-host.d.ts","sourceRoot":"","sources":["../../../src/core/node-host.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"node-host.d.ts","sourceRoot":"","sources":["../../../src/core/node-host.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,YAAY,EAAa,MAAM,YAAY,CAAC;AAErD,eAAO,MAAM,mBAAmB,QAAiE,CAAC;AAElG;;;GAGG;AACH,eAAO,MAAM,QAAQ,EAAE,YAuCtB,CAAC;AAmBF,qBAAa,oBAAqB,SAAQ,KAAK;gBACjC,QAAQ,EAAE,MAAM;CAG7B"}
|
|
@@ -2,7 +2,6 @@ import { realpath } from "fs";
|
|
|
2
2
|
import { mkdir, readdir, readFile, rm, stat, writeFile } from "fs/promises";
|
|
3
3
|
import { fileURLToPath, pathToFileURL } from "url";
|
|
4
4
|
import { findProjectRoot } from "../utils/misc.js";
|
|
5
|
-
import { fetch } from "./fetch.js";
|
|
6
5
|
import { createConsoleSink } from "./logger/index.js";
|
|
7
6
|
import { joinPaths } from "./path-utils.js";
|
|
8
7
|
import { createSourceFile, getSourceFileKindFromExt } from "./source-file.js";
|
|
@@ -13,7 +12,7 @@ export const CompilerPackageRoot = (await findProjectRoot(stat, fileURLToPath(im
|
|
|
13
12
|
*/
|
|
14
13
|
export const NodeHost = {
|
|
15
14
|
readUrl: async (url) => {
|
|
16
|
-
const response = await fetch(url);
|
|
15
|
+
const response = await fetch(url, { redirect: "follow" });
|
|
17
16
|
const text = await response.text();
|
|
18
17
|
return createSourceFile(text, response.url);
|
|
19
18
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-host.js","sourceRoot":"","sources":["../../../src/core/node-host.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"node-host.js","sourceRoot":"","sources":["../../../src/core/node-host.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typespec/compiler",
|
|
3
|
-
"version": "0.56.0-dev.
|
|
3
|
+
"version": "0.56.0-dev.21",
|
|
4
4
|
"description": "TypeSpec Compiler Preview",
|
|
5
5
|
"author": "Microsoft Corporation",
|
|
6
6
|
"license": "MIT",
|
|
@@ -64,7 +64,6 @@
|
|
|
64
64
|
"@babel/code-frame": "~7.24.2",
|
|
65
65
|
"ajv": "~8.12.0",
|
|
66
66
|
"change-case": "~5.4.4",
|
|
67
|
-
"follow-redirects": "^1.15.6",
|
|
68
67
|
"globby": "~14.0.1",
|
|
69
68
|
"mustache": "~4.2.0",
|
|
70
69
|
"picocolors": "~1.0.0",
|
|
@@ -78,7 +77,6 @@
|
|
|
78
77
|
},
|
|
79
78
|
"devDependencies": {
|
|
80
79
|
"@types/babel__code-frame": "~7.0.6",
|
|
81
|
-
"@types/follow-redirects": "^1.14.4",
|
|
82
80
|
"@types/mustache": "~4.2.5",
|
|
83
81
|
"@types/node": "~18.11.19",
|
|
84
82
|
"@types/prompts": "~2.4.9",
|
package/dist/src/core/fetch.d.ts
DELETED
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
export interface FetchResponse {
|
|
2
|
-
readonly url: string;
|
|
3
|
-
text(): Promise<string>;
|
|
4
|
-
}
|
|
5
|
-
/**
|
|
6
|
-
* Basic implementation of fetch to fit our needs.
|
|
7
|
-
* We are not using `node-fetch` due to a vulnerability and an issue in `<=3.2.8` the typing if `version >=3.2.9`
|
|
8
|
-
* Node built-in fetch is still experimental as of node 19
|
|
9
|
-
*/
|
|
10
|
-
export declare function fetch(uri: string): Promise<FetchResponse>;
|
|
11
|
-
//# sourceMappingURL=fetch.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../src/core/fetch.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CACzB;AACD;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAkCzD"}
|
package/dist/src/core/fetch.js
DELETED
|
@@ -1,38 +0,0 @@
|
|
|
1
|
-
import followRedirects from "follow-redirects";
|
|
2
|
-
import { compilerAssert } from "./diagnostics.js";
|
|
3
|
-
/**
|
|
4
|
-
* Basic implementation of fetch to fit our needs.
|
|
5
|
-
* We are not using `node-fetch` due to a vulnerability and an issue in `<=3.2.8` the typing if `version >=3.2.9`
|
|
6
|
-
* Node built-in fetch is still experimental as of node 19
|
|
7
|
-
*/
|
|
8
|
-
export function fetch(uri) {
|
|
9
|
-
return new Promise((resolve, reject) => {
|
|
10
|
-
request(uri, resolve, reject);
|
|
11
|
-
});
|
|
12
|
-
function request(uri, resolve, reject) {
|
|
13
|
-
const url = new URL(uri);
|
|
14
|
-
const protocol = url.protocol === "https:"
|
|
15
|
-
? followRedirects.https
|
|
16
|
-
: url.protocol === "http:"
|
|
17
|
-
? followRedirects.http
|
|
18
|
-
: undefined;
|
|
19
|
-
compilerAssert(protocol, `Protocol '${url.protocol}' is not supported`);
|
|
20
|
-
protocol
|
|
21
|
-
.get(url, (res) => {
|
|
22
|
-
let data = "";
|
|
23
|
-
res.on("data", (chunk) => {
|
|
24
|
-
data += chunk;
|
|
25
|
-
});
|
|
26
|
-
res.on("end", () => {
|
|
27
|
-
resolve({
|
|
28
|
-
url: url.href,
|
|
29
|
-
text: () => Promise.resolve(data),
|
|
30
|
-
});
|
|
31
|
-
});
|
|
32
|
-
})
|
|
33
|
-
.on("error", (err) => {
|
|
34
|
-
reject(err);
|
|
35
|
-
});
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
//# sourceMappingURL=fetch.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/core/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAMlD;;;;GAIG;AACH,MAAM,UAAU,KAAK,CAAC,GAAW;IAC/B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,SAAS,OAAO,CAAC,GAAW,EAAE,OAAqC,EAAE,MAA0B;QAC7F,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QACzB,MAAM,QAAQ,GACZ,GAAG,CAAC,QAAQ,KAAK,QAAQ;YACvB,CAAC,CAAC,eAAe,CAAC,KAAK;YACvB,CAAC,CAAC,GAAG,CAAC,QAAQ,KAAK,OAAO;gBACxB,CAAC,CAAC,eAAe,CAAC,IAAI;gBACtB,CAAC,CAAC,SAAS,CAAC;QAClB,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,CAAC,QAAQ,oBAAoB,CAAC,CAAC;QAExE,QAAQ;aACL,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE;YAChB,IAAI,IAAI,GAAG,EAAE,CAAC;YAEd,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;gBACvB,IAAI,IAAI,KAAK,CAAC;YAChB,CAAC,CAAC,CAAC;YAEH,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACjB,OAAO,CAAC;oBACN,GAAG,EAAE,GAAG,CAAC,IAAI;oBACb,IAAI,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;iBAClC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;aACD,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACnB,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CAAC,CAAC;IACP,CAAC;AACH,CAAC"}
|