@backtickjs/bundler 0.1.10 → 0.1.11
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/README.md +13 -14
- package/dist/bundle/buildBundle.d.ts +1 -1
- package/dist/bundle/buildBundle.js +66 -56
- package/dist/bundle/buildBundle.js.map +1 -1
- package/dist/bundle/expandServerComponents.d.ts +1 -1
- package/dist/bundle/expandServerComponents.js +29 -27
- package/dist/bundle/expandServerComponents.js.map +1 -1
- package/dist/bundle/params.d.ts +1 -0
- package/dist/bundle/params.js +9 -0
- package/dist/bundle/params.js.map +1 -1
- package/dist/bundler.d.ts +17 -13
- package/dist/bundler.js +12 -7
- package/dist/bundler.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/print/code.d.ts +1 -0
- package/dist/print/code.js +1 -1
- package/dist/print/code.js.map +1 -1
- package/dist/print/printBundle.js +17 -0
- package/dist/print/printBundle.js.map +1 -1
- package/package.json +2 -2
- package/src/bundle/buildBundle.ts +69 -67
- package/src/bundle/expandServerComponents.ts +29 -27
- package/src/bundle/params.ts +12 -0
- package/src/bundler.ts +24 -15
- package/src/index.ts +1 -1
- package/src/print/code.ts +3 -1
- package/src/print/printBundle.ts +19 -0
package/README.md
CHANGED
|
@@ -10,7 +10,7 @@ npm install @backtickjs/bundler @backtickjs/core
|
|
|
10
10
|
|
|
11
11
|
## Usage
|
|
12
12
|
|
|
13
|
-
For React Native, write CommonJS and serve it; the app fetches it and runs it with `
|
|
13
|
+
For React Native, write CommonJS and serve it; the app fetches it and runs it with `execRoot` from `@backtickjs/core/cjs`:
|
|
14
14
|
|
|
15
15
|
```tsx
|
|
16
16
|
import { bundler } from "@backtickjs/bundler";
|
|
@@ -23,8 +23,8 @@ const modules = {
|
|
|
23
23
|
};
|
|
24
24
|
|
|
25
25
|
// In a request handler:
|
|
26
|
-
const
|
|
27
|
-
const { code } =
|
|
26
|
+
const build = await bundler.build({ input: <Home />, modules });
|
|
27
|
+
const { code } = build.generate({ format: "cjs" });
|
|
28
28
|
response.setHeader("content-type", "text/javascript");
|
|
29
29
|
response.end(code);
|
|
30
30
|
```
|
|
@@ -38,7 +38,7 @@ import { createRoot } from "@backtickjs/react/client";
|
|
|
38
38
|
import { Home } from "./Home.js";
|
|
39
39
|
|
|
40
40
|
const element = <Home />;
|
|
41
|
-
const
|
|
41
|
+
const build = await bundler.build({
|
|
42
42
|
input: cs`$createRoot(document.getElementById("app")!).render($element)`,
|
|
43
43
|
modules: {
|
|
44
44
|
react: "19.2.3",
|
|
@@ -46,7 +46,7 @@ const bundle = await bundler.build({
|
|
|
46
46
|
"react-dom/client": "19.2.3",
|
|
47
47
|
},
|
|
48
48
|
});
|
|
49
|
-
const { code } =
|
|
49
|
+
const { code } = build.generate({ format: "es", sourcemap: "inline" });
|
|
50
50
|
```
|
|
51
51
|
|
|
52
52
|
### `modules`
|
|
@@ -57,12 +57,12 @@ The modules the client provides, by specifier, each at the exact version of the
|
|
|
57
57
|
|
|
58
58
|
### What crosses into a script
|
|
59
59
|
|
|
60
|
-
Spliced values are written into the bundle as data, never as code. What can't cross, `build` rejects before anything reaches the client; [Errors](https://backtickjs.com/docs/errors
|
|
60
|
+
Spliced values are written into the bundle as data, never as code. What can't cross, `build` rejects before anything reaches the client; [Errors](https://backtickjs.com/docs/errors/#from-the-bundler) has each message and its fix.
|
|
61
61
|
|
|
62
62
|
### Formats
|
|
63
63
|
|
|
64
64
|
- `"es"`: an ES module, for a web page. Packages are imported by specifier, which the page's import map resolves.
|
|
65
|
-
- `"cjs"`: CommonJS, for a client that provides `require` itself, as a React Native app does through `
|
|
65
|
+
- `"cjs"`: CommonJS, for a client that provides `require` itself, as a React Native app does through `execRoot`.
|
|
66
66
|
|
|
67
67
|
### Source maps
|
|
68
68
|
|
|
@@ -70,17 +70,16 @@ Spliced values are written into the bundle as data, never as code. What can't cr
|
|
|
70
70
|
|
|
71
71
|
## API
|
|
72
72
|
|
|
73
|
-
- `bundler.build({ input, modules })`: runs the server components in `input` and returns a `
|
|
74
|
-
- `
|
|
75
|
-
- Types: `BuildOptions`, `OutputOptions`, `OutputChunk`, `
|
|
73
|
+
- `bundler.build({ input, modules })`: runs the server components in `input` and returns a `Build`. Async.
|
|
74
|
+
- `Build.generate({ format, sourcemap })`: writes the bundle; returns `{ code, map }`, where `code` is a `Bundle<T>` (from `@backtickjs/core`), typed by what `input` is on the client, and `map` is `null` without a source map.
|
|
75
|
+
- Types: `BuildOptions`, `OutputOptions`, `OutputChunk`, `Build`.
|
|
76
76
|
|
|
77
77
|
## Related
|
|
78
78
|
|
|
79
|
-
- [`@backtickjs/core`](https://github.com/backtickjs/backtick/tree/main/packages/core): the `cs` tag
|
|
80
|
-
- [`@backtickjs/react-native-client`](https://github.com/backtickjs/backtick/tree/main/packages/react-native-client): runs a `cjs` bundle in a React Native app
|
|
79
|
+
- [`@backtickjs/core`](https://github.com/backtickjs/backtick/tree/main/packages/core): the `cs` tag, and `execRoot`, which runs a bundle in the app
|
|
81
80
|
- [`@backtickjs/react`](https://github.com/backtickjs/backtick/tree/main/adapters/react), [`@backtickjs/react-native`](https://github.com/backtickjs/backtick/tree/main/adapters/react-native), [`@backtickjs/solid-js`](https://github.com/backtickjs/backtick/tree/main/adapters/solid-js): framework adapters
|
|
82
|
-
- [How it works](https://backtickjs.com/docs/how-it-works)
|
|
83
|
-
- [Errors](https://backtickjs.com/docs/errors)
|
|
81
|
+
- [How it works](https://backtickjs.com/docs/how-it-works/)
|
|
82
|
+
- [Errors](https://backtickjs.com/docs/errors/)
|
|
84
83
|
|
|
85
84
|
## License
|
|
86
85
|
|
|
@@ -12,4 +12,4 @@ export interface BundleTree {
|
|
|
12
12
|
readonly root: string;
|
|
13
13
|
readonly names: Names;
|
|
14
14
|
}
|
|
15
|
-
export declare function buildBundle(
|
|
15
|
+
export declare function buildBundle(spliceable: unknown, provided: Modules): Promise<BundleTree>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { isClientImport, isClientScript, isJsxElement, } from "@backtickjs/core";
|
|
1
|
+
import { isClientExec, isClientImport, isClientScript, isJsxElement, } from "@backtickjs/core";
|
|
2
2
|
import { expandServerComponents } from "./expandServerComponents.js";
|
|
3
|
-
import { bindingsOf, capturesOf } from "./params.js";
|
|
3
|
+
import { bindingsOf, capturesOf, isValue } from "./params.js";
|
|
4
4
|
import { sourceName } from "./bindingKey.js";
|
|
5
5
|
import { array, arrow, call, createNames, imported, literal, object, } from "../print/code.js";
|
|
6
6
|
// Names a binding may not take: what strict code cannot bind. Every name the
|
|
@@ -25,7 +25,7 @@ const rootScope = () => ({ bindings: new Set(), read: new Set() });
|
|
|
25
25
|
// name, a capture is threaded under that one name the whole way down — an
|
|
26
26
|
// intermediate script that binds a same-looking variable has a different
|
|
27
27
|
// unique name, so there is nothing to disambiguate and nothing to rename.
|
|
28
|
-
export async function buildBundle(
|
|
28
|
+
export async function buildBundle(spliceable, provided) {
|
|
29
29
|
const names = createNames(provided);
|
|
30
30
|
// Each script's number, in the order rendering first reaches it. Two
|
|
31
31
|
// scripts written at one source location are one declaration, so the first
|
|
@@ -86,21 +86,19 @@ export async function buildBundle(value, provided) {
|
|
|
86
86
|
const passKeys = (target, hole) => bindingsOf(target.module.params[hole]);
|
|
87
87
|
// A script's label: `$cs` and its number.
|
|
88
88
|
const labelOf = (target) => `$cs${numbers.get(target)}`;
|
|
89
|
-
//
|
|
90
|
-
// thunk a splice is handed over as. One whose code reads nothing of the
|
|
89
|
+
// The thunk a splice is handed over as. One whose code reads nothing of the
|
|
91
90
|
// scope it's written in, beyond its own parameters, is the same function
|
|
92
91
|
// wherever it's written, so the bundle makes it once, as a constant, and
|
|
93
|
-
// the same code anywhere else is that constant: a
|
|
94
|
-
//
|
|
95
|
-
//
|
|
96
|
-
//
|
|
97
|
-
// still rendered where it stands.
|
|
92
|
+
// the same code anywhere else is that constant: a value spliced at every
|
|
93
|
+
// level of a deep composition is written once per level, not once per path.
|
|
94
|
+
// A thunk is the bundle's own, never the script's, so sharing one isn't
|
|
95
|
+
// observable; everything is still rendered where it stands.
|
|
98
96
|
const constants = [];
|
|
99
97
|
const byCode = new Map();
|
|
100
|
-
// `write` renders a
|
|
101
|
-
//
|
|
98
|
+
// `write` renders a thunk's code in a scope that records what it reads: a
|
|
99
|
+
// constant's label if it read nothing of `scope` beyond `own`, its
|
|
102
100
|
// parameters, or else the code, written where it's used.
|
|
103
|
-
const
|
|
101
|
+
const thunk = (scope, own, write) => {
|
|
104
102
|
const read = new Set();
|
|
105
103
|
const code = write({
|
|
106
104
|
bindings: new Set([...scope.bindings, ...own]),
|
|
@@ -113,27 +111,39 @@ export async function buildBundle(value, provided) {
|
|
|
113
111
|
}
|
|
114
112
|
let label = byCode.get(code);
|
|
115
113
|
if (label === undefined) {
|
|
116
|
-
label = `$
|
|
114
|
+
label = `$thunk${constants.length}`;
|
|
117
115
|
byCode.set(code, label);
|
|
118
116
|
constants.push([label, code]);
|
|
119
117
|
}
|
|
120
118
|
return label;
|
|
121
119
|
};
|
|
122
|
-
// A `once` script
|
|
123
|
-
//
|
|
124
|
-
//
|
|
125
|
-
// function that each make a
|
|
126
|
-
//
|
|
127
|
-
//
|
|
120
|
+
// A function, a class and a `once` script are each one value (see
|
|
121
|
+
// `isValue`): its code run at the top of the bundle, where nothing encloses
|
|
122
|
+
// it, and every read is that constant. One per script, not per code: two
|
|
123
|
+
// runs of a host function that each make a function are two functions, and
|
|
124
|
+
// two that each make a context two contexts, as in plain TypeScript.
|
|
125
|
+
//
|
|
126
|
+
// A function or a class that reads a variable of the scope it's read in,
|
|
127
|
+
// itself or through what it's handed, is made there instead, as one
|
|
128
|
+
// declared in a function is. A `once` script that does is refused.
|
|
128
129
|
const values = new Map();
|
|
129
|
-
const valueOf = (script) => {
|
|
130
|
+
const valueOf = (script, scope) => {
|
|
130
131
|
let label = values.get(script);
|
|
131
|
-
if (label
|
|
132
|
-
|
|
133
|
-
label = `$value${constants.length}`;
|
|
134
|
-
values.set(script, label);
|
|
135
|
-
constants.push([label, code]);
|
|
132
|
+
if (label !== undefined) {
|
|
133
|
+
return label;
|
|
136
134
|
}
|
|
135
|
+
const at = script.once
|
|
136
|
+
? rootScope()
|
|
137
|
+
: { bindings: scope.bindings, read: new Set() };
|
|
138
|
+
const code = call(labelOf(scriptFor(script)), exprCallArgs(script, at));
|
|
139
|
+
const outside = [...at.read].filter((key) => scope.bindings.has(key));
|
|
140
|
+
if (outside.length > 0) {
|
|
141
|
+
outside.forEach((key) => scope.read.add(key));
|
|
142
|
+
return code;
|
|
143
|
+
}
|
|
144
|
+
label = `$value${constants.length}`;
|
|
145
|
+
values.set(script, label);
|
|
146
|
+
constants.push([label, code]);
|
|
137
147
|
return label;
|
|
138
148
|
};
|
|
139
149
|
// Writes a value as the code it becomes: composition as data, which is what
|
|
@@ -141,34 +151,34 @@ export async function buildBundle(value, provided) {
|
|
|
141
151
|
// what to hand it; everything else is its literal form. Rendered in order,
|
|
142
152
|
// one value after the other, so the table follows the order rendering first
|
|
143
153
|
// reached each script. Expansion has refused cycles, so it ends.
|
|
144
|
-
const render = (
|
|
145
|
-
if (isClientScript(
|
|
146
|
-
if (
|
|
147
|
-
return valueOf(
|
|
154
|
+
const render = (spliceable, scope = rootScope()) => {
|
|
155
|
+
if (isClientScript(spliceable)) {
|
|
156
|
+
if (isValue(spliceable)) {
|
|
157
|
+
return valueOf(spliceable, scope);
|
|
148
158
|
}
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
return closure(scope, [], (inner) => call(labelOf(target), exprCallArgs(value, inner)), "$function");
|
|
159
|
+
return call(labelOf(scriptFor(spliceable)), exprCallArgs(spliceable, scope));
|
|
160
|
+
}
|
|
161
|
+
if (isJsxElement(spliceable)) {
|
|
162
|
+
return renderJsx(spliceable);
|
|
154
163
|
}
|
|
155
|
-
if (
|
|
156
|
-
return
|
|
164
|
+
if (isClientImport(spliceable)) {
|
|
165
|
+
return imported(names, spliceable);
|
|
157
166
|
}
|
|
158
|
-
if (
|
|
159
|
-
|
|
167
|
+
if (isClientExec(spliceable)) {
|
|
168
|
+
names.exec = true;
|
|
169
|
+
return "$exec";
|
|
160
170
|
}
|
|
161
|
-
if (
|
|
162
|
-
|
|
163
|
-
typeof
|
|
164
|
-
typeof
|
|
165
|
-
typeof
|
|
166
|
-
typeof
|
|
167
|
-
return literal(
|
|
171
|
+
if (spliceable === null ||
|
|
172
|
+
spliceable === undefined ||
|
|
173
|
+
typeof spliceable === "number" ||
|
|
174
|
+
typeof spliceable === "bigint" ||
|
|
175
|
+
typeof spliceable === "string" ||
|
|
176
|
+
typeof spliceable === "boolean") {
|
|
177
|
+
return literal(spliceable);
|
|
168
178
|
}
|
|
169
|
-
if (Array.isArray(
|
|
179
|
+
if (Array.isArray(spliceable)) {
|
|
170
180
|
const elements = [];
|
|
171
|
-
for (const element of
|
|
181
|
+
for (const element of spliceable) {
|
|
172
182
|
elements.push(render(element, scope));
|
|
173
183
|
}
|
|
174
184
|
return array(elements);
|
|
@@ -176,8 +186,8 @@ export async function buildBundle(value, provided) {
|
|
|
176
186
|
// A host function is host code, which never reaches the client: client
|
|
177
187
|
// code is written in a script, and reaches another as one.
|
|
178
188
|
// A server component among them, written as a tag: `<$Rule />`.
|
|
179
|
-
if (typeof
|
|
180
|
-
const { name } =
|
|
189
|
+
if (typeof spliceable === "function") {
|
|
190
|
+
const { name } = spliceable;
|
|
181
191
|
throw new Error((name === ""
|
|
182
192
|
? "Can't splice a host function"
|
|
183
193
|
: `Can't splice the host function \`${name}\``) +
|
|
@@ -186,7 +196,7 @@ export async function buildBundle(value, provided) {
|
|
|
186
196
|
"server component, draw it with a tag in a braced splice: " +
|
|
187
197
|
`\`{\${<${/^[A-Z]/.test(name) ? name : "Name"} />}}\`.`);
|
|
188
198
|
}
|
|
189
|
-
if (typeof
|
|
199
|
+
if (typeof spliceable !== "object") {
|
|
190
200
|
throw new Error("Can't splice a symbol: a bundle can't write one that is the same " +
|
|
191
201
|
"symbol on the client. Splice a string, and make the symbol from it " +
|
|
192
202
|
"in a script: cs`Symbol.for($key)`.");
|
|
@@ -196,14 +206,14 @@ export async function buildBundle(value, provided) {
|
|
|
196
206
|
// vanish — so fail loudly instead. An object with behaviour is built by a
|
|
197
207
|
// client function: `state` for what it holds, arrows for what may be done
|
|
198
208
|
// to it.
|
|
199
|
-
const prototype = Object.getPrototypeOf(
|
|
209
|
+
const prototype = Object.getPrototypeOf(spliceable);
|
|
200
210
|
if (prototype !== Object.prototype && prototype !== null) {
|
|
201
|
-
const name =
|
|
211
|
+
const name = spliceable.constructor?.name ?? "an unknown class";
|
|
202
212
|
throw new Error(`Can't splice this \`${name}\` instance: only plain objects cross into ` +
|
|
203
213
|
"a client script. Build one with a client function instead.");
|
|
204
214
|
}
|
|
205
215
|
const entries = [];
|
|
206
|
-
for (const [key, entry] of Object.entries(
|
|
216
|
+
for (const [key, entry] of Object.entries(spliceable)) {
|
|
207
217
|
entries.push([key, render(entry, scope)]);
|
|
208
218
|
}
|
|
209
219
|
return object(entries);
|
|
@@ -239,7 +249,7 @@ export async function buildBundle(value, provided) {
|
|
|
239
249
|
// nested inside it.
|
|
240
250
|
const passed = [...passKeys(target, index), ...capturesOf(target)];
|
|
241
251
|
// A thunk taking them, the splice rendered inside it.
|
|
242
|
-
parts.push(
|
|
252
|
+
parts.push(thunk(scope, passed, (inner) => arrow(passed.map(displayName), render(arg, inner))));
|
|
243
253
|
}
|
|
244
254
|
for (const key of capturesOf(target)) {
|
|
245
255
|
parts.push(capExpr(key, scope));
|
|
@@ -263,7 +273,7 @@ export async function buildBundle(value, provided) {
|
|
|
263
273
|
};
|
|
264
274
|
// Every server component first, so siblings run at once; then the drawing,
|
|
265
275
|
// in order. Nothing encloses the root, so nothing it holds can capture.
|
|
266
|
-
const root = render(await expandServerComponents(
|
|
276
|
+
const root = render(await expandServerComponents(spliceable));
|
|
267
277
|
// In table order, which is the order rendering first reached each script.
|
|
268
278
|
const modules = [...numbers.keys()].map((script) => [labelOf(script), script.module]);
|
|
269
279
|
return { modules, constants, root, names };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildBundle.js","sourceRoot":"","sources":["../../src/bundle/buildBundle.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,cAAc,EACd,cAAc,EACd,YAAY,GAEb,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"buildBundle.js","sourceRoot":"","sources":["../../src/bundle/buildBundle.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,5 +3,5 @@ interface Ancestors {
|
|
|
3
3
|
readonly value: object;
|
|
4
4
|
readonly parent: Ancestors | null;
|
|
5
5
|
}
|
|
6
|
-
export declare function expandServerComponents(
|
|
6
|
+
export declare function expandServerComponents(spliceable: unknown, ancestors?: Ancestors | null, values?: Map<ClientScript, Promise<unknown>>): Promise<unknown>;
|
|
7
7
|
export {};
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { isClientImport, isClientScript, isJsxElement, } from "@backtickjs/core";
|
|
2
|
+
import { isValue } from "./params.js";
|
|
2
3
|
const CYCLE_ERROR = "Can't splice a value that contains itself: a bundle writes each value " +
|
|
3
4
|
"out in full, so a cycle never ends. Break the cycle before splicing it.";
|
|
4
5
|
const contains = (ancestors, value) => {
|
|
@@ -18,58 +19,59 @@ const contains = (ancestors, value) => {
|
|
|
18
19
|
// the client code it bottoms out in reaches the bundle. A value holding no
|
|
19
20
|
// server component comes back as the same object.
|
|
20
21
|
//
|
|
21
|
-
// A `once` script
|
|
22
|
-
// many places read it: a server
|
|
22
|
+
// A function, a class and a `once` script are each one value (see `isValue`),
|
|
23
|
+
// so what one splices is expanded once, however many places read it: a server
|
|
24
|
+
// component inside it runs once. `values` holds
|
|
23
25
|
// each one's expansion for the call.
|
|
24
|
-
export async function expandServerComponents(
|
|
25
|
-
if (typeof
|
|
26
|
-
return
|
|
26
|
+
export async function expandServerComponents(spliceable, ancestors = null, values = new Map()) {
|
|
27
|
+
if (typeof spliceable !== "object" || spliceable === null) {
|
|
28
|
+
return spliceable;
|
|
27
29
|
}
|
|
28
|
-
if (contains(ancestors,
|
|
30
|
+
if (contains(ancestors, spliceable)) {
|
|
29
31
|
throw new Error(CYCLE_ERROR);
|
|
30
32
|
}
|
|
31
|
-
const inside = { value, parent: ancestors };
|
|
33
|
+
const inside = { value: spliceable, parent: ancestors };
|
|
32
34
|
const all = (entries) => Promise.all(entries.map((entry) => expandServerComponents(entry, inside, values)));
|
|
33
|
-
if (isJsxElement(
|
|
34
|
-
const { type } =
|
|
35
|
+
if (isJsxElement(spliceable)) {
|
|
36
|
+
const { type } = spliceable;
|
|
35
37
|
// A tag the client draws is left for rendering to refuse.
|
|
36
38
|
if (typeof type !== "function" || isClientImport(type)) {
|
|
37
|
-
return
|
|
39
|
+
return spliceable;
|
|
38
40
|
}
|
|
39
|
-
return expandServerComponents(await type(
|
|
41
|
+
return expandServerComponents(await type(spliceable.props), inside, values);
|
|
40
42
|
}
|
|
41
|
-
if (isClientScript(
|
|
43
|
+
if (isClientScript(spliceable)) {
|
|
42
44
|
const expanded = async () => {
|
|
43
|
-
const args = await all(
|
|
44
|
-
return args.every((arg, index) => arg ===
|
|
45
|
-
?
|
|
46
|
-
: { ...
|
|
45
|
+
const args = await all(spliceable.args);
|
|
46
|
+
return args.every((arg, index) => arg === spliceable.args[index])
|
|
47
|
+
? spliceable
|
|
48
|
+
: { ...spliceable, args };
|
|
47
49
|
};
|
|
48
|
-
if (!
|
|
50
|
+
if (!isValue(spliceable)) {
|
|
49
51
|
return expanded();
|
|
50
52
|
}
|
|
51
|
-
let made = values.get(
|
|
53
|
+
let made = values.get(spliceable);
|
|
52
54
|
if (made === undefined) {
|
|
53
55
|
made = expanded();
|
|
54
|
-
values.set(
|
|
56
|
+
values.set(spliceable, made);
|
|
55
57
|
}
|
|
56
58
|
return made;
|
|
57
59
|
}
|
|
58
|
-
if (Array.isArray(
|
|
59
|
-
const elements = await all(
|
|
60
|
-
return elements.every((element, index) => element ===
|
|
61
|
-
?
|
|
60
|
+
if (Array.isArray(spliceable)) {
|
|
61
|
+
const elements = await all(spliceable);
|
|
62
|
+
return elements.every((element, index) => element === spliceable[index])
|
|
63
|
+
? spliceable
|
|
62
64
|
: elements;
|
|
63
65
|
}
|
|
64
66
|
// Only plain objects cross; rendering refuses anything else.
|
|
65
|
-
const prototype = Object.getPrototypeOf(
|
|
67
|
+
const prototype = Object.getPrototypeOf(spliceable);
|
|
66
68
|
if (prototype !== Object.prototype && prototype !== null) {
|
|
67
|
-
return
|
|
69
|
+
return spliceable;
|
|
68
70
|
}
|
|
69
|
-
const entries = Object.entries(
|
|
71
|
+
const entries = Object.entries(spliceable);
|
|
70
72
|
const expanded = await all(entries.map(([, entry]) => entry));
|
|
71
73
|
if (expanded.every((entry, index) => entry === entries[index][1])) {
|
|
72
|
-
return
|
|
74
|
+
return spliceable;
|
|
73
75
|
}
|
|
74
76
|
// Defined, not assigned, so a `__proto__` key stays a key.
|
|
75
77
|
return Object.fromEntries(entries.map(([key], index) => [key, expanded[index]]));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expandServerComponents.js","sourceRoot":"","sources":["../../src/bundle/expandServerComponents.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,EACd,cAAc,EACd,YAAY,GACb,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"expandServerComponents.js","sourceRoot":"","sources":["../../src/bundle/expandServerComponents.ts"],"names":[],"mappings":"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"}
|
package/dist/bundle/params.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import type { ClientScript, Param } from "@backtickjs/core";
|
|
2
2
|
export declare function bindingsOf(param: Param | undefined): readonly string[];
|
|
3
|
+
export declare function isValue(script: ClientScript): boolean;
|
|
3
4
|
export declare function capturesOf(script: ClientScript): readonly string[];
|
package/dist/bundle/params.js
CHANGED
|
@@ -3,6 +3,15 @@
|
|
|
3
3
|
export function bindingsOf(param) {
|
|
4
4
|
return param?.kind === "splice" ? param.bindings : [];
|
|
5
5
|
}
|
|
6
|
+
// Whether a script is one value for the bundle, made once at its top: a
|
|
7
|
+
// `once` script, a function and a class, as a module-level one is. A function
|
|
8
|
+
// or a class that reads a variable of the script around it, itself or through
|
|
9
|
+
// what it's handed, is made where it's read instead (see `valueOf`).
|
|
10
|
+
export function isValue(script) {
|
|
11
|
+
return (script.once === true ||
|
|
12
|
+
script.module.kind === "function" ||
|
|
13
|
+
script.module.kind === "class");
|
|
14
|
+
}
|
|
6
15
|
// The binding keys a script captures, in parameter order.
|
|
7
16
|
export function capturesOf(script) {
|
|
8
17
|
return script.module.params.flatMap((param) => param.kind === "capture" ? [param.key] : []);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"params.js","sourceRoot":"","sources":["../../src/bundle/params.ts"],"names":[],"mappings":"AAEA,4EAA4E;AAE5E,6DAA6D;AAC7D,MAAM,UAAU,UAAU,CAAC,KAAwB;IACjD,OAAO,KAAK,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;AACxD,CAAC;AAED,0DAA0D;AAC1D,MAAM,UAAU,UAAU,CAAC,MAAoB;IAC7C,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAC5C,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAC5C,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"params.js","sourceRoot":"","sources":["../../src/bundle/params.ts"],"names":[],"mappings":"AAEA,4EAA4E;AAE5E,6DAA6D;AAC7D,MAAM,UAAU,UAAU,CAAC,KAAwB;IACjD,OAAO,KAAK,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;AACxD,CAAC;AAED,wEAAwE;AACxE,8EAA8E;AAC9E,8EAA8E;AAC9E,qEAAqE;AACrE,MAAM,UAAU,OAAO,CAAC,MAAoB;IAC1C,OAAO,CACL,MAAM,CAAC,IAAI,KAAK,IAAI;QACpB,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU;QACjC,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,OAAO,CAC/B,CAAC;AACJ,CAAC;AAED,0DAA0D;AAC1D,MAAM,UAAU,UAAU,CAAC,MAAoB;IAC7C,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAC5C,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAC5C,CAAC;AACJ,CAAC"}
|
package/dist/bundler.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Spliceable, SplicesAs } from "@backtickjs/core";
|
|
1
|
+
import type { Bundle, Spliceable, Spliced, SplicesAs } from "@backtickjs/core";
|
|
2
2
|
import type { Modules } from "./modules.js";
|
|
3
3
|
export interface BuildOptions<T = Spliceable> {
|
|
4
4
|
readonly input: T;
|
|
@@ -8,26 +8,30 @@ export interface OutputOptions {
|
|
|
8
8
|
readonly format: "es" | "cjs";
|
|
9
9
|
readonly sourcemap?: false | "inline" | "hidden";
|
|
10
10
|
}
|
|
11
|
-
/**
|
|
12
|
-
|
|
13
|
-
|
|
11
|
+
/**
|
|
12
|
+
* What `generate` writes: the bundle, which runs to a `T`, and its map where
|
|
13
|
+
* one was asked for.
|
|
14
|
+
*/
|
|
15
|
+
export interface OutputChunk<T = unknown> {
|
|
16
|
+
readonly code: Bundle<T>;
|
|
14
17
|
readonly map: string | null;
|
|
15
18
|
}
|
|
16
|
-
/**
|
|
17
|
-
|
|
18
|
-
|
|
19
|
+
/** What `build` makes of a value that is a `T` on the client, written out by
|
|
20
|
+
* `generate`. */
|
|
21
|
+
export interface Build<T = unknown> {
|
|
22
|
+
generate(options: OutputOptions): OutputChunk<T>;
|
|
19
23
|
}
|
|
20
24
|
/**
|
|
21
25
|
* What runs your components and hands back what they drew, shaped as Rollup
|
|
22
26
|
* is: a build, then output from it.
|
|
23
27
|
*
|
|
24
|
-
* const
|
|
25
|
-
* const { code, map } =
|
|
28
|
+
* const build = await bundler.build({ input: <Home />, modules });
|
|
29
|
+
* const { code, map } = build.generate({ format: "es", sourcemap: "hidden" });
|
|
26
30
|
*
|
|
27
|
-
*
|
|
28
|
-
* namespace rather than a bare function, so `
|
|
29
|
-
* give what comes back.
|
|
31
|
+
* `code` is the bundle, a module whose default export is the value (CommonJS:
|
|
32
|
+
* `module.exports`). A namespace rather than a bare function, so `build`
|
|
33
|
+
* stays a name a caller can give what comes back.
|
|
30
34
|
*/
|
|
31
35
|
export declare const bundler: {
|
|
32
|
-
build<T extends [T] extends [SplicesAs<T>] ? unknown : Spliceable>({ input, modules, }: BuildOptions<T>): Promise<
|
|
36
|
+
build<T extends [T] extends [SplicesAs<T>] ? unknown : Spliceable>({ input, modules, }: BuildOptions<T>): Promise<Build<Spliced<T>>>;
|
|
33
37
|
};
|
package/dist/bundler.js
CHANGED
|
@@ -4,12 +4,12 @@ import { printBundle } from "./print/printBundle.js";
|
|
|
4
4
|
* What runs your components and hands back what they drew, shaped as Rollup
|
|
5
5
|
* is: a build, then output from it.
|
|
6
6
|
*
|
|
7
|
-
* const
|
|
8
|
-
* const { code, map } =
|
|
7
|
+
* const build = await bundler.build({ input: <Home />, modules });
|
|
8
|
+
* const { code, map } = build.generate({ format: "es", sourcemap: "hidden" });
|
|
9
9
|
*
|
|
10
|
-
*
|
|
11
|
-
* namespace rather than a bare function, so `
|
|
12
|
-
* give what comes back.
|
|
10
|
+
* `code` is the bundle, a module whose default export is the value (CommonJS:
|
|
11
|
+
* `module.exports`). A namespace rather than a bare function, so `build`
|
|
12
|
+
* stays a name a caller can give what comes back.
|
|
13
13
|
*/
|
|
14
14
|
export const bundler = {
|
|
15
15
|
async build({ input, modules, }) {
|
|
@@ -18,7 +18,9 @@ export const bundler = {
|
|
|
18
18
|
const tree = await buildBundle(input, modules);
|
|
19
19
|
return {
|
|
20
20
|
generate: ({ format, sourcemap = false }) => {
|
|
21
|
-
const
|
|
21
|
+
const printed = printBundle(tree, format);
|
|
22
|
+
const code = printed.code;
|
|
23
|
+
const map = printed.map;
|
|
22
24
|
if (sourcemap === false) {
|
|
23
25
|
return { code, map: null };
|
|
24
26
|
}
|
|
@@ -26,7 +28,10 @@ export const bundler = {
|
|
|
26
28
|
return { code, map };
|
|
27
29
|
}
|
|
28
30
|
const url = `data:application/json;charset=utf-8,${encodeURIComponent(map)}`;
|
|
29
|
-
return {
|
|
31
|
+
return {
|
|
32
|
+
code: `${code}\n//# sourceMappingURL=${url}`,
|
|
33
|
+
map,
|
|
34
|
+
};
|
|
30
35
|
},
|
|
31
36
|
};
|
|
32
37
|
},
|
package/dist/bundler.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundler.js","sourceRoot":"","sources":["../src/bundler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"bundler.js","sourceRoot":"","sources":["../src/bundler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAqCrD;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG;IACrB,KAAK,CAAC,KAAK,CAA8D,EACvE,KAAK,EACL,OAAO,GACS;QAChB,0EAA0E;QAC1E,uEAAuE;QACvE,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC/C,OAAO;YACL,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,SAAS,GAAG,KAAK,EAAE,EAAE,EAAE;gBAC1C,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gBAC1C,MAAM,IAAI,GAAG,OAAO,CAAC,IAA0B,CAAC;gBAChD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;gBACxB,IAAI,SAAS,KAAK,KAAK,EAAE,CAAC;oBACxB,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;gBAC7B,CAAC;gBACD,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;oBAC3B,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;gBACvB,CAAC;gBACD,MAAM,GAAG,GAAG,uCAAuC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC7E,OAAO;oBACL,IAAI,EAAE,GAAG,IAAI,0BAA0B,GAAG,EAAwB;oBAClE,GAAG;iBACJ,CAAC;YACJ,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export { type
|
|
1
|
+
export { type Build, type BuildOptions, bundler, type OutputChunk, type OutputOptions, } from "./bundler.js";
|
|
2
2
|
export { type Modules, supports } from "./modules.js";
|
package/dist/print/code.d.ts
CHANGED
package/dist/print/code.js
CHANGED
|
@@ -4,7 +4,7 @@ import { supports } from "../modules.js";
|
|
|
4
4
|
// for the framework's compiler. Everything is code, as a string.
|
|
5
5
|
const IDENTIFIER = /^[A-Za-z_$][A-Za-z0-9_$]*$/;
|
|
6
6
|
export function createNames(modules) {
|
|
7
|
-
return { imports: new Map(), modules };
|
|
7
|
+
return { imports: new Map(), modules, exec: false };
|
|
8
8
|
}
|
|
9
9
|
// A string, as a literal: `<` escaped, so no `</script>` or `<!--` appears
|
|
10
10
|
// when the bundle is inlined in a page, and the line and paragraph separators,
|
package/dist/print/code.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code.js","sourceRoot":"","sources":["../../src/print/code.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEvD,6EAA6E;AAC7E,+EAA+E;AAC/E,iEAAiE;AAEjE,MAAM,UAAU,GAAG,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"code.js","sourceRoot":"","sources":["../../src/print/code.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEvD,6EAA6E;AAC7E,+EAA+E;AAC/E,iEAAiE;AAEjE,MAAM,UAAU,GAAG,4BAA4B,CAAC;AAahD,MAAM,UAAU,WAAW,CAAC,OAAgB;IAC1C,OAAO,EAAE,OAAO,EAAE,IAAI,GAAG,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;AACtD,CAAC;AAED,2EAA2E;AAC3E,+EAA+E;AAC/E,qEAAqE;AACrE,MAAM,UAAU,MAAM,CAAC,KAAa;IAClC,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,CAClC,kBAAkB,EAClB,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CACnE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,OAAO,CACrB,KAA4D;IAE5D,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,iEAAiE;QACjE,OAAO,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACrD,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,GAAG,KAAK,GAAG,CAAC;IACrB,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,MAAM,UAAU,IAAI,CAAC,MAAc,EAAE,IAAuB;IAC1D,OAAO,GAAG,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;AACzC,CAAC;AAED,6EAA6E;AAC7E,SAAS;AACT,MAAM,UAAU,KAAK,CAAC,MAAyB,EAAE,IAAY;IAC3D,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,GAAG,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,QAA2B;IAC/C,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;AACpC,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,MAAM,CACpB,OAA+C;IAE/C,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC;IAC1E,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;AACrC,CAAC;AAED,+EAA+E;AAC/E,+EAA+E;AAC/E,mCAAmC;AACnC,SAAS,MAAM,CAAC,GAAW;IACzB,IAAI,GAAG,KAAK,WAAW,EAAE,CAAC;QACxB,OAAO,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC;IAC5B,CAAC;IACD,OAAO,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AAClD,CAAC;AAED,yEAAyE;AACzE,MAAM,UAAU,QAAQ,CACtB,KAAY,EACZ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAyB;IAE9C,4EAA4E;IAC5E,4CAA4C;IAC5C,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,CAC9C,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,SAAS,IAAI,EAAE,EAAE,CAC1C,CAAC;QACF,MAAM,IAAI,KAAK,CACb,kBAAkB,IAAI,YAAY,IAAI,yBAAyB;YAC7D,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,YAAY,GAAG,CAC1C,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;QAC5C,MAAM,IAAI,KAAK,CACb,kBAAkB,IAAI,YAAY,IAAI,eAAe,OAAO,QAAQ;YAClE,uBAAuB,IAAI,IAAI,QAAQ,GAAG,CAC7C,CAAC;IACJ,CAAC;IACD,MAAM,GAAG,GAAG,GAAG,IAAI,KAAK,IAAI,EAAE,CAAC;IAC/B,IAAI,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACnC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,KAAK,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;QACzD,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,KAAK,CAAC,KAAK,CAAC;AACrB,CAAC;AAED,gEAAgE;AAChE,MAAM,UAAU,iBAAiB,CAC/B,IAAY,EACZ,IAAY,EACZ,KAAa;IAEb,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC7D,OAAO,YAAY,QAAQ,OAAO,KAAK,WAAW,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;AACpE,CAAC;AAED,gFAAgF;AAChF,MAAM,UAAU,kBAAkB,CAChC,IAAY,EACZ,IAAY,EACZ,KAAa;IAEb,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC7D,OAAO,WAAW,QAAQ,KAAK,KAAK,gBAAgB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;AACvE,CAAC"}
|
|
@@ -11,6 +11,20 @@ const RUNTIME = `const $require = (id) => {
|
|
|
11
11
|
}
|
|
12
12
|
return $exports[id];
|
|
13
13
|
};`;
|
|
14
|
+
// Another bundle, executed as this one is, to its value. As CommonJS, handed the
|
|
15
|
+
// `require` this bundle was: inside the module table, `require` is the
|
|
16
|
+
// table's own.
|
|
17
|
+
const EXEC_CJS = `const $exec = async (bundle) => {
|
|
18
|
+
const module = { exports: {} };
|
|
19
|
+
new Function("module", "exports", "require", bundle)(module, module.exports, require);
|
|
20
|
+
return module.exports;
|
|
21
|
+
};`;
|
|
22
|
+
// As an ES module, imported whole, the page's import map answering its
|
|
23
|
+
// imports as it answers this bundle's.
|
|
24
|
+
const EXEC_ES = `const $exec = async (bundle) => {
|
|
25
|
+
const module = await import("data:text/javascript," + encodeURIComponent(bundle));
|
|
26
|
+
return module.default;
|
|
27
|
+
};`;
|
|
14
28
|
/**
|
|
15
29
|
* A bundle tree as a module whose default export is the tree's root: the value
|
|
16
30
|
* bundled, as its scripts wrote it.
|
|
@@ -36,6 +50,9 @@ export function printBundle(tree, format) {
|
|
|
36
50
|
for (const { from, name, local } of names.imports.values()) {
|
|
37
51
|
module.line(declaration(from, name, local));
|
|
38
52
|
}
|
|
53
|
+
if (names.exec) {
|
|
54
|
+
module.line(format === "es" ? EXEC_ES : EXEC_CJS);
|
|
55
|
+
}
|
|
39
56
|
// Each script a module table's entry, as webpack's and Metro's are: its body
|
|
40
57
|
// under its id, run once by `$require`. The modules they require are the
|
|
41
58
|
// client's, each imported whole, once.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"printBundle.js","sourceRoot":"","sources":["../../src/print/printBundle.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"printBundle.js","sourceRoot":"","sources":["../../src/print/printBundle.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@backtickjs/bundler",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.11",
|
|
4
4
|
"description": "Runs Backtick server components and bundles a screen per request: one JavaScript file for the client",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"backtick",
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"access": "public"
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
|
-
"@backtickjs/core": "^0.1.
|
|
42
|
+
"@backtickjs/core": "^0.1.11",
|
|
43
43
|
"semver": "^7.8.1"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import {
|
|
2
2
|
type ClientModule,
|
|
3
3
|
type ClientScript,
|
|
4
|
+
isClientExec,
|
|
4
5
|
isClientImport,
|
|
5
6
|
isClientScript,
|
|
6
7
|
isJsxElement,
|
|
@@ -8,7 +9,7 @@ import {
|
|
|
8
9
|
} from "@backtickjs/core";
|
|
9
10
|
|
|
10
11
|
import { expandServerComponents } from "./expandServerComponents.js";
|
|
11
|
-
import { bindingsOf, capturesOf } from "./params.js";
|
|
12
|
+
import { bindingsOf, capturesOf, isValue } from "./params.js";
|
|
12
13
|
import { sourceName } from "./bindingKey.js";
|
|
13
14
|
import {
|
|
14
15
|
array,
|
|
@@ -69,7 +70,7 @@ const rootScope = (): Scope => ({ bindings: new Set(), read: new Set() });
|
|
|
69
70
|
// intermediate script that binds a same-looking variable has a different
|
|
70
71
|
// unique name, so there is nothing to disambiguate and nothing to rename.
|
|
71
72
|
export async function buildBundle(
|
|
72
|
-
|
|
73
|
+
spliceable: unknown,
|
|
73
74
|
provided: Modules,
|
|
74
75
|
): Promise<BundleTree> {
|
|
75
76
|
const names = createNames(provided);
|
|
@@ -137,25 +138,22 @@ export async function buildBundle(
|
|
|
137
138
|
const labelOf = (target: ClientScript): string =>
|
|
138
139
|
`$cs${numbers.get(target)!}`;
|
|
139
140
|
|
|
140
|
-
//
|
|
141
|
-
// thunk a splice is handed over as. One whose code reads nothing of the
|
|
141
|
+
// The thunk a splice is handed over as. One whose code reads nothing of the
|
|
142
142
|
// scope it's written in, beyond its own parameters, is the same function
|
|
143
143
|
// wherever it's written, so the bundle makes it once, as a constant, and
|
|
144
|
-
// the same code anywhere else is that constant: a
|
|
145
|
-
//
|
|
146
|
-
//
|
|
147
|
-
//
|
|
148
|
-
// still rendered where it stands.
|
|
144
|
+
// the same code anywhere else is that constant: a value spliced at every
|
|
145
|
+
// level of a deep composition is written once per level, not once per path.
|
|
146
|
+
// A thunk is the bundle's own, never the script's, so sharing one isn't
|
|
147
|
+
// observable; everything is still rendered where it stands.
|
|
149
148
|
const constants: (readonly [string, string])[] = [];
|
|
150
149
|
const byCode = new Map<string, string>();
|
|
151
|
-
// `write` renders a
|
|
152
|
-
//
|
|
150
|
+
// `write` renders a thunk's code in a scope that records what it reads: a
|
|
151
|
+
// constant's label if it read nothing of `scope` beyond `own`, its
|
|
153
152
|
// parameters, or else the code, written where it's used.
|
|
154
|
-
const
|
|
153
|
+
const thunk = (
|
|
155
154
|
scope: Scope,
|
|
156
155
|
own: readonly string[],
|
|
157
156
|
write: (inner: Scope) => string,
|
|
158
|
-
name: string,
|
|
159
157
|
): string => {
|
|
160
158
|
const read = new Set<string>();
|
|
161
159
|
const code = write({
|
|
@@ -171,31 +169,40 @@ export async function buildBundle(
|
|
|
171
169
|
}
|
|
172
170
|
let label = byCode.get(code);
|
|
173
171
|
if (label === undefined) {
|
|
174
|
-
label = `$
|
|
172
|
+
label = `$thunk${constants.length}`;
|
|
175
173
|
byCode.set(code, label);
|
|
176
174
|
constants.push([label, code]);
|
|
177
175
|
}
|
|
178
176
|
return label;
|
|
179
177
|
};
|
|
180
178
|
|
|
181
|
-
// A `once` script
|
|
182
|
-
//
|
|
183
|
-
//
|
|
184
|
-
// function that each make a
|
|
185
|
-
//
|
|
186
|
-
//
|
|
179
|
+
// A function, a class and a `once` script are each one value (see
|
|
180
|
+
// `isValue`): its code run at the top of the bundle, where nothing encloses
|
|
181
|
+
// it, and every read is that constant. One per script, not per code: two
|
|
182
|
+
// runs of a host function that each make a function are two functions, and
|
|
183
|
+
// two that each make a context two contexts, as in plain TypeScript.
|
|
184
|
+
//
|
|
185
|
+
// A function or a class that reads a variable of the scope it's read in,
|
|
186
|
+
// itself or through what it's handed, is made there instead, as one
|
|
187
|
+
// declared in a function is. A `once` script that does is refused.
|
|
187
188
|
const values = new Map<ClientScript, string>();
|
|
188
|
-
const valueOf = (script: ClientScript): string => {
|
|
189
|
+
const valueOf = (script: ClientScript, scope: Scope): string => {
|
|
189
190
|
let label = values.get(script);
|
|
190
|
-
if (label
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
)
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
191
|
+
if (label !== undefined) {
|
|
192
|
+
return label;
|
|
193
|
+
}
|
|
194
|
+
const at: Scope = script.once
|
|
195
|
+
? rootScope()
|
|
196
|
+
: { bindings: scope.bindings, read: new Set() };
|
|
197
|
+
const code = call(labelOf(scriptFor(script)), exprCallArgs(script, at));
|
|
198
|
+
const outside = [...at.read].filter((key) => scope.bindings.has(key));
|
|
199
|
+
if (outside.length > 0) {
|
|
200
|
+
outside.forEach((key) => scope.read.add(key));
|
|
201
|
+
return code;
|
|
198
202
|
}
|
|
203
|
+
label = `$value${constants.length}`;
|
|
204
|
+
values.set(script, label);
|
|
205
|
+
constants.push([label, code]);
|
|
199
206
|
return label;
|
|
200
207
|
};
|
|
201
208
|
|
|
@@ -204,41 +211,39 @@ export async function buildBundle(
|
|
|
204
211
|
// what to hand it; everything else is its literal form. Rendered in order,
|
|
205
212
|
// one value after the other, so the table follows the order rendering first
|
|
206
213
|
// reached each script. Expansion has refused cycles, so it ends.
|
|
207
|
-
const render = (
|
|
208
|
-
if (isClientScript(
|
|
209
|
-
if (
|
|
210
|
-
return valueOf(
|
|
214
|
+
const render = (spliceable: unknown, scope: Scope = rootScope()): string => {
|
|
215
|
+
if (isClientScript(spliceable)) {
|
|
216
|
+
if (isValue(spliceable)) {
|
|
217
|
+
return valueOf(spliceable, scope);
|
|
211
218
|
}
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
}
|
|
216
|
-
return closure(
|
|
217
|
-
scope,
|
|
218
|
-
[],
|
|
219
|
-
(inner) => call(labelOf(target), exprCallArgs(value, inner)),
|
|
220
|
-
"$function",
|
|
219
|
+
return call(
|
|
220
|
+
labelOf(scriptFor(spliceable)),
|
|
221
|
+
exprCallArgs(spliceable, scope),
|
|
221
222
|
);
|
|
222
223
|
}
|
|
223
|
-
if (isJsxElement(
|
|
224
|
-
return renderJsx(
|
|
224
|
+
if (isJsxElement(spliceable)) {
|
|
225
|
+
return renderJsx(spliceable);
|
|
226
|
+
}
|
|
227
|
+
if (isClientImport(spliceable)) {
|
|
228
|
+
return imported(names, spliceable);
|
|
225
229
|
}
|
|
226
|
-
if (
|
|
227
|
-
|
|
230
|
+
if (isClientExec(spliceable)) {
|
|
231
|
+
names.exec = true;
|
|
232
|
+
return "$exec";
|
|
228
233
|
}
|
|
229
234
|
if (
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
typeof
|
|
233
|
-
typeof
|
|
234
|
-
typeof
|
|
235
|
-
typeof
|
|
235
|
+
spliceable === null ||
|
|
236
|
+
spliceable === undefined ||
|
|
237
|
+
typeof spliceable === "number" ||
|
|
238
|
+
typeof spliceable === "bigint" ||
|
|
239
|
+
typeof spliceable === "string" ||
|
|
240
|
+
typeof spliceable === "boolean"
|
|
236
241
|
) {
|
|
237
|
-
return literal(
|
|
242
|
+
return literal(spliceable);
|
|
238
243
|
}
|
|
239
|
-
if (Array.isArray(
|
|
244
|
+
if (Array.isArray(spliceable)) {
|
|
240
245
|
const elements: string[] = [];
|
|
241
|
-
for (const element of
|
|
246
|
+
for (const element of spliceable) {
|
|
242
247
|
elements.push(render(element, scope));
|
|
243
248
|
}
|
|
244
249
|
return array(elements);
|
|
@@ -246,8 +251,8 @@ export async function buildBundle(
|
|
|
246
251
|
// A host function is host code, which never reaches the client: client
|
|
247
252
|
// code is written in a script, and reaches another as one.
|
|
248
253
|
// A server component among them, written as a tag: `<$Rule />`.
|
|
249
|
-
if (typeof
|
|
250
|
-
const { name } =
|
|
254
|
+
if (typeof spliceable === "function") {
|
|
255
|
+
const { name } = spliceable;
|
|
251
256
|
throw new Error(
|
|
252
257
|
(name === ""
|
|
253
258
|
? "Can't splice a host function"
|
|
@@ -258,7 +263,7 @@ export async function buildBundle(
|
|
|
258
263
|
`\`{\${<${/^[A-Z]/.test(name) ? name : "Name"} />}}\`.`,
|
|
259
264
|
);
|
|
260
265
|
}
|
|
261
|
-
if (typeof
|
|
266
|
+
if (typeof spliceable !== "object") {
|
|
262
267
|
throw new Error(
|
|
263
268
|
"Can't splice a symbol: a bundle can't write one that is the same " +
|
|
264
269
|
"symbol on the client. Splice a string, and make the symbol from it " +
|
|
@@ -270,16 +275,16 @@ export async function buildBundle(
|
|
|
270
275
|
// vanish — so fail loudly instead. An object with behaviour is built by a
|
|
271
276
|
// client function: `state` for what it holds, arrows for what may be done
|
|
272
277
|
// to it.
|
|
273
|
-
const prototype = Object.getPrototypeOf(
|
|
278
|
+
const prototype = Object.getPrototypeOf(spliceable);
|
|
274
279
|
if (prototype !== Object.prototype && prototype !== null) {
|
|
275
|
-
const name =
|
|
280
|
+
const name = spliceable.constructor?.name ?? "an unknown class";
|
|
276
281
|
throw new Error(
|
|
277
282
|
`Can't splice this \`${name}\` instance: only plain objects cross into ` +
|
|
278
283
|
"a client script. Build one with a client function instead.",
|
|
279
284
|
);
|
|
280
285
|
}
|
|
281
286
|
const entries: [string, string][] = [];
|
|
282
|
-
for (const [key, entry] of Object.entries(
|
|
287
|
+
for (const [key, entry] of Object.entries(spliceable)) {
|
|
283
288
|
entries.push([key, render(entry, scope)]);
|
|
284
289
|
}
|
|
285
290
|
return object(entries);
|
|
@@ -320,11 +325,8 @@ export async function buildBundle(
|
|
|
320
325
|
const passed = [...passKeys(target, index), ...capturesOf(target)];
|
|
321
326
|
// A thunk taking them, the splice rendered inside it.
|
|
322
327
|
parts.push(
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
passed,
|
|
326
|
-
(inner) => arrow(passed.map(displayName), render(arg, inner)),
|
|
327
|
-
"$thunk",
|
|
328
|
+
thunk(scope, passed, (inner) =>
|
|
329
|
+
arrow(passed.map(displayName), render(arg, inner)),
|
|
328
330
|
),
|
|
329
331
|
);
|
|
330
332
|
}
|
|
@@ -356,7 +358,7 @@ export async function buildBundle(
|
|
|
356
358
|
|
|
357
359
|
// Every server component first, so siblings run at once; then the drawing,
|
|
358
360
|
// in order. Nothing encloses the root, so nothing it holds can capture.
|
|
359
|
-
const root = render(await expandServerComponents(
|
|
361
|
+
const root = render(await expandServerComponents(spliceable));
|
|
360
362
|
// In table order, which is the order rendering first reached each script.
|
|
361
363
|
const modules = [...numbers.keys()].map(
|
|
362
364
|
(script) => [labelOf(script), script.module] as const,
|
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
isClientScript,
|
|
5
5
|
isJsxElement,
|
|
6
6
|
} from "@backtickjs/core";
|
|
7
|
+
import { isValue } from "./params.js";
|
|
7
8
|
|
|
8
9
|
const CYCLE_ERROR =
|
|
9
10
|
"Can't splice a value that contains itself: a bundle writes each value " +
|
|
@@ -34,70 +35,71 @@ const contains = (ancestors: Ancestors | null, value: object): boolean => {
|
|
|
34
35
|
// the client code it bottoms out in reaches the bundle. A value holding no
|
|
35
36
|
// server component comes back as the same object.
|
|
36
37
|
//
|
|
37
|
-
// A `once` script
|
|
38
|
-
// many places read it: a server
|
|
38
|
+
// A function, a class and a `once` script are each one value (see `isValue`),
|
|
39
|
+
// so what one splices is expanded once, however many places read it: a server
|
|
40
|
+
// component inside it runs once. `values` holds
|
|
39
41
|
// each one's expansion for the call.
|
|
40
42
|
export async function expandServerComponents(
|
|
41
|
-
|
|
43
|
+
spliceable: unknown,
|
|
42
44
|
ancestors: Ancestors | null = null,
|
|
43
45
|
values = new Map<ClientScript, Promise<unknown>>(),
|
|
44
46
|
): Promise<unknown> {
|
|
45
|
-
if (typeof
|
|
46
|
-
return
|
|
47
|
+
if (typeof spliceable !== "object" || spliceable === null) {
|
|
48
|
+
return spliceable;
|
|
47
49
|
}
|
|
48
|
-
if (contains(ancestors,
|
|
50
|
+
if (contains(ancestors, spliceable)) {
|
|
49
51
|
throw new Error(CYCLE_ERROR);
|
|
50
52
|
}
|
|
51
|
-
const inside: Ancestors = { value, parent: ancestors };
|
|
53
|
+
const inside: Ancestors = { value: spliceable, parent: ancestors };
|
|
52
54
|
const all = (entries: readonly unknown[]) =>
|
|
53
55
|
Promise.all(
|
|
54
56
|
entries.map((entry) => expandServerComponents(entry, inside, values)),
|
|
55
57
|
);
|
|
56
58
|
|
|
57
|
-
if (isJsxElement(
|
|
58
|
-
const { type } =
|
|
59
|
+
if (isJsxElement(spliceable)) {
|
|
60
|
+
const { type } = spliceable;
|
|
59
61
|
// A tag the client draws is left for rendering to refuse.
|
|
60
62
|
if (typeof type !== "function" || isClientImport(type)) {
|
|
61
|
-
return
|
|
63
|
+
return spliceable;
|
|
62
64
|
}
|
|
63
65
|
return expandServerComponents(
|
|
64
|
-
await type(
|
|
66
|
+
await type(spliceable.props as never),
|
|
65
67
|
inside,
|
|
66
68
|
values,
|
|
67
69
|
);
|
|
68
70
|
}
|
|
69
|
-
if (isClientScript(
|
|
71
|
+
if (isClientScript(spliceable)) {
|
|
70
72
|
const expanded = async (): Promise<unknown> => {
|
|
71
|
-
const args = await all(
|
|
72
|
-
return args.every((arg, index) => arg ===
|
|
73
|
-
?
|
|
74
|
-
: { ...
|
|
73
|
+
const args = await all(spliceable.args);
|
|
74
|
+
return args.every((arg, index) => arg === spliceable.args[index])
|
|
75
|
+
? spliceable
|
|
76
|
+
: { ...spliceable, args };
|
|
75
77
|
};
|
|
76
|
-
if (!
|
|
78
|
+
if (!isValue(spliceable)) {
|
|
77
79
|
return expanded();
|
|
78
80
|
}
|
|
79
|
-
let made = values.get(
|
|
81
|
+
let made = values.get(spliceable);
|
|
80
82
|
if (made === undefined) {
|
|
81
83
|
made = expanded();
|
|
82
|
-
values.set(
|
|
84
|
+
values.set(spliceable, made);
|
|
83
85
|
}
|
|
84
86
|
return made;
|
|
85
87
|
}
|
|
86
|
-
if (Array.isArray(
|
|
87
|
-
const elements = await all(
|
|
88
|
-
return elements.every((element, index) => element ===
|
|
89
|
-
?
|
|
88
|
+
if (Array.isArray(spliceable)) {
|
|
89
|
+
const elements = await all(spliceable);
|
|
90
|
+
return elements.every((element, index) => element === spliceable[index])
|
|
91
|
+
? spliceable
|
|
90
92
|
: elements;
|
|
91
93
|
}
|
|
92
94
|
// Only plain objects cross; rendering refuses anything else.
|
|
93
|
-
const prototype = Object.getPrototypeOf(
|
|
95
|
+
const prototype = Object.getPrototypeOf(spliceable);
|
|
94
96
|
if (prototype !== Object.prototype && prototype !== null) {
|
|
95
|
-
return
|
|
97
|
+
return spliceable;
|
|
96
98
|
}
|
|
97
|
-
const entries = Object.entries(
|
|
99
|
+
const entries = Object.entries(spliceable);
|
|
98
100
|
const expanded = await all(entries.map(([, entry]) => entry));
|
|
99
101
|
if (expanded.every((entry, index) => entry === entries[index]![1])) {
|
|
100
|
-
return
|
|
102
|
+
return spliceable;
|
|
101
103
|
}
|
|
102
104
|
// Defined, not assigned, so a `__proto__` key stays a key.
|
|
103
105
|
return Object.fromEntries(
|
package/src/bundle/params.ts
CHANGED
|
@@ -7,6 +7,18 @@ export function bindingsOf(param: Param | undefined): readonly string[] {
|
|
|
7
7
|
return param?.kind === "splice" ? param.bindings : [];
|
|
8
8
|
}
|
|
9
9
|
|
|
10
|
+
// Whether a script is one value for the bundle, made once at its top: a
|
|
11
|
+
// `once` script, a function and a class, as a module-level one is. A function
|
|
12
|
+
// or a class that reads a variable of the script around it, itself or through
|
|
13
|
+
// what it's handed, is made where it's read instead (see `valueOf`).
|
|
14
|
+
export function isValue(script: ClientScript): boolean {
|
|
15
|
+
return (
|
|
16
|
+
script.once === true ||
|
|
17
|
+
script.module.kind === "function" ||
|
|
18
|
+
script.module.kind === "class"
|
|
19
|
+
);
|
|
20
|
+
}
|
|
21
|
+
|
|
10
22
|
// The binding keys a script captures, in parameter order.
|
|
11
23
|
export function capturesOf(script: ClientScript): readonly string[] {
|
|
12
24
|
return script.module.params.flatMap((param) =>
|
package/src/bundler.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Spliceable, SplicesAs } from "@backtickjs/core";
|
|
1
|
+
import type { Bundle, Spliceable, Spliced, SplicesAs } from "@backtickjs/core";
|
|
2
2
|
import { buildBundle } from "./bundle/buildBundle.js";
|
|
3
3
|
import type { Modules } from "./modules.js";
|
|
4
4
|
import { printBundle } from "./print/printBundle.js";
|
|
@@ -23,39 +23,45 @@ export interface OutputOptions {
|
|
|
23
23
|
readonly sourcemap?: false | "inline" | "hidden";
|
|
24
24
|
}
|
|
25
25
|
|
|
26
|
-
/**
|
|
27
|
-
|
|
28
|
-
|
|
26
|
+
/**
|
|
27
|
+
* What `generate` writes: the bundle, which runs to a `T`, and its map where
|
|
28
|
+
* one was asked for.
|
|
29
|
+
*/
|
|
30
|
+
export interface OutputChunk<T = unknown> {
|
|
31
|
+
readonly code: Bundle<T>;
|
|
29
32
|
readonly map: string | null;
|
|
30
33
|
}
|
|
31
34
|
|
|
32
|
-
/**
|
|
33
|
-
|
|
34
|
-
|
|
35
|
+
/** What `build` makes of a value that is a `T` on the client, written out by
|
|
36
|
+
* `generate`. */
|
|
37
|
+
export interface Build<T = unknown> {
|
|
38
|
+
generate(options: OutputOptions): OutputChunk<T>;
|
|
35
39
|
}
|
|
36
40
|
|
|
37
41
|
/**
|
|
38
42
|
* What runs your components and hands back what they drew, shaped as Rollup
|
|
39
43
|
* is: a build, then output from it.
|
|
40
44
|
*
|
|
41
|
-
* const
|
|
42
|
-
* const { code, map } =
|
|
45
|
+
* const build = await bundler.build({ input: <Home />, modules });
|
|
46
|
+
* const { code, map } = build.generate({ format: "es", sourcemap: "hidden" });
|
|
43
47
|
*
|
|
44
|
-
*
|
|
45
|
-
* namespace rather than a bare function, so `
|
|
46
|
-
* give what comes back.
|
|
48
|
+
* `code` is the bundle, a module whose default export is the value (CommonJS:
|
|
49
|
+
* `module.exports`). A namespace rather than a bare function, so `build`
|
|
50
|
+
* stays a name a caller can give what comes back.
|
|
47
51
|
*/
|
|
48
52
|
export const bundler = {
|
|
49
53
|
async build<T extends [T] extends [SplicesAs<T>] ? unknown : Spliceable>({
|
|
50
54
|
input,
|
|
51
55
|
modules,
|
|
52
|
-
}: BuildOptions<T>): Promise<
|
|
56
|
+
}: BuildOptions<T>): Promise<Build<Spliced<T>>> {
|
|
53
57
|
// Scripts come compiled for their framework when their host was built, so
|
|
54
58
|
// the bundle is only put together: nothing is compiled or parsed here.
|
|
55
59
|
const tree = await buildBundle(input, modules);
|
|
56
60
|
return {
|
|
57
61
|
generate: ({ format, sourcemap = false }) => {
|
|
58
|
-
const
|
|
62
|
+
const printed = printBundle(tree, format);
|
|
63
|
+
const code = printed.code as Bundle<Spliced<T>>;
|
|
64
|
+
const map = printed.map;
|
|
59
65
|
if (sourcemap === false) {
|
|
60
66
|
return { code, map: null };
|
|
61
67
|
}
|
|
@@ -63,7 +69,10 @@ export const bundler = {
|
|
|
63
69
|
return { code, map };
|
|
64
70
|
}
|
|
65
71
|
const url = `data:application/json;charset=utf-8,${encodeURIComponent(map)}`;
|
|
66
|
-
return {
|
|
72
|
+
return {
|
|
73
|
+
code: `${code}\n//# sourceMappingURL=${url}` as Bundle<Spliced<T>>,
|
|
74
|
+
map,
|
|
75
|
+
};
|
|
67
76
|
},
|
|
68
77
|
};
|
|
69
78
|
},
|
package/src/index.ts
CHANGED
package/src/print/code.ts
CHANGED
|
@@ -14,10 +14,12 @@ const IDENTIFIER = /^[A-Za-z_$][A-Za-z0-9_$]*$/;
|
|
|
14
14
|
export interface Names {
|
|
15
15
|
readonly imports: Map<string, { from: string; name: string; local: string }>;
|
|
16
16
|
readonly modules: Modules;
|
|
17
|
+
// whether a script executes another bundle, which `$exec` does
|
|
18
|
+
exec: boolean;
|
|
17
19
|
}
|
|
18
20
|
|
|
19
21
|
export function createNames(modules: Modules): Names {
|
|
20
|
-
return { imports: new Map(), modules };
|
|
22
|
+
return { imports: new Map(), modules, exec: false };
|
|
21
23
|
}
|
|
22
24
|
|
|
23
25
|
// A string, as a literal: `<` escaped, so no `</script>` or `<!--` appears
|
package/src/print/printBundle.ts
CHANGED
|
@@ -16,6 +16,22 @@ const RUNTIME = `const $require = (id) => {
|
|
|
16
16
|
return $exports[id];
|
|
17
17
|
};`;
|
|
18
18
|
|
|
19
|
+
// Another bundle, executed as this one is, to its value. As CommonJS, handed the
|
|
20
|
+
// `require` this bundle was: inside the module table, `require` is the
|
|
21
|
+
// table's own.
|
|
22
|
+
const EXEC_CJS = `const $exec = async (bundle) => {
|
|
23
|
+
const module = { exports: {} };
|
|
24
|
+
new Function("module", "exports", "require", bundle)(module, module.exports, require);
|
|
25
|
+
return module.exports;
|
|
26
|
+
};`;
|
|
27
|
+
|
|
28
|
+
// As an ES module, imported whole, the page's import map answering its
|
|
29
|
+
// imports as it answers this bundle's.
|
|
30
|
+
const EXEC_ES = `const $exec = async (bundle) => {
|
|
31
|
+
const module = await import("data:text/javascript," + encodeURIComponent(bundle));
|
|
32
|
+
return module.default;
|
|
33
|
+
};`;
|
|
34
|
+
|
|
19
35
|
/**
|
|
20
36
|
* A bundle tree as a module whose default export is the tree's root: the value
|
|
21
37
|
* bundled, as its scripts wrote it.
|
|
@@ -44,6 +60,9 @@ export function printBundle(
|
|
|
44
60
|
for (const { from, name, local } of names.imports.values()) {
|
|
45
61
|
module.line(declaration(from, name, local));
|
|
46
62
|
}
|
|
63
|
+
if (names.exec) {
|
|
64
|
+
module.line(format === "es" ? EXEC_ES : EXEC_CJS);
|
|
65
|
+
}
|
|
47
66
|
// Each script a module table's entry, as webpack's and Metro's are: its body
|
|
48
67
|
// under its id, run once by `$require`. The modules they require are the
|
|
49
68
|
// client's, each imported whole, once.
|