@typespec/bundler 0.1.0-alpha.3-dev.5 → 0.1.0-alpha.3-dev.8
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/src/bundler.d.ts +10 -0
- package/dist/src/bundler.d.ts.map +1 -1
- package/dist/src/bundler.js +19 -1
- package/dist/src/bundler.js.map +1 -1
- package/dist/src/cli.js +58 -8
- package/dist/src/cli.js.map +1 -1
- package/dist/src/index.d.ts +1 -2
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +1 -2
- package/dist/src/index.js.map +1 -1
- package/dist/src/vite/index.d.ts +2 -0
- package/dist/src/vite/index.d.ts.map +1 -0
- package/dist/src/vite/index.js +2 -0
- package/dist/src/vite/index.js.map +1 -0
- package/dist/src/vite/vite-plugin.d.ts.map +1 -0
- package/dist/src/{vite-plugin.js → vite/vite-plugin.js} +1 -1
- package/dist/src/vite/vite-plugin.js.map +1 -0
- package/package.json +14 -5
- package/dist/src/vite-plugin.d.ts.map +0 -1
- package/dist/src/vite-plugin.js.map +0 -1
- /package/dist/src/{vite-plugin.d.ts → vite/vite-plugin.d.ts} +0 -0
package/dist/src/bundler.d.ts
CHANGED
|
@@ -1,3 +1,8 @@
|
|
|
1
|
+
export interface BundleManifest {
|
|
2
|
+
name: string;
|
|
3
|
+
version: string;
|
|
4
|
+
imports: Record<string, string>;
|
|
5
|
+
}
|
|
1
6
|
export interface TypeSpecBundleDefinition {
|
|
2
7
|
path: string;
|
|
3
8
|
main: string;
|
|
@@ -13,6 +18,10 @@ export interface TypeSpecBundle {
|
|
|
13
18
|
* Bundle content
|
|
14
19
|
*/
|
|
15
20
|
files: TypeSpecBundleFile[];
|
|
21
|
+
/**
|
|
22
|
+
* Resolved manifest.
|
|
23
|
+
*/
|
|
24
|
+
manifest: BundleManifest;
|
|
16
25
|
}
|
|
17
26
|
export interface TypeSpecBundleFile {
|
|
18
27
|
export?: string;
|
|
@@ -21,6 +30,7 @@ export interface TypeSpecBundleFile {
|
|
|
21
30
|
}
|
|
22
31
|
interface PackageJson {
|
|
23
32
|
name: string;
|
|
33
|
+
version: string;
|
|
24
34
|
main: string;
|
|
25
35
|
tspMain?: string;
|
|
26
36
|
peerDependencies: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundler.d.ts","sourceRoot":"","sources":["../../src/bundler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bundler.d.ts","sourceRoot":"","sources":["../../src/bundler.ts"],"names":[],"mappings":"AAiBA,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,UAAU,EAAE,wBAAwB,CAAC;IAErC;;OAEG;IACH,KAAK,EAAE,kBAAkB,EAAE,CAAC;IAE5B;;OAEG;IACH,QAAQ,EAAE,cAAc,CAAC;CAC1B;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC;AAED,wBAAsB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAUvF;AAED,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,iBA8B3C;AAED,wBAAsB,qBAAqB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,iBAQjF"}
|
package/dist/src/bundler.js
CHANGED
|
@@ -2,7 +2,7 @@ import commonjs from "@rollup/plugin-commonjs";
|
|
|
2
2
|
import json from "@rollup/plugin-json";
|
|
3
3
|
import nodeResolve from "@rollup/plugin-node-resolve";
|
|
4
4
|
import virtual from "@rollup/plugin-virtual";
|
|
5
|
-
import { compile, getNormalizedAbsolutePath, joinPaths, NodeHost, normalizePath, } from "@typespec/compiler";
|
|
5
|
+
import { compile, getNormalizedAbsolutePath, joinPaths, NodeHost, normalizePath, resolvePath, } from "@typespec/compiler";
|
|
6
6
|
import { mkdir, readFile, realpath, writeFile } from "fs/promises";
|
|
7
7
|
import { basename, join, resolve } from "path";
|
|
8
8
|
import { rollup, watch } from "rollup";
|
|
@@ -55,6 +55,8 @@ export async function bundleTypeSpecLibrary(libraryPath, outputDir) {
|
|
|
55
55
|
for (const file of bundle.files) {
|
|
56
56
|
await writeFile(joinPaths(outputDir, file.filename), file.content);
|
|
57
57
|
}
|
|
58
|
+
const manifest = createManifest(bundle.definition);
|
|
59
|
+
await writeFile(joinPaths(outputDir, "manifest.json"), JSON.stringify(manifest, null, 2));
|
|
58
60
|
}
|
|
59
61
|
async function resolveTypeSpecBundleDefinition(libraryPath) {
|
|
60
62
|
libraryPath = normalizePath(await realpath(libraryPath));
|
|
@@ -129,6 +131,7 @@ async function generateTypeSpecBundle(definition, bundle) {
|
|
|
129
131
|
});
|
|
130
132
|
return {
|
|
131
133
|
definition,
|
|
134
|
+
manifest: createManifest(definition),
|
|
132
135
|
files: output
|
|
133
136
|
.filter((x) => "code" in x)
|
|
134
137
|
.map((chunk) => {
|
|
@@ -168,4 +171,19 @@ function createBundleEntrypoint({ libraryPath, mainFile, jsSourceFileNames, type
|
|
|
168
171
|
"};",
|
|
169
172
|
].join("\n");
|
|
170
173
|
}
|
|
174
|
+
function createManifest(definition) {
|
|
175
|
+
return {
|
|
176
|
+
name: definition.packageJson.name,
|
|
177
|
+
version: definition.packageJson.version,
|
|
178
|
+
imports: createImportMap(definition),
|
|
179
|
+
};
|
|
180
|
+
}
|
|
181
|
+
function createImportMap(definition) {
|
|
182
|
+
const imports = {};
|
|
183
|
+
imports["."] = `./index.js`;
|
|
184
|
+
for (const name of Object.keys(definition.exports)) {
|
|
185
|
+
imports[name] = "./" + resolvePath(name) + ".js";
|
|
186
|
+
}
|
|
187
|
+
return imports;
|
|
188
|
+
}
|
|
171
189
|
//# sourceMappingURL=bundler.js.map
|
package/dist/src/bundler.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundler.js","sourceRoot":"","sources":["../../src/bundler.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,yBAAyB,CAAC;AAC/C,OAAO,IAAI,MAAM,qBAAqB,CAAC;AACvC,OAAO,WAAW,MAAM,6BAA6B,CAAC;AACtD,OAAO,OAAO,MAAM,wBAAwB,CAAC;AAC7C,OAAO,EACL,OAAO,EACP,yBAAyB,EACzB,SAAS,EACT,QAAQ,EACR,aAAa,
|
|
1
|
+
{"version":3,"file":"bundler.js","sourceRoot":"","sources":["../../src/bundler.ts"],"names":[],"mappings":"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"}
|
package/dist/src/cli.js
CHANGED
|
@@ -1,12 +1,62 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
import
|
|
1
|
+
/* eslint-disable no-console */
|
|
2
|
+
import { resolvePath, typespecVersion } from "@typespec/compiler";
|
|
3
|
+
import yargs from "yargs";
|
|
4
4
|
import { bundleTypeSpecLibrary } from "./bundler.js";
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
5
|
+
try {
|
|
6
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
7
|
+
// @ts-ignore
|
|
8
|
+
await import("source-map-support/register.js");
|
|
9
|
+
}
|
|
10
|
+
catch {
|
|
11
|
+
// package only present in dev.
|
|
12
|
+
}
|
|
13
|
+
async function main() {
|
|
14
|
+
console.log(`TypeSpec Developer Tools v${typespecVersion}\n`);
|
|
15
|
+
await yargs(process.argv.slice(2))
|
|
16
|
+
.scriptName("tspd")
|
|
17
|
+
.help()
|
|
18
|
+
.strict()
|
|
19
|
+
.parserConfiguration({
|
|
20
|
+
"greedy-arrays": false,
|
|
21
|
+
"boolean-negation": false,
|
|
22
|
+
})
|
|
23
|
+
.option("debug", {
|
|
24
|
+
type: "boolean",
|
|
25
|
+
description: "Output debug log messages.",
|
|
26
|
+
default: false,
|
|
27
|
+
})
|
|
28
|
+
.command("bundle <entrypoint>", "Generate browser compatible bundle.", (cmd) => {
|
|
29
|
+
return cmd
|
|
30
|
+
.positional("entrypoint", {
|
|
31
|
+
description: "Path to the library entrypoint.",
|
|
32
|
+
type: "string",
|
|
33
|
+
demandOption: true,
|
|
34
|
+
})
|
|
35
|
+
.option("output-dir", {
|
|
36
|
+
type: "string",
|
|
37
|
+
});
|
|
38
|
+
}, async (args) => {
|
|
39
|
+
var _a;
|
|
40
|
+
const resolvedRoot = resolvePath(process.cwd(), args.entrypoint);
|
|
41
|
+
await bundleTypeSpecLibrary(resolvedRoot, (_a = args["output-dir"]) !== null && _a !== void 0 ? _a : resolvePath(resolvedRoot, "out/browser"));
|
|
42
|
+
})
|
|
43
|
+
.version(typespecVersion)
|
|
44
|
+
.demandCommand(1, "You must use one of the supported commands.").argv;
|
|
45
|
+
}
|
|
46
|
+
function internalError(error) {
|
|
47
|
+
// NOTE: An expected error, like one thrown for bad input, shouldn't reach
|
|
48
|
+
// here, but be handled somewhere else. If we reach here, it should be
|
|
49
|
+
// considered a bug and therefore we should not suppress the stack trace as
|
|
50
|
+
// that risks losing it in the case of a bug that does not repro easily.
|
|
51
|
+
console.error("Internal error!");
|
|
52
|
+
console.error("File issue at https://github.com/microsoft/typespec");
|
|
53
|
+
console.error();
|
|
54
|
+
console.error(error);
|
|
10
55
|
process.exit(1);
|
|
56
|
+
}
|
|
57
|
+
process.on("unhandledRejection", (error) => {
|
|
58
|
+
console.error("Unhandled promise rejection!");
|
|
59
|
+
internalError(error);
|
|
11
60
|
});
|
|
61
|
+
main().catch(internalError);
|
|
12
62
|
//# sourceMappingURL=cli.js.map
|
package/dist/src/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAErD,IAAI;IACF,6DAA6D;IAC7D,aAAa;IACb,MAAM,MAAM,CAAC,gCAAgC,CAAC,CAAC;CAChD;AAAC,MAAM;IACN,+BAA+B;CAChC;AAED,KAAK,UAAU,IAAI;IACjB,OAAO,CAAC,GAAG,CAAC,6BAA6B,eAAe,IAAI,CAAC,CAAC;IAE9D,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAC/B,UAAU,CAAC,MAAM,CAAC;SAClB,IAAI,EAAE;SACN,MAAM,EAAE;SACR,mBAAmB,CAAC;QACnB,eAAe,EAAE,KAAK;QACtB,kBAAkB,EAAE,KAAK;KAC1B,CAAC;SACD,MAAM,CAAC,OAAO,EAAE;QACf,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,4BAA4B;QACzC,OAAO,EAAE,KAAK;KACf,CAAC;SACD,OAAO,CACN,qBAAqB,EACrB,qCAAqC,EACrC,CAAC,GAAG,EAAE,EAAE;QACN,OAAO,GAAG;aACP,UAAU,CAAC,YAAY,EAAE;YACxB,WAAW,EAAE,iCAAiC;YAC9C,IAAI,EAAE,QAAQ;YACd,YAAY,EAAE,IAAI;SACnB,CAAC;aACD,MAAM,CAAC,YAAY,EAAE;YACpB,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;IACP,CAAC,EACD,KAAK,EAAE,IAAI,EAAE,EAAE;;QACb,MAAM,YAAY,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACjE,MAAM,qBAAqB,CACzB,YAAY,EACZ,MAAA,IAAI,CAAC,YAAY,CAAC,mCAAI,WAAW,CAAC,YAAY,EAAE,aAAa,CAAC,CAC/D,CAAC;IACJ,CAAC,CACF;SACA,OAAO,CAAC,eAAe,CAAC;SACxB,aAAa,CAAC,CAAC,EAAE,6CAA6C,CAAC,CAAC,IAAI,CAAC;AAC1E,CAAC;AAED,SAAS,aAAa,CAAC,KAAc;IACnC,0EAA0E;IAC1E,sEAAsE;IACtE,2EAA2E;IAC3E,wEAAwE;IAExE,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACjC,OAAO,CAAC,KAAK,CAAC,qDAAqD,CAAC,CAAC;IACrE,OAAO,CAAC,KAAK,EAAE,CAAC;IAChB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAErB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,OAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,KAAc,EAAE,EAAE;IAClD,OAAO,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAC9C,aAAa,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC;AAEH,IAAI,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC"}
|
package/dist/src/index.d.ts
CHANGED
package/dist/src/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,cAAc,EACd,wBAAwB,EACxB,kBAAkB,EAClB,oBAAoB,GACrB,MAAM,cAAc,CAAC"}
|
package/dist/src/index.js
CHANGED
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,oBAAoB,GACrB,MAAM,cAAc,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/vite/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/vite/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,oBAAoB,EAAE,MAAM,kBAAkB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"vite-plugin.d.ts","sourceRoot":"","sources":["../../../src/vite/vite-plugin.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAA6B,MAAM,EAAkB,MAAM,MAAM,CAAC;AAQ9E,MAAM,WAAW,2BAA2B;IAC1C,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,GAAG,MAAM,CA+FjF"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { resolvePath } from "@typespec/compiler";
|
|
2
2
|
import { resolve } from "path";
|
|
3
|
-
import { createTypeSpecBundle, watchTypeSpecBundle, } from "
|
|
3
|
+
import { createTypeSpecBundle, watchTypeSpecBundle, } from "../bundler.js";
|
|
4
4
|
export function typespecBundlePlugin(options) {
|
|
5
5
|
let config;
|
|
6
6
|
const definitions = {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"vite-plugin.js","sourceRoot":"","sources":["../../../src/vite/vite-plugin.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typespec/bundler",
|
|
3
|
-
"version": "0.1.0-alpha.3-dev.
|
|
3
|
+
"version": "0.1.0-alpha.3-dev.8",
|
|
4
4
|
"author": "Microsoft Corporation",
|
|
5
5
|
"description": "Package to bundle a typespec library.",
|
|
6
6
|
"homepage": "https://microsoft.github.io/typespec",
|
|
@@ -17,10 +17,16 @@
|
|
|
17
17
|
"typespec"
|
|
18
18
|
],
|
|
19
19
|
"type": "module",
|
|
20
|
+
"bin": {
|
|
21
|
+
"typespec-bundler": "./dist/src/cli.js"
|
|
22
|
+
},
|
|
20
23
|
"main": "dist/src/index.js",
|
|
21
|
-
"
|
|
24
|
+
"exports": {
|
|
25
|
+
".": "./dist/src/index.js",
|
|
26
|
+
"./vite": "./dist/src/vite/index.js"
|
|
27
|
+
},
|
|
22
28
|
"engines": {
|
|
23
|
-
"node": ">=
|
|
29
|
+
"node": ">=18.0.0"
|
|
24
30
|
},
|
|
25
31
|
"files": [
|
|
26
32
|
"lib/*.tsp",
|
|
@@ -35,7 +41,9 @@
|
|
|
35
41
|
"@rollup/plugin-node-resolve": "~15.2.1",
|
|
36
42
|
"@rollup/plugin-multi-entry": "~6.0.0",
|
|
37
43
|
"rollup": "~3.29.2",
|
|
38
|
-
"@rollup/plugin-alias": "~5.0.0"
|
|
44
|
+
"@rollup/plugin-alias": "~5.0.0",
|
|
45
|
+
"yargs": "~17.7.2",
|
|
46
|
+
"picocolors": "~1.0.0"
|
|
39
47
|
},
|
|
40
48
|
"devDependencies": {
|
|
41
49
|
"@types/mocha": "~10.0.1",
|
|
@@ -48,7 +56,8 @@
|
|
|
48
56
|
"c8": "~8.0.1",
|
|
49
57
|
"rimraf": "~5.0.1",
|
|
50
58
|
"typescript": "~5.2.2",
|
|
51
|
-
"vite": "^4.4.9"
|
|
59
|
+
"vite": "^4.4.9",
|
|
60
|
+
"@types/yargs": "~17.0.24"
|
|
52
61
|
},
|
|
53
62
|
"peerDependencies": {},
|
|
54
63
|
"scripts": {
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"vite-plugin.d.ts","sourceRoot":"","sources":["../../src/vite-plugin.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAA6B,MAAM,EAAkB,MAAM,MAAM,CAAC;AAQ9E,MAAM,WAAW,2BAA2B;IAC1C,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,GAAG,MAAM,CA+FjF"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"vite-plugin.js","sourceRoot":"","sources":["../../src/vite-plugin.ts"],"names":[],"mappings":"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"}
|
|
File without changes
|