GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — vm: use import attributes instead of import assertions · nodejs/node@57efd52

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

doc/api
- vm.md
lib/internal/vm
- module.js
test/parallel
- test-vm-module-link.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎doc/api/vm.md‎`

Copy file name to clipboardExpand all lines: doc/api/vm.md

+27-20Lines changed: 27 additions & 20 deletions

Display the source diff
Display the rich diff

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ changes:`
`62`	`62`	`- v17.0.0`
`63`	`63`	`- v16.12.0`
`64`	`64`	`pr-url: https://github.com/nodejs/node/pull/40249`
`65`		`- description: Added support for import assertions to the`
	`65`	`+ description: Added support for import attributes to the`
`66`	`66`	`importModuleDynamically` parameter.
`67`	`67`	`- version: v10.6.0`
`68`	`68`	`pr-url: https://github.com/nodejs/node/pull/20300`
`@@ -101,7 +101,7 @@ changes:`
`101`	`101`	`using it in a production environment.`
`102`	`102`	* `specifier` {string} specifier passed to `import()`
`103`	`103`	* `script` {vm.Script}
`104`		- * `importAssertions` {Object} The `"assert"` value passed to the
	`104`	+ * `importAttributes` {Object} The `"with"` value passed to the
`105`	`105`	[`optionsExpression`][] optional parameter, or an empty object if no value
`106`	`106`	`was provided.`
`107`	`107`	* Returns: {Module Namespace Object\|vm.Module} Returning a `vm.Module` is
`@@ -615,6 +615,14 @@ The identifier of the current module, as set in the constructor.`
`615`	`615`
`616`	`616`	### `module.link(linker)`
`617`	`617`
	`618`	`+<!-- YAML`
	`619`	`+changes:`
	`620`	`+ - version: REPLACEME`
	`621`	`+ pr-url: https://github.com/nodejs/node/pull/50141`
	`622`	+ description: The option `extra.assert` is renamed to `extra.attributes`. The
	`623`	`+ former name is still provided for backward compatibility.`
	`624`	`+-->`
	`625`	`+`
`618`	`626`	* `linker` {Function}
`619`	`627`	* `specifier` {string} The specifier of the requested module:
`620`	`628`	```mjs
`@@ -625,15 +633,14 @@ The identifier of the current module, as set in the constructor.`
`625`	`633`	* `referencingModule` {vm.Module} The `Module` object `link()` is called on.
`626`	`634`
`627`	`635`	* `extra` {Object}
`628`		- * `assert` {Object} The data from the assertion:
`629`		`- <!-- eslint-skip -->`
`630`		- ```js
`631`		`- import foo from 'foo' assert { name: 'value' };`
`632`		`- // ^^^^^^^^^^^^^^^^^ the assertion`
	`636`	+ * `attributes` {Object} The data from the attribute:
	`637`	+ ```mjs
	`638`	`+ import foo from 'foo' with { name: 'value' };`
	`639`	`+ // ^^^^^^^^^^^^^^^^^ the attribute`
`633`	`640`	```
`634`		`- Per ECMA-262, hosts are expected to ignore assertions that they do not`
`635`		`- support, as opposed to, for example, triggering an error if an`
`636`		`- unsupported assertion is present.`
	`641`	`+ Per ECMA-262, hosts are expected to trigger an error if an`
	`642`	`+ unsupported attribute is present.`
	`643`	+ * `assert` {Object} Alias for `extra.attributes`.
`637`	`644`
`638`	`645`	`* Returns: {vm.Module\|Promise}`
`639`	`646`	`* Returns: {Promise}`
`@@ -732,7 +739,7 @@ changes:`
`732`	`739`	`- v17.0.0`
`733`	`740`	`- v16.12.0`
`734`	`741`	`pr-url: https://github.com/nodejs/node/pull/40249`
`735`		`- description: Added support for import assertions to the`
	`742`	`+ description: Added support for import attributes to the`
`736`	`743`	`importModuleDynamically` parameter.
`737`	`744`	`-->`
`738`	`745`
`@@ -762,7 +769,7 @@ changes:`
`762`	`769`	`import()` will reject with [`ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING`][].
`763`	`770`	* `specifier` {string} specifier passed to `import()`
`764`	`771`	* `module` {vm.Module}
`765`		- * `importAssertions` {Object} The `"assert"` value passed to the
	`772`	+ * `importAttributes` {Object} The `"with"` value passed to the
`766`	`773`	[`optionsExpression`][] optional parameter, or an empty object if no value
`767`	`774`	`was provided.`
`768`	`775`	* Returns: {Module Namespace Object\|vm.Module} Returning a `vm.Module` is
`@@ -977,7 +984,7 @@ changes:`
`977`	`984`	`- v17.0.0`
`978`	`985`	`- v16.12.0`
`979`	`986`	`pr-url: https://github.com/nodejs/node/pull/40249`
`980`		`- description: Added support for import assertions to the`
	`987`	`+ description: Added support for import attributes to the`
`981`	`988`	`importModuleDynamically` parameter.
`982`	`989`	`- version: v15.9.0`
`983`	`990`	`pr-url: https://github.com/nodejs/node/pull/35431`
`@@ -1021,7 +1028,7 @@ changes:`
`1021`	`1028`	`considered stable.`
`1022`	`1029`	* `specifier` {string} specifier passed to `import()`
`1023`	`1030`	* `function` {Function}
`1024`		- * `importAssertions` {Object} The `"assert"` value passed to the
	`1031`	+ * `importAttributes` {Object} The `"with"` value passed to the
`1025`	`1032`	[`optionsExpression`][] optional parameter, or an empty object if no value
`1026`	`1033`	`was provided.`
`1027`	`1034`	* Returns: {Module Namespace Object\|vm.Module} Returning a `vm.Module` is
`@@ -1207,7 +1214,7 @@ changes:`
`1207`	`1214`	`- v17.0.0`
`1208`	`1215`	`- v16.12.0`
`1209`	`1216`	`pr-url: https://github.com/nodejs/node/pull/40249`
`1210`		`- description: Added support for import assertions to the`
	`1217`	`+ description: Added support for import attributes to the`
`1211`	`1218`	`importModuleDynamically` parameter.
`1212`	`1219`	`- version: v6.3.0`
`1213`	`1220`	`pr-url: https://github.com/nodejs/node/pull/6635`
`@@ -1245,7 +1252,7 @@ changes:`
`1245`	`1252`	`using it in a production environment.`
`1246`	`1253`	* `specifier` {string} specifier passed to `import()`
`1247`	`1254`	* `script` {vm.Script}
`1248`		- * `importAssertions` {Object} The `"assert"` value passed to the
	`1255`	+ * `importAttributes` {Object} The `"with"` value passed to the
`1249`	`1256`	[`optionsExpression`][] optional parameter, or an empty object if no value
`1250`	`1257`	`was provided.`
`1251`	`1258`	* Returns: {Module Namespace Object\|vm.Module} Returning a `vm.Module` is
`@@ -1285,7 +1292,7 @@ changes:`
`1285`	`1292`	`- v17.0.0`
`1286`	`1293`	`- v16.12.0`
`1287`	`1294`	`pr-url: https://github.com/nodejs/node/pull/40249`
`1288`		`- description: Added support for import assertions to the`
	`1295`	`+ description: Added support for import attributes to the`
`1289`	`1296`	`importModuleDynamically` parameter.
`1290`	`1297`	`- version: v14.6.0`
`1291`	`1298`	`pr-url: https://github.com/nodejs/node/pull/34023`
`@@ -1344,7 +1351,7 @@ changes:`
`1344`	`1351`	`using it in a production environment.`
`1345`	`1352`	* `specifier` {string} specifier passed to `import()`
`1346`	`1353`	* `script` {vm.Script}
`1347`		- * `importAssertions` {Object} The `"assert"` value passed to the
	`1354`	+ * `importAttributes` {Object} The `"with"` value passed to the
`1348`	`1355`	[`optionsExpression`][] optional parameter, or an empty object if no value
`1349`	`1356`	`was provided.`
`1350`	`1357`	* Returns: {Module Namespace Object\|vm.Module} Returning a `vm.Module` is
`@@ -1388,7 +1395,7 @@ changes:`
`1388`	`1395`	`- v17.0.0`
`1389`	`1396`	`- v16.12.0`
`1390`	`1397`	`pr-url: https://github.com/nodejs/node/pull/40249`
`1391`		`- description: Added support for import assertions to the`
	`1398`	`+ description: Added support for import attributes to the`
`1392`	`1399`	`importModuleDynamically` parameter.
`1393`	`1400`	`- version: v6.3.0`
`1394`	`1401`	`pr-url: https://github.com/nodejs/node/pull/6635`
`@@ -1424,7 +1431,7 @@ changes:`
`1424`	`1431`	`using it in a production environment.`
`1425`	`1432`	* `specifier` {string} specifier passed to `import()`
`1426`	`1433`	* `script` {vm.Script}
`1427`		- * `importAssertions` {Object} The `"assert"` value passed to the
	`1434`	+ * `importAttributes` {Object} The `"with"` value passed to the
`1428`	`1435`	[`optionsExpression`][] optional parameter, or an empty object if no value
`1429`	`1436`	`was provided.`
`1430`	`1437`	* Returns: {Module Namespace Object\|vm.Module} Returning a `vm.Module` is

Collapse file

`‎lib/internal/vm/module.js‎`

Copy file name to clipboardExpand all lines: lib/internal/vm/module.js

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -304,8 +304,8 @@ class SourceTextModule extends Module {`
`304`	`304`	`this[kLink] = async (linker) => {`
`305`	`305`	`this.#statusOverride = 'linking';`
`306`	`306`
`307`		`- const promises = this[kWrap].link(async (identifier, assert) => {`
`308`		`- const module = await linker(identifier, this, { assert });`
	`307`	`+ const promises = this[kWrap].link(async (identifier, attributes) => {`
	`308`	`+ const module = await linker(identifier, this, { attributes, assert: attributes });`
`309`	`309`	`if (module[kWrap] === undefined) {`
`310`	`310`	`throw new ERR_VM_MODULE_NOT_MODULE();`
`311`	`311`	`}`

Collapse file

`‎test/parallel/test-vm-module-link.js‎`

Copy file name to clipboardExpand all lines: test/parallel/test-vm-module-link.js

+4-2Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`'use strict';`
`2`	`2`
`3`		`-// Flags: --experimental-vm-modules`
	`3`	`+// Flags: --experimental-vm-modules --harmony-import-attributes`
`4`	`4`
`5`	`5`	`const common = require('../common');`
`6`	`6`
`@@ -126,12 +126,14 @@ async function circular2() {`
`126`	`126`
`127`	`127`	`async function asserts() {`
`128`	`128`	const m = new SourceTextModule(`
`129`		`- import "foo" assert { n1: 'v1', n2: 'v2' };`
	`129`	`+ import "foo" with { n1: 'v1', n2: 'v2' };`
`130`	`130`	`, { identifier: 'm' });
`131`	`131`	`await m.link((s, r, p) => {`
`132`	`132`	`assert.strictEqual(s, 'foo');`
`133`	`133`	`assert.strictEqual(r.identifier, 'm');`
	`134`	`+ assert.strictEqual(p.attributes.n1, 'v1');`
`134`	`135`	`assert.strictEqual(p.assert.n1, 'v1');`
	`136`	`+ assert.strictEqual(p.attributes.n2, 'v2');`
`135`	`137`	`assert.strictEqual(p.assert.n2, 'v2');`
`136`	`138`	`return new SourceTextModule('');`
`137`	`139`	`});`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.