diff --git a/.github/workflows/test-ojs-runtime.yml b/.github/workflows/test-ojs-runtime.yml new file mode 100644 index 00000000000..44fe260dd55 --- /dev/null +++ b/.github/workflows/test-ojs-runtime.yml @@ -0,0 +1,45 @@ +# Rebuilds the OJS runtime bundles from packages/ojs and fails if they differ +# from the bundles committed in src/resources/formats/html/ojs. +name: OJS Runtime Bundle +on: + workflow_dispatch: + pull_request: + branches: [main] + paths: + - "packages/ojs/**" + - "src/resources/formats/html/ojs/quarto-ojs-runtime*.js" + - ".github/workflows/test-ojs-runtime.yml" + push: + # only trigger on branches, not on tags + branches: [main] + paths: + - "packages/ojs/**" + - "src/resources/formats/html/ojs/quarto-ojs-runtime*.js" + - ".github/workflows/test-ojs-runtime.yml" + +permissions: + contents: read + +jobs: + check-bundle: + runs-on: ubuntu-latest + steps: + - name: Checkout Repo + uses: actions/checkout@v6 + + - uses: actions/setup-node@v6 + with: + node-version: 24 + + - name: Build OJS runtime + working-directory: packages/ojs + run: | + npm ci + npm run build + + - name: Check committed bundles match the sources + run: | + if ! git diff --exit-code --stat -- src/resources/formats/html/ojs; then + echo "::error::The committed OJS runtime bundles don't match packages/ojs. Run 'npm ci && npm run build' in packages/ojs and commit the result." + exit 1 + fi diff --git a/news/changelog-1.11.md b/news/changelog-1.11.md index ba13a185842..149e4babe56 100644 --- a/news/changelog-1.11.md +++ b/news/changelog-1.11.md @@ -9,6 +9,10 @@ All changes included in 1.11: - ([#14946](https://github.com/quarto-dev/quarto-cli/issues/14946)): Fix `revealjs` and `dashboard` logos resolving to broken paths in documents in a project subdirectory when the project has a brand (regression introduced in v1.8.22). Logo paths are now always relative to the document; a project-relative logo path in a website with a brand still works but prints a deprecation warning. - ([#14993](https://github.com/quarto-dev/quarto-cli/issues/14993)): Fix Typst output dropping a brand font from a `font-family` list when another document in the same directory or project was rendered first with different brand fonts. +## Dependencies + +- ([#15043](https://github.com/quarto-dev/quarto-cli/issues/15043)): Update the OJS runtime to acorn 8.17, Observable Inspector 5.0.1, and Observable Inputs 0.10.6. `FileAttachment(...).mimeType` now reports `text/javascript` instead of `application/javascript` for `.js` and `.mjs` files. + ## Accessibility - ([#730](https://github.com/quarto-dev/quarto-cli/issues/730)): Fix keyboard navigation of tabsets in HTML documents without Bootstrap (`theme: none`): Tab now moves from the selected tab into its panel instead of selecting the next tab, and the arrow keys switch tabs. diff --git a/packages/ojs/.gitignore b/packages/ojs/.gitignore new file mode 100644 index 00000000000..c2658d7d1b3 --- /dev/null +++ b/packages/ojs/.gitignore @@ -0,0 +1 @@ +node_modules/ diff --git a/packages/ojs/README.md b/packages/ojs/README.md new file mode 100644 index 00000000000..26e0f687133 --- /dev/null +++ b/packages/ojs/README.md @@ -0,0 +1,69 @@ +# OJS runtime + +Sources for `quarto-ojs-runtime.js` and `quarto-ojs-runtime.min.js`, the bundles that +Quarto serves for `{ojs}` cells. The built bundles are committed in +`src/resources/formats/html/ojs/`. + +- `quarto-ojs-runtime/`: Quarto's runtime: code transforms, the Observable connector, + the inspector, and Shiny integration. +- `external-*/`: Quarto forks of Observable's + [runtime](https://github.com/observablehq/runtime), + [stdlib](https://github.com/observablehq/stdlib) and + [parser](https://github.com/observablehq/parser), of + [d3-require](https://github.com/d3/d3-require), and of + [unofficial-observablehq-compiler](https://github.com/asg017/unofficial-observablehq-compiler). + +All of these packages are under the ISC license, as given in each `package.json`, except +two files vendored in `quarto-ojs-runtime/src/`: `escodegen.js` is a fork of +[escodegen](https://github.com/estools/escodegen) (BSD-2-Clause) and `escape.js` comes from +[escape-html](https://github.com/component/escape-html) (MIT). Both keep their license +headers, which are preserved in `quarto-ojs-runtime.js`. + +These moved from `packages/ojs/` in [quarto-dev/quarto](https://github.com/quarto-dev/quarto) +([#15043](https://github.com/quarto-dev/quarto-cli/issues/15043)), where the forks were +`git subtree`s. They were copied from +[quarto-dev/quarto@42177e13](https://github.com/quarto-dev/quarto/tree/42177e13074cf905619bbb52b1dba313fb5b4bb1/packages/ojs), +the head of [quarto-dev/quarto#1180](https://github.com/quarto-dev/quarto/pull/1180) before +it deleted them. That commit is not on quarto-dev/quarto's `main` branch. + +## Building + +With Node.js 24 or later: + +```bash +cd packages/ojs +npm ci +npm run build +``` + +This writes both bundles directly into `src/resources/formats/html/ojs/`. The build is +reproducible: CI rebuilds the bundles and fails if they differ from the committed +ones, so commit the rebuilt bundles together with any change here. + +The npm workspaces link the forks to each other and to the runtime. Rollup bundles +everything from source. The compiler fork's `module` field points to its ES module +source, so its `dist/` build isn't needed. + +## Maintaining the forks + +The forks are plain copies here, so `git subtree pull` doesn't work. To take an +upstream change, apply it by hand and rebuild. Upstream development of these +packages has largely stopped. + +Changes from the copies in quarto-dev/quarto: + +- The forks' `devDependencies` are removed. They were for each fork's own build, + tests and linting, which don't run here, and their old rollup plugins conflict + with npm's peer dependency checks. The forks' `scripts` won't work without them. + The forks' `yarn.lock` files are removed too; `package-lock.json` here covers + every package. +- The forks' `.github/` and `.circleci/` directories are removed. GitHub only runs + workflows from the repository root, and the forks' scripts can't run here anyway. +- The compiler fork's `package.json` gains `"module": "src/index.js"`. + +## Notes + +- Keep `@observablehq/inputs` on 0.10. Version 0.11 renames the form class + (`__ns__` to `inputs-3a86ea`), which breaks Shiny's button styling. +- `src/resources/formats/html/ojs/quarto-ojs.css` is maintained directly in that + directory. quarto-dev/quarto had an older copy of it, which wasn't brought over. diff --git a/packages/ojs/external-asg017-unofficial-observablehq-compiler/.gitignore b/packages/ojs/external-asg017-unofficial-observablehq-compiler/.gitignore new file mode 100644 index 00000000000..750e539b99f --- /dev/null +++ b/packages/ojs/external-asg017-unofficial-observablehq-compiler/.gitignore @@ -0,0 +1,90 @@ +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +lerna-debug.log* + +# Diagnostic reports (https://nodejs.org/api/report.html) +report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage +*.lcov + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# TypeScript v1 declaration files +typings/ + +# TypeScript cache +*.tsbuildinfo + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env +.env.test + +# parcel-bundler cache (https://parceljs.org/) +.cache + +# next.js build output +.next + +# nuxt.js build output +.nuxt + +# vuepress build output +.vuepress/dist + +# Serverless directories +.serverless/ + +# FuseBox cache +.fusebox/ + +# DynamoDB Local files +.dynamodb/ + +dist/ diff --git a/packages/ojs/external-asg017-unofficial-observablehq-compiler/.prettierrc b/packages/ojs/external-asg017-unofficial-observablehq-compiler/.prettierrc new file mode 100644 index 00000000000..2c63c085104 --- /dev/null +++ b/packages/ojs/external-asg017-unofficial-observablehq-compiler/.prettierrc @@ -0,0 +1,2 @@ +{ +} diff --git a/packages/ojs/external-asg017-unofficial-observablehq-compiler/.surgeignore b/packages/ojs/external-asg017-unofficial-observablehq-compiler/.surgeignore new file mode 100644 index 00000000000..1d23a65f8a1 --- /dev/null +++ b/packages/ojs/external-asg017-unofficial-observablehq-compiler/.surgeignore @@ -0,0 +1,3 @@ +src/ +node_modules/ +yarn.lock diff --git a/packages/ojs/external-asg017-unofficial-observablehq-compiler/README.md b/packages/ojs/external-asg017-unofficial-observablehq-compiler/README.md new file mode 100644 index 00000000000..16625089685 --- /dev/null +++ b/packages/ojs/external-asg017-unofficial-observablehq-compiler/README.md @@ -0,0 +1,120 @@ +# unofficial-observablehq-compiler + +An unoffical compiler _and_ interpreter for Observable notebooks (the glue between the Observable parser and runtime) + +This library has two parts: The Interpreter and the Compiler. The Interpreter will interpret "Observable syntax" into "javascript syntax" live in a javascript environment. For example: + +```javascript +import { Intepreter } from "@alex.garcia/unofficial-observablehq-compiler"; +import { Inspector, Runtime } from "@observablehq/runtime"; + +async function main() { + const runtime = new Runtime(); + const main = runtime.module(); + const observer = Inspector.into(document.body); + const interpret = new Intepreter({ module: main, observer }); + + await interpret.module(` +import {text} from '@jashkenas/inputs' + +viewof name = text({ + title: "what's your name?", + value: '' +}) + +md\`Hello **\${name}**, it's nice to meet you!\` + +`); +} +main(); +``` + +The Compiler will compile "Observable syntax" into javascript source code (as an ES module). + +For more live examples and functionality, take a look at the [announcement notebook](https://observablehq.com/d/74f872c4fde62e35) +and this [test page](https://github.com/asg017/unofficial-observablehq-compiler/blob/master/test/test.html). + +## API Reference + +### new Interpreter(_params_) + +`Interpreter` is a class that encompasses all logic to interpret Observable js code. _params_ is an optional object with the following allowed configuration: + +`resolveImportPath(path, specifers)`: An async function that resolves to the `define` definition for a notebook. _path_ is the string provided in the import statement, and _specifiers_ is a array of string if the imported cell name specifiers in the statement (cells inside `import {...}`). _specifiers_ is useful when implementing tree-shaking. For example, `import {chart as CHART} from "@d3/bar-chart"` would supply `path="@d3/bar-chart"` and `specifiers=["chart"]`. Default imports from observablehq.com, eg `https://api.observablehq.com/@d3/bar-chart.js?v=3` +`resolveFileAttachments`: A function that, given the name of a FileAttachment, returns the URL that the FileAttachment will be fetched from. Defaults to `name => name`. +`defineImportMarkdown`: A boolean, whether to define a markdown description cell for imports in the notebook. Defaults true. +`observeViewofValues`: A boolean, whether to pass in an _observer_ for the value of viewof cells. +`module`: A default Observable runtime [module](https://github.com/observablehq/runtime#modules) that will be used in operations such as `.cell` and `.module`, if no other module is passed in. +`observer`: A default Observable runtime [observer](https://github.com/observablehq/runtime#observer) that will be used in operations such as `.cell` and `.module`, if no other observer is passed in. + +Keep in mind, there is no sandboxing done, so it has the same security implications as `eval()`. + +interpret.**cell**(_source_ [, *module*, *observer*]) + +Parses the given string _source_ with the Observable parser [`.parseCell()`](https://github.com/observablehq/parser#parseCell) and interprets the source, passing it and the _observer_ along to the Observable _module_. Returns a Promise that resolves to an array of runtime [variables](https://github.com/observablehq/runtime#variables) that were defined when interpreting the source. More than one variable can be defined with a single cell, like with `viewof`, `mutable`, and `import` cells. _source_ can also be a pre-parsed [cell](https://github.com/observablehq/parser#cell) instead of source code. + +interpret.**module**(_source_ [, *module*, *observer*]) + +Parses the given string _source_ with the Observable parser [`.parseModule()`](https://github.com/observablehq/parser#parseModule) and interprets the source, passing it and the _observer_ along to the Observable _module_. Returns a Promise that resolves to an array of an array of runtime [variables](https://github.com/observablehq/runtime#variables) that were defined when interpreting the source. _source_ can also be a pre-parsed [program](https://github.com/observablehq/parser#program) instead of source code. + +interpret.**notebook**(_source_ [, *module*, *observer*]) + +TODO + +new **Compiler**(_params_) + +`Compiler` is a class that encompasses all logic to compile Observable javascript code into vanilla Javascript code, as an ES module. _params_ is an optional object with the following allowed configuration. + +`resolveImportPath(path, specifers)`: A function that returns a URL to where the notebook is defined. _path_ is the string provided in the import statement, and _specifiers_ is a array of string if the imported cell name specifiers in the statement (cells inside `import {...}`). _specifiers_ is useful when implementing tree-shaking. For example, `import {chart as CHART} from "@d3/bar-chart"` would supply `path="@d3/bar-chart"` and `specifiers=["chart"]`. Default imports from observablehq.com, eg `https://api.observablehq.com/@d3/bar-chart.js?v=3` + +`resolveFileAttachments`: A function that, given the name of a FileAttachment, returns the URL that the FileAttachment will be fetched from. Defaults to `name => name`. + +`UNSAFE_allowJavascriptFileAttachments` A boolean. When true, the `resolveFileAttachments` function will resolve to raw JavaScript when calculating the value of a FileAttachment reference. This is useful if you need to use `new URL` or `import.meta.url` when determining where a FileAttachment url should resolve too. This is unsafe because the Compiler will not escape any quotes when including it in the compiled output, so do use with extreme caution when dealing with user input. + +```javascript + +// This can be unsafe since FileAttachment names can include quotes. +// Instead, map file attachments names to something deterministic and escape-safe, +// like SHA hashes. +const resolveFileAttachments = name => `new URL("./files/${name}", import.meta.url)` + +Compiled output when: + +// UNSAFE_allowJavascriptFileAttachments == false +const fileAttachments = new Map([["a", "new URL(\"./files/a\", import.meta.url)"]]); + +// UNSAFE_allowJavascriptFileAttachments == true +const fileAttachments = new Map([["a", new URL("./files/a", import.meta.url)]]); + + +``` + +`defineImportMarkdown` - A boolean, whether to define a markdown description cell for imports in the notebook. Defaults true. + +`observeViewofValues` - A boolean, whether or not to pass in the `observer` function for viewof value cells. Defaults true. + +`observeMutableValues` - A boolean, whether or not to pass in the `observer` function for mutable value cells. Defaults true. + +compile.**module**(_source_) + +TODO + +compile.**notebook**(_source_) + +TODO + +## License + +This library is MIT, but it relies and gets heavy inspiration from the following +libraries licensed under ISC: + +- [@observablehq/runtime](https://github.com/observablehq/runtime) +- [@observablehq/stdlib](https://github.com/observablehq/stdlib) +- [@observablehq/inspector](https://github.com/observablehq/inspector) +- [@observablehq/parser](https://github.com/observablehq/parser) + +## Contributing + +Feel free to send in PR's as you wish! Take a look at the [issues](https://github.com/asg017/unofficial-observablehq-compiler/issues) +to find something to work on. Just please follow the [Contributor Covenant](https://www.contributor-covenant.org/) +in all your interactions :smile: diff --git a/packages/ojs/external-asg017-unofficial-observablehq-compiler/index.html b/packages/ojs/external-asg017-unofficial-observablehq-compiler/index.html new file mode 100644 index 00000000000..dc4218b8603 --- /dev/null +++ b/packages/ojs/external-asg017-unofficial-observablehq-compiler/index.html @@ -0,0 +1,58 @@ + + + + + + + + +
+ + diff --git a/packages/ojs/external-asg017-unofficial-observablehq-compiler/package.json b/packages/ojs/external-asg017-unofficial-observablehq-compiler/package.json new file mode 100644 index 00000000000..1b458058e58 --- /dev/null +++ b/packages/ojs/external-asg017-unofficial-observablehq-compiler/package.json @@ -0,0 +1,40 @@ +{ + "name": "external-alex-garcia-unofficial-observablehq-compiler", + "version": "0.0.7", + "description": "A fork of an unofficial compiler to bind @observablehq/parser and @observablehq/runtime", + "main": "dist/index.js", + "module": "src/index.js", + "author": "Carlos Scheidegger ", + "repository": { + "type": "git", + "url": "https://github.com/quarto-dev/external-asg017-unofficial-observablehq-compiler.git" + }, + "license": "ISC", + "publishConfig": { + "access": "public" + }, + "files": [ + "dist/**/*.js" + ], + "scripts": { + "build": "rollup -c", + "format": "prettier --write src/**/*.js", + "test": "npm run build && tape 'test/**/*-test.js' && npm run test-format", + "test-format": "prettier --check src/**/*.js", + "test-html": "http-server", + "prepublishOnly": "npm run build", + "postpublish": "git push && git push --tags" + }, + "keywords": [ + "observable", + "observablehq", + "observable-notebooks", + "notebooks", + "parser", + "compiler" + ], + "dependencies": { + "@observablehq/parser": "4.2", + "acorn-walk": "^7.0.0" + } +} diff --git a/packages/ojs/external-asg017-unofficial-observablehq-compiler/rollup.config.js b/packages/ojs/external-asg017-unofficial-observablehq-compiler/rollup.config.js new file mode 100644 index 00000000000..b3b9701a33d --- /dev/null +++ b/packages/ojs/external-asg017-unofficial-observablehq-compiler/rollup.config.js @@ -0,0 +1,21 @@ +import node from "rollup-plugin-node-resolve"; +import commonjs from "rollup-plugin-commonjs"; + +export default { + input: "src/index.js", + output: [ + { + compact: true, + file: "dist/index.js", + format: "umd", + name: "unofficial_observablehq_compiler" + }, + { + compact: true, + file: "dist/index-esm.js", + format: "esm", + name: "esm" + } + ], + plugins: [node(), commonjs()] +}; diff --git a/packages/ojs/external-asg017-unofficial-observablehq-compiler/src/compiler.js b/packages/ojs/external-asg017-unofficial-observablehq-compiler/src/compiler.js new file mode 100644 index 00000000000..7c1127c40f1 --- /dev/null +++ b/packages/ojs/external-asg017-unofficial-observablehq-compiler/src/compiler.js @@ -0,0 +1,249 @@ +import { parseCell, parseModule } from "@observablehq/parser"; +import { setupRegularCell, setupImportCell, extractPath } from "./utils"; +import { treeShakeModule } from "./tree-shake"; + +function ESMImports(moduleObject, resolveImportPath) { + const importMap = new Map(); + let importSrc = ""; + let j = 0; + + for (const { body } of moduleObject.cells) { + if (body.type !== "ImportDeclaration" || importMap.has(body.source.value)) + continue; + + const defineName = `define${++j}`; + // TODO get cell specififiers here and pass in as 2nd param to resolveImportPath + // need to use same logic as tree-shake name()s + const specifiers = body.specifiers.map(d => { + const prefix = d.view ? "viewof " : d.mutable ? "mutable " : ""; + return `${prefix}${d.imported.name}`; + }); + const fromPath = resolveImportPath(body.source.value, specifiers); + importMap.set(body.source.value, { defineName, fromPath }); + importSrc += `import ${defineName} from "${fromPath}";\n`; + } + + if (importSrc.length) importSrc += "\n"; + return { importSrc, importMap }; +} + +// by default, file attachments get resolved like: +// [ ["a", "https://example.com/files/a"] ] +// but sometimes, you'll want to write JS code when resolving +// instead of being limiting by strings. The third param +// enables that, allowing for resolving like: +// [ ["a", new URL("./files/a", import.meta.url)] ] +function ESMAttachments( + moduleObject, + resolveFileAttachments, + UNSAFE_allowJavascriptFileAttachments = false +) { + let mapValue; + if (UNSAFE_allowJavascriptFileAttachments) { + const attachmentMapEntries = []; + for (const cell of moduleObject.cells) { + if (cell.fileAttachments.size === 0) continue; + for (const file of cell.fileAttachments.keys()) + attachmentMapEntries.push([file, resolveFileAttachments(file)]); + } + if (attachmentMapEntries.length) + mapValue = `[${attachmentMapEntries + .map(([key, value]) => `[${JSON.stringify(key)}, ${value}]`) + .join(",")}]`; + } else { + const attachmentMapEntries = []; + // loop over cells with fileAttachments + for (const cell of moduleObject.cells) { + if (cell.fileAttachments.size === 0) continue; + // add filenames and resolved URLs to array + for (const file of cell.fileAttachments.keys()) + attachmentMapEntries.push([file, resolveFileAttachments(file)]); + } + if (attachmentMapEntries.length) + mapValue = JSON.stringify(attachmentMapEntries); + } + + if (!mapValue) return ""; + return ` const fileAttachments = new Map(${mapValue}); + main.builtin("FileAttachment", runtime.fileAttachments(name => fileAttachments.get(name)));`; +} + +function ESMVariables(moduleObject, importMap, params) { + const { + defineImportMarkdown, + observeViewofValues, + observeMutableValues + } = params; + + let childJ = 0; + return moduleObject.cells + .map(cell => { + let src = ""; + + if (cell.body.type === "ImportDeclaration") { + const { + specifiers, + hasInjections, + injections, + importString + } = setupImportCell(cell); + + if (defineImportMarkdown) + src += + ` main.variable(observer()).define( + null, + ["md"], + md => md\`~~~javascript +${importString} +~~~\` + );` + "\n"; + + // name imported notebook define functions + const childName = `child${++childJ}`; + src += ` const ${childName} = runtime.module(${ + importMap.get(cell.body.source.value).defineName + })${ + hasInjections ? `.derive(${JSON.stringify(injections)}, main)` : "" + }; +${specifiers + .map( + specifier => + ` main.import("${specifier.name}", "${specifier.alias}", ${childName});` + ) + .join("\n")}`; + } else { + const { + cellName, + references, + bodyText, + cellReferences + } = setupRegularCell(cell); + + const cellNameString = cellName ? `"${cellName}"` : ""; + const referenceString = references.join(","); + let code = ""; + if (cell.body.type !== "BlockStatement") + code = `{return( +${bodyText} +)}`; + else code = "\n" + bodyText + "\n"; + const cellReferencesString = cellReferences.length + ? JSON.stringify(cellReferences) + ", " + : ""; + let cellFunction = ""; + if (cell.generator && cell.async) + cellFunction = `async function*(${referenceString})${code}`; + else if (cell.async) + cellFunction = `async function(${referenceString})${code}`; + else if (cell.generator) + cellFunction = `function*(${referenceString})${code}`; + else cellFunction = `function(${referenceString})${code}`; + + if (cell.id && cell.id.type === "ViewExpression") { + const reference = `"viewof ${cellName}"`; + src += ` main.variable(observer(${reference})).define(${reference}, ${cellReferencesString}${cellFunction}); + main.variable(${ + observeViewofValues ? `observer("${cellName}")` : `null` + }).define("${cellName}", ["Generators", ${reference}], (G, _) => G.input(_));`; + } else if (cell.id && cell.id.type === "MutableExpression") { + const initialName = `"initial ${cellName}"`; + const mutableName = `"mutable ${cellName}"`; + src += ` main.define(${initialName}, ${cellReferencesString}${cellFunction}); + main.variable(observer(${mutableName})).define(${mutableName}, ["Mutable", ${initialName}], (M, _) => new M(_)); + main.variable(${ + observeMutableValues ? `observer("${cellName}")` : `null` + }).define("${cellName}", [${mutableName}], _ => _.generator);`; + } else { + src += ` main.variable(observer(${cellNameString})).define(${ + cellName ? cellNameString + ", " : "" + }${cellReferencesString}${cellFunction});`; + } + } + return src; + }) + .join("\n"); +} +function createESModule(moduleObject, params = {}) { + const { + resolveImportPath, + resolveFileAttachments, + defineImportMarkdown, + observeViewofValues, + observeMutableValues, + UNSAFE_allowJavascriptFileAttachments + } = params; + const { importSrc, importMap } = ESMImports(moduleObject, resolveImportPath); + return `${importSrc}export default function define(runtime, observer) { + const main = runtime.module(); +${ESMAttachments( + moduleObject, + resolveFileAttachments, + UNSAFE_allowJavascriptFileAttachments +)} +${ESMVariables(moduleObject, importMap, { + defineImportMarkdown, + observeViewofValues, + observeMutableValues +}) || ""} + return main; +}`; +} + +function defaultResolveImportPath(path) { + const source = extractPath(path); + return `https://api.observablehq.com/${source}.js?v=3`; +} + +function defaultResolveFileAttachments(name) { + return name; +} +export class Compiler { + constructor(params = {}) { + const { + resolveFileAttachments = defaultResolveFileAttachments, + resolveImportPath = defaultResolveImportPath, + defineImportMarkdown = true, + observeViewofValues = true, + observeMutableValues = true, + UNSAFE_allowJavascriptFileAttachments = false + } = params; + this.resolveFileAttachments = resolveFileAttachments; + this.resolveImportPath = resolveImportPath; + this.defineImportMarkdown = defineImportMarkdown; + this.observeViewofValues = observeViewofValues; + this.observeMutableValues = observeMutableValues; + this.UNSAFE_allowJavascriptFileAttachments = UNSAFE_allowJavascriptFileAttachments; + } + module(input, params = {}) { + let m1 = typeof input === "string" ? parseModule(input) : input; + + if (params.treeShake) m1 = treeShakeModule(m1, params.treeShake); + + return createESModule(m1, { + resolveImportPath: this.resolveImportPath, + resolveFileAttachments: this.resolveFileAttachments, + defineImportMarkdown: this.defineImportMarkdown, + observeViewofValues: this.observeViewofValues, + observeMutableValues: this.observeMutableValues, + UNSAFE_allowJavascriptFileAttachments: this + .UNSAFE_allowJavascriptFileAttachments + }); + } + notebook(obj) { + const cells = obj.nodes.map(({ value }) => { + const cell = parseCell(value); + cell.input = value; + return cell; + }); + return createESModule( + { cells }, + { + resolveImportPath: this.resolveImportPath, + resolveFileAttachments: this.resolveFileAttachments, + defineImportMarkdown: this.defineImportMarkdown, + observeViewofValues: this.observeViewofValues, + observeMutableValues: this.observeMutableValues + } + ); + } +} diff --git a/packages/ojs/external-asg017-unofficial-observablehq-compiler/src/index.js b/packages/ojs/external-asg017-unofficial-observablehq-compiler/src/index.js new file mode 100644 index 00000000000..099b48f3063 --- /dev/null +++ b/packages/ojs/external-asg017-unofficial-observablehq-compiler/src/index.js @@ -0,0 +1,4 @@ +export { Compiler } from "./compiler.js"; +export { Interpreter } from "./interpreter.js"; +export * as parser from "@observablehq/parser"; +export { treeShakeModule } from "./tree-shake.js"; diff --git a/packages/ojs/external-asg017-unofficial-observablehq-compiler/src/interpreter.js b/packages/ojs/external-asg017-unofficial-observablehq-compiler/src/interpreter.js new file mode 100644 index 00000000000..bdb1bc51098 --- /dev/null +++ b/packages/ojs/external-asg017-unofficial-observablehq-compiler/src/interpreter.js @@ -0,0 +1,176 @@ +import { parseCell, parseModule } from "@observablehq/parser"; +import { setupRegularCell, setupImportCell, extractPath } from "./utils"; + +const AsyncFunction = Object.getPrototypeOf(async function() {}).constructor; +const GeneratorFunction = Object.getPrototypeOf(function*() {}).constructor; +const AsyncGeneratorFunction = Object.getPrototypeOf(async function*() {}) + .constructor; + +function createRegularCellDefinition(cell) { + const { cellName, references, bodyText, cellReferences } = setupRegularCell( + cell + ); + + let code; + if (cell.body.type !== "BlockStatement") { + if (cell.async) + code = `return (async function(){ return (${bodyText});})()`; + else code = `return (function(){ return (${bodyText});})()`; + } else code = bodyText; + + let f; + if (cell.generator && cell.async) + f = new AsyncGeneratorFunction(...references, code); + else if (cell.async) f = new AsyncFunction(...references, code); + else if (cell.generator) f = new GeneratorFunction(...references, code); + else f = new Function(...references, code); + return { + cellName, + cellFunction: f, + cellReferences + }; +} + +function defaultResolveImportPath(path) { + const source = extractPath(path); + return import(`https://api.observablehq.com/${source}.js?v=3`).then( + m => m.default + ); +} + +function defaultResolveFileAttachments(name) { + return name; +} + +export class Interpreter { + constructor(params = {}) { + const { + module = null, + observer = null, + resolveImportPath = defaultResolveImportPath, + resolveFileAttachments = defaultResolveFileAttachments, + defineImportMarkdown = true, + observeViewofValues = true, + observeMutableValues = true + } = params; + + // can't be this.module bc of async module(). + // so make defaultObserver follow same convention. + this.defaultModule = module; + this.defaultObserver = observer; + + this.resolveImportPath = resolveImportPath; + this.resolveFileAttachments = resolveFileAttachments; + this.defineImportMarkdown = defineImportMarkdown; + this.observeViewofValues = observeViewofValues; + this.observeMutableValues = observeMutableValues; + } + + async module(input, module, observer) { + module = module || this.defaultModule; + observer = observer || this.defaultObserver; + + if (!module) throw Error("No module provided."); + if (!observer) throw Error("No observer provided."); + + const parsedModule = parseModule(input); + const cellPromises = []; + for (const cell of parsedModule.cells) { + cell.input = input; + cellPromises.push(this.cell(cell, module, observer)); + } + return Promise.all(cellPromises); + } + + async cell(input, module, observer) { + module = module || this.defaultModule; + observer = observer || this.defaultObserver; + + if (!module) throw Error("No module provided."); + if (!observer) throw Error("No observer provided."); + + let cell; + if (typeof input === "string") { + cell = parseCell(input); + cell.input = input; + } else { + cell = input; + } + + if (cell.body.type === "ImportDeclaration") { + const path = cell.body.source.value; + const specs = cell.body.specifiers.map(d => { + const prefix = d.view ? "viewof " : d.mutable ? "mutable " : ""; + return `${prefix}${d.imported.name}`; + }); + const fromModule = await this.resolveImportPath(path, specs); + let mdVariable, vars; + + const { + specifiers, + hasInjections, + injections, + importString + } = setupImportCell(cell); + + const other = module._runtime.module(fromModule); + + if (this.defineImportMarkdown) + mdVariable = module.variable(observer()).define( + null, + ["md"], + md => md`~~~javascript + ${importString} + ~~~` + ); + if (hasInjections) { + const child = other.derive(injections, module); + vars = specifiers.map(({ name, alias }) => + module.import(name, alias, child) + ); + } else { + vars = specifiers.map(({ name, alias }) => + module.import(name, alias, other) + ); + } + return mdVariable ? [mdVariable, ...vars] : vars; + } else { + const { + cellName, + cellFunction, + cellReferences + } = createRegularCellDefinition(cell); + if (cell.id && cell.id.type === "ViewExpression") { + const reference = `viewof ${cellName}`; + return [ + module + .variable(observer(reference)) + .define(reference, cellReferences, cellFunction.bind(this)), + module + .variable(this.observeViewofValues ? observer(cellName) : null) + .define(cellName, ["Generators", reference], (G, _) => G.input(_)) + ]; + } else if (cell.id && cell.id.type === "MutableExpression") { + const initialName = `initial ${cellName}`; + const mutableName = `mutable ${cellName}`; + return [ + module + .variable(null) + .define(initialName, cellReferences, cellFunction), + module + .variable(observer(mutableName)) + .define(mutableName, ["Mutable", initialName], (M, _) => new M(_)), + module + .variable(this.observeMutableValues ? observer(cellName) : null) + .define(cellName, [mutableName], _ => _.generator) + ]; + } else { + return [ + module + .variable(observer(cellName)) + .define(cellName, cellReferences, cellFunction.bind(this)) + ]; + } + } + } +} diff --git a/packages/ojs/external-asg017-unofficial-observablehq-compiler/src/tree-shake.js b/packages/ojs/external-asg017-unofficial-observablehq-compiler/src/tree-shake.js new file mode 100644 index 00000000000..6da74afb0db --- /dev/null +++ b/packages/ojs/external-asg017-unofficial-observablehq-compiler/src/tree-shake.js @@ -0,0 +1,70 @@ +function names(cell) { + if (cell.body && cell.body.specifiers) + return cell.body.specifiers.map( + d => `${d.view ? "viewof " : d.mutable ? "mutable " : ""}${d.local.name}` + ); + + if (cell.id && cell.id.type && cell.id) { + if (cell.id.type === "ViewExpression") return [`viewof ${cell.id.id.name}`]; + if (cell.id.type === "MutableExpression") + return [`mutable ${cell.id.id.name}`]; + if (cell.id.name) return [cell.id.name]; + } + + return []; +} + +function references(cell) { + if (cell.references) + return cell.references.map(d => { + if (d.name) return d.name; + if (d.type === "ViewExpression") return `viewof ${d.id.name}`; + if (d.type === "MutableExpression") return `mutable ${d.id.name}`; + return null; + }); + + if (cell.body && cell.body.injections) + return cell.body.injections.map( + d => + `${d.view ? "viewof " : d.mutable ? "mutable " : ""}${d.imported.name}` + ); + + return []; +} + +function getCellRefs(module) { + const cells = []; + for (const cell of module.cells) { + const ns = names(cell); + const refs = references(cell); + if (!ns || !ns.length) continue; + for (const name of ns) { + cells.push([name, refs]); + if (name.startsWith("viewof ")) + cells.push([name.substring("viewof ".length), [name]]); + } + } + return new Map(cells); +} + +export function treeShakeModule(module, targets) { + const cellRefs = getCellRefs(module); + + const embed = new Set(); + const todo = targets.slice(); + while (todo.length) { + const d = todo.pop(); + embed.add(d); + // happens when 1) d is an stdlib cell, 2) d doesnt have a defintion, + // or 3) d is in the window/global object. Let's be forgiving + // and let it happen + if (!cellRefs.has(d)) continue; + const refs = cellRefs.get(d); + for (const ref of refs) if (!embed.has(ref)) todo.push(ref); + } + return { + cells: module.cells.filter( + cell => names(cell).filter(name => embed.has(name)).length + ) + }; +} diff --git a/packages/ojs/external-asg017-unofficial-observablehq-compiler/src/utils.js b/packages/ojs/external-asg017-unofficial-observablehq-compiler/src/utils.js new file mode 100644 index 00000000000..c69f844e74e --- /dev/null +++ b/packages/ojs/external-asg017-unofficial-observablehq-compiler/src/utils.js @@ -0,0 +1,148 @@ +import { walk } from "@observablehq/parser"; + +import { full, simple } from "acorn-walk"; + +/** + * FINISH REPLACING THE SIMPLE WALKER WITH A FULL WALKER THAT DOES SUBSTITUTION ALL AT ONCE. + * + */ + +export const extractPath = path => { + let source = path; + let m; + + // "https://api.observablehq.com/@jashkenas/inputs.js?v=3" => strip off ".js" + if ((m = /\.js(\?|$)/i.exec(source))) source = source.slice(0, m.index); + + // "74f872c4fde62e35" => "d/..." + if ((m = /^[0-9a-f]{16}$/i.test(source))) source = `d/${source}`; + + // link of notebook + if ((m = /^https:\/\/(api\.|beta\.|)observablehq\.com\//i.exec(source))) + source = source.slice(m[0].length); + return source; +}; + +export function setupImportCell(cell) { + const specifiers = []; + + if (cell.body.specifiers) + for (const specifier of cell.body.specifiers) { + if (specifier.view) { + specifiers.push({ + name: "viewof " + specifier.imported.name, + alias: "viewof " + specifier.local.name + }); + } else if (specifier.mutable) { + specifiers.push({ + name: "mutable " + specifier.imported.name, + alias: "mutable " + specifier.local.name + }); + } + specifiers.push({ + name: specifier.imported.name, + alias: specifier.local.name + }); + } + // If injections is undefined, do not derive! + const hasInjections = cell.body.injections !== undefined; + const injections = []; + if (hasInjections) + for (const injection of cell.body.injections) { + // This currently behaves like notebooks on observablehq.com + // Commenting out the if & else if blocks result in behavior like Example 3 here: https://observablehq.com/d/7ccad009e4d89969 + if (injection.view) { + injections.push({ + name: "viewof " + injection.imported.name, + alias: "viewof " + injection.local.name + }); + } else if (injection.mutable) { + injections.push({ + name: "mutable " + injection.imported.name, + alias: "mutable " + injection.local.name + }); + } + injections.push({ + name: injection.imported.name, + alias: injection.local.name + }); + } + const importString = `import {${specifiers + .map(specifier => `${specifier.name} as ${specifier.alias}`) + .join(", ")}} ${ + hasInjections + ? `with {${injections + .map(injection => `${injection.name} as ${injection.alias}`) + .join(", ")}} ` + : `` + }from "${cell.body.source.value}"`; + + return { specifiers, hasInjections, injections, importString }; +} + +export function setupRegularCell(cell) { + let name = null; + if (cell.id && cell.id.name) name = cell.id.name; + else if (cell.id && cell.id.id && cell.id.id.name) name = cell.id.id.name; + let bodyText = cell.input.substring(cell.body.start, cell.body.end); + let expressionMap = {}; + let references = []; + let counter = 0; + const cellReferences = Array.from(new Set((cell.references || []).map(ref => { + if (ref.type === "ViewExpression") { + if (expressionMap[ref.id.name] === undefined) { + const newName = `$${counter++}`; + expressionMap[ref.id.name] = newName; + references.push(newName); + } + return "viewof " + ref.id.name; + } else if (ref.type === "MutableExpression") { + if (expressionMap[ref.id.name] === undefined) { + const newName = `$${counter++}`; + expressionMap[ref.id.name] = newName; + references.push(newName); + } + return "mutable " + ref.id.name; + } else { + references.push(ref.name); + return ref.name; + } + }))); + const uniq = (lst) => { + const result = []; + const s = new Set(); + for (const v of lst) { + if (s.has(v)) continue; + s.add(v); + result.push(v); + } + return result; + } + const patches = []; + let latestPatch = { newStr: "", span: [cell.body.start, cell.body.start] }; + full(cell.body, node => { + if (node.type === "ViewExpression" || node.type === "MutableExpression") { + // cover previous ground? + if (node.start !== latestPatch.span[1]) { + patches.push({ newStr: cell.input.substring(latestPatch.span[1], node.start)}); + } + const suffix = node.type === "MutableExpression" ? ".value" : ""; + const newStr = `${expressionMap[node.id.name]}${suffix}`; + const patch = { + newStr, + span: [node.start, node.end] + }; + latestPatch = patch; + patches.push(patch); + } + }, walk); + patches.push({newStr: cell.input.substring(latestPatch.span[1], cell.body.end), span: [latestPatch.span[1], cell.body.end]}); + bodyText = patches.map(x => x.newStr).join(""); + + return { + cellName: name, + references: uniq(references), + bodyText, + cellReferences: uniq(cellReferences) + }; +} diff --git a/packages/ojs/external-asg017-unofficial-observablehq-compiler/test/compiler-test.js b/packages/ojs/external-asg017-unofficial-observablehq-compiler/test/compiler-test.js new file mode 100644 index 00000000000..b67ce79aa93 --- /dev/null +++ b/packages/ojs/external-asg017-unofficial-observablehq-compiler/test/compiler-test.js @@ -0,0 +1,441 @@ +const test = require("tape"); +const { Runtime } = require("@observablehq/runtime"); +const { Compiler } = require("../dist/index"); + +test("Compiler: simple", async t => { + const compile = new Compiler(); + const runtime = new Runtime(); + + const src = compile.module(`a = 1; b = 2; c = a + b; + d = {yield 1; yield 2; yield 3;}; e = await Promise.resolve(40);`); + + t.equal( + src, + `export default function define(runtime, observer) { + const main = runtime.module(); + + main.variable(observer("a")).define("a", function(){return( +1 +)}); + main.variable(observer("b")).define("b", function(){return( +2 +)}); + main.variable(observer("c")).define("c", ["a","b"], function(a,b){return( +a + b +)}); + main.variable(observer("d")).define("d", function*() +{yield 1; yield 2; yield 3;} +); + main.variable(observer("e")).define("e", async function(){return( +await Promise.resolve(40) +)}); + return main; +}` + ); + const define = eval(`(${src.substring("export default ".length)})`); + const main = runtime.module(define); + + t.equals(await main.value("a"), 1); + t.equals(await main.value("b"), 2); + t.equals(await main.value("c"), 3); + t.equals(await main.value("d"), 1); + t.equals(await main.value("e"), 40); + + t.end(); +}); + +test("Compiler: viewof cells", async t => { + const compile = new Compiler(); + const runtime = new Runtime(); + + const src = compile.module( + `viewof a = ({name: 'alex', value: 101, addEventListener: () => {} })` + ); + + t.equal( + src, + `export default function define(runtime, observer) { + const main = runtime.module(); + + main.variable(observer("viewof a")).define("viewof a", function(){return( +{name: 'alex', value: 101, addEventListener: () => {} } +)}); + main.variable(observer("a")).define("a", ["Generators", "viewof a"], (G, _) => G.input(_)); + return main; +}` + ); + const define = eval(`(${src.substring("export default ".length)})`); + const main = runtime.module(define); + + t.equals(await main.value("a"), 101); + + t.end(); +}); + +test("Compiler: mutable cells", async t => { + const compile = new Compiler(); + const runtime = new Runtime(); + + const src = compile.module(`mutable a = 200; _ = (mutable a = 202)`); + + t.equal( + src, + `export default function define(runtime, observer) { + const main = runtime.module(); + + main.define("initial a", function(){return( +200 +)}); + main.variable(observer("mutable a")).define("mutable a", ["Mutable", "initial a"], (M, _) => new M(_)); + main.variable(observer("a")).define("a", ["mutable a"], _ => _.generator); + main.variable(observer("_")).define("_", ["mutable a"], function($0){return( +$0.value = 202 +)}); + return main; +}` + ); + const define = eval(`(${src.substring("export default ".length)})`); + const main = runtime.module(define); + + t.equals(await main.value("a"), 200); + t.equals(await main.value("_"), 202); + t.equals(await main.value("a"), 202); + + t.end(); +}); + +test("Compiler: import cells", async t => { + const compile = new Compiler({ + resolveImportPath: (name, specifiers) => + `https://example.com/${name}?${specifiers + .map(s => `specifiers=${encodeURIComponent(s)}`) + .join("&")}` + }); + + const src = compile.module(`import {a as A, b as B, c as C} from "alpha";`); + + t.equal( + src, + `import define1 from "https://example.com/alpha?specifiers=a&specifiers=b&specifiers=c"; + +export default function define(runtime, observer) { + const main = runtime.module(); + + main.variable(observer()).define( + null, + ["md"], + md => md\`~~~javascript +import {a as A, b as B, c as C} from "alpha" +~~~\` + ); + const child1 = runtime.module(define1); + main.import("a", "A", child1); + main.import("b", "B", child1); + main.import("c", "C", child1); + return main; +}` + ); + + t.end(); +}); + +// defineImportMarkdown +test("Compiler: defineImportMarkdown", async t => { + let compile = new Compiler({ defineImportMarkdown: true }); + let src = compile.module(`import {a} from "whatever";`); + + t.equal( + src, + `import define1 from "https://api.observablehq.com/whatever.js?v=3"; + +export default function define(runtime, observer) { + const main = runtime.module(); + + main.variable(observer()).define( + null, + ["md"], + md => md\`~~~javascript +import {a as a} from "whatever" +~~~\` + ); + const child1 = runtime.module(define1); + main.import("a", "a", child1); + return main; +}` + ); + + compile = new Compiler({ defineImportMarkdown: false }); + src = compile.module(`import {a} from "whatever";`); + t.equal( + src, + `import define1 from "https://api.observablehq.com/whatever.js?v=3"; + +export default function define(runtime, observer) { + const main = runtime.module(); + + const child1 = runtime.module(define1); + main.import("a", "a", child1); + return main; +}` + ); + + t.end(); +}); + +// observeViewofValues +test("Compiler: observeViewofValues", async t => { + let compile = new Compiler({ observeViewofValues: true }); + let src = compile.module( + "viewof a = ({value: 100, addEventListener: () => {}, removeEventListener: () => {}})" + ); + + t.equal( + src, + `export default function define(runtime, observer) { + const main = runtime.module(); + + main.variable(observer("viewof a")).define("viewof a", function(){return( +{value: 100, addEventListener: () => {}, removeEventListener: () => {}} +)}); + main.variable(observer("a")).define("a", ["Generators", "viewof a"], (G, _) => G.input(_)); + return main; +}` + ); + + compile = new Compiler({ observeViewofValues: false }); + src = compile.module( + "viewof a = ({value: 100, addEventListener: () => {}, removeEventListener: () => {}})" + ); + + t.equal( + src, + `export default function define(runtime, observer) { + const main = runtime.module(); + + main.variable(observer("viewof a")).define("viewof a", function(){return( +{value: 100, addEventListener: () => {}, removeEventListener: () => {}} +)}); + main.variable(null).define("a", ["Generators", "viewof a"], (G, _) => G.input(_)); + return main; +}` + ); + + t.end(); +}); + +test("Compiler: observeMutableValues", async t => { + let compile = new Compiler({ observeMutableValues: true }); + let src = compile.module("mutable a = 0x100"); + + t.equal( + src, + `export default function define(runtime, observer) { + const main = runtime.module(); + + main.define("initial a", function(){return( +0x100 +)}); + main.variable(observer("mutable a")).define("mutable a", ["Mutable", "initial a"], (M, _) => new M(_)); + main.variable(observer("a")).define("a", ["mutable a"], _ => _.generator); + return main; +}` + ); + + compile = new Compiler({ observeMutableValues: false }); + src = compile.module("mutable a = 0x100"); + + t.equal( + src, + `export default function define(runtime, observer) { + const main = runtime.module(); + + main.define("initial a", function(){return( +0x100 +)}); + main.variable(observer("mutable a")).define("mutable a", ["Mutable", "initial a"], (M, _) => new M(_)); + main.variable(null).define("a", ["mutable a"], _ => _.generator); + return main; +}` + ); + + t.end(); +}); + +test("Compiler: resolveFileAttachments", async t => { + function resolveFileAttachments(name) { + return `https://example.com/${name}`; + } + let compile = new Compiler({ resolveFileAttachments }); + let src = compile.module('a = FileAttachment("a")'); + + t.equal( + src, + `export default function define(runtime, observer) { + const main = runtime.module(); + const fileAttachments = new Map([["a","https://example.com/a"]]); + main.builtin("FileAttachment", runtime.fileAttachments(name => fileAttachments.get(name))); + main.variable(observer("a")).define("a", ["FileAttachment"], function(FileAttachment){return( +FileAttachment("a") +)}); + return main; +}` + ); + + t.end(); +}); + +test("Compiler: resolveFileAttachments UNSAFE_allowJavascriptFileAttachments", async t => { + function resolveFileAttachments(name) { + return `new URL("./path/to/${name}", import.meta.url)`; + } + let compile = new Compiler({ + resolveFileAttachments, + UNSAFE_allowJavascriptFileAttachments: true + }); + let src = compile.module('a = FileAttachment("a")'); + + t.equal( + src, + `export default function define(runtime, observer) { + const main = runtime.module(); + const fileAttachments = new Map([["a", new URL("./path/to/a", import.meta.url)]]); + main.builtin("FileAttachment", runtime.fileAttachments(name => fileAttachments.get(name))); + main.variable(observer("a")).define("a", ["FileAttachment"], function(FileAttachment){return( +FileAttachment("a") +)}); + return main; +}` + ); + + t.end(); +}); + +test("Compiler: treeShake", async t => { + let src; + const initSrc = ` + viewof a = html\`\`; b = 2; c = a + b; + d = 2; e = 4; f = d + e; + height = c; + import {chart} with {height} from "@d3/bar-chart";`; + const compile = new Compiler({ defineImportMarkdown: false }); + + src = compile.module(initSrc, { + treeShake: ["f"] + }); + + t.equal( + src, + `export default function define(runtime, observer) { + const main = runtime.module(); + + main.variable(observer("d")).define("d", function(){return( +2 +)}); + main.variable(observer("e")).define("e", function(){return( +4 +)}); + main.variable(observer("f")).define("f", ["d","e"], function(d,e){return( +d + e +)}); + return main; +}` + ); + + src = compile.module(initSrc, { + treeShake: ["f", "a"] + }); + + t.equal( + src, + `export default function define(runtime, observer) { + const main = runtime.module(); + + main.variable(observer("viewof a")).define("viewof a", ["html"], function(html){return( +html\`\` +)}); + main.variable(observer("a")).define("a", ["Generators", "viewof a"], (G, _) => G.input(_)); + main.variable(observer("d")).define("d", function(){return( +2 +)}); + main.variable(observer("e")).define("e", function(){return( +4 +)}); + main.variable(observer("f")).define("f", ["d","e"], function(d,e){return( +d + e +)}); + return main; +}` + ); + + src = compile.module(initSrc, { + treeShake: ["chart"] + }); + + t.equal( + src, + `import define1 from "https://api.observablehq.com/@d3/bar-chart.js?v=3"; + +export default function define(runtime, observer) { + const main = runtime.module(); + + main.variable(observer("viewof a")).define("viewof a", ["html"], function(html){return( +html\`\` +)}); + main.variable(observer("a")).define("a", ["Generators", "viewof a"], (G, _) => G.input(_)); + main.variable(observer("b")).define("b", function(){return( +2 +)}); + main.variable(observer("c")).define("c", ["a","b"], function(a,b){return( +a + b +)}); + main.variable(observer("height")).define("height", ["c"], function(c){return( +c +)}); + const child1 = runtime.module(define1).derive([{"name":"height","alias":"height"}], main); + main.import("chart", "chart", child1); + return main; +}` + ); + + // make sure tree shaking an unreference cell just returns a define identity function. + t.equals( + compile.module(`a = 1; b = a/1;`, { treeShake: ["c"] }), + `export default function define(runtime, observer) { + const main = runtime.module(); + + + return main; +}` + ); + + t.end(); +}); + +test("Compiler: multiple refs", async t => { + const compile = new Compiler(); + const runtime = new Runtime(); + + const src = compile.module(`a = 1; b = a,a,a,a;`); + + t.equal( + src, + `export default function define(runtime, observer) { + const main = runtime.module(); + + main.variable(observer("a")).define("a", function(){return( +1 +)}); + main.variable(observer("b")).define("b", ["a"], function(a){return( +a,a,a,a +)}); + return main; +}` + ); + const define = eval(`(${src.substring("export default ".length)})`); + const main = runtime.module(define); + + t.equals(await main.value("a"), 1); + t.equals(await main.value("b"), 1); + + t.end(); +}); diff --git a/packages/ojs/external-asg017-unofficial-observablehq-compiler/test/executable_attachment.js b/packages/ojs/external-asg017-unofficial-observablehq-compiler/test/executable_attachment.js new file mode 100644 index 00000000000..78cab1ac0ea --- /dev/null +++ b/packages/ojs/external-asg017-unofficial-observablehq-compiler/test/executable_attachment.js @@ -0,0 +1,4 @@ +// https://observablehq.com/@jashkenas/executable-js-fileattachment-test +export const html = document.createElement("H1"); + +html.innerHTML = "Successfully executed JS in attachment!"; diff --git a/packages/ojs/external-asg017-unofficial-observablehq-compiler/test/interpreter-test.js b/packages/ojs/external-asg017-unofficial-observablehq-compiler/test/interpreter-test.js new file mode 100644 index 00000000000..b546ebdc9fc --- /dev/null +++ b/packages/ojs/external-asg017-unofficial-observablehq-compiler/test/interpreter-test.js @@ -0,0 +1,326 @@ +const test = require("tape"); +const { Interpreter } = require("../dist/index"); +const { Runtime, RuntimeError } = require("@observablehq/runtime"); + +test("Interpreter: simple cells", async t => { + const interpret = new Interpreter(); + const runtime = new Runtime(); + const main = runtime.module(); + let observer = () => null; + + const a = await interpret.cell("a = 1", main, observer); + + t.equals(await main.value("a"), 1); + t.equals(a.length, 1); + t.equals(a[0]._module, main); + t.equals(a[0]._value, 1); + + await interpret.module("b = 2; c = a + b;", main, observer); + + t.equals(await main.value("b"), 2); + t.equals(await main.value("c"), 3); + + await interpret.module( + "d = {yield 1; yield 2; yield 3;}; e = await Promise.resolve(40);", + main, + observer + ); + + t.equals(await main.value("d"), 1); + t.equals(await main.value("e"), 40); + + try { + await main.value("x"); + t.fail(); + } catch (error) { + t.equal(error.constructor, RuntimeError); + } + + t.end(); +}); + +test("Interpreter: viewof cells", async t => { + const interpret = new Interpreter(); + const runtime = new Runtime(); + const main = runtime.module(); + let observer = () => null; + + const a = await interpret.cell( + "viewof a = ({name: 'alex', value: 101, addEventListener: () => {} })", + main, + observer + ); + + t.equals(await main.value("a"), 101); + t.equals((await main.value("viewof a")).name, "alex"); + t.equals(a.length, 2); + t.equals(a[0]._name, "viewof a"); + t.equals(a[1]._name, "a"); + + t.end(); +}); + +test("Interpreter: mutable cells", async t => { + const interpret = new Interpreter(); + const runtime = new Runtime(); + const main = runtime.module(); + let observer = () => null; + + const Mutable = await runtime._builtin.value("Mutable"); + + let a = await interpret.cell("mutable a = 200", main, observer); + + t.equals(await main.value("initial a"), 200); + t.equals((await main.value("mutable a")).constructor, Mutable); + t.equals(await main.value("a"), 200); + + t.equals(a.length, 3); + t.equals(a[0]._name, "initial a"); + t.equals(a[1]._name, "mutable a"); + t.equals(a[2]._name, "a"); + + a = await interpret.cell("_ = (mutable a = 202)", main, observer); + + t.equals(a.length, 1); + t.equals(a[0]._name, "_"); + t.equals(await main.value("_"), 202); + t.equals(await main.value("a"), 202); + + t.end(); +}); + +test("Interpreter: import cells", async t => { + function resolveImportPath(name, specifiers) { + const specs = new Set(specifiers); + if (name === "alpha") + return function define(runtime, observer) { + const main = runtime.module(); + main.variable(observer("a")).define("a", function() { + return 100; + }); + main.variable(observer("b")).define("b", function() { + return 200; + }); + main.variable(observer("c")).define("c", ["a", "b"], function(a, b) { + return a + b; + }); + return main; + }; + if (name === "delta") + return function define(runtime, observer) { + const main = runtime.module(); + main.variable(observer("d")).define("d", function() { + return 1000; + }); + main.variable(observer("e")).define("e", function() { + return 2000; + }); + main.variable(observer("f")).define("f", ["d", "e"], function(d, e) { + return d - e; + }); + return main; + }; + } + + const interpret = new Interpreter({ resolveImportPath }); + let runtime = new Runtime(); + let main = runtime.module(); + let observer = () => null; + + const alpha = await interpret.cell( + `import {a as A, b as B, c as C} from "alpha";`, + main, + observer + ); + + t.equals(alpha.length, 4); + + // the first is the unnamed "markdown" import cell + t.equals(alpha[0]._name, null); + t.equals(alpha[1]._name, "A"); + t.equals(alpha[2]._name, "B"); + t.equals(alpha[3]._name, "C"); + t.equals(await main.value("A"), 100); + t.equals(await main.value("B"), 200); + t.equals(await main.value("C"), 300); + + runtime.dispose(); + + // fresh runtime/module for next stuff + runtime = new Runtime(); + main = runtime.module(); + + const program = await interpret.module( + ` + import {c as C} from "alpha"; + + import {f as F} with {C as d} from "delta"; + `, + main, + observer + ); + + t.equals(program.length, 2); + t.equals(program[0].length, 2); + t.equals(program[0][0]._name, null); + t.equals(program[0][1]._name, "C"); + t.equals(program[1].length, 2); + t.equals(program[1][0]._name, null); + t.equals(program[1][1]._name, "F"); + // a=100, b=200, C = a + b + t.equals(await main.value("C"), 300); + // d=300 (C), e=2000, f=d-e + t.equals(await main.value("F"), -1700); + + t.end(); +}); + +test("Interpreter: resolveImportPath specifiers", async t => { + function resolveImportPath(name, specifiers) { + t.plan(1); + return function define(runtime, observer) { + t.deepEquals(specifiers, ["a", "b", "x"]); + return main; + }; + } + const interpret = new Interpreter({ resolveImportPath }); + let runtime = new Runtime(); + let main = runtime.module(); + let observer = () => null; + + await interpret.cell( + `import {a as A, b as B, x as X} from "alpha";`, + main, + observer + ); + t.end(); +}); + +test("Interpreter: defineImportMarkdown", async t => { + function resolveImportPath(name) { + return function define(runtime, observer) { + const main = runtime.module(); + main.variable(observer("a")).define("a", function() { + return 100; + }); + return main; + }; + } + + let interpret = new Interpreter({ + resolveImportPath, + defineImportMarkdown: true + }); + let runtime = new Runtime(); + let main = runtime.module(); + let observer = () => null; + + let a = await interpret.cell("import {a} from 'whatever';", main, observer); + + t.equals(a.length, 2); + t.equals(a[0]._name, null); + t.equals(a[0]._inputs[0]._name, "md"); + t.equals(a[1]._name, "a"); + + runtime.dispose(); + + interpret = new Interpreter({ + resolveImportPath, + defineImportMarkdown: false + }); + runtime = new Runtime(); + main = runtime.module(); + + a = await interpret.cell("import {a} from 'whatever';", main, observer); + + t.equals(a.length, 1); + t.equals(a[0]._name, "a"); + + t.end(); +}); + +test("Interpreter: observeViewofValues", async t => { + let aObserved = false; + let bObserved = false; + + let interpret = new Interpreter({ + observeViewofValues: true + }); + let runtime = new Runtime(); + let main = runtime.module(); + + function observerA(name) { + if (name === "a") aObserved = true; + } + + await interpret.cell( + "viewof a = ({value: 100, addEventListener: () => {}, removeEventListener: () => {}})", + main, + observerA + ); + + t.true(aObserved); + t.equals(await main.value("a"), 100); + runtime.dispose(); + + interpret = new Interpreter({ + observeViewofValues: false + }); + runtime = new Runtime(); + main = runtime.module(); + + function observerB(name) { + if (name === "b") bObserved = true; + } + + await interpret.cell( + "viewof b = ({value: 200, addEventListener: () => {}})", + main, + observerB + ); + + t.false(bObserved); + t.equals(await main.value("b"), 200); + + t.end(); +}); + +test("Interpreter: observeMutableValues", async t => { + let aObserved = false; + let bObserved = false; + + let interpret = new Interpreter({ + observeMutableValues: true + }); + let runtime = new Runtime(); + let main = runtime.module(); + + function observerA(name) { + if (name === "a") aObserved = true; + } + + await interpret.cell("mutable a = 0x100", main, observerA); + + t.true(aObserved); + t.equals(await main.value("a"), 0x100); + runtime.dispose(); + + interpret = new Interpreter({ + observeMutableValues: false + }); + runtime = new Runtime(); + main = runtime.module(); + + function observerB(name) { + if (name === "b") bObserved = true; + } + + await interpret.cell("mutable b = 0x200", main, observerB); + + t.false(bObserved); + t.equals(await main.value("b"), 0x200); + + t.end(); +}); + +// TODO: resolveFileAttachments test. diff --git a/packages/ojs/external-asg017-unofficial-observablehq-compiler/test/test.html b/packages/ojs/external-asg017-unofficial-observablehq-compiler/test/test.html new file mode 100644 index 00000000000..897ca7433a3 --- /dev/null +++ b/packages/ojs/external-asg017-unofficial-observablehq-compiler/test/test.html @@ -0,0 +1,144 @@ + + + + + + + +
+ + diff --git a/packages/ojs/external-asg017-unofficial-observablehq-compiler/test/test_ES_module.html b/packages/ojs/external-asg017-unofficial-observablehq-compiler/test/test_ES_module.html new file mode 100644 index 00000000000..9d5081f50c2 --- /dev/null +++ b/packages/ojs/external-asg017-unofficial-observablehq-compiler/test/test_ES_module.html @@ -0,0 +1,154 @@ + + + + + + + +
+ + diff --git a/packages/ojs/external-asg017-unofficial-observablehq-compiler/test/test_cell.html b/packages/ojs/external-asg017-unofficial-observablehq-compiler/test/test_cell.html new file mode 100644 index 00000000000..c3a6d6bb3d3 --- /dev/null +++ b/packages/ojs/external-asg017-unofficial-observablehq-compiler/test/test_cell.html @@ -0,0 +1,76 @@ + + + + + + + +
+ + diff --git a/packages/ojs/external-asg017-unofficial-observablehq-compiler/test/test_notebook_json.html b/packages/ojs/external-asg017-unofficial-observablehq-compiler/test/test_notebook_json.html new file mode 100644 index 00000000000..0684c9a31f0 --- /dev/null +++ b/packages/ojs/external-asg017-unofficial-observablehq-compiler/test/test_notebook_json.html @@ -0,0 +1,120 @@ + + + + + + + +
+ + diff --git a/packages/ojs/external-d3-d3-require/.eslintrc.json b/packages/ojs/external-d3-d3-require/.eslintrc.json new file mode 100644 index 00000000000..5b00223a664 --- /dev/null +++ b/packages/ojs/external-d3-d3-require/.eslintrc.json @@ -0,0 +1,15 @@ +{ + "extends": "eslint:recommended", + "parserOptions": { + "sourceType": "module", + "ecmaVersion": 8 + }, + "env": { + "browser": true, + "es6": true + }, + "rules": { + "semi": 2, + "no-cond-assign": 0 + } +} diff --git a/packages/ojs/external-d3-d3-require/.gitignore b/packages/ojs/external-d3-d3-require/.gitignore new file mode 100644 index 00000000000..8abcf6a8869 --- /dev/null +++ b/packages/ojs/external-d3-d3-require/.gitignore @@ -0,0 +1,5 @@ +*.sublime-workspace +.DS_Store +dist/ +node_modules +npm-debug.log diff --git a/packages/ojs/external-d3-d3-require/LICENSE b/packages/ojs/external-d3-d3-require/LICENSE new file mode 100644 index 00000000000..9609770ca0e --- /dev/null +++ b/packages/ojs/external-d3-d3-require/LICENSE @@ -0,0 +1,13 @@ +Copyright 2017-2022 Observable, Inc. + +Permission to use, copy, modify, and/or distribute this software for any purpose +with or without fee is hereby granted, provided that the above copyright notice +and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS +OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF +THIS SOFTWARE. diff --git a/packages/ojs/external-d3-d3-require/README.md b/packages/ojs/external-d3-d3-require/README.md new file mode 100644 index 00000000000..72173bd2671 --- /dev/null +++ b/packages/ojs/external-d3-d3-require/README.md @@ -0,0 +1,111 @@ +# @quarto/external-d3-d3-require: a fork of https://github.com/d3/d3-require + +This fork changes d3-require to work better in the presence of other javascript importers that might hijack window.define. +This comes up in [quarto](https://quarto.org) specifically when using Jupyter's HTMLWidgets. + +# d3-require + +A minimal, promise-based implementation to require [asynchronous module definitions](https://github.com/amdjs/amdjs-api/blob/master/AMD.md) (AMD). This implementation is [small](https://github.com/d3/d3-require/blob/main/src/index.mjs) and supports a strict subset of AMD. It is designed to work with browser-targeting libraries that implement one of the [recommended UMD patterns](https://github.com/umdjs/umd). The constraints of this implementation are: + +* The `define` method must be called synchronously by the library on load. + +* Only the built-in `exports` and `module` dependencies are allowed; no `require` as in CommonJS. The `module` entry only contains an `exports` property. + +* Named module definitions (*e.g.*, jQuery) are treated as anonymous modules. + +By default, [d3.require](#require) loads modules from [jsDelivr](https://jsdelivr.com/); the module *name* can be any package (or scoped package) name optionally followed by the at sign (@) and a semver range. For example, `d3.require("d3@5")` loads the highest version of [D3](https://d3js.org) 5.x. Relative paths and absolute URLs are also supported. You can change this behavior using [d3.requireFrom](#requireFrom). + +## Installing + +If you use NPM, `npm install d3-require`. Otherwise, download the [latest release](https://github.com/d3/d3-require/releases/latest). You can also load directly from [jsDelivr](https://www.jsdelivr.com/package/npm/d3-require). AMD, CommonJS, and vanilla environments are supported. In vanilla, `d3` and `define` globals are exported: + +```html + + +``` + +## API Reference + +# d3.require(names…) [<>](https://github.com/d3/d3-require/blob/main/src/index.mjs "Source") + +To load a module: + +```js +d3.require("d3-array").then(d3 => { + console.log(d3.range(100)); +}); +``` + +To load a module within a version range: + +```js +d3.require("d3-array@1").then(d3 => { + console.log(d3.range(100)); +}); +``` + +To load two modules and merge them into a single object: + +```js +d3.require("d3-array", "d3-color").then(d3 => { + console.log(d3.range(360).map(h => d3.hsl(h, 1, 0.5))); +}); +``` + +Note: if more than one *name* is specified, the promise will yield a new object with each of the loaded module’s own enumerable property values copied into the new object. If multiple modules define the same property name, the value from the latest module that defines the property is used; it is recommended that you only combine modules that avoid naming conflicts. + +If a module’s property value is null or undefined on load, such as [d3.event](https://github.com/d3/d3-selection/blob/main/README.md#event), the value will be exposed via [getter](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/get) rather than copied; this is to simulate ES module-style [live bindings](http://2ality.com/2015/07/es6-module-exports.html). However, property values that are neither null nor undefined on load are copied by value assignment, and thus **are not live bindings**! + +# d3.requireFrom(resolver) [<>](https://github.com/d3/d3-require/blob/main/src/index.mjs "Source") + +Returns a new [require function](#require) which loads modules from the specified *resolver*, which is a function that takes a module name and returns the corresponding URL. For example: + +```js +const myRequire = d3.requireFrom(async name => { + return `https://unpkg.com/${name}`; +}); + +myRequire("d3-array").then(d3 => { + console.log(d3.range(100)); +}); +``` + +The returned *require* function exposes the passed in *resolver* as [*require*.resolve](#require_resolve). See also [resolveFrom](#resolveFrom). + +# require.resolve(name[, base]) [<>](https://github.com/d3/d3-require/blob/main/src/index.mjs "Source") + +Returns a promise to the URL to load the module with the specified *name*. The *name* may also be specified as a relative path, in which case it is resolved relative to the specified *base* URL. If *base* is not specified, it defaults to the global [location](https://developer.mozilla.org/en-US/docs/Web/API/Window/location). + +# require.alias(aliases) [<>](https://github.com/d3/d3-require/blob/main/src/index.mjs "Source") + +Returns a [require function](#require) with the specified *aliases*. For each key in the specified *aliases* object, any require of that key is substituted with the corresponding value. The values can be strings representing the name or URL of the module to load, or a literal non-string value for direct substitution. For example, if `React` and `ReactDOM` are already in-scope, you can say: + +```js +const myRequire = d3.require.alias({ + "react": React, + "react-dom": ReactDOM +}); + +myRequire("semiotic").then(Semiotic => { + console.log(Semiotic); +}); +``` + +# d3.resolveFrom(origin, mains) [<>](https://github.com/d3/d3-require/blob/main/src/index.mjs "Source") + +Returns a new [resolver function](#require_resolve) which loads modules from the specified *origin* and observes the specified *mains* entry points. The returned function can be passed to [requireFrom](#requireFrom). For example: + +```js +const myResolve = d3.resolveFrom(`https://unpkg.com/${name}`); +const myRequire = d3.requireFrom(myResolve); +``` + +# d3.RequireError + +The class of error that may be thrown by require. diff --git a/packages/ojs/external-d3-d3-require/d3-require.sublime-project b/packages/ojs/external-d3-d3-require/d3-require.sublime-project new file mode 100644 index 00000000000..772dfa53016 --- /dev/null +++ b/packages/ojs/external-d3-d3-require/d3-require.sublime-project @@ -0,0 +1,17 @@ +{ + "folders": [ + { + "path": ".", + "file_exclude_patterns": ["*.sublime-workspace"], + "folder_exclude_patterns": ["dist"] + } + ], + "build_systems": [ + { + "name": "yarn test", + "cmd": ["yarn", "test"], + "file_regex": "\\((...*?):([0-9]*):([0-9]*)\\)", + "working_dir": "$project_path" + } + ] +} diff --git a/packages/ojs/external-d3-d3-require/package.json b/packages/ojs/external-d3-d3-require/package.json new file mode 100644 index 00000000000..74b6fd37744 --- /dev/null +++ b/packages/ojs/external-d3-d3-require/package.json @@ -0,0 +1,30 @@ +{ + "name": "external-d3-d3-require", + "version": "1.3.1", + "description": "A fork of d3/d3-require.", + "author": { + "name": "RStudio, PBC." + }, + "license": "ISC", + "main": "dist/d3-require.js", + "unpkg": "dist/d3-require.min.js", + "module": "src/index.mjs", + "repository": { + "type": "git", + "url": "https://github.com/quarto-dev/external-d3-d3-require.git" + }, + "files": [ + "dist/**/*.js", + "src/**/*.mjs" + ], + "scripts": { + "build": "rollup -c", + "test": "mocha -r module-alias/register 'test/**/*-test.mjs' && eslint --ext mjs src test", + "prepublishOnly": "rm -rf dist && rollup -c", + "postpublish": "git push && git push --tags" + }, + "_moduleAliases": { + "d3-require": "./src/index.mjs" + }, + "sideEffects": false +} diff --git a/packages/ojs/external-d3-d3-require/rollup.config.js b/packages/ojs/external-d3-d3-require/rollup.config.js new file mode 100644 index 00000000000..080c2d82626 --- /dev/null +++ b/packages/ojs/external-d3-d3-require/rollup.config.js @@ -0,0 +1,39 @@ +import {terser} from "rollup-plugin-terser"; +import * as meta from "./package.json"; + +const config = { + input: "src/index.mjs", + external: Object.keys(meta.dependencies || {}).filter(key => /^d3-/.test(key)), + output: { + file: `dist/${meta.name}.js`, + name: "d3", + format: "umd", + indent: false, + extend: true, + banner: `// ${meta.name} v${meta.version} Fork changes are Copyright ${(new Date).getFullYear()} ${meta.author.name}\n// Original package Copyright ${(new Date).getFullYear()} ObservableHQ.`, + globals: Object.assign({}, ...Object.keys(meta.dependencies || {}).filter(key => /^d3-/.test(key)).map(key => ({[key]: "d3"}))) + }, + plugins: [] +}; + +export default [ + config, + { + ...config, + output: { + ...config.output, + file: `dist/${meta.name}.min.js` + }, + plugins: [ + ...config.plugins, + terser({ + output: { + preamble: config.output.banner + }, + mangle: { + reserved: ["RequireError"] + } + }) + ] + } +]; diff --git a/packages/ojs/external-d3-d3-require/src/index.mjs b/packages/ojs/external-d3-d3-require/src/index.mjs new file mode 100644 index 00000000000..29a7b961a85 --- /dev/null +++ b/packages/ojs/external-d3-d3-require/src/index.mjs @@ -0,0 +1,181 @@ +const metas = new Map; +const queue = []; +const map = queue.map; +const some = queue.some; +const hasOwnProperty = queue.hasOwnProperty; +const identifierRe = /^((?:@[^/@]+\/)?[^/@]+)(?:@([^/]+))?(?:\/(.*))?$/; +const versionRe = /^\d+\.\d+\.\d+(-[\w-.+]+)?$/; +const extensionRe = /(?:\.[^/]*|\/)$/; + +export class RequireError extends Error { + constructor(message) { + super(message); + } +} + +RequireError.prototype.name = RequireError.name; + +function parseIdentifier(identifier) { + const match = identifierRe.exec(identifier); + return match && { + name: match[1], + version: match[2], + path: match[3] + }; +} + +export function resolveFrom(origin = "https://cdn.jsdelivr.net/npm/", mains = ["unpkg", "jsdelivr", "browser", "main"]) { + if (!/\/$/.test(origin)) throw new Error("origin lacks trailing slash"); + + function main(meta) { + for (const key of mains) { + let value = meta[key]; + if (typeof value === "string") { + if (value.startsWith("./")) value = value.slice(2); + return extensionRe.test(value) ? value : `${value}.js`; + } + } + } + + function resolveMeta(target) { + const url = `${origin}${target.name}${target.version ? `@${target.version}` : ""}/package.json`; + let meta = metas.get(url); + if (!meta) metas.set(url, meta = fetch(url).then(response => { + if (!response.ok) throw new RequireError("unable to load package.json"); + if (response.redirected && !metas.has(response.url)) metas.set(response.url, meta); + return response.json(); + })); + return meta; + } + + return async function resolve(name, base) { + if (name.startsWith(origin)) name = name.substring(origin.length); + if (/^(\w+:)|\/\//i.test(name)) return name; + if (/^[.]{0,2}\//i.test(name)) return new URL(name, base == null ? location : base).href; + if (!name.length || /^[\s._]/.test(name) || /\s$/.test(name)) throw new RequireError("illegal name"); + const target = parseIdentifier(name); + if (!target) return `${origin}${name}`; + if (!target.version && base != null && base.startsWith(origin)) { + const meta = await resolveMeta(parseIdentifier(base.substring(origin.length))); + target.version = meta.dependencies && meta.dependencies[target.name] || meta.peerDependencies && meta.peerDependencies[target.name]; + } + if (target.path && !extensionRe.test(target.path)) target.path += ".js"; + if (target.path && target.version && versionRe.test(target.version)) return `${origin}${target.name}@${target.version}/${target.path}`; + const meta = await resolveMeta(target); + return `${origin}${meta.name}@${meta.version}/${target.path || main(meta) || "index.js"}`; + }; +} + +export var require = requireFrom(resolveFrom()); +let requestsInFlight = 0; +let prevDefine = undefined; + +export function requireFrom(resolver) { + const cache = new Map; + const requireBase = requireRelative(null); + + function requireAbsolute(url) { + if (typeof url !== "string") return url; + let module = cache.get(url); + if (!module) cache.set(url, module = new Promise((resolve, reject) => { + const script = document.createElement("script"); + script.onload = () => { + try { resolve(queue.pop()(requireRelative(url))); } + catch (error) { reject(new RequireError("invalid module")); } + script.remove(); + requestsInFlight--; + if (requestsInFlight === 0) { + window.define = prevDefine; + } + }; + script.onerror = () => { + reject(new RequireError("unable to load module")); + script.remove(); + requestsInFlight--; + if (requestsInFlight === 0) { + window.define = prevDefine; + } + }; + script.async = true; + script.src = url; + if (requestsInFlight === 0) { + prevDefine = window.define; + window.define = define; + } + requestsInFlight++; + + document.head.appendChild(script); + })); + return module; + } + + function requireRelative(base) { + return name => Promise.resolve(resolver(name, base)).then(requireAbsolute); + } + + function requireAlias(aliases) { + return requireFrom((name, base) => { + if (name in aliases) { + name = aliases[name], base = null; + if (typeof name !== "string") return name; + } + return resolver(name, base); + }); + } + + function require(name) { + return arguments.length > 1 + ? Promise.all(map.call(arguments, requireBase)).then(merge) + : requireBase(name); + } + + require.alias = requireAlias; + require.resolve = resolver; + + return require; +} + +function merge(modules) { + const o = {}; + for (const m of modules) { + for (const k in m) { + if (hasOwnProperty.call(m, k)) { + if (m[k] == null) Object.defineProperty(o, k, {get: getter(m, k)}); + else o[k] = m[k]; + } + } + } + return o; +} + +function getter(object, name) { + return () => object[name]; +} + +function isbuiltin(name) { + name = name + ""; + return name === "exports" || name === "module"; +} + +function define(name, dependencies, factory) { + const n = arguments.length; + if (n < 2) factory = name, dependencies = []; + else if (n < 3) factory = dependencies, dependencies = typeof name === "string" ? [] : name; + queue.push(some.call(dependencies, isbuiltin) ? require => { + const exports = {}; + const module = {exports}; + return Promise.all(map.call(dependencies, name => { + name = name + ""; + return name === "exports" ? exports : name === "module" ? module : require(name); + })).then(dependencies => { + factory.apply(null, dependencies); + return module.exports; + }); + } : require => { + return Promise.all(map.call(dependencies, require)).then(dependencies => { + return typeof factory === "function" ? factory.apply(null, dependencies) : factory; + }); + }); +} + +define.amd = {}; diff --git a/packages/ojs/external-d3-d3-require/test/.eslintrc.json b/packages/ojs/external-d3-d3-require/test/.eslintrc.json new file mode 100644 index 00000000000..f7b875acdd6 --- /dev/null +++ b/packages/ojs/external-d3-d3-require/test/.eslintrc.json @@ -0,0 +1,6 @@ +{ + "env": { + "mocha": true, + "node": true + } +} diff --git a/packages/ojs/external-d3-d3-require/test/data/cdn.jsdelivr.net/npm/d3-array@2/package.json b/packages/ojs/external-d3-d3-require/test/data/cdn.jsdelivr.net/npm/d3-array@2/package.json new file mode 100644 index 00000000000..9cd53ff770e --- /dev/null +++ b/packages/ojs/external-d3-d3-require/test/data/cdn.jsdelivr.net/npm/d3-array@2/package.json @@ -0,0 +1,53 @@ +{ + "name": "d3-array", + "version": "2.12.1", + "description": "Array manipulation, ordering, searching, summarizing, etc.", + "keywords": [ + "d3", + "d3-module", + "histogram", + "bisect", + "shuffle", + "statistics", + "search", + "sort", + "array" + ], + "homepage": "https://d3js.org/d3-array/", + "license": "BSD-3-Clause", + "author": { + "name": "Mike Bostock", + "url": "http://bost.ocks.org/mike" + }, + "main": "dist/d3-array.js", + "unpkg": "dist/d3-array.min.js", + "module": "src/index.js", + "repository": { + "type": "git", + "url": "https://github.com/d3/d3-array.git" + }, + "files": [ + "dist/**/*.js", + "src/**/*.js" + ], + "scripts": { + "pretest": "rollup -c", + "test": "./test/run.sh", + "prepublishOnly": "rm -rf dist && yarn test", + "postpublish": "git push && git push --tags && cd ../d3.github.com && git pull && cp ../${npm_package_name}/dist/${npm_package_name}.js ${npm_package_name}.v${npm_package_version%%.*}.js && cp ../${npm_package_name}/dist/${npm_package_name}.min.js ${npm_package_name}.v${npm_package_version%%.*}.min.js && git add ${npm_package_name}.v${npm_package_version%%.*}.js ${npm_package_name}.v${npm_package_version%%.*}.min.js && git commit -m \"${npm_package_name} ${npm_package_version}\" && git push && cd - && zip -j dist/${npm_package_name}.zip -- LICENSE README.md dist/${npm_package_name}.js dist/${npm_package_name}.min.js" + }, + "sideEffects": false, + "devDependencies": { + "@rollup/plugin-node-resolve": "11", + "d3-random": "2", + "eslint": "7", + "jsdom": "16", + "rollup": "2", + "rollup-plugin-terser": "7", + "tape": "4", + "tape-await": "0.1" + }, + "dependencies": { + "internmap": "^1.0.0" + } +} diff --git a/packages/ojs/external-d3-d3-require/test/data/cdn.jsdelivr.net/npm/d3-array@3/package.json b/packages/ojs/external-d3-d3-require/test/data/cdn.jsdelivr.net/npm/d3-array@3/package.json new file mode 100644 index 00000000000..fd7d125d1a0 --- /dev/null +++ b/packages/ojs/external-d3-d3-require/test/data/cdn.jsdelivr.net/npm/d3-array@3/package.json @@ -0,0 +1,61 @@ +{ + "name": "d3-array", + "version": "3.1.6", + "description": "Array manipulation, ordering, searching, summarizing, etc.", + "homepage": "https://d3js.org/d3-array/", + "repository": { + "type": "git", + "url": "https://github.com/d3/d3-array.git" + }, + "keywords": [ + "d3", + "d3-module", + "histogram", + "bisect", + "shuffle", + "statistics", + "search", + "sort", + "array" + ], + "license": "ISC", + "author": { + "name": "Mike Bostock", + "url": "http://bost.ocks.org/mike" + }, + "type": "module", + "files": [ + "dist/**/*.js", + "src/**/*.js" + ], + "module": "src/index.js", + "main": "src/index.js", + "jsdelivr": "dist/d3-array.min.js", + "unpkg": "dist/d3-array.min.js", + "exports": { + "umd": "./dist/d3-array.min.js", + "default": "./src/index.js" + }, + "sideEffects": false, + "dependencies": { + "internmap": "1 - 2" + }, + "devDependencies": { + "@rollup/plugin-node-resolve": "13", + "d3-dsv": "3", + "d3-random": "2 - 3", + "eslint": "8", + "jsdom": "19", + "mocha": "9", + "rollup": "2", + "rollup-plugin-terser": "7" + }, + "scripts": { + "test": "mocha 'test/**/*-test.js' && eslint src test", + "prepublishOnly": "rm -rf dist && yarn test && rollup -c", + "postpublish": "git push && git push --tags && cd ../d3.github.com && git pull && cp ../${npm_package_name}/dist/${npm_package_name}.js ${npm_package_name}.v${npm_package_version%%.*}.js && cp ../${npm_package_name}/dist/${npm_package_name}.min.js ${npm_package_name}.v${npm_package_version%%.*}.min.js && git add ${npm_package_name}.v${npm_package_version%%.*}.js ${npm_package_name}.v${npm_package_version%%.*}.min.js && git commit -m \"${npm_package_name} ${npm_package_version}\" && git push && cd -" + }, + "engines": { + "node": ">=12" + } +} diff --git a/packages/ojs/external-d3-d3-require/test/data/cdn.jsdelivr.net/npm/d3/package.json b/packages/ojs/external-d3-d3-require/test/data/cdn.jsdelivr.net/npm/d3/package.json new file mode 100644 index 00000000000..b07960ad53a --- /dev/null +++ b/packages/ojs/external-d3-d3-require/test/data/cdn.jsdelivr.net/npm/d3/package.json @@ -0,0 +1,85 @@ +{ + "name": "d3", + "version": "7.4.4", + "description": "Data-Driven Documents", + "homepage": "https://d3js.org", + "repository": { + "type": "git", + "url": "https://github.com/d3/d3.git" + }, + "keywords": [ + "d3", + "dom", + "visualization", + "svg", + "animation", + "canvas" + ], + "license": "ISC", + "author": { + "name": "Mike Bostock", + "url": "https://bost.ocks.org/mike" + }, + "type": "module", + "files": [ + "dist/**/*.js", + "src/**/*.js" + ], + "module": "src/index.js", + "main": "src/index.js", + "jsdelivr": "dist/d3.min.js", + "unpkg": "dist/d3.min.js", + "exports": { + "umd": "./dist/d3.min.js", + "default": "./src/index.js" + }, + "dependencies": { + "d3-array": "3", + "d3-axis": "3", + "d3-brush": "3", + "d3-chord": "3", + "d3-color": "3", + "d3-contour": "3", + "d3-delaunay": "6", + "d3-dispatch": "3", + "d3-drag": "3", + "d3-dsv": "3", + "d3-ease": "3", + "d3-fetch": "3", + "d3-force": "3", + "d3-format": "3", + "d3-geo": "3", + "d3-hierarchy": "3", + "d3-interpolate": "3", + "d3-path": "3", + "d3-polygon": "3", + "d3-quadtree": "3", + "d3-random": "3", + "d3-scale": "4", + "d3-scale-chromatic": "3", + "d3-selection": "3", + "d3-shape": "3", + "d3-time": "3", + "d3-time-format": "4", + "d3-timer": "3", + "d3-transition": "3", + "d3-zoom": "3" + }, + "devDependencies": { + "@rollup/plugin-json": "4", + "@rollup/plugin-node-resolve": "13", + "eslint": "8", + "mocha": "9", + "rollup": "2", + "rollup-plugin-ascii": "0.0", + "rollup-plugin-terser": "7" + }, + "scripts": { + "test": "mocha 'test/**/*-test.js' && eslint src test", + "prepublishOnly": "rm -rf dist && yarn test && rollup -c && git push", + "postpublish": "git push --tags && cd ../d3.github.com && git pull && cp ../d3/dist/d3.js d3.v${npm_package_version%%.*}.js && cp ../d3/dist/d3.min.js d3.v${npm_package_version%%.*}.min.js && git add d3.v${npm_package_version%%.*}.js d3.v${npm_package_version%%.*}.min.js && git commit -m \"d3 ${npm_package_version}\" && git push && cd -" + }, + "engines": { + "node": ">=12" + } +} diff --git a/packages/ojs/external-d3-d3-require/test/data/cdn.jsdelivr.net/npm/d3@7/package.json b/packages/ojs/external-d3-d3-require/test/data/cdn.jsdelivr.net/npm/d3@7/package.json new file mode 100644 index 00000000000..b07960ad53a --- /dev/null +++ b/packages/ojs/external-d3-d3-require/test/data/cdn.jsdelivr.net/npm/d3@7/package.json @@ -0,0 +1,85 @@ +{ + "name": "d3", + "version": "7.4.4", + "description": "Data-Driven Documents", + "homepage": "https://d3js.org", + "repository": { + "type": "git", + "url": "https://github.com/d3/d3.git" + }, + "keywords": [ + "d3", + "dom", + "visualization", + "svg", + "animation", + "canvas" + ], + "license": "ISC", + "author": { + "name": "Mike Bostock", + "url": "https://bost.ocks.org/mike" + }, + "type": "module", + "files": [ + "dist/**/*.js", + "src/**/*.js" + ], + "module": "src/index.js", + "main": "src/index.js", + "jsdelivr": "dist/d3.min.js", + "unpkg": "dist/d3.min.js", + "exports": { + "umd": "./dist/d3.min.js", + "default": "./src/index.js" + }, + "dependencies": { + "d3-array": "3", + "d3-axis": "3", + "d3-brush": "3", + "d3-chord": "3", + "d3-color": "3", + "d3-contour": "3", + "d3-delaunay": "6", + "d3-dispatch": "3", + "d3-drag": "3", + "d3-dsv": "3", + "d3-ease": "3", + "d3-fetch": "3", + "d3-force": "3", + "d3-format": "3", + "d3-geo": "3", + "d3-hierarchy": "3", + "d3-interpolate": "3", + "d3-path": "3", + "d3-polygon": "3", + "d3-quadtree": "3", + "d3-random": "3", + "d3-scale": "4", + "d3-scale-chromatic": "3", + "d3-selection": "3", + "d3-shape": "3", + "d3-time": "3", + "d3-time-format": "4", + "d3-timer": "3", + "d3-transition": "3", + "d3-zoom": "3" + }, + "devDependencies": { + "@rollup/plugin-json": "4", + "@rollup/plugin-node-resolve": "13", + "eslint": "8", + "mocha": "9", + "rollup": "2", + "rollup-plugin-ascii": "0.0", + "rollup-plugin-terser": "7" + }, + "scripts": { + "test": "mocha 'test/**/*-test.js' && eslint src test", + "prepublishOnly": "rm -rf dist && yarn test && rollup -c && git push", + "postpublish": "git push --tags && cd ../d3.github.com && git pull && cp ../d3/dist/d3.js d3.v${npm_package_version%%.*}.js && cp ../d3/dist/d3.min.js d3.v${npm_package_version%%.*}.min.js && git add d3.v${npm_package_version%%.*}.js d3.v${npm_package_version%%.*}.min.js && git commit -m \"d3 ${npm_package_version}\" && git push && cd -" + }, + "engines": { + "node": ">=12" + } +} diff --git a/packages/ojs/external-d3-d3-require/test/data/cdn.jsdelivr.net/npm/iconv-lite/package.json b/packages/ojs/external-d3-d3-require/test/data/cdn.jsdelivr.net/npm/iconv-lite/package.json new file mode 100644 index 00000000000..a7c74fcc299 --- /dev/null +++ b/packages/ojs/external-d3-d3-require/test/data/cdn.jsdelivr.net/npm/iconv-lite/package.json @@ -0,0 +1,46 @@ +{ + "name": "iconv-lite", + "description": "Convert character encodings in pure javascript.", + "version": "0.4.24", + "license": "MIT", + "keywords": [ + "iconv", + "convert", + "charset", + "icu" + ], + "author": "Alexander Shtuchkin ", + "main": "./lib/index.js", + "typings": "./lib/index.d.ts", + "homepage": "https://github.com/ashtuchkin/iconv-lite", + "bugs": "https://github.com/ashtuchkin/iconv-lite/issues", + "repository": { + "type": "git", + "url": "git://github.com/ashtuchkin/iconv-lite.git" + }, + "engines": { + "node": ">=0.10.0" + }, + "scripts": { + "coverage": "istanbul cover _mocha -- --grep .", + "coverage-open": "open coverage/lcov-report/index.html", + "test": "mocha --reporter spec --grep ." + }, + "browser": { + "./lib/extend-node": false, + "./lib/streams": false + }, + "devDependencies": { + "mocha": "^3.1.0", + "request": "~2.87.0", + "unorm": "*", + "errto": "*", + "async": "*", + "istanbul": "*", + "semver": "*", + "iconv": "*" + }, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + } +} diff --git a/packages/ojs/external-d3-d3-require/test/data/cdn.jsdelivr.net/npm/simple-statistics/package.json b/packages/ojs/external-d3-d3-require/test/data/cdn.jsdelivr.net/npm/simple-statistics/package.json new file mode 100644 index 00000000000..a691104b4df --- /dev/null +++ b/packages/ojs/external-d3-d3-require/test/data/cdn.jsdelivr.net/npm/simple-statistics/package.json @@ -0,0 +1,64 @@ +{ + "name": "simple-statistics", + "version": "6.0.0", + "description": "Simple Statistics", + "author": "Tom MacWright (http://macwright.org/)", + "repository": { + "type": "git", + "url": "git://github.com/simple-statistics/simple-statistics.git" + }, + "files": [ + "src", + "dist", + "index.js", + "index.d.ts" + ], + "devDependencies": { + "are-we-flow-yet": "^1.0.0", + "cz-conventional-changelog": "^2.0.0", + "documentation": "^6.0.0", + "eslint": "^4.1.0", + "flow-bin": "^0.71.0", + "jsdoctest": "^1.7.1", + "mocha": "^5.0.0", + "random-js": "^1.0.4", + "rollup": "^0.58.0", + "rollup-plugin-uglify": "^3.0.0", + "standard-version": "^4.0.0", + "tap": "^11.0.0", + "typescript": "^2.5.3", + "uglify-js": "^3.0.0" + }, + "scripts": { + "release": "standard-version && sh ./scripts/update_website.sh", + "pretest": "npm run build", + "test": "npm run lint && tap --coverage test/*.test.js --jobs=4 && npm run jsdoctest", + "build": "rm -rf dist && mkdir dist && rollup -c", + "prepublish": "npm run build && ./scripts/update_readme.js", + "prelint": "are-we-flow-yet src && flow check src && tsc", + "lint": "eslint index.js src test", + "postlint": "documentation lint src", + "jsdoctest": "mocha --require jsdoctest dist/simple-statistics.js" + }, + "main": "dist/simple-statistics.js", + "module": "dist/simple-statistics.mjs", + "browser": "dist/simple-statistics.min.js", + "types": "index.d.ts", + "engines": { + "node": "*" + }, + "license": "ISC", + "keywords": [ + "descriptive", + "linear", + "math", + "probability", + "regression", + "statistics" + ], + "config": { + "commitizen": { + "path": "./node_modules/cz-conventional-changelog" + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-d3-d3-require/test/data/unpkg.com b/packages/ojs/external-d3-d3-require/test/data/unpkg.com new file mode 120000 index 00000000000..5871679aa77 --- /dev/null +++ b/packages/ojs/external-d3-d3-require/test/data/unpkg.com @@ -0,0 +1 @@ +cdn.jsdelivr.net/npm \ No newline at end of file diff --git a/packages/ojs/external-d3-d3-require/test/fetch.mjs b/packages/ojs/external-d3-d3-require/test/fetch.mjs new file mode 100644 index 00000000000..15a806175a4 --- /dev/null +++ b/packages/ojs/external-d3-d3-require/test/fetch.mjs @@ -0,0 +1,39 @@ +import {promises as fs} from "fs"; +import * as path from "path"; + +export default function fetchit(description, run) { + return it(description, withFetch(run)); +} + +fetchit.skip = (description, run) => { + return it.skip(description, withFetch(run)); +}; + +fetchit.only = (description, run) => { + return it.only(description, withFetch(run)); +}; + +function withFetch(run) { + return async () => { + global.fetch = async (href) => new Response(path.resolve("./test/data", href.replace(/^https:\/\//, ""))); + try { + return await run(); + } finally { + delete global.fetch; + } + }; +} + +class Response { + constructor(href) { + this._href = href; + this.ok = true; + this.status = 200; + } + async text() { + return fs.readFile(this._href, {encoding: "utf-8"}); + } + async json() { + return JSON.parse(await this.text()); + } +} diff --git a/packages/ojs/external-d3-d3-require/test/index-test.mjs b/packages/ojs/external-d3-d3-require/test/index-test.mjs new file mode 100644 index 00000000000..4fa029ef6fe --- /dev/null +++ b/packages/ojs/external-d3-d3-require/test/index-test.mjs @@ -0,0 +1,86 @@ +import * as d3 from "../src/index.mjs"; +import it from "./fetch.mjs"; +import assert from "assert"; + +const {resolveFrom} = d3; + +it("resolveFrom() defaults to jsDelivr", async () => { + const resolve1 = resolveFrom(); + assert.strictEqual(await resolve1("d3"), "https://cdn.jsdelivr.net/npm/d3@7.4.4/dist/d3.min.js"); + assert.strictEqual(await resolve1("d3/dist/d3.min.js"), "https://cdn.jsdelivr.net/npm/d3@7.4.4/dist/d3.min.js"); + assert.strictEqual(await resolve1("d3@7"), "https://cdn.jsdelivr.net/npm/d3@7.4.4/dist/d3.min.js"); + assert.strictEqual(await resolve1("d3@7/dist/d3.min.js"), "https://cdn.jsdelivr.net/npm/d3@7.4.4/dist/d3.min.js"); + assert.strictEqual(await resolve1("d3@7.4.4/dist/d3.min.js"), "https://cdn.jsdelivr.net/npm/d3@7.4.4/dist/d3.min.js"); + const resolve2 = resolveFrom(undefined); + assert.strictEqual(await resolve2("d3@7.4.4/dist/d3.min.js"), "https://cdn.jsdelivr.net/npm/d3@7.4.4/dist/d3.min.js"); +}); + +it("resolveFrom(origin) respects the specified origin", async () => { + const resolve1 = resolveFrom("https://unpkg.com/"); + assert.strictEqual(await resolve1("d3"), "https://unpkg.com/d3@7.4.4/dist/d3.min.js"); + assert.strictEqual(await resolve1("d3/dist/d3.min.js"), "https://unpkg.com/d3@7.4.4/dist/d3.min.js"); + assert.strictEqual(await resolve1("d3@7"), "https://unpkg.com/d3@7.4.4/dist/d3.min.js"); + assert.strictEqual(await resolve1("d3@7/dist/d3.min.js"), "https://unpkg.com/d3@7.4.4/dist/d3.min.js"); + assert.strictEqual(await resolve1("d3@7.4.4/dist/d3.min.js"), "https://unpkg.com/d3@7.4.4/dist/d3.min.js"); + const resolve2 = resolveFrom("https://cdn.jsdelivr.net/npm/"); + assert.strictEqual(await resolve2("d3"), "https://cdn.jsdelivr.net/npm/d3@7.4.4/dist/d3.min.js"); + assert.strictEqual(await resolve2("d3/dist/d3.min.js"), "https://cdn.jsdelivr.net/npm/d3@7.4.4/dist/d3.min.js"); + assert.strictEqual(await resolve2("d3@7"), "https://cdn.jsdelivr.net/npm/d3@7.4.4/dist/d3.min.js"); + assert.strictEqual(await resolve2("d3@7/dist/d3.min.js"), "https://cdn.jsdelivr.net/npm/d3@7.4.4/dist/d3.min.js"); + assert.strictEqual(await resolve2("d3@7.4.4/dist/d3.min.js"), "https://cdn.jsdelivr.net/npm/d3@7.4.4/dist/d3.min.js"); +}); + +it("resolveFrom(origin) requires the origin to have a trailing slash", async () => { + assert.throws(() => resolveFrom("https://unpkg.com"), /origin lacks trailing slash/); +}); + +it("resolve(name) adds the file extension if necessary", async () => { + const resolve = resolveFrom(); + assert.strictEqual(await resolve("d3/dist/d3"), "https://cdn.jsdelivr.net/npm/d3@7.4.4/dist/d3.js"); + assert.strictEqual(await resolve("d3/dist/d3"), "https://cdn.jsdelivr.net/npm/d3@7.4.4/dist/d3.js"); + assert.strictEqual(await resolve("d3@7.4.4/dist/d3"), "https://cdn.jsdelivr.net/npm/d3@7.4.4/dist/d3.js"); +}); + +it("resolve(name) does not add the file extension if not necessary", async () => { + const resolve = resolveFrom(); + assert.strictEqual(await resolve("d3/dist/d3.js"), "https://cdn.jsdelivr.net/npm/d3@7.4.4/dist/d3.js"); + assert.strictEqual(await resolve("d3/dist/d3.js"), "https://cdn.jsdelivr.net/npm/d3@7.4.4/dist/d3.js"); + assert.strictEqual(await resolve("d3@7/dist/d3.min"), "https://cdn.jsdelivr.net/npm/d3@7.4.4/dist/d3.min"); + assert.strictEqual(await resolve("d3@7/dist/d3.min"), "https://cdn.jsdelivr.net/npm/d3@7.4.4/dist/d3.min"); + assert.strictEqual(await resolve("d3@7/dist/d3/"), "https://cdn.jsdelivr.net/npm/d3@7.4.4/dist/d3/"); + assert.strictEqual(await resolve("d3@7/dist/d3/"), "https://cdn.jsdelivr.net/npm/d3@7.4.4/dist/d3/"); + assert.strictEqual(await resolve("d3@7.4.4/dist/d3.js"), "https://cdn.jsdelivr.net/npm/d3@7.4.4/dist/d3.js"); + assert.strictEqual(await resolve("d3@7.4.4/dist/d3.min"), "https://cdn.jsdelivr.net/npm/d3@7.4.4/dist/d3.min"); + assert.strictEqual(await resolve("d3@7.4.4/dist/d3/"), "https://cdn.jsdelivr.net/npm/d3@7.4.4/dist/d3/"); +}); + +it("resolve(name) supports the browser entry point by default", async () => { + const resolve = resolveFrom(); + assert.strictEqual(await resolve("simple-statistics"), "https://cdn.jsdelivr.net/npm/simple-statistics@6.0.0/dist/simple-statistics.min.js"); +}); + +it("resolve(name) respects the specified main entry points, in order", async () => { + const resolve1 = resolveFrom(undefined, ["main"]); + assert.strictEqual(await resolve1("simple-statistics"), "https://cdn.jsdelivr.net/npm/simple-statistics@6.0.0/dist/simple-statistics.js"); + const resolve2 = resolveFrom(undefined, ["browser", "main"]); + assert.strictEqual(await resolve2("simple-statistics"), "https://cdn.jsdelivr.net/npm/simple-statistics@6.0.0/dist/simple-statistics.min.js"); + const resolve3 = resolveFrom(undefined, ["main", "browser"]); + assert.strictEqual(await resolve3("simple-statistics"), "https://cdn.jsdelivr.net/npm/simple-statistics@6.0.0/dist/simple-statistics.js"); +}); + +it("resolve(name) ignores entry points that aren’t strings, and strips leading dot-slash", async () => { + const resolve = resolveFrom(); + assert.strictEqual(await resolve("iconv-lite"), "https://cdn.jsdelivr.net/npm/iconv-lite@0.4.24/lib/index.js"); +}); + +it("resolve(name, base) uses the base dependency version if a version is not specified", async () => { + const resolve = resolveFrom(); + assert.strictEqual(await resolve("d3-array", "https://cdn.jsdelivr.net/npm/d3@7/dist/d3.js"), "https://cdn.jsdelivr.net/npm/d3-array@3.1.6/dist/d3-array.min.js"); + assert.strictEqual(await resolve("d3-array/dist/d3-array.js", "https://cdn.jsdelivr.net/npm/d3@7/dist/d3.js"), "https://cdn.jsdelivr.net/npm/d3-array@3.1.6/dist/d3-array.js"); +}); + +it("resolve(name, base) ignores the base dependency version if a version is specified", async () => { + const resolve = resolveFrom(); + assert.strictEqual(await resolve("d3-array@2", "https://cdn.jsdelivr.net/npm/d3@7/dist/d3.js"), "https://cdn.jsdelivr.net/npm/d3-array@2.12.1/dist/d3-array.min.js"); + assert.strictEqual(await resolve("d3-array@2/dist/d3-array.js", "https://cdn.jsdelivr.net/npm/d3@7/dist/d3.js"), "https://cdn.jsdelivr.net/npm/d3-array@2.12.1/dist/d3-array.js"); +}); diff --git a/packages/ojs/external-d3-d3-require/test/test-cellauto.html b/packages/ojs/external-d3-d3-require/test/test-cellauto.html new file mode 100644 index 00000000000..0cf7d727531 --- /dev/null +++ b/packages/ojs/external-d3-d3-require/test/test-cellauto.html @@ -0,0 +1,9 @@ + + + diff --git a/packages/ojs/external-d3-d3-require/test/test-dependency.html b/packages/ojs/external-d3-d3-require/test/test-dependency.html new file mode 100644 index 00000000000..5b551287dfe --- /dev/null +++ b/packages/ojs/external-d3-d3-require/test/test-dependency.html @@ -0,0 +1,9 @@ + + + diff --git a/packages/ojs/external-d3-d3-require/test/test-error.html b/packages/ojs/external-d3-d3-require/test/test-error.html new file mode 100644 index 00000000000..dd47f229372 --- /dev/null +++ b/packages/ojs/external-d3-d3-require/test/test-error.html @@ -0,0 +1,9 @@ + + + diff --git a/packages/ojs/external-d3-d3-require/test/test-getter.html b/packages/ojs/external-d3-d3-require/test/test-getter.html new file mode 100644 index 00000000000..9d422117865 --- /dev/null +++ b/packages/ojs/external-d3-d3-require/test/test-getter.html @@ -0,0 +1,13 @@ + + + diff --git a/packages/ojs/external-d3-d3-require/test/test-jquery.html b/packages/ojs/external-d3-d3-require/test/test-jquery.html new file mode 100644 index 00000000000..fca173a7223 --- /dev/null +++ b/packages/ojs/external-d3-d3-require/test/test-jquery.html @@ -0,0 +1,9 @@ + + + diff --git a/packages/ojs/external-d3-d3-require/test/test-module.html b/packages/ojs/external-d3-d3-require/test/test-module.html new file mode 100644 index 00000000000..2b5e3397f06 --- /dev/null +++ b/packages/ojs/external-d3-d3-require/test/test-module.html @@ -0,0 +1,13 @@ + + + diff --git a/packages/ojs/external-d3-d3-require/test/test.html b/packages/ojs/external-d3-d3-require/test/test.html new file mode 100644 index 00000000000..6eb9916334d --- /dev/null +++ b/packages/ojs/external-d3-d3-require/test/test.html @@ -0,0 +1,17 @@ + + + diff --git a/packages/ojs/external-observablehq-parser/.eslintignore b/packages/ojs/external-observablehq-parser/.eslintignore new file mode 100644 index 00000000000..39c3d7c979c --- /dev/null +++ b/packages/ojs/external-observablehq-parser/.eslintignore @@ -0,0 +1,2 @@ +dist/ +test/input/ diff --git a/packages/ojs/external-observablehq-parser/.eslintrc.json b/packages/ojs/external-observablehq-parser/.eslintrc.json new file mode 100644 index 00000000000..1736e1bcf2c --- /dev/null +++ b/packages/ojs/external-observablehq-parser/.eslintrc.json @@ -0,0 +1,18 @@ +{ + "extends": "eslint:recommended", + "parserOptions": { + "sourceType": "module", + "ecmaVersion": 2020 + }, + "env": { + "es6": true, + "node": true + }, + "rules": { + "no-cond-assign": 0, + "no-var": 2, + "comma-dangle": ["error", "never"], + "semi": [2, "always"], + "quotes": ["error", "double", {"allowTemplateLiterals": true}] + } +} diff --git a/packages/ojs/external-observablehq-parser/.gitignore b/packages/ojs/external-observablehq-parser/.gitignore new file mode 100644 index 00000000000..0c1f9000a56 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/.gitignore @@ -0,0 +1,3 @@ +.DS_Store +dist/ +node_modules/ diff --git a/packages/ojs/external-observablehq-parser/LICENSE b/packages/ojs/external-observablehq-parser/LICENSE new file mode 100644 index 00000000000..cf16bc44598 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/LICENSE @@ -0,0 +1,13 @@ +Copyright 2018 Observable, Inc. + +Permission to use, copy, modify, and/or distribute this software for any purpose +with or without fee is hereby granted, provided that the above copyright notice +and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS +OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF +THIS SOFTWARE. diff --git a/packages/ojs/external-observablehq-parser/README.md b/packages/ojs/external-observablehq-parser/README.md new file mode 100644 index 00000000000..6f44a455229 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/README.md @@ -0,0 +1,474 @@ +# @quarto/external-observablehq-parser: A fork of @observablehq/parser + +Changes from the original: + +- add back `parseModule`, since that's required by Quarto's OJS runtime. + +(Original README.md follows.) + +# @observablehq/parser + +To parse a cell: + +```js +import {parseCell} from "@observablehq/parser"; + +const cell = parseCell(`hello = "world"`); +``` + +## Examples + +(In these examples, the *node*.start and *node*.end indexes into the *input* string are not shown for brevity. If *options*.locations is true, *node*.loc will also be populated with the line and column numbers.) + +An expression cell (where [*cell*.body](#cell_body) is a type of expression): + +```js +1 + 2 +``` + +```json +{ + "type": "Cell", + "id": null, + "async": false, + "generator": false, + "body": { + "type": "BinaryExpression", + "left": { + "type": "Literal", + "value": 1, + "raw": "1" + }, + "operator": "+", + "right": { + "type": "Literal", + "value": 2, + "raw": "2" + } + } +} +``` + +A block cell (where [*cell*.body](#cell_body) is a BlockStatement): + +```js +{ + return 1 + 2; +} +``` + +```json +{ + "type": "Cell", + "id": null, + "async": false, + "generator": false, + "body": { + "type": "BlockStatement", + "body": [ + { + "type": "ReturnStatement", + "argument": { + "type": "BinaryExpression", + "left": { + "type": "Literal", + "value": 1, + "raw": "1" + }, + "operator": "+", + "right": { + "type": "Literal", + "value": 2, + "raw": "2" + } + } + } + ] + } +} +``` + +An empty cell (where [*cell*.body](#cell_body) is null): + +```js +``` + +```json +{ + "type": "Cell", + "id": null, + "async": false, + "generator": false, + "body": null +} +``` + +A named expression cell (where [*cell*.id](#cell_id) is an Identifier): + +```js +foo = 42 +``` + +```json +{ + "type": "Cell", + "id": { + "type": "Identifier", + "name": "foo" + }, + "async": false, + "generator": false, + "body": { + "type": "Literal", + "value": 42, + "raw": "42" + } +} +``` + +A named block cell (where [*cell*.id](#cell_id) is an Identifier): + +```js +foo = { + return 42; +} +``` + +```json +{ + "type": "Cell", + "id": { + "type": "Identifier", + "name": "foo" + }, + "async": false, + "generator": false, + "body": { + "type": "BlockStatement", + "body": [ + { + "type": "ReturnStatement", + "argument": { + "type": "Literal", + "value": 42, + "raw": "42" + } + } + ] + } +} +``` + +An asynchronous expression cell (where [*cell*.async](#cell_async) is true): + +```js +2 * await value +``` + +```json +{ + "type": "Cell", + "id": null, + "async": true, + "generator": false, + "body": { + "type": "BinaryExpression", + "left": { + "type": "Literal", + "value": 2, + "raw": "2" + }, + "operator": "*", + "right": { + "type": "AwaitExpression", + "argument": { + "type": "Identifier", + "name": "value" + } + } + } +} +``` + +A generator expression cell (where [*cell*.generator](#cell_generator) is true): + +```js +yield* [1, 2, 3] +``` + +```json +{ + "type": "Cell", + "id": null, + "async": false, + "generator": true, + "body": { + "type": "YieldExpression", + "delegate": true, + "argument": { + "type": "ArrayExpression", + "elements": [ + { + "type": "Literal", + "value": 1, + "raw": "1" + }, + { + "type": "Literal", + "value": 2, + "raw": "2" + }, + { + "type": "Literal", + "value": 3, + "raw": "3" + } + ] + } + } +} +``` + +A viewof expression cell (where [*cell*.id](#cell_id) is a [ViewExpression](#viewexpression)): + +```js +viewof x = DOM.range() +``` + +```json +{ + "type": "Cell", + "id": { + "type": "ViewExpression", + "id": { + "type": "Identifier", + "name": "x" + } + }, + "async": false, + "generator": false, + "body": { + "type": "CallExpression", + "callee": { + "type": "MemberExpression", + "object": { + "type": "Identifier", + "name": "DOM" + }, + "property": { + "type": "Identifier", + "name": "range" + }, + "computed": false + }, + "arguments": [] + } +} +``` + +A viewof reference within an expression cell (where [*cell*.body](#cell_body) contains a [ViewExpression](#viewexpression)): + +```js +viewof x.tagName +``` + +```json +{ + "type": "Cell", + "id": null, + "async": false, + "generator": false, + "body": { + "type": "MemberExpression", + "object": { + "type": "ViewExpression", + "id": { + "type": "Identifier", + "name": "x" + } + }, + "property": { + "type": "Identifier", + "name": "tagName" + }, + "computed": false + } +} +``` + +An import cell (where [*cell*.body](#cell_body) is an [ImportDeclaration](#importdeclaration)): + +```js +import {foo} from "module" +``` + +```json +{ + "type": "Cell", + "id": null, + "async": false, + "generator": false, + "body": { + "type": "ImportDeclaration", + "specifiers": [ + { + "type": "ImportSpecifier", + "view": false, + "imported": { + "type": "Identifier", + "name": "foo" + }, + "local": { + "type": "Identifier", + "name": "foo" + } + } + ], + "source": { + "type": "Literal", + "value": "module", + "raw": "\"module\"" + } + } +} +``` + +Importing a view (where [*specifier*.view](#specifier_view) is true): + +```js +import {viewof foo} from "module" +``` + +```json +{ + "type": "Cell", + "id": null, + "async": false, + "generator": false, + "body": { + "type": "ImportDeclaration", + "specifiers": [ + { + "type": "ImportSpecifier", + "view": true, + "imported": { + "type": "Identifier", + "name": "foo" + }, + "local": { + "type": "Identifier", + "name": "foo" + } + } + ], + "source": { + "type": "Literal", + "value": "module", + "raw": "\"module\"" + } + } +} +``` + +Importing a view imports both the view symbol (`viewof foo`) and the value symbol (`foo`). Likewise, if the specified view is renamed during import (*e.g.*, `viewof foo as bar`), both the view symbol and the value symbol are renamed (*e.g.*, `viewof bar` and `bar`). + +Importing with injection (where [*declaration*.injections](#declaration_injections) is present): + +```js +import {chart} with {sales as data} from "@mbostock/d3-bar-chart" +``` + +```json +{ + "type": "Cell", + "id": null, + "async": false, + "generator": false, + "body": { + "type": "ImportDeclaration", + "specifiers": [ + { + "type": "ImportSpecifier", + "view": false, + "imported": { + "type": "Identifier", + "name": "chart" + }, + "local": { + "type": "Identifier", + "name": "chart" + } + } + ], + "injections": [ + { + "type": "ImportSpecifier", + "view": false, + "imported": { + "type": "Identifier", + "name": "sales" + }, + "local": { + "type": "Identifier", + "name": "data" + } + } + ], + "source": { + "type": "Literal", + "value": "@mbostock/d3-bar-chart", + "raw": "\"@mbostock/d3-bar-chart\"" + } + } +} +``` + +For an injection, *specifier*.imported and *specifier*.local are reversed compared to a normal specifier: they are from the perspective of the imported module rather than the importing module. So in the example above, the importing module’s variable *sales* is injected into the imported module (the chart), replacing the variable *data*. + +Injecting a view injects both the view symbol (`viewof foo`) and the value symbol (`foo`). Likewise, if the specified view is renamed during injection (*e.g.*, `viewof foo as bar`), both the view symbol and the value symbol are renamed (*e.g.*, `viewof bar` and `bar`). + +## API Reference + +# parseCell(input[, options]) [<>](https://github.com/observablehq/parser/blob/main/src/parse.js "Source") + +Returns a [cell](#cell). + +# peekId(input) [<>](https://github.com/observablehq/parser/blob/main/src/peek.js "Source") + +Tries to find the ID of a cell given a snippet of its contents, and returns it as a string if found. + +### Cell + +# cell.id + +The name of the cell: null if the cell is anonymous; otherwise an Identifier or a ViewExpression. + +# cell.body + +The body of the cell: null for an empty cell; an ImportDeclaration for an import cell; otherwise a BlockStatement or an expression node. + +# cell.async + +A boolean indicating whether the cell body is asynchronous (*i.e.*, whether it contains an `await` statement). False for import and empty cells. + +# cell.generator + +A boolean indicating whether the cell body is a generator (*i.e.*, whether it contains a `yield` statement). False for import and empty cells. + +### ViewExpression + +# view.id + +The view identifier: an Identifier. + +### ImportDeclaration + +# declaration.injections + +An array of ImportSpecifier nodes, if the import declaration has a `with` clause, and otherwise null. + +### ImportSpecifier + +# specifier.view + +A boolean indicating whether the import specifies a view. diff --git a/packages/ojs/external-observablehq-parser/package.json b/packages/ojs/external-observablehq-parser/package.json new file mode 100644 index 00000000000..b8a690f6682 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/package.json @@ -0,0 +1,46 @@ +{ + "name": "external-observablehq-parser", + "description": "A fork of ObservableHQ's Acorn parser for Observable JavaScript", + "version": "6.0.2", + "author": { + "name": "quarto-dev (RStudio PBC).", + "url": "https://quarto.org" + }, + "license": "ISC", + "type": "module", + "main": "src/index.js", + "module": "src/index.js", + "jsdelivr": "dist/parser.min.js", + "unpkg": "dist/parser.min.js", + "exports": { + "umd": "./dist/parser.min.js", + "default": "./src/index.js" + }, + "repository": { + "type": "git", + "url": "https://github.com/quarto-dev/quarto/" + }, + "files": [ + "dist/**/*.js", + "src/**/*.js" + ], + "engines": { + "node": ">=14.5.0" + }, + "scripts": { + "build": "rollup -c rollup.config.debug.js && rollup -c rollup.config.min.js", + "test": "mkdir -p test/output && mocha -r module-alias/register 'test/**/*-test.js' && eslint src test", + "prepublishOnly": "rm -rf dist && rollup -c rollup.config.debug.js && rollup -c rollup.config.min.js", + "postpublish": "git push && git push --tags" + }, + "_moduleAliases": { + "external-observablehq-parser": "./src/index.js" + }, + "dependencies": { + "acorn": "8.17.0", + "acorn-walk": "8.3.5" + }, + "publishConfig": { + "access": "public" + } +} diff --git a/packages/ojs/external-observablehq-parser/rollup.config.debug.js b/packages/ojs/external-observablehq-parser/rollup.config.debug.js new file mode 100644 index 00000000000..07e0e396dd7 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/rollup.config.debug.js @@ -0,0 +1,27 @@ +import {terser} from "rollup-plugin-terser"; +import * as meta from "./package.json"; + +const copyright = `// @observablehq/parser v${meta.version} Copyright ${(new Date).getFullYear()} Observable, Inc.`; +const forkCopyright = `// @quarto/external-observablehq-parser v${meta.version} fork changes are Copyright ${(new Date).getFullYear()} RStudio, PBC.\n${copyright}`; + +import theirBase from "./rollup.config.js"; +const base = theirBase[0]; + +base.plugins = [ + terser({ + output: { + beautify: true, + preamble: forkCopyright, + indent_level: 2, + }, + mangle: false, + compress: false, + }) +]; +base.output.format = "esm"; +base.output.name = "quarto-dev/external-observablehq-parser" +base.output.file = "dist/external-observablehq-parser.js" + +console.log(base); + +export default [ base ]; \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/rollup.config.js b/packages/ojs/external-observablehq-parser/rollup.config.js new file mode 100644 index 00000000000..6259237d698 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/rollup.config.js @@ -0,0 +1,32 @@ +import {terser} from "rollup-plugin-terser"; +import * as meta from "./package.json"; + +const copyright = `// @observablehq/parser v${meta.version} Copyright ${(new Date).getFullYear()} Observable, Inc.`; + +const base = { + input: "src/index.js", + plugins: [ + terser({ + output: {preamble: copyright}, + mangle: {reserved: ["RequireError"]} + }) + ], + external: [ + "acorn", + "acorn-walk" + ], + output: { + globals: { + "acorn": "acorn", + "acorn-walk": "acorn.walk" + }, + format: "umd", + extend: true, + name: "observablehq", + file: "dist/parser.min.js" + } +}; + +export default [ + base +]; diff --git a/packages/ojs/external-observablehq-parser/rollup.config.min.js b/packages/ojs/external-observablehq-parser/rollup.config.min.js new file mode 100644 index 00000000000..d96ff30ee8d --- /dev/null +++ b/packages/ojs/external-observablehq-parser/rollup.config.min.js @@ -0,0 +1,20 @@ +import {terser} from "rollup-plugin-terser"; +import * as meta from "./package.json"; + +const copyright = `// @observablehq/parser v${meta.version} Copyright ${(new Date).getFullYear()} Observable, Inc.`; +const forkCopyright = `// @quarto/external-observablehq-parser v${meta.version} fork changes are Copyright ${(new Date).getFullYear()} RStudio, PBC.\n${copyright}`; + +import theirBase from "./rollup.config.js"; +const base = theirBase[0]; + +base.plugins = [ + terser({ + output: {preamble: forkCopyright}, + mangle: {reserved: ["RequireError"]}, + }) +]; +base.output.format = "esm"; +base.output.name = "quarto-dev/external-observablehq-parser"; +base.output.file = "dist/external-observablehq-parser.min.js"; + +export default [ base ]; \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/src/features.js b/packages/ojs/external-observablehq-parser/src/features.js new file mode 100644 index 00000000000..e0a558046a2 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/src/features.js @@ -0,0 +1,42 @@ +import {simple} from "acorn-walk"; +import walk from "./walk.js"; + +export default function findFeatures(cell, featureName) { + const ast = {type: "Program", body: [cell.body]}; + const features = new Map(); + const {references} = cell; + + simple( + ast, + { + CallExpression: node => { + const {callee, arguments: args} = node; + + // Ignore function calls that are not references to the feature. + if ( + callee.type !== "Identifier" || + callee.name !== featureName || + references.indexOf(callee) < 0 + ) return; + + // Forbid dynamic calls. + if ( + args.length !== 1 || + !((args[0].type === "Literal" && /^['"]/.test(args[0].raw)) || + (args[0].type === "TemplateLiteral" && args[0].expressions.length === 0)) + ) { + throw Object.assign(new SyntaxError(`${featureName} requires a single literal string argument`), {node}); + } + + const [arg] = args; + const name = arg.type === "Literal" ? arg.value : arg.quasis[0].value.cooked; + const location = {start: arg.start, end: arg.end}; + if (features.has(name)) features.get(name).push(location); + else features.set(name, [location]); + } + }, + walk + ); + + return features; +} diff --git a/packages/ojs/external-observablehq-parser/src/globals.js b/packages/ojs/external-observablehq-parser/src/globals.js new file mode 100644 index 00000000000..a1ab568d3bc --- /dev/null +++ b/packages/ojs/external-observablehq-parser/src/globals.js @@ -0,0 +1,85 @@ +export default new Set([ + "Array", + "ArrayBuffer", + "atob", + "AudioContext", + "Blob", + "Boolean", + "BigInt", + "btoa", + "clearInterval", + "clearTimeout", + "console", + "crypto", + "CustomEvent", + "DataView", + "Date", + "decodeURI", + "decodeURIComponent", + "devicePixelRatio", + "document", + "encodeURI", + "encodeURIComponent", + "Error", + "escape", + "eval", + "fetch", + "File", + "FileList", + "FileReader", + "Float32Array", + "Float64Array", + "Function", + "Headers", + "Image", + "ImageData", + "Infinity", + "Int16Array", + "Int32Array", + "Int8Array", + "Intl", + "isFinite", + "isNaN", + "JSON", + "Map", + "Math", + "NaN", + "Number", + "navigator", + "Object", + "parseFloat", + "parseInt", + "performance", + "Path2D", + "Promise", + "Proxy", + "RangeError", + "ReferenceError", + "Reflect", + "RegExp", + "cancelAnimationFrame", + "requestAnimationFrame", + "Set", + "setInterval", + "setTimeout", + "String", + "Symbol", + "SyntaxError", + "TextDecoder", + "TextEncoder", + "this", + "TypeError", + "Uint16Array", + "Uint32Array", + "Uint8Array", + "Uint8ClampedArray", + "undefined", + "unescape", + "URIError", + "URL", + "WeakMap", + "WeakSet", + "WebSocket", + "Worker", + "window" +]); diff --git a/packages/ojs/external-observablehq-parser/src/index.js b/packages/ojs/external-observablehq-parser/src/index.js new file mode 100644 index 00000000000..e8ca6b75973 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/src/index.js @@ -0,0 +1,3 @@ +export {parseCell, CellParser, TemplateCellParser, parseModule} from "./parse.js"; +export {peekId} from "./peek.js"; +export {default as walk} from "./walk.js"; diff --git a/packages/ojs/external-observablehq-parser/src/parse.js b/packages/ojs/external-observablehq-parser/src/parse.js new file mode 100644 index 00000000000..7436b991aa7 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/src/parse.js @@ -0,0 +1,414 @@ +import {getLineInfo, TokContext, tokTypes as tt, Parser} from "acorn"; +import defaultGlobals from "./globals.js"; +import findReferences from "./references.js"; +import findFeatures from "./features.js"; + +const SCOPE_FUNCTION = 2; +const SCOPE_ASYNC = 4; +const SCOPE_GENERATOR = 8; + +export function parseCell(input, {tag, raw, globals, ...options} = {}) { + let cell; + // Parse empty input as JavaScript to keep ensure resulting ast + // is consistent for all empty input cases. + if (tag != null && input) { + cell = TemplateCellParser.parse(input, options); + const parsedTag = CellTagParser.parse(tag, options); + parseReferences(parsedTag, tag, globals); + parseFeatures(parsedTag, tag); + cell.tag = parsedTag; + cell.raw = !!raw; + } else { + cell = CellParser.parse(input, options); + } + parseReferences(cell, input, globals); + parseFeatures(cell, input); + return cell; +} + +export class CellParser extends Parser { + constructor(options, ...args) { + super(Object.assign({ecmaVersion: 13}, options), ...args); + } + enterScope(flags) { + if (flags & SCOPE_FUNCTION) ++this.O_function; + return super.enterScope(flags); + } + exitScope() { + if (this.currentScope().flags & SCOPE_FUNCTION) --this.O_function; + return super.exitScope(); + } + parseForIn(node, init) { + if (this.O_function === 1 && node.await) this.O_async = true; + return super.parseForIn(node, init); + } + parseAwait() { + if (this.O_function === 1) this.O_async = true; + return super.parseAwait(); + } + parseYield(noIn) { + if (this.O_function === 1) this.O_generator = true; + return super.parseYield(noIn); + } + parseImport(node) { + this.next(); + node.specifiers = this.parseImportSpecifiers(); + if (this.type === tt._with) { + this.next(); + node.injections = this.parseImportSpecifiers(); + } + this.expectContextual("from"); + node.source = this.type === tt.string ? this.parseExprAtom() : this.unexpected(); + return this.finishNode(node, "ImportDeclaration"); + } + parseImportSpecifiers() { + const nodes = []; + const identifiers = new Set; + let first = true; + this.expect(tt.braceL); + while (!this.eat(tt.braceR)) { + if (first) { + first = false; + } else { + this.expect(tt.comma); + if (this.afterTrailingComma(tt.braceR)) break; + } + const node = this.startNode(); + node.view = this.eatContextual("viewof"); + node.mutable = node.view ? false : this.eatContextual("mutable"); + node.imported = this.parseIdent(); + this.checkUnreserved(node.imported); + this.checkLocal(node.imported); + if (this.eatContextual("as")) { + node.local = this.parseIdent(); + this.checkUnreserved(node.local); + this.checkLocal(node.local); + } else { + node.local = node.imported; + } + this.checkLValSimple(node.local, "let"); + if (identifiers.has(node.local.name)) { + this.raise(node.local.start, `Identifier '${node.local.name}' has already been declared`); + } + identifiers.add(node.local.name); + nodes.push(this.finishNode(node, "ImportSpecifier")); + } + return nodes; + } + parseExprAtom(refDestructuringErrors) { + return ( + this.parseMaybeKeywordExpression("viewof", "ViewExpression") || + this.parseMaybeKeywordExpression("mutable", "MutableExpression") || + super.parseExprAtom(refDestructuringErrors) + ); + } + startCell() { + this.O_function = 0; + this.O_async = false; + this.O_generator = false; + this.strict = true; + this.enterScope(SCOPE_FUNCTION | SCOPE_ASYNC | SCOPE_GENERATOR); + } + finishCell(node, body, id) { + if (id) this.checkLocal(id); + node.id = id; + node.body = body; + node.async = this.O_async; + node.generator = this.O_generator; + this.exitScope(); + return this.finishNode(node, "Cell"); + } + parseCell(node, eof) { + const lookahead = new CellParser({}, this.input, this.start); + let token = lookahead.getToken(); + let body = null; + let id = null; + + this.startCell(); + + // An import? + if (token.type === tt._import && lookahead.getToken().type !== tt.parenL) { + body = this.parseImport(this.startNode()); + } + + // A non-empty cell? + else if (token.type !== tt.eof && token.type !== tt.semi) { + // A named cell? + if (token.type === tt.name) { + if (token.value === "viewof" || token.value === "mutable") { + token = lookahead.getToken(); + if (token.type !== tt.name) { + lookahead.unexpected(); + } + } + token = lookahead.getToken(); + if (token.type === tt.eq) { + id = + this.parseMaybeKeywordExpression("viewof", "ViewExpression") || + this.parseMaybeKeywordExpression("mutable", "MutableExpression") || + this.parseIdent(); + token = lookahead.getToken(); + this.expect(tt.eq); + } + } + + // A block? + if (token.type === tt.braceL) { + body = this.parseBlock(); + } + + // An expression? + // Possibly a function or class declaration? + else { + body = this.parseExpression(); + if ( + id === null && + (body.type === "FunctionExpression" || + body.type === "ClassExpression") + ) { + id = body.id; + } + } + } + + this.semicolon(); + if (eof) this.expect(tt.eof); // TODO + + return this.finishCell(node, body, id); + } + parseTopLevel(node) { + return this.parseCell(node, true); + } + toAssignable(node, isBinding, refDestructuringErrors) { + return node.type === "MutableExpression" + ? node + : super.toAssignable(node, isBinding, refDestructuringErrors); + } + checkLocal(id) { + const node = id.id || id; + if (defaultGlobals.has(node.name) || node.name === "arguments") { + this.raise(node.start, `Identifier '${node.name}' is reserved`); + } + } + checkUnreserved(node) { + if (node.name === "viewof" || node.name === "mutable") { + this.raise(node.start, `Unexpected keyword '${node.name}'`); + } + return super.checkUnreserved(node); + } + checkLValSimple(expr, bindingType, checkClashes) { + return super.checkLValSimple( + expr.type === "MutableExpression" ? expr.id : expr, + bindingType, + checkClashes + ); + } + unexpected(pos) { + this.raise( + pos != null ? pos : this.start, + this.type === tt.eof ? "Unexpected end of input" : "Unexpected token" + ); + } + parseMaybeKeywordExpression(keyword, type) { + if (this.isContextual(keyword)) { + const node = this.startNode(); + this.next(); + node.id = this.parseIdent(); + return this.finishNode(node, type); + } + } +} + +// Based on acorn’s q_tmpl. We will use this to initialize the +// parser context so our `readTemplateToken` override is called. +// `readTemplateToken` is based on acorn's `readTmplToken` which +// is used inside template literals. Our version allows backQuotes. +const o_tmpl = new TokContext( + "`", // token + true, // isExpr + true, // preserveSpace + parser => readTemplateToken.call(parser) // override +); + +export class TemplateCellParser extends CellParser { + constructor(...args) { + super(...args); + // Initialize the type so that we're inside a backQuote + this.type = tt.backQuote; + this.exprAllowed = false; + } + initialContext() { + // Provide our custom TokContext + return [o_tmpl]; + } + parseCell(node) { + this.startCell(); + + // Fix for nextToken calling finishToken(tt.eof) + if (this.type === tt.eof) this.value = ""; + + // Based on acorn.Parser.parseTemplate + const isTagged = true; + const body = this.startNode(); + body.expressions = []; + let curElt = this.parseTemplateElement({isTagged}); + body.quasis = [curElt]; + while (this.type !== tt.eof) { + this.expect(tt.dollarBraceL); + body.expressions.push(this.parseExpression()); + this.expect(tt.braceR); + body.quasis.push(curElt = this.parseTemplateElement({isTagged})); + } + curElt.tail = true; + this.next(); + this.finishNode(body, "TemplateLiteral"); + + this.expect(tt.eof); + return this.finishCell(node, body, null); + } +} + +// This is our custom override for parsing a template that allows backticks. +// Based on acorn's readInvalidTemplateToken. +function readTemplateToken() { + out: for (; this.pos < this.input.length; this.pos++) { + switch (this.input.charCodeAt(this.pos)) { + case 92: { // slash + if (this.pos < this.input.length - 1) ++this.pos; // not a terminal slash + break; + } + case 36: { // dollar + if (this.input.charCodeAt(this.pos + 1) === 123) { // dollar curly + if (this.pos === this.start && this.type === tt.invalidTemplate) { + this.pos += 2; + return this.finishToken(tt.dollarBraceL); + } + break out; + } + break; + } + } + } + return this.finishToken(tt.invalidTemplate, this.input.slice(this.start, this.pos)); +} + +export class CellTagParser extends Parser { + constructor(options, ...args) { + super(Object.assign({ecmaVersion: 12}, options), ...args); + } + enterScope(flags) { + if (flags & SCOPE_FUNCTION) ++this.O_function; + return super.enterScope(flags); + } + exitScope() { + if (this.currentScope().flags & SCOPE_FUNCTION) --this.O_function; + return super.exitScope(); + } + parseForIn(node, init) { + if (this.O_function === 1 && node.await) this.O_async = true; + return super.parseForIn(node, init); + } + parseAwait() { + if (this.O_function === 1) this.O_async = true; + return super.parseAwait(); + } + parseYield(noIn) { + if (this.O_function === 1) this.O_generator = true; + return super.parseYield(noIn); + } + parseTopLevel(node) { + this.O_function = 0; + this.O_async = false; + this.O_generator = false; + this.strict = true; + this.enterScope(SCOPE_FUNCTION | SCOPE_ASYNC | SCOPE_GENERATOR); + node.body = this.parseExpression(); + node.input = this.input; + node.async = this.O_async; + node.generator = this.O_generator; + this.exitScope(); + return this.finishNode(node, "CellTag"); + } +} + +// Find references. +// Check for illegal references to arguments. +// Check for illegal assignments to global references. +function parseReferences(cell, input, globals = defaultGlobals) { + if (!cell.body) { + cell.references = []; + } else if (cell.body.type === "ImportDeclaration") { + cell.references = cell.body.injections + ? cell.body.injections.map(i => i.imported) + : []; + } else { + try { + cell.references = findReferences(cell, globals); + } catch (error) { + if (error.node) { + const loc = getLineInfo(input, error.node.start); + error.message += ` (${loc.line}:${loc.column})`; + error.pos = error.node.start; + error.loc = loc; + delete error.node; + } + throw error; + } + } + return cell; +} + +// Find features: file attachments, secrets, database clients. +// Check for illegal references to arguments. +// Check for illegal assignments to global references. +function parseFeatures(cell, input) { + if (cell.body && cell.body.type !== "ImportDeclaration") { + try { + cell.fileAttachments = findFeatures(cell, "FileAttachment"); + cell.databaseClients = findFeatures(cell, "DatabaseClient"); + cell.secrets = findFeatures(cell, "Secret"); + cell.notificationClients = findFeatures(cell, "NotificationClient"); + } catch (error) { + if (error.node) { + const loc = getLineInfo(input, error.node.start); + error.message += ` (${loc.line}:${loc.column})`; + error.pos = error.node.start; + error.loc = loc; + delete error.node; + } + throw error; + } + } else { + cell.fileAttachments = new Map(); + cell.databaseClients = new Map(); + cell.secrets = new Map(); + cell.notificationClients = new Map(); + } + return cell; +} + +/* Fork changes begin here */ + +export function parseModule(input, {globals} = {}) { + const program = ModuleParser.parse(input); + for (const cell of program.cells) { + parseReferences(cell, input, globals); + parseFeatures(cell, input, globals); + } + return program; +} + +export class ModuleParser extends CellParser { + parseTopLevel(node) { + if (!node.cells) node.cells = []; + while (this.type !== tt.eof) { + const cell = this.parseCell(this.startNode()); + cell.input = this.input; + node.cells.push(cell); + } + this.next(); + return this.finishNode(node, "Program"); + } +} + +/* Fork changes end here */ diff --git a/packages/ojs/external-observablehq-parser/src/peek.js b/packages/ojs/external-observablehq-parser/src/peek.js new file mode 100644 index 00000000000..f1f06ded470 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/src/peek.js @@ -0,0 +1,76 @@ +import {tokTypes as tt, Parser} from "acorn"; + +const STATE_START = Symbol("start"); +const STATE_MODIFIER = Symbol("modifier"); +const STATE_FUNCTION = Symbol("function"); +const STATE_NAME = Symbol("name"); + +/* + ┌─────┐ + ┌───────────│START│─function|class + │ └─────┘ │ +viewof|mutable|async │ ▼ + │ │ ┌────────┐ ┌─┐ + ▼ │ │FUNCTION│◀───▶│*│ + ┌────────┐ │ └────────┘ └─┘ + │MODIFIER│ │ │ + └────────┘ name name + │ │ │ + └──name─┐ │ ▼ + ▼ │ ┌─────────────┐ + ┌────────┐ │ │FUNCTION_NAME│ + │ NAME │◀─┘ └─────────────┘ + └────────┘ + │ + = + ▼ + ┌────────┐ + │ EQ │ + └────────┘ +*/ + +export function peekId(input) { + let state = STATE_START; + let name; + try { + for (const token of Parser.tokenizer(input, {ecmaVersion: 11})) { + switch (state) { + case STATE_START: + case STATE_MODIFIER: { + if (token.type === tt.name) { + if ( + state === STATE_START && + (token.value === "viewof" || + token.value === "mutable" || + token.value === "async") + ) { + state = STATE_MODIFIER; + continue; + } + state = STATE_NAME; + name = token; + continue; + } + if (token.type === tt._function || token.type === tt._class) { + state = STATE_FUNCTION; + continue; + } + break; + } + case STATE_NAME: { + if (token.type === tt.eq) return name.value; + break; + } + case STATE_FUNCTION: { + if (token.type === tt.star) continue; + if (token.type === tt.name && token.end < input.length) + return token.value; + break; + } + } + return; + } + } catch (ignore) { + return; + } +} diff --git a/packages/ojs/external-observablehq-parser/src/references.js b/packages/ojs/external-observablehq-parser/src/references.js new file mode 100644 index 00000000000..308c323fd9f --- /dev/null +++ b/packages/ojs/external-observablehq-parser/src/references.js @@ -0,0 +1,225 @@ +// Based on https://github.com/ForbesLindesay/acorn-globals +// Copyright (c) 2014 Forbes Lindesay +// https://github.com/ForbesLindesay/acorn-globals/blob/master/LICENSE + +import {ancestor} from "acorn-walk"; +import walk from "./walk.js"; + +function isScope(node) { + return node.type === "FunctionExpression" + || node.type === "FunctionDeclaration" + || node.type === "ArrowFunctionExpression" + || node.type === "Program"; +} + +function isBlockScope(node) { + return node.type === "BlockStatement" + || node.type === "ForInStatement" + || node.type === "ForOfStatement" + || node.type === "ForStatement" + || isScope(node); +} + +function declaresArguments(node) { + return node.type === "FunctionExpression" + || node.type === "FunctionDeclaration"; +} + +export default function findReferences(cell, globals) { + const ast = {type: "Program", body: [cell.body]}; + const locals = new Map; + const globalSet = new Set(globals); + const references = []; + + function hasLocal(node, name) { + const l = locals.get(node); + return l ? l.has(name) : false; + } + + function declareLocal(node, id) { + const l = locals.get(node); + if (l) l.add(id.name); + else locals.set(node, new Set([id.name])); + } + + function declareClass(node) { + if (node.id) declareLocal(node, node.id); + } + + function declareFunction(node) { + node.params.forEach(param => declarePattern(param, node)); + if (node.id) declareLocal(node, node.id); + } + + function declareCatchClause(node) { + if (node.param) declarePattern(node.param, node); + } + + function declarePattern(node, parent) { + switch (node.type) { + case "Identifier": + declareLocal(parent, node); + break; + case "ObjectPattern": + node.properties.forEach(node => declarePattern(node, parent)); + break; + case "ArrayPattern": + node.elements.forEach(node => node && declarePattern(node, parent)); + break; + case "Property": + declarePattern(node.value, parent); + break; + case "RestElement": + declarePattern(node.argument, parent); + break; + case "AssignmentPattern": + declarePattern(node.left, parent); + break; + default: + throw new Error("Unrecognized pattern type: " + node.type); + } + } + + function declareModuleSpecifier(node) { + declareLocal(ast, node.local); + } + + ancestor( + ast, + { + VariableDeclaration: (node, parents) => { + let parent = null; + for (let i = parents.length - 1; i >= 0 && parent === null; --i) { + if (node.kind === "var" ? isScope(parents[i]) : isBlockScope(parents[i])) { + parent = parents[i]; + } + } + node.declarations.forEach(declaration => declarePattern(declaration.id, parent)); + }, + FunctionDeclaration: (node, parents) => { + let parent = null; + for (let i = parents.length - 2; i >= 0 && parent === null; --i) { + if (isScope(parents[i])) { + parent = parents[i]; + } + } + declareLocal(parent, node.id); + declareFunction(node); + }, + Function: declareFunction, + ClassDeclaration: (node, parents) => { + let parent = null; + for (let i = parents.length - 2; i >= 0 && parent === null; i--) { + if (isScope(parents[i])) { + parent = parents[i]; + } + } + declareLocal(parent, node.id); + }, + Class: declareClass, + CatchClause: declareCatchClause, + ImportDefaultSpecifier: declareModuleSpecifier, + ImportSpecifier: declareModuleSpecifier, + ImportNamespaceSpecifier: declareModuleSpecifier + }, + walk + ); + + function identifier(node, parents) { + let name = node.name; + if (name === "undefined") return; + for (let i = parents.length - 2; i >= 0; --i) { + if (name === "arguments") { + if (declaresArguments(parents[i])) { + return; + } + } + if (hasLocal(parents[i], name)) { + return; + } + if (parents[i].type === "ViewExpression") { + node = parents[i]; + name = `viewof ${node.id.name}`; + } + if (parents[i].type === "MutableExpression") { + node = parents[i]; + name = `mutable ${node.id.name}`; + } + } + if (!globalSet.has(name)) { + if (name === "arguments") { + throw Object.assign(new SyntaxError(`arguments is not allowed`), {node}); + } + references.push(node); + } + } + + ancestor( + ast, + { + VariablePattern: identifier, + Identifier: identifier + }, + walk + ); + + function checkConst(node, parents) { + if (!node) return; + switch (node.type) { + case "Identifier": + case "VariablePattern": { + for (const parent of parents) { + if (hasLocal(parent, node.name)) { + return; + } + } + if (parents[parents.length - 2].type === "MutableExpression") { + return; + } + throw Object.assign(new SyntaxError(`Assignment to constant variable ${node.name}`), {node}); + } + case "ArrayPattern": { + for (const element of node.elements) { + checkConst(element, parents); + } + return; + } + case "ObjectPattern": { + for (const property of node.properties) { + checkConst(property, parents); + } + return; + } + case "Property": { + checkConst(node.value, parents); + return; + } + case "RestElement": { + checkConst(node.argument, parents); + return; + } + } + } + + function checkConstArgument(node, parents) { + checkConst(node.argument, parents); + } + + function checkConstLeft(node, parents) { + checkConst(node.left, parents); + } + + ancestor( + ast, + { + AssignmentExpression: checkConstLeft, + AssignmentPattern: checkConstLeft, + UpdateExpression: checkConstArgument, + ForOfStatement: checkConstLeft, + ForInStatement: checkConstLeft + }, + walk + ); + + return references; +} diff --git a/packages/ojs/external-observablehq-parser/src/walk.js b/packages/ojs/external-observablehq-parser/src/walk.js new file mode 100644 index 00000000000..b4d23a31e5a --- /dev/null +++ b/packages/ojs/external-observablehq-parser/src/walk.js @@ -0,0 +1,11 @@ +import {make} from "acorn-walk"; + +export default make({ + Import() {}, + ViewExpression(node, st, c) { + c(node.id, st, "Identifier"); + }, + MutableExpression(node, st, c) { + c(node.id, st, "Identifier"); + } +}); diff --git a/packages/ojs/external-observablehq-parser/test/.eslintrc.json b/packages/ojs/external-observablehq-parser/test/.eslintrc.json new file mode 100644 index 00000000000..7eeefc33b66 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/.eslintrc.json @@ -0,0 +1,5 @@ +{ + "env": { + "mocha": true + } +} diff --git a/packages/ojs/external-observablehq-parser/test/input/anonymous-block-cell.js b/packages/ojs/external-observablehq-parser/test/input/anonymous-block-cell.js new file mode 100644 index 00000000000..a89d6648f7c --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/anonymous-block-cell.js @@ -0,0 +1,3 @@ +{ + return 42; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/anonymous-expression-cell.js b/packages/ojs/external-observablehq-parser/test/input/anonymous-expression-cell.js new file mode 100644 index 00000000000..d81cc0710eb --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/anonymous-expression-cell.js @@ -0,0 +1 @@ +42 diff --git a/packages/ojs/external-observablehq-parser/test/input/anonymous-function.js b/packages/ojs/external-observablehq-parser/test/input/anonymous-function.js new file mode 100644 index 00000000000..07583c8e90d --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/anonymous-function.js @@ -0,0 +1 @@ +function() { return 42; } diff --git a/packages/ojs/external-observablehq-parser/test/input/arguments-name.js b/packages/ojs/external-observablehq-parser/test/input/arguments-name.js new file mode 100644 index 00000000000..d27623af8ac --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/arguments-name.js @@ -0,0 +1 @@ +arguments = false diff --git a/packages/ojs/external-observablehq-parser/test/input/await-block-cell.js b/packages/ojs/external-observablehq-parser/test/input/await-block-cell.js new file mode 100644 index 00000000000..eb7dbfb6e73 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/await-block-cell.js @@ -0,0 +1,3 @@ +{ + await promise; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/await-in-arrow-function-expression.js b/packages/ojs/external-observablehq-parser/test/input/await-in-arrow-function-expression.js new file mode 100644 index 00000000000..8a6d1a020e7 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/await-in-arrow-function-expression.js @@ -0,0 +1,3 @@ +async () => { + await promise; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/await-in-arrow-function.js b/packages/ojs/external-observablehq-parser/test/input/await-in-arrow-function.js new file mode 100644 index 00000000000..5319a18242b --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/await-in-arrow-function.js @@ -0,0 +1,5 @@ +{ + const inner = async () => { + await promise; + }; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/await-in-class.js b/packages/ojs/external-observablehq-parser/test/input/await-in-class.js new file mode 100644 index 00000000000..2446ab72828 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/await-in-class.js @@ -0,0 +1,7 @@ +{ + class Inner { + async method() { + await promise; + } + } +} diff --git a/packages/ojs/external-observablehq-parser/test/input/await-in-function.js b/packages/ojs/external-observablehq-parser/test/input/await-in-function.js new file mode 100644 index 00000000000..27f3c604dc1 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/await-in-function.js @@ -0,0 +1,5 @@ +{ + async function inner() { + await promise; + } +} diff --git a/packages/ojs/external-observablehq-parser/test/input/await-in-markdown.md b/packages/ojs/external-observablehq-parser/test/input/await-in-markdown.md new file mode 100644 index 00000000000..ca0cc3de3a0 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/await-in-markdown.md @@ -0,0 +1 @@ +**${await importantValue()}** diff --git a/packages/ojs/external-observablehq-parser/test/input/await-yield.js b/packages/ojs/external-observablehq-parser/test/input/await-yield.js new file mode 100644 index 00000000000..2165859404a --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/await-yield.js @@ -0,0 +1,4 @@ +{ + await promise; + yield value; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/backslash-after-dollar-markdown.md b/packages/ojs/external-observablehq-parser/test/input/backslash-after-dollar-markdown.md new file mode 100644 index 00000000000..a0fde2719f0 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/backslash-after-dollar-markdown.md @@ -0,0 +1 @@ +$\{foo} diff --git a/packages/ojs/external-observablehq-parser/test/input/backslash-before-dollar-markdown.md b/packages/ojs/external-observablehq-parser/test/input/backslash-before-dollar-markdown.md new file mode 100644 index 00000000000..fa438cc8a15 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/backslash-before-dollar-markdown.md @@ -0,0 +1 @@ +\${foo} diff --git a/packages/ojs/external-observablehq-parser/test/input/backslash-markdown.md b/packages/ojs/external-observablehq-parser/test/input/backslash-markdown.md new file mode 100644 index 00000000000..0cea35278eb --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/backslash-markdown.md @@ -0,0 +1 @@ +\Slash before, slash after\ \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/input/bare-dynamic-import.js b/packages/ojs/external-observablehq-parser/test/input/bare-dynamic-import.js new file mode 100644 index 00000000000..e6eff0789a4 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/bare-dynamic-import.js @@ -0,0 +1 @@ +import("bar") diff --git a/packages/ojs/external-observablehq-parser/test/input/basic.db.sql b/packages/ojs/external-observablehq-parser/test/input/basic.db.sql new file mode 100644 index 00000000000..6862048a750 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/basic.db.sql @@ -0,0 +1 @@ +SELECT * FROM my_table WHERE my_column = ${val} diff --git a/packages/ojs/external-observablehq-parser/test/input/basic.html b/packages/ojs/external-observablehq-parser/test/input/basic.html new file mode 100644 index 00000000000..b5abefc1109 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/basic.html @@ -0,0 +1 @@ +
${hello}
\ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/input/basic.sql b/packages/ojs/external-observablehq-parser/test/input/basic.sql new file mode 100644 index 00000000000..f75d27f59cc --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/basic.sql @@ -0,0 +1 @@ +SELECT * FROM my_table WHERE my_column = ${val} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/input/basic.tex b/packages/ojs/external-observablehq-parser/test/input/basic.tex new file mode 100644 index 00000000000..feff548b996 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/basic.tex @@ -0,0 +1 @@ +${numerator} \over ${denominator} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/input/bigint-zero.js b/packages/ojs/external-observablehq-parser/test/input/bigint-zero.js new file mode 100644 index 00000000000..d865e1aed94 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/bigint-zero.js @@ -0,0 +1 @@ +0n diff --git a/packages/ojs/external-observablehq-parser/test/input/bigint.js b/packages/ojs/external-observablehq-parser/test/input/bigint.js new file mode 100644 index 00000000000..704172149a5 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/bigint.js @@ -0,0 +1 @@ +foo + 42n diff --git a/packages/ojs/external-observablehq-parser/test/input/binary-expression.js b/packages/ojs/external-observablehq-parser/test/input/binary-expression.js new file mode 100644 index 00000000000..c9f71d3fae4 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/binary-expression.js @@ -0,0 +1 @@ +foo + 42 diff --git a/packages/ojs/external-observablehq-parser/test/input/block-leading-comment.js b/packages/ojs/external-observablehq-parser/test/input/block-leading-comment.js new file mode 100644 index 00000000000..24563e4da13 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/block-leading-comment.js @@ -0,0 +1,4 @@ + // Hello, comment. + foo = { + return 42; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/block-trailing-comment.js b/packages/ojs/external-observablehq-parser/test/input/block-trailing-comment.js new file mode 100644 index 00000000000..2bdc8ea8b5e --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/block-trailing-comment.js @@ -0,0 +1,3 @@ +foo = { + return 42; +} // Hello, comment. diff --git a/packages/ojs/external-observablehq-parser/test/input/catch-clause.js b/packages/ojs/external-observablehq-parser/test/input/catch-clause.js new file mode 100644 index 00000000000..3f13f0fa7d8 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/catch-clause.js @@ -0,0 +1,9 @@ +{ + try { + let [x] = y; + x++; + return x; + } catch (e) { + return e; + } +} diff --git a/packages/ojs/external-observablehq-parser/test/input/comma-then-comment.js b/packages/ojs/external-observablehq-parser/test/input/comma-then-comment.js new file mode 100644 index 00000000000..a144bdab9ab --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/comma-then-comment.js @@ -0,0 +1 @@ +foo, // Oops, invalid syntax. diff --git a/packages/ojs/external-observablehq-parser/test/input/comment.js b/packages/ojs/external-observablehq-parser/test/input/comment.js new file mode 100644 index 00000000000..28c359dd2ad --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/comment.js @@ -0,0 +1 @@ +// Hello, comment. diff --git a/packages/ojs/external-observablehq-parser/test/input/computed-property-name.js b/packages/ojs/external-observablehq-parser/test/input/computed-property-name.js new file mode 100644 index 00000000000..bed80f4a3c7 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/computed-property-name.js @@ -0,0 +1 @@ +({[field]: value}) => value diff --git a/packages/ojs/external-observablehq-parser/test/input/database-client.js b/packages/ojs/external-observablehq-parser/test/input/database-client.js new file mode 100644 index 00000000000..d5da8703af2 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/database-client.js @@ -0,0 +1,3 @@ +{ + let a = DatabaseClient("a"); +} diff --git a/packages/ojs/external-observablehq-parser/test/input/destructured-array-assignment.js b/packages/ojs/external-observablehq-parser/test/input/destructured-array-assignment.js new file mode 100644 index 00000000000..630328f6407 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/destructured-array-assignment.js @@ -0,0 +1,3 @@ +{ + ([md] = []); +} diff --git a/packages/ojs/external-observablehq-parser/test/input/destructured-array-rest-assignment.js b/packages/ojs/external-observablehq-parser/test/input/destructured-array-rest-assignment.js new file mode 100644 index 00000000000..ade9a3e8384 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/destructured-array-rest-assignment.js @@ -0,0 +1,3 @@ +{ + ([,,...md] = {}); +} diff --git a/packages/ojs/external-observablehq-parser/test/input/destructured-arrow-with-default.js b/packages/ojs/external-observablehq-parser/test/input/destructured-arrow-with-default.js new file mode 100644 index 00000000000..88ea6bd0b74 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/destructured-arrow-with-default.js @@ -0,0 +1 @@ +fun = ({foo = "default"}) => {} diff --git a/packages/ojs/external-observablehq-parser/test/input/destructured-assignment-with-default-assignment.js b/packages/ojs/external-observablehq-parser/test/input/destructured-assignment-with-default-assignment.js new file mode 100644 index 00000000000..623cd16acc0 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/destructured-assignment-with-default-assignment.js @@ -0,0 +1,4 @@ +{ + let value; + ({foo: value = (md = true)} = {}); +} diff --git a/packages/ojs/external-observablehq-parser/test/input/destructured-assignment-with-default.js b/packages/ojs/external-observablehq-parser/test/input/destructured-assignment-with-default.js new file mode 100644 index 00000000000..bf950ac7168 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/destructured-assignment-with-default.js @@ -0,0 +1,4 @@ +{ + let value; + ({foo: value = md} = {}); +} diff --git a/packages/ojs/external-observablehq-parser/test/input/destructured-object-assignment.js b/packages/ojs/external-observablehq-parser/test/input/destructured-object-assignment.js new file mode 100644 index 00000000000..24b2132a0ab --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/destructured-object-assignment.js @@ -0,0 +1,3 @@ +{ + ({md} = {}); +} diff --git a/packages/ojs/external-observablehq-parser/test/input/destructured-object-rest-assignment.js b/packages/ojs/external-observablehq-parser/test/input/destructured-object-rest-assignment.js new file mode 100644 index 00000000000..a6f6f2b4276 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/destructured-object-rest-assignment.js @@ -0,0 +1,3 @@ +{ + ({...md} = {}); +} diff --git a/packages/ojs/external-observablehq-parser/test/input/destructured-object-with-default.js b/packages/ojs/external-observablehq-parser/test/input/destructured-object-with-default.js new file mode 100644 index 00000000000..954df733e52 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/destructured-object-with-default.js @@ -0,0 +1 @@ +function fun({foo = "default"}) {} diff --git a/packages/ojs/external-observablehq-parser/test/input/dynamic-import.js b/packages/ojs/external-observablehq-parser/test/input/dynamic-import.js new file mode 100644 index 00000000000..30fbdcf0a9c --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/dynamic-import.js @@ -0,0 +1 @@ +foo = import("bar") diff --git a/packages/ojs/external-observablehq-parser/test/input/empty.js b/packages/ojs/external-observablehq-parser/test/input/empty.js new file mode 100644 index 00000000000..e69de29bb2d diff --git a/packages/ojs/external-observablehq-parser/test/input/empty.md b/packages/ojs/external-observablehq-parser/test/input/empty.md new file mode 100644 index 00000000000..e69de29bb2d diff --git a/packages/ojs/external-observablehq-parser/test/input/expression-extra.js b/packages/ojs/external-observablehq-parser/test/input/expression-extra.js new file mode 100644 index 00000000000..d675fa44e50 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/expression-extra.js @@ -0,0 +1 @@ +foo bar diff --git a/packages/ojs/external-observablehq-parser/test/input/expression-trailing-comment.js b/packages/ojs/external-observablehq-parser/test/input/expression-trailing-comment.js new file mode 100644 index 00000000000..427a84ec7f7 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/expression-trailing-comment.js @@ -0,0 +1 @@ +foo = 42 // Hello, comment. diff --git a/packages/ojs/external-observablehq-parser/test/input/extra-semicolon.js b/packages/ojs/external-observablehq-parser/test/input/extra-semicolon.js new file mode 100644 index 00000000000..0b2300eebbe --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/extra-semicolon.js @@ -0,0 +1 @@ +foo = 42; diff --git a/packages/ojs/external-observablehq-parser/test/input/file-attachment-forbidden-1.js b/packages/ojs/external-observablehq-parser/test/input/file-attachment-forbidden-1.js new file mode 100644 index 00000000000..ff173dbfabf --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/file-attachment-forbidden-1.js @@ -0,0 +1 @@ +x = FileAttachment(`hi ${1}`) diff --git a/packages/ojs/external-observablehq-parser/test/input/file-attachment-forbidden.js b/packages/ojs/external-observablehq-parser/test/input/file-attachment-forbidden.js new file mode 100644 index 00000000000..494437dfb12 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/file-attachment-forbidden.js @@ -0,0 +1 @@ +x = FileAttachment("hi" + 1) diff --git a/packages/ojs/external-observablehq-parser/test/input/file-attachment-masked.js b/packages/ojs/external-observablehq-parser/test/input/file-attachment-masked.js new file mode 100644 index 00000000000..dcda335a358 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/file-attachment-masked.js @@ -0,0 +1,4 @@ +{ + let FileAttachment = (a, b) => a + b; + return FileAttachment(1, 2); +} diff --git a/packages/ojs/external-observablehq-parser/test/input/file-attachment-nested.js b/packages/ojs/external-observablehq-parser/test/input/file-attachment-nested.js new file mode 100644 index 00000000000..32216ce41f5 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/file-attachment-nested.js @@ -0,0 +1,11 @@ +viewof slider = { + while (count > 0) { + let b, c; + const a = FileAttachment("a"); + if (condition) { + b = defaultFile ? defaultFileValue : FileAttachment('b'); + c = FileAttachment(`c`); + } + } + return input(a, b, c); +} diff --git a/packages/ojs/external-observablehq-parser/test/input/file-attachment.js b/packages/ojs/external-observablehq-parser/test/input/file-attachment.js new file mode 100644 index 00000000000..8086d5f0049 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/file-attachment.js @@ -0,0 +1,6 @@ +{ + let a = FileAttachment("a"); + let b = FileAttachment('b'); + let c = FileAttachment(`c`); + let c2 = FileAttachment("c"); +} diff --git a/packages/ojs/external-observablehq-parser/test/input/for-await-generator.js b/packages/ojs/external-observablehq-parser/test/input/for-await-generator.js new file mode 100644 index 00000000000..c13c17d0050 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/for-await-generator.js @@ -0,0 +1,5 @@ +{ + for await (const value of foo()) { + yield value; + } +} diff --git a/packages/ojs/external-observablehq-parser/test/input/for-await-in-function.js b/packages/ojs/external-observablehq-parser/test/input/for-await-in-function.js new file mode 100644 index 00000000000..d1314b6eeee --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/for-await-in-function.js @@ -0,0 +1,7 @@ +async function bar() { + const values = []; + for await (const value of foo()) { + values.push(value); + } + return values; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/for-await.js b/packages/ojs/external-observablehq-parser/test/input/for-await.js new file mode 100644 index 00000000000..c2d795ad138 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/for-await.js @@ -0,0 +1,7 @@ +{ + const values = []; + for await (const value of foo()) { + values.push(value); + } + return values; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/function-unexpected-viewof.js b/packages/ojs/external-observablehq-parser/test/input/function-unexpected-viewof.js new file mode 100644 index 00000000000..d4c1cd1a9c1 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/function-unexpected-viewof.js @@ -0,0 +1 @@ +function viewof() {} diff --git a/packages/ojs/external-observablehq-parser/test/input/global-assignment.js b/packages/ojs/external-observablehq-parser/test/input/global-assignment.js new file mode 100644 index 00000000000..3113f75f830 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/global-assignment.js @@ -0,0 +1,3 @@ +{ + foo = 42; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/illegal-arguments.js b/packages/ojs/external-observablehq-parser/test/input/illegal-arguments.js new file mode 100644 index 00000000000..976cf6717e0 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/illegal-arguments.js @@ -0,0 +1 @@ +1 + arguments.length diff --git a/packages/ojs/external-observablehq-parser/test/input/illegal-arrow-arguments.js b/packages/ojs/external-observablehq-parser/test/input/illegal-arrow-arguments.js new file mode 100644 index 00000000000..fbdecc04e91 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/illegal-arrow-arguments.js @@ -0,0 +1 @@ +() => arguments.length diff --git a/packages/ojs/external-observablehq-parser/test/input/import-as-duplicate.js b/packages/ojs/external-observablehq-parser/test/input/import-as-duplicate.js new file mode 100644 index 00000000000..0a720d8fa36 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/import-as-duplicate.js @@ -0,0 +1 @@ +import {foo, bar as foo} from "module" diff --git a/packages/ojs/external-observablehq-parser/test/input/import-default-as.js b/packages/ojs/external-observablehq-parser/test/input/import-default-as.js new file mode 100644 index 00000000000..abe5f8b3c7f --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/import-default-as.js @@ -0,0 +1 @@ +import {default as foo} from "module" diff --git a/packages/ojs/external-observablehq-parser/test/input/import-default.js b/packages/ojs/external-observablehq-parser/test/input/import-default.js new file mode 100644 index 00000000000..10a024ce35b --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/import-default.js @@ -0,0 +1 @@ +import foo from "module" diff --git a/packages/ojs/external-observablehq-parser/test/input/import-duplicate.js b/packages/ojs/external-observablehq-parser/test/input/import-duplicate.js new file mode 100644 index 00000000000..d3e153a2bdb --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/import-duplicate.js @@ -0,0 +1 @@ +import {foo, foo} from "module" diff --git a/packages/ojs/external-observablehq-parser/test/input/import-empty.js b/packages/ojs/external-observablehq-parser/test/input/import-empty.js new file mode 100644 index 00000000000..157feb16cfb --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/import-empty.js @@ -0,0 +1 @@ +import {} from "module" diff --git a/packages/ojs/external-observablehq-parser/test/input/import-extra.js b/packages/ojs/external-observablehq-parser/test/input/import-extra.js new file mode 100644 index 00000000000..6ea1211bd6d --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/import-extra.js @@ -0,0 +1 @@ +import {foo, bar as baz} from "module" foo diff --git a/packages/ojs/external-observablehq-parser/test/input/import-mutable-as.js b/packages/ojs/external-observablehq-parser/test/input/import-mutable-as.js new file mode 100644 index 00000000000..2e5f7add09f --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/import-mutable-as.js @@ -0,0 +1 @@ +import {mutable foo as bar} from "module" diff --git a/packages/ojs/external-observablehq-parser/test/input/import-mutable.js b/packages/ojs/external-observablehq-parser/test/input/import-mutable.js new file mode 100644 index 00000000000..5b0ad0d2249 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/import-mutable.js @@ -0,0 +1 @@ +import {mutable foo} from "module" diff --git a/packages/ojs/external-observablehq-parser/test/input/import-semicolon.js b/packages/ojs/external-observablehq-parser/test/input/import-semicolon.js new file mode 100644 index 00000000000..8bf1eee71de --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/import-semicolon.js @@ -0,0 +1 @@ +import {foo, bar as baz} from "module"; diff --git a/packages/ojs/external-observablehq-parser/test/input/import-side-effect.js b/packages/ojs/external-observablehq-parser/test/input/import-side-effect.js new file mode 100644 index 00000000000..629e1156c68 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/import-side-effect.js @@ -0,0 +1 @@ +import "module" diff --git a/packages/ojs/external-observablehq-parser/test/input/import-viewof-as.js b/packages/ojs/external-observablehq-parser/test/input/import-viewof-as.js new file mode 100644 index 00000000000..e8311bb2055 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/import-viewof-as.js @@ -0,0 +1 @@ +import {viewof foo as bar} from "module" diff --git a/packages/ojs/external-observablehq-parser/test/input/import-viewof.js b/packages/ojs/external-observablehq-parser/test/input/import-viewof.js new file mode 100644 index 00000000000..5ffde22f7cc --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/import-viewof.js @@ -0,0 +1 @@ +import {viewof foo} from "module" diff --git a/packages/ojs/external-observablehq-parser/test/input/import-with-as-duplicate.js b/packages/ojs/external-observablehq-parser/test/input/import-with-as-duplicate.js new file mode 100644 index 00000000000..31bc5def4b5 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/import-with-as-duplicate.js @@ -0,0 +1 @@ +import {} with {foo, bar as foo} from "module" diff --git a/packages/ojs/external-observablehq-parser/test/input/import-with-default-as.js b/packages/ojs/external-observablehq-parser/test/input/import-with-default-as.js new file mode 100644 index 00000000000..00935b1287d --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/import-with-default-as.js @@ -0,0 +1 @@ +import {foo} with {baz as default} from "module" diff --git a/packages/ojs/external-observablehq-parser/test/input/import-with-default.js b/packages/ojs/external-observablehq-parser/test/input/import-with-default.js new file mode 100644 index 00000000000..943f411e005 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/import-with-default.js @@ -0,0 +1 @@ +import {foo} with {default as baz} from "module" diff --git a/packages/ojs/external-observablehq-parser/test/input/import-with-duplicate.js b/packages/ojs/external-observablehq-parser/test/input/import-with-duplicate.js new file mode 100644 index 00000000000..d3fd2ff5e36 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/import-with-duplicate.js @@ -0,0 +1 @@ +import {} with {foo, foo} from "module" diff --git a/packages/ojs/external-observablehq-parser/test/input/import-with-empty.js b/packages/ojs/external-observablehq-parser/test/input/import-with-empty.js new file mode 100644 index 00000000000..96afb161d5d --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/import-with-empty.js @@ -0,0 +1 @@ +import {foo} with {} from "module" diff --git a/packages/ojs/external-observablehq-parser/test/input/import-with.js b/packages/ojs/external-observablehq-parser/test/input/import-with.js new file mode 100644 index 00000000000..95294b25622 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/import-with.js @@ -0,0 +1 @@ +import {foo} with {bar as baz} from "module" diff --git a/packages/ojs/external-observablehq-parser/test/input/import.js b/packages/ojs/external-observablehq-parser/test/input/import.js new file mode 100644 index 00000000000..999f6028f1d --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/import.js @@ -0,0 +1 @@ +import {foo, bar as baz} from "module" diff --git a/packages/ojs/external-observablehq-parser/test/input/leading-semicolon.js b/packages/ojs/external-observablehq-parser/test/input/leading-semicolon.js new file mode 100644 index 00000000000..4505c643010 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/leading-semicolon.js @@ -0,0 +1 @@ +;42 diff --git a/packages/ojs/external-observablehq-parser/test/input/legal-arguments.js b/packages/ojs/external-observablehq-parser/test/input/legal-arguments.js new file mode 100644 index 00000000000..0ba1321949e --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/legal-arguments.js @@ -0,0 +1 @@ +function() { return arguments.length; } diff --git a/packages/ojs/external-observablehq-parser/test/input/logical-assignment.js b/packages/ojs/external-observablehq-parser/test/input/logical-assignment.js new file mode 100644 index 00000000000..ce81bff5cbb --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/logical-assignment.js @@ -0,0 +1,6 @@ +{ + let a = null; + let b = false; + a ||= b; + return a; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/markdown-interpolation.md b/packages/ojs/external-observablehq-parser/test/input/markdown-interpolation.md new file mode 100644 index 00000000000..57fb097eac6 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/markdown-interpolation.md @@ -0,0 +1,3 @@ +Count: ${++mutable count} +View: ${viewof Foo} +Regular Value: ${value} diff --git a/packages/ojs/external-observablehq-parser/test/input/markdown.md b/packages/ojs/external-observablehq-parser/test/input/markdown.md new file mode 100644 index 00000000000..971bb5538cf --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/markdown.md @@ -0,0 +1,7 @@ +# Header 1 + +``` +const codeBlock = true; +``` + +Paragraph that references `codeBlock`. Foo value: "${foo}". \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/input/member-assignment.js b/packages/ojs/external-observablehq-parser/test/input/member-assignment.js new file mode 100644 index 00000000000..f53ef6a108b --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/member-assignment.js @@ -0,0 +1 @@ +window.foo = 2 diff --git a/packages/ojs/external-observablehq-parser/test/input/multiple-input-references.js b/packages/ojs/external-observablehq-parser/test/input/multiple-input-references.js new file mode 100644 index 00000000000..41b4fa9fe15 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/multiple-input-references.js @@ -0,0 +1,6 @@ +cell = { + const sum = a + b; + const product = a * b; + const difference = a - b; + return {sum, product, difference}; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/mutable-argument.js b/packages/ojs/external-observablehq-parser/test/input/mutable-argument.js new file mode 100644 index 00000000000..57133fe38a6 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/mutable-argument.js @@ -0,0 +1,3 @@ +function fn(mutable) { + return mutable; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/mutable-as-property.js b/packages/ojs/external-observablehq-parser/test/input/mutable-as-property.js new file mode 100644 index 00000000000..8701d5b807a --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/mutable-as-property.js @@ -0,0 +1 @@ +object[mutable foo] + 1 diff --git a/packages/ojs/external-observablehq-parser/test/input/mutable-assign-default.js b/packages/ojs/external-observablehq-parser/test/input/mutable-assign-default.js new file mode 100644 index 00000000000..24d98b0dba2 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/mutable-assign-default.js @@ -0,0 +1 @@ +mutable state = await Service.fetch(config) diff --git a/packages/ojs/external-observablehq-parser/test/input/mutable-assignment.js b/packages/ojs/external-observablehq-parser/test/input/mutable-assignment.js new file mode 100644 index 00000000000..4268d0f4d7d --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/mutable-assignment.js @@ -0,0 +1,3 @@ +{ + mutable value = 101; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/mutable-block-cell.js b/packages/ojs/external-observablehq-parser/test/input/mutable-block-cell.js new file mode 100644 index 00000000000..b243fd9396a --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/mutable-block-cell.js @@ -0,0 +1,3 @@ +mutable foo = { + return {x: 0, y: 0}; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/mutable-constant.js b/packages/ojs/external-observablehq-parser/test/input/mutable-constant.js new file mode 100644 index 00000000000..813f312c54b --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/mutable-constant.js @@ -0,0 +1 @@ +mutable 101 diff --git a/packages/ojs/external-observablehq-parser/test/input/mutable-default-value.js b/packages/ojs/external-observablehq-parser/test/input/mutable-default-value.js new file mode 100644 index 00000000000..6b8d81dc750 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/mutable-default-value.js @@ -0,0 +1,3 @@ +function fn(y = mutable x) { + return y; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/mutable-destructure-array.js b/packages/ojs/external-observablehq-parser/test/input/mutable-destructure-array.js new file mode 100644 index 00000000000..8ad56cdd0a6 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/mutable-destructure-array.js @@ -0,0 +1 @@ +([mutable x] = [42]) diff --git a/packages/ojs/external-observablehq-parser/test/input/mutable-destructure-object.js b/packages/ojs/external-observablehq-parser/test/input/mutable-destructure-object.js new file mode 100644 index 00000000000..873859c2201 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/mutable-destructure-object.js @@ -0,0 +1 @@ +({property: mutable x} = {property: value}) diff --git a/packages/ojs/external-observablehq-parser/test/input/mutable-destructure-property.js b/packages/ojs/external-observablehq-parser/test/input/mutable-destructure-property.js new file mode 100644 index 00000000000..b8428e30691 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/mutable-destructure-property.js @@ -0,0 +1 @@ +({mutable property} = {mutable property: 42}) diff --git a/packages/ojs/external-observablehq-parser/test/input/mutable-in-markdown.md b/packages/ojs/external-observablehq-parser/test/input/mutable-in-markdown.md new file mode 100644 index 00000000000..6c84a8a851a --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/mutable-in-markdown.md @@ -0,0 +1,3 @@ +${++mutable counter}. First item +${++mutable counter}. Second item +${++mutable counter}. Third item diff --git a/packages/ojs/external-observablehq-parser/test/input/mutable-internal-comment.js b/packages/ojs/external-observablehq-parser/test/input/mutable-internal-comment.js new file mode 100644 index 00000000000..ce6e7824c0d --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/mutable-internal-comment.js @@ -0,0 +1 @@ +mutable /* comment */ value diff --git a/packages/ojs/external-observablehq-parser/test/input/mutable-member.js b/packages/ojs/external-observablehq-parser/test/input/mutable-member.js new file mode 100644 index 00000000000..0d198101313 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/mutable-member.js @@ -0,0 +1 @@ +object.mutable foo + 1 diff --git a/packages/ojs/external-observablehq-parser/test/input/mutable-reference.js b/packages/ojs/external-observablehq-parser/test/input/mutable-reference.js new file mode 100644 index 00000000000..4e1392ad5c1 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/mutable-reference.js @@ -0,0 +1 @@ +mutable value.property diff --git a/packages/ojs/external-observablehq-parser/test/input/mutable-var.js b/packages/ojs/external-observablehq-parser/test/input/mutable-var.js new file mode 100644 index 00000000000..566d489fc97 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/mutable-var.js @@ -0,0 +1,3 @@ +{ + var mutable = 2; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/named-async-function.js b/packages/ojs/external-observablehq-parser/test/input/named-async-function.js new file mode 100644 index 00000000000..841d4e43cbb --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/named-async-function.js @@ -0,0 +1 @@ +async function foo() { await promise; } diff --git a/packages/ojs/external-observablehq-parser/test/input/named-block-cell.js b/packages/ojs/external-observablehq-parser/test/input/named-block-cell.js new file mode 100644 index 00000000000..366f411b473 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/named-block-cell.js @@ -0,0 +1,3 @@ +foo = { + return 42; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/named-class-with-field.js b/packages/ojs/external-observablehq-parser/test/input/named-class-with-field.js new file mode 100644 index 00000000000..3485e4bb883 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/named-class-with-field.js @@ -0,0 +1,3 @@ +class Foo { + field = "field"; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/named-class-with-method.js b/packages/ojs/external-observablehq-parser/test/input/named-class-with-method.js new file mode 100644 index 00000000000..3b531c87eff --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/named-class-with-method.js @@ -0,0 +1,5 @@ +class Foo { + method() { + return "foo"; + } +} diff --git a/packages/ojs/external-observablehq-parser/test/input/named-class-with-private-field.js b/packages/ojs/external-observablehq-parser/test/input/named-class-with-private-field.js new file mode 100644 index 00000000000..9c7b96ec905 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/named-class-with-private-field.js @@ -0,0 +1,4 @@ +class Foo { + #field = "field"; + #method() {} +} diff --git a/packages/ojs/external-observablehq-parser/test/input/named-class-with-static-field.js b/packages/ojs/external-observablehq-parser/test/input/named-class-with-static-field.js new file mode 100644 index 00000000000..83dc6563ee9 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/named-class-with-static-field.js @@ -0,0 +1,3 @@ +class Foo { + static field = "field"; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/named-class.js b/packages/ojs/external-observablehq-parser/test/input/named-class.js new file mode 100644 index 00000000000..4e6a6de6531 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/named-class.js @@ -0,0 +1 @@ +class Foo {} diff --git a/packages/ojs/external-observablehq-parser/test/input/named-empty.js b/packages/ojs/external-observablehq-parser/test/input/named-empty.js new file mode 100644 index 00000000000..312149d4072 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/named-empty.js @@ -0,0 +1 @@ +foo = diff --git a/packages/ojs/external-observablehq-parser/test/input/named-expression-cell.js b/packages/ojs/external-observablehq-parser/test/input/named-expression-cell.js new file mode 100644 index 00000000000..c84a9b135a3 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/named-expression-cell.js @@ -0,0 +1 @@ +foo = 42 diff --git a/packages/ojs/external-observablehq-parser/test/input/named-function-in-named-cell.js b/packages/ojs/external-observablehq-parser/test/input/named-function-in-named-cell.js new file mode 100644 index 00000000000..1a2590b9a7a --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/named-function-in-named-cell.js @@ -0,0 +1 @@ +foo = function bar() { return 42; } diff --git a/packages/ojs/external-observablehq-parser/test/input/named-function.js b/packages/ojs/external-observablehq-parser/test/input/named-function.js new file mode 100644 index 00000000000..0b45d268a48 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/named-function.js @@ -0,0 +1 @@ +function foo() { return 42; } diff --git a/packages/ojs/external-observablehq-parser/test/input/named-generator-function.js b/packages/ojs/external-observablehq-parser/test/input/named-generator-function.js new file mode 100644 index 00000000000..849cd137104 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/named-generator-function.js @@ -0,0 +1 @@ +function* foo() { yield 42; } diff --git a/packages/ojs/external-observablehq-parser/test/input/notification-client.js b/packages/ojs/external-observablehq-parser/test/input/notification-client.js new file mode 100644 index 00000000000..d8291d1c8e9 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/notification-client.js @@ -0,0 +1,3 @@ +{ + let a = NotificationClient("slack:@claire"); +} diff --git a/packages/ojs/external-observablehq-parser/test/input/nullish-coalescing.js b/packages/ojs/external-observablehq-parser/test/input/nullish-coalescing.js new file mode 100644 index 00000000000..0c6225c854a --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/nullish-coalescing.js @@ -0,0 +1 @@ +foo = null ?? 'default string' diff --git a/packages/ojs/external-observablehq-parser/test/input/object-literal.js b/packages/ojs/external-observablehq-parser/test/input/object-literal.js new file mode 100644 index 00000000000..7260b47690f --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/object-literal.js @@ -0,0 +1 @@ +({foo: 42}) diff --git a/packages/ojs/external-observablehq-parser/test/input/optional-chaining.js b/packages/ojs/external-observablehq-parser/test/input/optional-chaining.js new file mode 100644 index 00000000000..3fb76ae4de0 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/optional-chaining.js @@ -0,0 +1 @@ +dogName = adventurer.dog?.name diff --git a/packages/ojs/external-observablehq-parser/test/input/reserved-function.js b/packages/ojs/external-observablehq-parser/test/input/reserved-function.js new file mode 100644 index 00000000000..7de2686b34f --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/reserved-function.js @@ -0,0 +1 @@ +function Array() {} diff --git a/packages/ojs/external-observablehq-parser/test/input/reserved-import-as.js b/packages/ojs/external-observablehq-parser/test/input/reserved-import-as.js new file mode 100644 index 00000000000..a573a367243 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/reserved-import-as.js @@ -0,0 +1 @@ +import {foo as Array} from "module" diff --git a/packages/ojs/external-observablehq-parser/test/input/reserved-import-view.js b/packages/ojs/external-observablehq-parser/test/input/reserved-import-view.js new file mode 100644 index 00000000000..f7d239d1e03 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/reserved-import-view.js @@ -0,0 +1 @@ +import {viewof Array} from "module" diff --git a/packages/ojs/external-observablehq-parser/test/input/reserved-import-with-as.js b/packages/ojs/external-observablehq-parser/test/input/reserved-import-with-as.js new file mode 100644 index 00000000000..6141c27ab68 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/reserved-import-with-as.js @@ -0,0 +1 @@ +import {foo} with {bar as Array} from "module" diff --git a/packages/ojs/external-observablehq-parser/test/input/reserved-import-with.js b/packages/ojs/external-observablehq-parser/test/input/reserved-import-with.js new file mode 100644 index 00000000000..1f94dcd068a --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/reserved-import-with.js @@ -0,0 +1 @@ +import {foo} with {Array} from "module" diff --git a/packages/ojs/external-observablehq-parser/test/input/reserved-import.js b/packages/ojs/external-observablehq-parser/test/input/reserved-import.js new file mode 100644 index 00000000000..379f0bb9f8d --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/reserved-import.js @@ -0,0 +1 @@ +import {Array} from "module" diff --git a/packages/ojs/external-observablehq-parser/test/input/reserved-name.js b/packages/ojs/external-observablehq-parser/test/input/reserved-name.js new file mode 100644 index 00000000000..aece145ba26 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/reserved-name.js @@ -0,0 +1 @@ +Array = false diff --git a/packages/ojs/external-observablehq-parser/test/input/reserved-view.js b/packages/ojs/external-observablehq-parser/test/input/reserved-view.js new file mode 100644 index 00000000000..f315197a7db --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/reserved-view.js @@ -0,0 +1 @@ +viewof Array = false diff --git a/packages/ojs/external-observablehq-parser/test/input/secret.js b/packages/ojs/external-observablehq-parser/test/input/secret.js new file mode 100644 index 00000000000..b571d68bb42 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/secret.js @@ -0,0 +1,3 @@ +{ + let a = Secret("a"); +} diff --git a/packages/ojs/external-observablehq-parser/test/input/semicolon.js b/packages/ojs/external-observablehq-parser/test/input/semicolon.js new file mode 100644 index 00000000000..092bc2b0412 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/semicolon.js @@ -0,0 +1 @@ +; diff --git a/packages/ojs/external-observablehq-parser/test/input/sequence-expression.js b/packages/ojs/external-observablehq-parser/test/input/sequence-expression.js new file mode 100644 index 00000000000..2739d724db3 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/sequence-expression.js @@ -0,0 +1 @@ +1, 2, 3 diff --git a/packages/ojs/external-observablehq-parser/test/input/shadowed-view.js b/packages/ojs/external-observablehq-parser/test/input/shadowed-view.js new file mode 100644 index 00000000000..9c75ab2a289 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/shadowed-view.js @@ -0,0 +1,5 @@ +{ + let x = 2; + x = 4; + return viewof x; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/simple-await-tagged-template.js b/packages/ojs/external-observablehq-parser/test/input/simple-await-tagged-template.js new file mode 100644 index 00000000000..5b6abb3b4af --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/simple-await-tagged-template.js @@ -0,0 +1 @@ +md`${await promise}` diff --git a/packages/ojs/external-observablehq-parser/test/input/simple-await-template.js b/packages/ojs/external-observablehq-parser/test/input/simple-await-template.js new file mode 100644 index 00000000000..a136afb9b65 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/simple-await-template.js @@ -0,0 +1 @@ +`${await promise}` diff --git a/packages/ojs/external-observablehq-parser/test/input/simple-await-template.md b/packages/ojs/external-observablehq-parser/test/input/simple-await-template.md new file mode 100644 index 00000000000..653f8d57a84 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/simple-await-template.md @@ -0,0 +1 @@ +${await promise} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/input/simple-identifier.js b/packages/ojs/external-observablehq-parser/test/input/simple-identifier.js new file mode 100644 index 00000000000..257cc5642cb --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/simple-identifier.js @@ -0,0 +1 @@ +foo diff --git a/packages/ojs/external-observablehq-parser/test/input/spread-element.js b/packages/ojs/external-observablehq-parser/test/input/spread-element.js new file mode 100644 index 00000000000..dec735b7e59 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/spread-element.js @@ -0,0 +1 @@ +({foo, ...bar}) => bar diff --git a/packages/ojs/external-observablehq-parser/test/input/template-literal-semicolon.js b/packages/ojs/external-observablehq-parser/test/input/template-literal-semicolon.js new file mode 100644 index 00000000000..a9448b89b66 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/template-literal-semicolon.js @@ -0,0 +1 @@ +html`hello`; diff --git a/packages/ojs/external-observablehq-parser/test/input/this-as-name.js b/packages/ojs/external-observablehq-parser/test/input/this-as-name.js new file mode 100644 index 00000000000..aa288897240 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/this-as-name.js @@ -0,0 +1 @@ +this = 42 diff --git a/packages/ojs/external-observablehq-parser/test/input/this.js b/packages/ojs/external-observablehq-parser/test/input/this.js new file mode 100644 index 00000000000..9ecf3cf1d5e --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/this.js @@ -0,0 +1 @@ +this diff --git a/packages/ojs/external-observablehq-parser/test/input/underline.tex b/packages/ojs/external-observablehq-parser/test/input/underline.tex new file mode 100644 index 00000000000..a92d666e245 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/underline.tex @@ -0,0 +1 @@ +\text{This is some text \underline{with an underline}} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/input/var-statement.js b/packages/ojs/external-observablehq-parser/test/input/var-statement.js new file mode 100644 index 00000000000..3c06778d801 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/var-statement.js @@ -0,0 +1 @@ +var foo = 42 diff --git a/packages/ojs/external-observablehq-parser/test/input/viewof-argument.js b/packages/ojs/external-observablehq-parser/test/input/viewof-argument.js new file mode 100644 index 00000000000..d4fc98aed76 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/viewof-argument.js @@ -0,0 +1,3 @@ +function foo(viewof) { + return viewof; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/viewof-assignment.js b/packages/ojs/external-observablehq-parser/test/input/viewof-assignment.js new file mode 100644 index 00000000000..a2d6c81ce5c --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/viewof-assignment.js @@ -0,0 +1,3 @@ +{ + viewof foo = 2; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/viewof-binding.js b/packages/ojs/external-observablehq-parser/test/input/viewof-binding.js new file mode 100644 index 00000000000..ca62bfc3ade --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/viewof-binding.js @@ -0,0 +1,3 @@ +{ + let viewof foo = 2; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/viewof-block-cell.js b/packages/ojs/external-observablehq-parser/test/input/viewof-block-cell.js new file mode 100644 index 00000000000..6c4aa9ce75a --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/viewof-block-cell.js @@ -0,0 +1,3 @@ +viewof foo = { + return DOM.input(); +} diff --git a/packages/ojs/external-observablehq-parser/test/input/viewof-expression-cell.js b/packages/ojs/external-observablehq-parser/test/input/viewof-expression-cell.js new file mode 100644 index 00000000000..bb08e1c10d5 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/viewof-expression-cell.js @@ -0,0 +1 @@ +viewof foo = DOM.input() diff --git a/packages/ojs/external-observablehq-parser/test/input/viewof-in-markdown.md b/packages/ojs/external-observablehq-parser/test/input/viewof-in-markdown.md new file mode 100644 index 00000000000..2579ebb2c5e --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/viewof-in-markdown.md @@ -0,0 +1 @@ +# `Code Title ${object[viewof foo]}` diff --git a/packages/ojs/external-observablehq-parser/test/input/viewof-internal-comment.js b/packages/ojs/external-observablehq-parser/test/input/viewof-internal-comment.js new file mode 100644 index 00000000000..5bc2b1ab0e2 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/viewof-internal-comment.js @@ -0,0 +1 @@ +viewof /* comment */ bar = DOM.range() diff --git a/packages/ojs/external-observablehq-parser/test/input/viewof-let.js b/packages/ojs/external-observablehq-parser/test/input/viewof-let.js new file mode 100644 index 00000000000..dd76eaa0e93 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/viewof-let.js @@ -0,0 +1,3 @@ +{ + let viewof = 2; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/viewof-member-expression.js b/packages/ojs/external-observablehq-parser/test/input/viewof-member-expression.js new file mode 100644 index 00000000000..b0679186897 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/viewof-member-expression.js @@ -0,0 +1 @@ +viewof foo.name diff --git a/packages/ojs/external-observablehq-parser/test/input/viewof-member.js b/packages/ojs/external-observablehq-parser/test/input/viewof-member.js new file mode 100644 index 00000000000..c8ea11bbffd --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/viewof-member.js @@ -0,0 +1 @@ +object.viewof foo + 2 diff --git a/packages/ojs/external-observablehq-parser/test/input/viewof-orphan.js b/packages/ojs/external-observablehq-parser/test/input/viewof-orphan.js new file mode 100644 index 00000000000..e73dfd2420e --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/viewof-orphan.js @@ -0,0 +1 @@ +viewof 42 diff --git a/packages/ojs/external-observablehq-parser/test/input/viewof-property.js b/packages/ojs/external-observablehq-parser/test/input/viewof-property.js new file mode 100644 index 00000000000..4433144c982 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/viewof-property.js @@ -0,0 +1 @@ +object[viewof foo] + 2 diff --git a/packages/ojs/external-observablehq-parser/test/input/viewof-reference-internal-comment.js b/packages/ojs/external-observablehq-parser/test/input/viewof-reference-internal-comment.js new file mode 100644 index 00000000000..5da2bd62e8b --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/viewof-reference-internal-comment.js @@ -0,0 +1 @@ +viewof /* comment */ bar diff --git a/packages/ojs/external-observablehq-parser/test/input/viewof-reference.js b/packages/ojs/external-observablehq-parser/test/input/viewof-reference.js new file mode 100644 index 00000000000..1237eaf257b --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/viewof-reference.js @@ -0,0 +1 @@ +viewof input.tagName diff --git a/packages/ojs/external-observablehq-parser/test/input/yield-await.js b/packages/ojs/external-observablehq-parser/test/input/yield-await.js new file mode 100644 index 00000000000..896ba726056 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/yield-await.js @@ -0,0 +1,4 @@ +{ + yield value; + await promise; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/yield-block-cell.js b/packages/ojs/external-observablehq-parser/test/input/yield-block-cell.js new file mode 100644 index 00000000000..a7094789b04 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/yield-block-cell.js @@ -0,0 +1,3 @@ +{ + yield value; +} diff --git a/packages/ojs/external-observablehq-parser/test/input/yield-expression-cell.js b/packages/ojs/external-observablehq-parser/test/input/yield-expression-cell.js new file mode 100644 index 00000000000..a9941034712 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/yield-expression-cell.js @@ -0,0 +1 @@ +yield value diff --git a/packages/ojs/external-observablehq-parser/test/input/yield-in-function.js b/packages/ojs/external-observablehq-parser/test/input/yield-in-function.js new file mode 100644 index 00000000000..a987edd7418 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/yield-in-function.js @@ -0,0 +1,5 @@ +{ + function* inner() { + yield value; + } +} diff --git a/packages/ojs/external-observablehq-parser/test/input/yield-star-expression-cell.js b/packages/ojs/external-observablehq-parser/test/input/yield-star-expression-cell.js new file mode 100644 index 00000000000..e1082ff2524 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/input/yield-star-expression-cell.js @@ -0,0 +1 @@ +yield* values diff --git a/packages/ojs/external-observablehq-parser/test/output/anonymous-block-cell.js.json b/packages/ojs/external-observablehq-parser/test/output/anonymous-block-cell.js.json new file mode 100644 index 00000000000..c6c2aed6a75 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/anonymous-block-cell.js.json @@ -0,0 +1,32 @@ +{ + "type": "Cell", + "start": 0, + "end": 17, + "id": null, + "body": { + "type": "BlockStatement", + "start": 0, + "end": 16, + "body": [ + { + "type": "ReturnStatement", + "start": 4, + "end": 14, + "argument": { + "type": "Literal", + "start": 11, + "end": 13, + "value": 42, + "raw": "42" + } + } + ] + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/anonymous-expression-cell.js.json b/packages/ojs/external-observablehq-parser/test/output/anonymous-expression-cell.js.json new file mode 100644 index 00000000000..c34cdf77648 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/anonymous-expression-cell.js.json @@ -0,0 +1,20 @@ +{ + "type": "Cell", + "start": 0, + "end": 3, + "id": null, + "body": { + "type": "Literal", + "start": 0, + "end": 2, + "value": 42, + "raw": "42" + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/anonymous-function.js.json b/packages/ojs/external-observablehq-parser/test/output/anonymous-function.js.json new file mode 100644 index 00000000000..81d0f7b408f --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/anonymous-function.js.json @@ -0,0 +1,42 @@ +{ + "type": "Cell", + "start": 0, + "end": 26, + "id": null, + "body": { + "type": "FunctionExpression", + "start": 0, + "end": 25, + "id": null, + "expression": false, + "generator": false, + "async": false, + "params": [], + "body": { + "type": "BlockStatement", + "start": 11, + "end": 25, + "body": [ + { + "type": "ReturnStatement", + "start": 13, + "end": 23, + "argument": { + "type": "Literal", + "start": 20, + "end": 22, + "value": 42, + "raw": "42" + } + } + ] + } + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/arguments-name.js.json b/packages/ojs/external-observablehq-parser/test/output/arguments-name.js.json new file mode 100644 index 00000000000..8117b88015d --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/arguments-name.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Identifier 'arguments' is reserved (1:0)", + "pos": 0, + "loc": { + "line": 1, + "column": 0 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/await-block-cell.js.json b/packages/ojs/external-observablehq-parser/test/output/await-block-cell.js.json new file mode 100644 index 00000000000..30a402feee9 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/await-block-cell.js.json @@ -0,0 +1,43 @@ +{ + "type": "Cell", + "start": 0, + "end": 21, + "id": null, + "body": { + "type": "BlockStatement", + "start": 0, + "end": 20, + "body": [ + { + "type": "ExpressionStatement", + "start": 4, + "end": 18, + "expression": { + "type": "AwaitExpression", + "start": 4, + "end": 17, + "argument": { + "type": "Identifier", + "start": 10, + "end": 17, + "name": "promise" + } + } + } + ] + }, + "async": true, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 10, + "end": 17, + "name": "promise" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/await-in-arrow-function-expression.js.json b/packages/ojs/external-observablehq-parser/test/output/await-in-arrow-function-expression.js.json new file mode 100644 index 00000000000..6cb64551381 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/await-in-arrow-function-expression.js.json @@ -0,0 +1,53 @@ +{ + "type": "Cell", + "start": 0, + "end": 33, + "id": null, + "body": { + "type": "ArrowFunctionExpression", + "start": 0, + "end": 32, + "id": null, + "expression": false, + "generator": false, + "async": true, + "params": [], + "body": { + "type": "BlockStatement", + "start": 12, + "end": 32, + "body": [ + { + "type": "ExpressionStatement", + "start": 16, + "end": 30, + "expression": { + "type": "AwaitExpression", + "start": 16, + "end": 29, + "argument": { + "type": "Identifier", + "start": 22, + "end": 29, + "name": "promise" + } + } + } + ] + } + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 22, + "end": 29, + "name": "promise" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/await-in-arrow-function.js.json b/packages/ojs/external-observablehq-parser/test/output/await-in-arrow-function.js.json new file mode 100644 index 00000000000..06e8b7ab23d --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/await-in-arrow-function.js.json @@ -0,0 +1,79 @@ +{ + "type": "Cell", + "start": 0, + "end": 58, + "id": null, + "body": { + "type": "BlockStatement", + "start": 0, + "end": 57, + "body": [ + { + "type": "VariableDeclaration", + "start": 4, + "end": 55, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 10, + "end": 54, + "id": { + "type": "Identifier", + "start": 10, + "end": 15, + "name": "inner" + }, + "init": { + "type": "ArrowFunctionExpression", + "start": 18, + "end": 54, + "id": null, + "expression": false, + "generator": false, + "async": true, + "params": [], + "body": { + "type": "BlockStatement", + "start": 30, + "end": 54, + "body": [ + { + "type": "ExpressionStatement", + "start": 36, + "end": 50, + "expression": { + "type": "AwaitExpression", + "start": 36, + "end": 49, + "argument": { + "type": "Identifier", + "start": 42, + "end": 49, + "name": "promise" + } + } + } + ] + } + } + } + ], + "kind": "const" + } + ] + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 42, + "end": 49, + "name": "promise" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/await-in-class.js.json b/packages/ojs/external-observablehq-parser/test/output/await-in-class.js.json new file mode 100644 index 00000000000..c3dce341223 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/await-in-class.js.json @@ -0,0 +1,93 @@ +{ + "type": "Cell", + "start": 0, + "end": 72, + "id": null, + "body": { + "type": "BlockStatement", + "start": 0, + "end": 71, + "body": [ + { + "type": "ClassDeclaration", + "start": 4, + "end": 69, + "id": { + "type": "Identifier", + "start": 10, + "end": 15, + "name": "Inner" + }, + "superClass": null, + "body": { + "type": "ClassBody", + "start": 16, + "end": 69, + "body": [ + { + "type": "MethodDefinition", + "start": 22, + "end": 65, + "static": false, + "computed": false, + "key": { + "type": "Identifier", + "start": 28, + "end": 34, + "name": "method" + }, + "kind": "method", + "value": { + "type": "FunctionExpression", + "start": 34, + "end": 65, + "id": null, + "expression": false, + "generator": false, + "async": true, + "params": [], + "body": { + "type": "BlockStatement", + "start": 37, + "end": 65, + "body": [ + { + "type": "ExpressionStatement", + "start": 45, + "end": 59, + "expression": { + "type": "AwaitExpression", + "start": 45, + "end": 58, + "argument": { + "type": "Identifier", + "start": 51, + "end": 58, + "name": "promise" + } + } + } + ] + } + } + } + ] + } + } + ] + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 51, + "end": 58, + "name": "promise" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/await-in-function.js.json b/packages/ojs/external-observablehq-parser/test/output/await-in-function.js.json new file mode 100644 index 00000000000..5beb679892b --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/await-in-function.js.json @@ -0,0 +1,65 @@ +{ + "type": "Cell", + "start": 0, + "end": 54, + "id": null, + "body": { + "type": "BlockStatement", + "start": 0, + "end": 53, + "body": [ + { + "type": "FunctionDeclaration", + "start": 4, + "end": 51, + "id": { + "type": "Identifier", + "start": 19, + "end": 24, + "name": "inner" + }, + "expression": false, + "generator": false, + "async": true, + "params": [], + "body": { + "type": "BlockStatement", + "start": 27, + "end": 51, + "body": [ + { + "type": "ExpressionStatement", + "start": 33, + "end": 47, + "expression": { + "type": "AwaitExpression", + "start": 33, + "end": 46, + "argument": { + "type": "Identifier", + "start": 39, + "end": 46, + "name": "promise" + } + } + } + ] + } + } + ] + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 39, + "end": 46, + "name": "promise" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/await-in-markdown.md.json b/packages/ojs/external-observablehq-parser/test/output/await-in-markdown.md.json new file mode 100644 index 00000000000..d017f4fedda --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/await-in-markdown.md.json @@ -0,0 +1,94 @@ +{ + "type": "Cell", + "start": 0, + "end": 30, + "id": null, + "body": { + "type": "TemplateLiteral", + "start": 0, + "end": 30, + "expressions": [ + { + "type": "AwaitExpression", + "start": 4, + "end": 26, + "argument": { + "type": "CallExpression", + "start": 10, + "end": 26, + "callee": { + "type": "Identifier", + "start": 10, + "end": 24, + "name": "importantValue" + }, + "arguments": [], + "optional": false + } + } + ], + "quasis": [ + { + "type": "TemplateElement", + "start": 0, + "end": 2, + "value": { + "raw": "**", + "cooked": null + }, + "tail": false + }, + { + "type": "TemplateElement", + "start": 27, + "end": 30, + "value": { + "raw": "**\n", + "cooked": null + }, + "tail": true + } + ] + }, + "async": true, + "generator": false, + "tag": { + "type": "CellTag", + "start": 0, + "end": 2, + "body": { + "type": "Identifier", + "start": 0, + "end": 2, + "name": "md" + }, + "input": "md", + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 0, + "end": 2, + "name": "md" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] + }, + "raw": false, + "references": [ + { + "type": "Identifier", + "start": 10, + "end": 24, + "name": "importantValue" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/await-yield.js.json b/packages/ojs/external-observablehq-parser/test/output/await-yield.js.json new file mode 100644 index 00000000000..fc5b4917e44 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/await-yield.js.json @@ -0,0 +1,66 @@ +{ + "type": "Cell", + "start": 0, + "end": 36, + "id": null, + "body": { + "type": "BlockStatement", + "start": 0, + "end": 35, + "body": [ + { + "type": "ExpressionStatement", + "start": 4, + "end": 18, + "expression": { + "type": "AwaitExpression", + "start": 4, + "end": 17, + "argument": { + "type": "Identifier", + "start": 10, + "end": 17, + "name": "promise" + } + } + }, + { + "type": "ExpressionStatement", + "start": 21, + "end": 33, + "expression": { + "type": "YieldExpression", + "start": 21, + "end": 32, + "delegate": false, + "argument": { + "type": "Identifier", + "start": 27, + "end": 32, + "name": "value" + } + } + } + ] + }, + "async": true, + "generator": true, + "references": [ + { + "type": "Identifier", + "start": 10, + "end": 17, + "name": "promise" + }, + { + "type": "Identifier", + "start": 27, + "end": 32, + "name": "value" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/backslash-after-dollar-markdown.md.json b/packages/ojs/external-observablehq-parser/test/output/backslash-after-dollar-markdown.md.json new file mode 100644 index 00000000000..6ed1b88b555 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/backslash-after-dollar-markdown.md.json @@ -0,0 +1,58 @@ +{ + "type": "Cell", + "start": 0, + "end": 8, + "id": null, + "body": { + "type": "TemplateLiteral", + "start": 0, + "end": 8, + "expressions": [], + "quasis": [ + { + "type": "TemplateElement", + "start": 0, + "end": 8, + "value": { + "raw": "$\\{foo}\n", + "cooked": null + }, + "tail": true + } + ] + }, + "async": false, + "generator": false, + "tag": { + "type": "CellTag", + "start": 0, + "end": 2, + "body": { + "type": "Identifier", + "start": 0, + "end": 2, + "name": "md" + }, + "input": "md", + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 0, + "end": 2, + "name": "md" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] + }, + "raw": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/backslash-before-dollar-markdown.md.json b/packages/ojs/external-observablehq-parser/test/output/backslash-before-dollar-markdown.md.json new file mode 100644 index 00000000000..7090496f66e --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/backslash-before-dollar-markdown.md.json @@ -0,0 +1,58 @@ +{ + "type": "Cell", + "start": 0, + "end": 8, + "id": null, + "body": { + "type": "TemplateLiteral", + "start": 0, + "end": 8, + "expressions": [], + "quasis": [ + { + "type": "TemplateElement", + "start": 0, + "end": 8, + "value": { + "raw": "\\${foo}\n", + "cooked": null + }, + "tail": true + } + ] + }, + "async": false, + "generator": false, + "tag": { + "type": "CellTag", + "start": 0, + "end": 2, + "body": { + "type": "Identifier", + "start": 0, + "end": 2, + "name": "md" + }, + "input": "md", + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 0, + "end": 2, + "name": "md" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] + }, + "raw": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/backslash-markdown.md.json b/packages/ojs/external-observablehq-parser/test/output/backslash-markdown.md.json new file mode 100644 index 00000000000..33d697e0698 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/backslash-markdown.md.json @@ -0,0 +1,58 @@ +{ + "type": "Cell", + "start": 0, + "end": 27, + "id": null, + "body": { + "type": "TemplateLiteral", + "start": 0, + "end": 27, + "expressions": [], + "quasis": [ + { + "type": "TemplateElement", + "start": 0, + "end": 27, + "value": { + "raw": "\\Slash before, slash after\\", + "cooked": null + }, + "tail": true + } + ] + }, + "async": false, + "generator": false, + "tag": { + "type": "CellTag", + "start": 0, + "end": 2, + "body": { + "type": "Identifier", + "start": 0, + "end": 2, + "name": "md" + }, + "input": "md", + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 0, + "end": 2, + "name": "md" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] + }, + "raw": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/bare-dynamic-import.js.json b/packages/ojs/external-observablehq-parser/test/output/bare-dynamic-import.js.json new file mode 100644 index 00000000000..666238fcc32 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/bare-dynamic-import.js.json @@ -0,0 +1,25 @@ +{ + "type": "Cell", + "start": 0, + "end": 14, + "id": null, + "body": { + "type": "ImportExpression", + "start": 0, + "end": 13, + "source": { + "type": "Literal", + "start": 7, + "end": 12, + "value": "bar", + "raw": "\"bar\"" + } + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/basic.db.sql.json b/packages/ojs/external-observablehq-parser/test/output/basic.db.sql.json new file mode 100644 index 00000000000..2149b1eb38d --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/basic.db.sql.json @@ -0,0 +1,125 @@ +{ + "type": "Cell", + "start": 0, + "end": 48, + "id": null, + "body": { + "type": "TemplateLiteral", + "start": 0, + "end": 48, + "expressions": [ + { + "type": "Identifier", + "start": 43, + "end": 46, + "name": "val" + } + ], + "quasis": [ + { + "type": "TemplateElement", + "start": 0, + "end": 41, + "value": { + "raw": "SELECT * FROM my_table WHERE my_column = ", + "cooked": null + }, + "tail": false + }, + { + "type": "TemplateElement", + "start": 47, + "end": 48, + "value": { + "raw": "\n", + "cooked": null + }, + "tail": true + } + ] + }, + "async": false, + "generator": false, + "tag": { + "type": "CellTag", + "start": 0, + "end": 38, + "body": { + "type": "MemberExpression", + "start": 0, + "end": 38, + "object": { + "type": "AwaitExpression", + "start": 1, + "end": 33, + "argument": { + "type": "CallExpression", + "start": 7, + "end": 33, + "callee": { + "type": "Identifier", + "start": 7, + "end": 21, + "name": "DatabaseClient" + }, + "arguments": [ + { + "type": "Literal", + "start": 22, + "end": 32, + "value": "database", + "raw": "\"database\"" + } + ], + "optional": false + } + }, + "property": { + "type": "Identifier", + "start": 35, + "end": 38, + "name": "sql" + }, + "computed": false, + "optional": false + }, + "input": "(await DatabaseClient(\"database\")).sql", + "async": true, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 7, + "end": 21, + "name": "DatabaseClient" + } + ], + "fileAttachments": [], + "databaseClients": [ + [ + "database", + [ + { + "start": 22, + "end": 32 + } + ] + ] + ], + "secrets": [], + "notificationClients": [] + }, + "raw": false, + "references": [ + { + "type": "Identifier", + "start": 43, + "end": 46, + "name": "val" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/basic.html.json b/packages/ojs/external-observablehq-parser/test/output/basic.html.json new file mode 100644 index 00000000000..082702de0b5 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/basic.html.json @@ -0,0 +1,95 @@ +{ + "type": "Cell", + "start": 0, + "end": 19, + "id": null, + "body": { + "type": "TemplateLiteral", + "start": 0, + "end": 19, + "expressions": [ + { + "type": "Identifier", + "start": 7, + "end": 12, + "name": "hello" + } + ], + "quasis": [ + { + "type": "TemplateElement", + "start": 0, + "end": 5, + "value": { + "raw": "
", + "cooked": null + }, + "tail": false + }, + { + "type": "TemplateElement", + "start": 13, + "end": 19, + "value": { + "raw": "
", + "cooked": null + }, + "tail": true + } + ] + }, + "async": false, + "generator": false, + "tag": { + "type": "CellTag", + "start": 0, + "end": 8, + "body": { + "type": "MemberExpression", + "start": 0, + "end": 8, + "object": { + "type": "Identifier", + "start": 0, + "end": 3, + "name": "htl" + }, + "property": { + "type": "Identifier", + "start": 4, + "end": 8, + "name": "html" + }, + "computed": false, + "optional": false + }, + "input": "htl.html", + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 0, + "end": 3, + "name": "htl" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] + }, + "raw": false, + "references": [ + { + "type": "Identifier", + "start": 7, + "end": 12, + "name": "hello" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/basic.sql.json b/packages/ojs/external-observablehq-parser/test/output/basic.sql.json new file mode 100644 index 00000000000..dcbba024825 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/basic.sql.json @@ -0,0 +1,94 @@ +{ + "type": "Cell", + "start": 0, + "end": 47, + "id": null, + "body": { + "type": "TemplateLiteral", + "start": 0, + "end": 47, + "expressions": [ + { + "type": "Identifier", + "start": 43, + "end": 46, + "name": "val" + } + ], + "quasis": [ + { + "type": "TemplateElement", + "start": 0, + "end": 41, + "value": { + "raw": "SELECT * FROM my_table WHERE my_column = ", + "cooked": null + }, + "tail": false + }, + { + "type": "TemplateElement", + "start": 47, + "end": 47, + "value": { + "raw": "" + }, + "tail": true + } + ] + }, + "async": false, + "generator": false, + "tag": { + "type": "CellTag", + "start": 0, + "end": 6, + "body": { + "type": "MemberExpression", + "start": 0, + "end": 6, + "object": { + "type": "Identifier", + "start": 0, + "end": 2, + "name": "db" + }, + "property": { + "type": "Identifier", + "start": 3, + "end": 6, + "name": "sql" + }, + "computed": false, + "optional": false + }, + "input": "db.sql", + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 0, + "end": 2, + "name": "db" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] + }, + "raw": false, + "references": [ + { + "type": "Identifier", + "start": 43, + "end": 46, + "name": "val" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/basic.tex.json b/packages/ojs/external-observablehq-parser/test/output/basic.tex.json new file mode 100644 index 00000000000..8193b30d712 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/basic.tex.json @@ -0,0 +1,116 @@ +{ + "type": "Cell", + "start": 0, + "end": 33, + "id": null, + "body": { + "type": "TemplateLiteral", + "start": 0, + "end": 33, + "expressions": [ + { + "type": "Identifier", + "start": 2, + "end": 11, + "name": "numerator" + }, + { + "type": "Identifier", + "start": 21, + "end": 32, + "name": "denominator" + } + ], + "quasis": [ + { + "type": "TemplateElement", + "start": 0, + "end": 0, + "value": { + "raw": "", + "cooked": null + }, + "tail": false + }, + { + "type": "TemplateElement", + "start": 12, + "end": 19, + "value": { + "raw": " \\over ", + "cooked": null + }, + "tail": false + }, + { + "type": "TemplateElement", + "start": 33, + "end": 33, + "value": { + "raw": "" + }, + "tail": true + } + ] + }, + "async": false, + "generator": false, + "tag": { + "type": "CellTag", + "start": 0, + "end": 9, + "body": { + "type": "MemberExpression", + "start": 0, + "end": 9, + "object": { + "type": "Identifier", + "start": 0, + "end": 3, + "name": "tex" + }, + "property": { + "type": "Identifier", + "start": 4, + "end": 9, + "name": "block" + }, + "computed": false, + "optional": false + }, + "input": "tex.block", + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 0, + "end": 3, + "name": "tex" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] + }, + "raw": true, + "references": [ + { + "type": "Identifier", + "start": 2, + "end": 11, + "name": "numerator" + }, + { + "type": "Identifier", + "start": 21, + "end": 32, + "name": "denominator" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/bigint-zero.js.json b/packages/ojs/external-observablehq-parser/test/output/bigint-zero.js.json new file mode 100644 index 00000000000..668f0689e23 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/bigint-zero.js.json @@ -0,0 +1,21 @@ +{ + "type": "Cell", + "start": 0, + "end": 3, + "id": null, + "body": { + "type": "Literal", + "start": 0, + "end": 2, + "value": "0", + "raw": "0n", + "bigint": "0" + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/bigint.js.json b/packages/ojs/external-observablehq-parser/test/output/bigint.js.json new file mode 100644 index 00000000000..25e35f1b62b --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/bigint.js.json @@ -0,0 +1,40 @@ +{ + "type": "Cell", + "start": 0, + "end": 10, + "id": null, + "body": { + "type": "BinaryExpression", + "start": 0, + "end": 9, + "left": { + "type": "Identifier", + "start": 0, + "end": 3, + "name": "foo" + }, + "operator": "+", + "right": { + "type": "Literal", + "start": 6, + "end": 9, + "value": "42", + "raw": "42n", + "bigint": "42" + } + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 0, + "end": 3, + "name": "foo" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/binary-expression.js.json b/packages/ojs/external-observablehq-parser/test/output/binary-expression.js.json new file mode 100644 index 00000000000..183129c7d7a --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/binary-expression.js.json @@ -0,0 +1,39 @@ +{ + "type": "Cell", + "start": 0, + "end": 9, + "id": null, + "body": { + "type": "BinaryExpression", + "start": 0, + "end": 8, + "left": { + "type": "Identifier", + "start": 0, + "end": 3, + "name": "foo" + }, + "operator": "+", + "right": { + "type": "Literal", + "start": 6, + "end": 8, + "value": 42, + "raw": "42" + } + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 0, + "end": 3, + "name": "foo" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/block-leading-comment.js.json b/packages/ojs/external-observablehq-parser/test/output/block-leading-comment.js.json new file mode 100644 index 00000000000..2b373cc66a4 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/block-leading-comment.js.json @@ -0,0 +1,37 @@ +{ + "type": "Cell", + "start": 0, + "end": 44, + "id": { + "type": "Identifier", + "start": 21, + "end": 24, + "name": "foo" + }, + "body": { + "type": "BlockStatement", + "start": 27, + "end": 43, + "body": [ + { + "type": "ReturnStatement", + "start": 31, + "end": 41, + "argument": { + "type": "Literal", + "start": 38, + "end": 40, + "value": 42, + "raw": "42" + } + } + ] + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/block-trailing-comment.js.json b/packages/ojs/external-observablehq-parser/test/output/block-trailing-comment.js.json new file mode 100644 index 00000000000..f3797b01a2b --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/block-trailing-comment.js.json @@ -0,0 +1,37 @@ +{ + "type": "Cell", + "start": 0, + "end": 42, + "id": { + "type": "Identifier", + "start": 0, + "end": 3, + "name": "foo" + }, + "body": { + "type": "BlockStatement", + "start": 6, + "end": 22, + "body": [ + { + "type": "ReturnStatement", + "start": 10, + "end": 20, + "argument": { + "type": "Literal", + "start": 17, + "end": 19, + "value": 42, + "raw": "42" + } + } + ] + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/catch-clause.js.json b/packages/ojs/external-observablehq-parser/test/output/catch-clause.js.json new file mode 100644 index 00000000000..c11cce8047d --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/catch-clause.js.json @@ -0,0 +1,130 @@ +{ + "type": "Cell", + "start": 0, + "end": 86, + "id": null, + "body": { + "type": "BlockStatement", + "start": 0, + "end": 85, + "body": [ + { + "type": "TryStatement", + "start": 4, + "end": 83, + "block": { + "type": "BlockStatement", + "start": 8, + "end": 53, + "body": [ + { + "type": "VariableDeclaration", + "start": 14, + "end": 26, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 18, + "end": 25, + "id": { + "type": "ArrayPattern", + "start": 18, + "end": 21, + "elements": [ + { + "type": "Identifier", + "start": 19, + "end": 20, + "name": "x" + } + ] + }, + "init": { + "type": "Identifier", + "start": 24, + "end": 25, + "name": "y" + } + } + ], + "kind": "let" + }, + { + "type": "ExpressionStatement", + "start": 31, + "end": 35, + "expression": { + "type": "UpdateExpression", + "start": 31, + "end": 34, + "operator": "++", + "prefix": false, + "argument": { + "type": "Identifier", + "start": 31, + "end": 32, + "name": "x" + } + } + }, + { + "type": "ReturnStatement", + "start": 40, + "end": 49, + "argument": { + "type": "Identifier", + "start": 47, + "end": 48, + "name": "x" + } + } + ] + }, + "handler": { + "type": "CatchClause", + "start": 54, + "end": 83, + "param": { + "type": "Identifier", + "start": 61, + "end": 62, + "name": "e" + }, + "body": { + "type": "BlockStatement", + "start": 64, + "end": 83, + "body": [ + { + "type": "ReturnStatement", + "start": 70, + "end": 79, + "argument": { + "type": "Identifier", + "start": 77, + "end": 78, + "name": "e" + } + } + ] + } + }, + "finalizer": null + } + ] + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 24, + "end": 25, + "name": "y" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/comma-then-comment.js.json b/packages/ojs/external-observablehq-parser/test/output/comma-then-comment.js.json new file mode 100644 index 00000000000..e69758ac53b --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/comma-then-comment.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Unexpected end of input (2:0)", + "pos": 30, + "loc": { + "line": 2, + "column": 0 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/comment.js.json b/packages/ojs/external-observablehq-parser/test/output/comment.js.json new file mode 100644 index 00000000000..df8188bd1c4 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/comment.js.json @@ -0,0 +1,14 @@ +{ + "type": "Cell", + "start": 0, + "end": 19, + "id": null, + "body": null, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/computed-property-name.js.json b/packages/ojs/external-observablehq-parser/test/output/computed-property-name.js.json new file mode 100644 index 00000000000..bc523a27c5b --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/computed-property-name.js.json @@ -0,0 +1,65 @@ +{ + "type": "Cell", + "start": 0, + "end": 28, + "id": null, + "body": { + "type": "ArrowFunctionExpression", + "start": 0, + "end": 27, + "id": null, + "expression": true, + "generator": false, + "async": false, + "params": [ + { + "type": "ObjectPattern", + "start": 1, + "end": 17, + "properties": [ + { + "type": "Property", + "start": 2, + "end": 16, + "method": false, + "shorthand": false, + "computed": true, + "key": { + "type": "Identifier", + "start": 3, + "end": 8, + "name": "field" + }, + "value": { + "type": "Identifier", + "start": 11, + "end": 16, + "name": "value" + }, + "kind": "init" + } + ] + } + ], + "body": { + "type": "Identifier", + "start": 22, + "end": 27, + "name": "value" + } + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 3, + "end": 8, + "name": "field" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/database-client.js.json b/packages/ojs/external-observablehq-parser/test/output/database-client.js.json new file mode 100644 index 00000000000..72d436085d1 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/database-client.js.json @@ -0,0 +1,77 @@ +{ + "type": "Cell", + "start": 0, + "end": 35, + "id": null, + "body": { + "type": "BlockStatement", + "start": 0, + "end": 34, + "body": [ + { + "type": "VariableDeclaration", + "start": 4, + "end": 32, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 8, + "end": 31, + "id": { + "type": "Identifier", + "start": 8, + "end": 9, + "name": "a" + }, + "init": { + "type": "CallExpression", + "start": 12, + "end": 31, + "callee": { + "type": "Identifier", + "start": 12, + "end": 26, + "name": "DatabaseClient" + }, + "arguments": [ + { + "type": "Literal", + "start": 27, + "end": 30, + "value": "a", + "raw": "\"a\"" + } + ], + "optional": false + } + } + ], + "kind": "let" + } + ] + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 12, + "end": 26, + "name": "DatabaseClient" + } + ], + "fileAttachments": [], + "databaseClients": [ + [ + "a", + [ + { + "start": 27, + "end": 30 + } + ] + ] + ], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/destructured-array-assignment.js.json b/packages/ojs/external-observablehq-parser/test/output/destructured-array-assignment.js.json new file mode 100644 index 00000000000..3225c668969 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/destructured-array-assignment.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Assignment to constant variable md (2:4)", + "pos": 6, + "loc": { + "line": 2, + "column": 4 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/destructured-array-rest-assignment.js.json b/packages/ojs/external-observablehq-parser/test/output/destructured-array-rest-assignment.js.json new file mode 100644 index 00000000000..39a5ef4a808 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/destructured-array-rest-assignment.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Assignment to constant variable md (2:9)", + "pos": 11, + "loc": { + "line": 2, + "column": 9 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/destructured-arrow-with-default.js.json b/packages/ojs/external-observablehq-parser/test/output/destructured-arrow-with-default.js.json new file mode 100644 index 00000000000..295a1b53015 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/destructured-arrow-with-default.js.json @@ -0,0 +1,75 @@ +{ + "type": "Cell", + "start": 0, + "end": 32, + "id": { + "type": "Identifier", + "start": 0, + "end": 3, + "name": "fun" + }, + "body": { + "type": "ArrowFunctionExpression", + "start": 6, + "end": 31, + "id": null, + "expression": false, + "generator": false, + "async": false, + "params": [ + { + "type": "ObjectPattern", + "start": 7, + "end": 24, + "properties": [ + { + "type": "Property", + "start": 8, + "end": 23, + "method": false, + "shorthand": true, + "computed": false, + "key": { + "type": "Identifier", + "start": 8, + "end": 11, + "name": "foo" + }, + "kind": "init", + "value": { + "type": "AssignmentPattern", + "start": 8, + "end": 23, + "left": { + "type": "Identifier", + "start": 8, + "end": 11, + "name": "foo" + }, + "right": { + "type": "Literal", + "start": 14, + "end": 23, + "value": "default", + "raw": "\"default\"" + } + } + } + ] + } + ], + "body": { + "type": "BlockStatement", + "start": 29, + "end": 31, + "body": [] + } + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/destructured-assignment-with-default-assignment.js.json b/packages/ojs/external-observablehq-parser/test/output/destructured-assignment-with-default-assignment.js.json new file mode 100644 index 00000000000..0d4735f422a --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/destructured-assignment-with-default-assignment.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Assignment to constant variable md (3:18)", + "pos": 33, + "loc": { + "line": 3, + "column": 18 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/destructured-assignment-with-default.js.json b/packages/ojs/external-observablehq-parser/test/output/destructured-assignment-with-default.js.json new file mode 100644 index 00000000000..64e1e5e0838 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/destructured-assignment-with-default.js.json @@ -0,0 +1,103 @@ +{ + "type": "Cell", + "start": 0, + "end": 45, + "id": null, + "body": { + "type": "BlockStatement", + "start": 0, + "end": 44, + "body": [ + { + "type": "VariableDeclaration", + "start": 4, + "end": 14, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 8, + "end": 13, + "id": { + "type": "Identifier", + "start": 8, + "end": 13, + "name": "value" + }, + "init": null + } + ], + "kind": "let" + }, + { + "type": "ExpressionStatement", + "start": 17, + "end": 42, + "expression": { + "type": "AssignmentExpression", + "start": 18, + "end": 40, + "operator": "=", + "left": { + "type": "ObjectPattern", + "start": 18, + "end": 35, + "properties": [ + { + "type": "Property", + "start": 19, + "end": 34, + "method": false, + "shorthand": false, + "computed": false, + "key": { + "type": "Identifier", + "start": 19, + "end": 22, + "name": "foo" + }, + "value": { + "type": "AssignmentPattern", + "start": 24, + "end": 34, + "left": { + "type": "Identifier", + "start": 24, + "end": 29, + "name": "value" + }, + "right": { + "type": "Identifier", + "start": 32, + "end": 34, + "name": "md" + } + }, + "kind": "init" + } + ] + }, + "right": { + "type": "ObjectExpression", + "start": 38, + "end": 40, + "properties": [] + } + } + } + ] + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 32, + "end": 34, + "name": "md" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/destructured-object-assignment.js.json b/packages/ojs/external-observablehq-parser/test/output/destructured-object-assignment.js.json new file mode 100644 index 00000000000..3225c668969 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/destructured-object-assignment.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Assignment to constant variable md (2:4)", + "pos": 6, + "loc": { + "line": 2, + "column": 4 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/destructured-object-rest-assignment.js.json b/packages/ojs/external-observablehq-parser/test/output/destructured-object-rest-assignment.js.json new file mode 100644 index 00000000000..cbc9b24d875 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/destructured-object-rest-assignment.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Assignment to constant variable md (2:7)", + "pos": 9, + "loc": { + "line": 2, + "column": 7 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/destructured-object-with-default.js.json b/packages/ojs/external-observablehq-parser/test/output/destructured-object-with-default.js.json new file mode 100644 index 00000000000..6509c9e150f --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/destructured-object-with-default.js.json @@ -0,0 +1,80 @@ +{ + "type": "Cell", + "start": 0, + "end": 35, + "id": { + "type": "Identifier", + "start": 9, + "end": 12, + "name": "fun" + }, + "body": { + "type": "FunctionExpression", + "start": 0, + "end": 34, + "id": { + "type": "Identifier", + "start": 9, + "end": 12, + "name": "fun" + }, + "expression": false, + "generator": false, + "async": false, + "params": [ + { + "type": "ObjectPattern", + "start": 13, + "end": 30, + "properties": [ + { + "type": "Property", + "start": 14, + "end": 29, + "method": false, + "shorthand": true, + "computed": false, + "key": { + "type": "Identifier", + "start": 14, + "end": 17, + "name": "foo" + }, + "kind": "init", + "value": { + "type": "AssignmentPattern", + "start": 14, + "end": 29, + "left": { + "type": "Identifier", + "start": 14, + "end": 17, + "name": "foo" + }, + "right": { + "type": "Literal", + "start": 20, + "end": 29, + "value": "default", + "raw": "\"default\"" + } + } + } + ] + } + ], + "body": { + "type": "BlockStatement", + "start": 32, + "end": 34, + "body": [] + } + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/dynamic-import.js.json b/packages/ojs/external-observablehq-parser/test/output/dynamic-import.js.json new file mode 100644 index 00000000000..2fcc31959e0 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/dynamic-import.js.json @@ -0,0 +1,30 @@ +{ + "type": "Cell", + "start": 0, + "end": 20, + "id": { + "type": "Identifier", + "start": 0, + "end": 3, + "name": "foo" + }, + "body": { + "type": "ImportExpression", + "start": 6, + "end": 19, + "source": { + "type": "Literal", + "start": 13, + "end": 18, + "value": "bar", + "raw": "\"bar\"" + } + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/empty.js.json b/packages/ojs/external-observablehq-parser/test/output/empty.js.json new file mode 100644 index 00000000000..391eaf7d59d --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/empty.js.json @@ -0,0 +1,14 @@ +{ + "type": "Cell", + "start": 0, + "end": 0, + "id": null, + "body": null, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/empty.md.json b/packages/ojs/external-observablehq-parser/test/output/empty.md.json new file mode 100644 index 00000000000..391eaf7d59d --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/empty.md.json @@ -0,0 +1,14 @@ +{ + "type": "Cell", + "start": 0, + "end": 0, + "id": null, + "body": null, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/expression-extra.js.json b/packages/ojs/external-observablehq-parser/test/output/expression-extra.js.json new file mode 100644 index 00000000000..1dbfb845ac0 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/expression-extra.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Unexpected token (1:4)", + "pos": 4, + "loc": { + "line": 1, + "column": 4 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/expression-trailing-comment.js.json b/packages/ojs/external-observablehq-parser/test/output/expression-trailing-comment.js.json new file mode 100644 index 00000000000..26bf452a9e5 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/expression-trailing-comment.js.json @@ -0,0 +1,25 @@ +{ + "type": "Cell", + "start": 0, + "end": 28, + "id": { + "type": "Identifier", + "start": 0, + "end": 3, + "name": "foo" + }, + "body": { + "type": "Literal", + "start": 6, + "end": 8, + "value": 42, + "raw": "42" + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/extra-semicolon.js.json b/packages/ojs/external-observablehq-parser/test/output/extra-semicolon.js.json new file mode 100644 index 00000000000..95341220a5a --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/extra-semicolon.js.json @@ -0,0 +1,25 @@ +{ + "type": "Cell", + "start": 0, + "end": 10, + "id": { + "type": "Identifier", + "start": 0, + "end": 3, + "name": "foo" + }, + "body": { + "type": "Literal", + "start": 6, + "end": 8, + "value": 42, + "raw": "42" + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/file-attachment-forbidden-1.js.json b/packages/ojs/external-observablehq-parser/test/output/file-attachment-forbidden-1.js.json new file mode 100644 index 00000000000..b474d6b6ae4 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/file-attachment-forbidden-1.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "FileAttachment requires a single literal string argument (1:4)", + "pos": 4, + "loc": { + "line": 1, + "column": 4 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/file-attachment-forbidden.js.json b/packages/ojs/external-observablehq-parser/test/output/file-attachment-forbidden.js.json new file mode 100644 index 00000000000..b474d6b6ae4 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/file-attachment-forbidden.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "FileAttachment requires a single literal string argument (1:4)", + "pos": 4, + "loc": { + "line": 1, + "column": 4 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/file-attachment-masked.js.json b/packages/ojs/external-observablehq-parser/test/output/file-attachment-masked.js.json new file mode 100644 index 00000000000..411e8c60841 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/file-attachment-masked.js.json @@ -0,0 +1,113 @@ +{ + "type": "Cell", + "start": 0, + "end": 75, + "id": null, + "body": { + "type": "BlockStatement", + "start": 0, + "end": 74, + "body": [ + { + "type": "VariableDeclaration", + "start": 4, + "end": 41, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 8, + "end": 40, + "id": { + "type": "Identifier", + "start": 8, + "end": 22, + "name": "FileAttachment" + }, + "init": { + "type": "ArrowFunctionExpression", + "start": 25, + "end": 40, + "id": null, + "expression": true, + "generator": false, + "async": false, + "params": [ + { + "type": "Identifier", + "start": 26, + "end": 27, + "name": "a" + }, + { + "type": "Identifier", + "start": 29, + "end": 30, + "name": "b" + } + ], + "body": { + "type": "BinaryExpression", + "start": 35, + "end": 40, + "left": { + "type": "Identifier", + "start": 35, + "end": 36, + "name": "a" + }, + "operator": "+", + "right": { + "type": "Identifier", + "start": 39, + "end": 40, + "name": "b" + } + } + } + } + ], + "kind": "let" + }, + { + "type": "ReturnStatement", + "start": 44, + "end": 72, + "argument": { + "type": "CallExpression", + "start": 51, + "end": 71, + "callee": { + "type": "Identifier", + "start": 51, + "end": 65, + "name": "FileAttachment" + }, + "arguments": [ + { + "type": "Literal", + "start": 66, + "end": 67, + "value": 1, + "raw": "1" + }, + { + "type": "Literal", + "start": 69, + "end": 70, + "value": 2, + "raw": "2" + } + ], + "optional": false + } + } + ] + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/file-attachment-nested.js.json b/packages/ojs/external-observablehq-parser/test/output/file-attachment-nested.js.json new file mode 100644 index 00000000000..4205da08e64 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/file-attachment-nested.js.json @@ -0,0 +1,388 @@ +{ + "type": "Cell", + "start": 0, + "end": 242, + "id": { + "type": "ViewExpression", + "start": 0, + "end": 13, + "id": { + "type": "Identifier", + "start": 7, + "end": 13, + "name": "slider" + } + }, + "body": { + "type": "BlockStatement", + "start": 16, + "end": 241, + "body": [ + { + "type": "WhileStatement", + "start": 20, + "end": 214, + "test": { + "type": "BinaryExpression", + "start": 27, + "end": 36, + "left": { + "type": "Identifier", + "start": 27, + "end": 32, + "name": "count" + }, + "operator": ">", + "right": { + "type": "Literal", + "start": 35, + "end": 36, + "value": 0, + "raw": "0" + } + }, + "body": { + "type": "BlockStatement", + "start": 38, + "end": 214, + "body": [ + { + "type": "VariableDeclaration", + "start": 44, + "end": 53, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 48, + "end": 49, + "id": { + "type": "Identifier", + "start": 48, + "end": 49, + "name": "b" + }, + "init": null + }, + { + "type": "VariableDeclarator", + "start": 51, + "end": 52, + "id": { + "type": "Identifier", + "start": 51, + "end": 52, + "name": "c" + }, + "init": null + } + ], + "kind": "let" + }, + { + "type": "VariableDeclaration", + "start": 58, + "end": 88, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 64, + "end": 87, + "id": { + "type": "Identifier", + "start": 64, + "end": 65, + "name": "a" + }, + "init": { + "type": "CallExpression", + "start": 68, + "end": 87, + "callee": { + "type": "Identifier", + "start": 68, + "end": 82, + "name": "FileAttachment" + }, + "arguments": [ + { + "type": "Literal", + "start": 83, + "end": 86, + "value": "a", + "raw": "\"a\"" + } + ], + "optional": false + } + } + ], + "kind": "const" + }, + { + "type": "IfStatement", + "start": 93, + "end": 210, + "test": { + "type": "Identifier", + "start": 97, + "end": 106, + "name": "condition" + }, + "consequent": { + "type": "BlockStatement", + "start": 108, + "end": 210, + "body": [ + { + "type": "ExpressionStatement", + "start": 116, + "end": 173, + "expression": { + "type": "AssignmentExpression", + "start": 116, + "end": 172, + "operator": "=", + "left": { + "type": "Identifier", + "start": 116, + "end": 117, + "name": "b" + }, + "right": { + "type": "ConditionalExpression", + "start": 120, + "end": 172, + "test": { + "type": "Identifier", + "start": 120, + "end": 131, + "name": "defaultFile" + }, + "consequent": { + "type": "Identifier", + "start": 134, + "end": 150, + "name": "defaultFileValue" + }, + "alternate": { + "type": "CallExpression", + "start": 153, + "end": 172, + "callee": { + "type": "Identifier", + "start": 153, + "end": 167, + "name": "FileAttachment" + }, + "arguments": [ + { + "type": "Literal", + "start": 168, + "end": 171, + "value": "b", + "raw": "'b'" + } + ], + "optional": false + } + } + } + }, + { + "type": "ExpressionStatement", + "start": 180, + "end": 204, + "expression": { + "type": "AssignmentExpression", + "start": 180, + "end": 203, + "operator": "=", + "left": { + "type": "Identifier", + "start": 180, + "end": 181, + "name": "c" + }, + "right": { + "type": "CallExpression", + "start": 184, + "end": 203, + "callee": { + "type": "Identifier", + "start": 184, + "end": 198, + "name": "FileAttachment" + }, + "arguments": [ + { + "type": "TemplateLiteral", + "start": 199, + "end": 202, + "expressions": [], + "quasis": [ + { + "type": "TemplateElement", + "start": 200, + "end": 201, + "value": { + "raw": "c", + "cooked": "c" + }, + "tail": true + } + ] + } + ], + "optional": false + } + } + } + ] + }, + "alternate": null + } + ] + } + }, + { + "type": "ReturnStatement", + "start": 217, + "end": 239, + "argument": { + "type": "CallExpression", + "start": 224, + "end": 238, + "callee": { + "type": "Identifier", + "start": 224, + "end": 229, + "name": "input" + }, + "arguments": [ + { + "type": "Identifier", + "start": 230, + "end": 231, + "name": "a" + }, + { + "type": "Identifier", + "start": 233, + "end": 234, + "name": "b" + }, + { + "type": "Identifier", + "start": 236, + "end": 237, + "name": "c" + } + ], + "optional": false + } + } + ] + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 27, + "end": 32, + "name": "count" + }, + { + "type": "Identifier", + "start": 68, + "end": 82, + "name": "FileAttachment" + }, + { + "type": "Identifier", + "start": 97, + "end": 106, + "name": "condition" + }, + { + "type": "Identifier", + "start": 120, + "end": 131, + "name": "defaultFile" + }, + { + "type": "Identifier", + "start": 134, + "end": 150, + "name": "defaultFileValue" + }, + { + "type": "Identifier", + "start": 153, + "end": 167, + "name": "FileAttachment" + }, + { + "type": "Identifier", + "start": 184, + "end": 198, + "name": "FileAttachment" + }, + { + "type": "Identifier", + "start": 224, + "end": 229, + "name": "input" + }, + { + "type": "Identifier", + "start": 230, + "end": 231, + "name": "a" + }, + { + "type": "Identifier", + "start": 233, + "end": 234, + "name": "b" + }, + { + "type": "Identifier", + "start": 236, + "end": 237, + "name": "c" + } + ], + "fileAttachments": [ + [ + "a", + [ + { + "start": 83, + "end": 86 + } + ] + ], + [ + "b", + [ + { + "start": 168, + "end": 171 + } + ] + ], + [ + "c", + [ + { + "start": 199, + "end": 202 + } + ] + ] + ], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/file-attachment.js.json b/packages/ojs/external-observablehq-parser/test/output/file-attachment.js.json new file mode 100644 index 00000000000..38ca5da8d7b --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/file-attachment.js.json @@ -0,0 +1,248 @@ +{ + "type": "Cell", + "start": 0, + "end": 129, + "id": null, + "body": { + "type": "BlockStatement", + "start": 0, + "end": 128, + "body": [ + { + "type": "VariableDeclaration", + "start": 4, + "end": 32, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 8, + "end": 31, + "id": { + "type": "Identifier", + "start": 8, + "end": 9, + "name": "a" + }, + "init": { + "type": "CallExpression", + "start": 12, + "end": 31, + "callee": { + "type": "Identifier", + "start": 12, + "end": 26, + "name": "FileAttachment" + }, + "arguments": [ + { + "type": "Literal", + "start": 27, + "end": 30, + "value": "a", + "raw": "\"a\"" + } + ], + "optional": false + } + } + ], + "kind": "let" + }, + { + "type": "VariableDeclaration", + "start": 35, + "end": 63, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 39, + "end": 62, + "id": { + "type": "Identifier", + "start": 39, + "end": 40, + "name": "b" + }, + "init": { + "type": "CallExpression", + "start": 43, + "end": 62, + "callee": { + "type": "Identifier", + "start": 43, + "end": 57, + "name": "FileAttachment" + }, + "arguments": [ + { + "type": "Literal", + "start": 58, + "end": 61, + "value": "b", + "raw": "'b'" + } + ], + "optional": false + } + } + ], + "kind": "let" + }, + { + "type": "VariableDeclaration", + "start": 66, + "end": 94, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 70, + "end": 93, + "id": { + "type": "Identifier", + "start": 70, + "end": 71, + "name": "c" + }, + "init": { + "type": "CallExpression", + "start": 74, + "end": 93, + "callee": { + "type": "Identifier", + "start": 74, + "end": 88, + "name": "FileAttachment" + }, + "arguments": [ + { + "type": "TemplateLiteral", + "start": 89, + "end": 92, + "expressions": [], + "quasis": [ + { + "type": "TemplateElement", + "start": 90, + "end": 91, + "value": { + "raw": "c", + "cooked": "c" + }, + "tail": true + } + ] + } + ], + "optional": false + } + } + ], + "kind": "let" + }, + { + "type": "VariableDeclaration", + "start": 97, + "end": 126, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 101, + "end": 125, + "id": { + "type": "Identifier", + "start": 101, + "end": 103, + "name": "c2" + }, + "init": { + "type": "CallExpression", + "start": 106, + "end": 125, + "callee": { + "type": "Identifier", + "start": 106, + "end": 120, + "name": "FileAttachment" + }, + "arguments": [ + { + "type": "Literal", + "start": 121, + "end": 124, + "value": "c", + "raw": "\"c\"" + } + ], + "optional": false + } + } + ], + "kind": "let" + } + ] + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 12, + "end": 26, + "name": "FileAttachment" + }, + { + "type": "Identifier", + "start": 43, + "end": 57, + "name": "FileAttachment" + }, + { + "type": "Identifier", + "start": 74, + "end": 88, + "name": "FileAttachment" + }, + { + "type": "Identifier", + "start": 106, + "end": 120, + "name": "FileAttachment" + } + ], + "fileAttachments": [ + [ + "a", + [ + { + "start": 27, + "end": 30 + } + ] + ], + [ + "b", + [ + { + "start": 58, + "end": 61 + } + ] + ], + [ + "c", + [ + { + "start": 89, + "end": 92 + }, + { + "start": 121, + "end": 124 + } + ] + ] + ], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/for-await-generator.js.json b/packages/ojs/external-observablehq-parser/test/output/for-await-generator.js.json new file mode 100644 index 00000000000..690df4f1b6c --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/for-await-generator.js.json @@ -0,0 +1,90 @@ +{ + "type": "Cell", + "start": 0, + "end": 62, + "id": null, + "body": { + "type": "BlockStatement", + "start": 0, + "end": 61, + "body": [ + { + "type": "ForOfStatement", + "start": 4, + "end": 59, + "await": true, + "left": { + "type": "VariableDeclaration", + "start": 15, + "end": 26, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 21, + "end": 26, + "id": { + "type": "Identifier", + "start": 21, + "end": 26, + "name": "value" + }, + "init": null + } + ], + "kind": "const" + }, + "right": { + "type": "CallExpression", + "start": 30, + "end": 35, + "callee": { + "type": "Identifier", + "start": 30, + "end": 33, + "name": "foo" + }, + "arguments": [], + "optional": false + }, + "body": { + "type": "BlockStatement", + "start": 37, + "end": 59, + "body": [ + { + "type": "ExpressionStatement", + "start": 43, + "end": 55, + "expression": { + "type": "YieldExpression", + "start": 43, + "end": 54, + "delegate": false, + "argument": { + "type": "Identifier", + "start": 49, + "end": 54, + "name": "value" + } + } + } + ] + } + } + ] + }, + "async": true, + "generator": true, + "references": [ + { + "type": "Identifier", + "start": 30, + "end": 33, + "name": "foo" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/for-await-in-function.js.json b/packages/ojs/external-observablehq-parser/test/output/for-await-in-function.js.json new file mode 100644 index 00000000000..8f1b62a74a0 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/for-await-in-function.js.json @@ -0,0 +1,167 @@ +{ + "type": "Cell", + "start": 0, + "end": 128, + "id": { + "type": "Identifier", + "start": 15, + "end": 18, + "name": "bar" + }, + "body": { + "type": "FunctionExpression", + "start": 0, + "end": 127, + "id": { + "type": "Identifier", + "start": 15, + "end": 18, + "name": "bar" + }, + "expression": false, + "generator": false, + "async": true, + "params": [], + "body": { + "type": "BlockStatement", + "start": 21, + "end": 127, + "body": [ + { + "type": "VariableDeclaration", + "start": 25, + "end": 43, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 31, + "end": 42, + "id": { + "type": "Identifier", + "start": 31, + "end": 37, + "name": "values" + }, + "init": { + "type": "ArrayExpression", + "start": 40, + "end": 42, + "elements": [] + } + } + ], + "kind": "const" + }, + { + "type": "ForOfStatement", + "start": 46, + "end": 108, + "await": true, + "left": { + "type": "VariableDeclaration", + "start": 57, + "end": 68, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 63, + "end": 68, + "id": { + "type": "Identifier", + "start": 63, + "end": 68, + "name": "value" + }, + "init": null + } + ], + "kind": "const" + }, + "right": { + "type": "CallExpression", + "start": 72, + "end": 77, + "callee": { + "type": "Identifier", + "start": 72, + "end": 75, + "name": "foo" + }, + "arguments": [], + "optional": false + }, + "body": { + "type": "BlockStatement", + "start": 79, + "end": 108, + "body": [ + { + "type": "ExpressionStatement", + "start": 85, + "end": 104, + "expression": { + "type": "CallExpression", + "start": 85, + "end": 103, + "callee": { + "type": "MemberExpression", + "start": 85, + "end": 96, + "object": { + "type": "Identifier", + "start": 85, + "end": 91, + "name": "values" + }, + "property": { + "type": "Identifier", + "start": 92, + "end": 96, + "name": "push" + }, + "computed": false, + "optional": false + }, + "arguments": [ + { + "type": "Identifier", + "start": 97, + "end": 102, + "name": "value" + } + ], + "optional": false + } + } + ] + } + }, + { + "type": "ReturnStatement", + "start": 111, + "end": 125, + "argument": { + "type": "Identifier", + "start": 118, + "end": 124, + "name": "values" + } + } + ] + } + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 72, + "end": 75, + "name": "foo" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/for-await.js.json b/packages/ojs/external-observablehq-parser/test/output/for-await.js.json new file mode 100644 index 00000000000..e8f5e903a4f --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/for-await.js.json @@ -0,0 +1,147 @@ +{ + "type": "Cell", + "start": 0, + "end": 107, + "id": null, + "body": { + "type": "BlockStatement", + "start": 0, + "end": 106, + "body": [ + { + "type": "VariableDeclaration", + "start": 4, + "end": 22, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 10, + "end": 21, + "id": { + "type": "Identifier", + "start": 10, + "end": 16, + "name": "values" + }, + "init": { + "type": "ArrayExpression", + "start": 19, + "end": 21, + "elements": [] + } + } + ], + "kind": "const" + }, + { + "type": "ForOfStatement", + "start": 25, + "end": 87, + "await": true, + "left": { + "type": "VariableDeclaration", + "start": 36, + "end": 47, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 42, + "end": 47, + "id": { + "type": "Identifier", + "start": 42, + "end": 47, + "name": "value" + }, + "init": null + } + ], + "kind": "const" + }, + "right": { + "type": "CallExpression", + "start": 51, + "end": 56, + "callee": { + "type": "Identifier", + "start": 51, + "end": 54, + "name": "foo" + }, + "arguments": [], + "optional": false + }, + "body": { + "type": "BlockStatement", + "start": 58, + "end": 87, + "body": [ + { + "type": "ExpressionStatement", + "start": 64, + "end": 83, + "expression": { + "type": "CallExpression", + "start": 64, + "end": 82, + "callee": { + "type": "MemberExpression", + "start": 64, + "end": 75, + "object": { + "type": "Identifier", + "start": 64, + "end": 70, + "name": "values" + }, + "property": { + "type": "Identifier", + "start": 71, + "end": 75, + "name": "push" + }, + "computed": false, + "optional": false + }, + "arguments": [ + { + "type": "Identifier", + "start": 76, + "end": 81, + "name": "value" + } + ], + "optional": false + } + } + ] + } + }, + { + "type": "ReturnStatement", + "start": 90, + "end": 104, + "argument": { + "type": "Identifier", + "start": 97, + "end": 103, + "name": "values" + } + } + ] + }, + "async": true, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 51, + "end": 54, + "name": "foo" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/function-unexpected-viewof.js.json b/packages/ojs/external-observablehq-parser/test/output/function-unexpected-viewof.js.json new file mode 100644 index 00000000000..ba0cce7e837 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/function-unexpected-viewof.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Unexpected keyword 'viewof' (1:9)", + "pos": 9, + "loc": { + "line": 1, + "column": 9 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/global-assignment.js.json b/packages/ojs/external-observablehq-parser/test/output/global-assignment.js.json new file mode 100644 index 00000000000..e39fc88599c --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/global-assignment.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Assignment to constant variable foo (2:2)", + "pos": 4, + "loc": { + "line": 2, + "column": 2 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/illegal-arguments.js.json b/packages/ojs/external-observablehq-parser/test/output/illegal-arguments.js.json new file mode 100644 index 00000000000..791ecc618f0 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/illegal-arguments.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "arguments is not allowed (1:4)", + "pos": 4, + "loc": { + "line": 1, + "column": 4 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/illegal-arrow-arguments.js.json b/packages/ojs/external-observablehq-parser/test/output/illegal-arrow-arguments.js.json new file mode 100644 index 00000000000..2072419c10a --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/illegal-arrow-arguments.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "arguments is not allowed (1:6)", + "pos": 6, + "loc": { + "line": 1, + "column": 6 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/import-as-duplicate.js.json b/packages/ojs/external-observablehq-parser/test/output/import-as-duplicate.js.json new file mode 100644 index 00000000000..e5e73bd85a5 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/import-as-duplicate.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Identifier 'foo' has already been declared (1:20)", + "pos": 20, + "loc": { + "line": 1, + "column": 20 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/import-default-as.js.json b/packages/ojs/external-observablehq-parser/test/output/import-default-as.js.json new file mode 100644 index 00000000000..6464cf60dac --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/import-default-as.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Unexpected keyword 'default' (1:8)", + "pos": 8, + "loc": { + "line": 1, + "column": 8 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/import-default.js.json b/packages/ojs/external-observablehq-parser/test/output/import-default.js.json new file mode 100644 index 00000000000..e5418e13707 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/import-default.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Unexpected token (1:7)", + "pos": 7, + "loc": { + "line": 1, + "column": 7 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/import-duplicate.js.json b/packages/ojs/external-observablehq-parser/test/output/import-duplicate.js.json new file mode 100644 index 00000000000..66a4360aada --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/import-duplicate.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Identifier 'foo' has already been declared (1:13)", + "pos": 13, + "loc": { + "line": 1, + "column": 13 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/import-empty.js.json b/packages/ojs/external-observablehq-parser/test/output/import-empty.js.json new file mode 100644 index 00000000000..39260e05fd5 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/import-empty.js.json @@ -0,0 +1,26 @@ +{ + "type": "Cell", + "start": 0, + "end": 24, + "id": null, + "body": { + "type": "ImportDeclaration", + "start": 0, + "end": 23, + "specifiers": [], + "source": { + "type": "Literal", + "start": 15, + "end": 23, + "value": "module", + "raw": "\"module\"" + } + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/import-extra.js.json b/packages/ojs/external-observablehq-parser/test/output/import-extra.js.json new file mode 100644 index 00000000000..4f4b660efff --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/import-extra.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Unexpected token (1:39)", + "pos": 39, + "loc": { + "line": 1, + "column": 39 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/import-mutable-as.js.json b/packages/ojs/external-observablehq-parser/test/output/import-mutable-as.js.json new file mode 100644 index 00000000000..de70a523a28 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/import-mutable-as.js.json @@ -0,0 +1,46 @@ +{ + "type": "Cell", + "start": 0, + "end": 42, + "id": null, + "body": { + "type": "ImportDeclaration", + "start": 0, + "end": 41, + "specifiers": [ + { + "type": "ImportSpecifier", + "start": 8, + "end": 26, + "view": false, + "mutable": true, + "imported": { + "type": "Identifier", + "start": 16, + "end": 19, + "name": "foo" + }, + "local": { + "type": "Identifier", + "start": 23, + "end": 26, + "name": "bar" + } + } + ], + "source": { + "type": "Literal", + "start": 33, + "end": 41, + "value": "module", + "raw": "\"module\"" + } + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/import-mutable.js.json b/packages/ojs/external-observablehq-parser/test/output/import-mutable.js.json new file mode 100644 index 00000000000..3f1a36bf96e --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/import-mutable.js.json @@ -0,0 +1,46 @@ +{ + "type": "Cell", + "start": 0, + "end": 35, + "id": null, + "body": { + "type": "ImportDeclaration", + "start": 0, + "end": 34, + "specifiers": [ + { + "type": "ImportSpecifier", + "start": 8, + "end": 19, + "view": false, + "mutable": true, + "imported": { + "type": "Identifier", + "start": 16, + "end": 19, + "name": "foo" + }, + "local": { + "type": "Identifier", + "start": 16, + "end": 19, + "name": "foo" + } + } + ], + "source": { + "type": "Literal", + "start": 26, + "end": 34, + "value": "module", + "raw": "\"module\"" + } + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/import-semicolon.js.json b/packages/ojs/external-observablehq-parser/test/output/import-semicolon.js.json new file mode 100644 index 00000000000..3890f1b81d1 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/import-semicolon.js.json @@ -0,0 +1,65 @@ +{ + "type": "Cell", + "start": 0, + "end": 40, + "id": null, + "body": { + "type": "ImportDeclaration", + "start": 0, + "end": 38, + "specifiers": [ + { + "type": "ImportSpecifier", + "start": 8, + "end": 11, + "view": false, + "mutable": false, + "imported": { + "type": "Identifier", + "start": 8, + "end": 11, + "name": "foo" + }, + "local": { + "type": "Identifier", + "start": 8, + "end": 11, + "name": "foo" + } + }, + { + "type": "ImportSpecifier", + "start": 13, + "end": 23, + "view": false, + "mutable": false, + "imported": { + "type": "Identifier", + "start": 13, + "end": 16, + "name": "bar" + }, + "local": { + "type": "Identifier", + "start": 20, + "end": 23, + "name": "baz" + } + } + ], + "source": { + "type": "Literal", + "start": 30, + "end": 38, + "value": "module", + "raw": "\"module\"" + } + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/import-side-effect.js.json b/packages/ojs/external-observablehq-parser/test/output/import-side-effect.js.json new file mode 100644 index 00000000000..e5418e13707 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/import-side-effect.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Unexpected token (1:7)", + "pos": 7, + "loc": { + "line": 1, + "column": 7 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/import-viewof-as.js.json b/packages/ojs/external-observablehq-parser/test/output/import-viewof-as.js.json new file mode 100644 index 00000000000..15b21bc8718 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/import-viewof-as.js.json @@ -0,0 +1,46 @@ +{ + "type": "Cell", + "start": 0, + "end": 41, + "id": null, + "body": { + "type": "ImportDeclaration", + "start": 0, + "end": 40, + "specifiers": [ + { + "type": "ImportSpecifier", + "start": 8, + "end": 25, + "view": true, + "mutable": false, + "imported": { + "type": "Identifier", + "start": 15, + "end": 18, + "name": "foo" + }, + "local": { + "type": "Identifier", + "start": 22, + "end": 25, + "name": "bar" + } + } + ], + "source": { + "type": "Literal", + "start": 32, + "end": 40, + "value": "module", + "raw": "\"module\"" + } + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/import-viewof.js.json b/packages/ojs/external-observablehq-parser/test/output/import-viewof.js.json new file mode 100644 index 00000000000..e740d05c430 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/import-viewof.js.json @@ -0,0 +1,46 @@ +{ + "type": "Cell", + "start": 0, + "end": 34, + "id": null, + "body": { + "type": "ImportDeclaration", + "start": 0, + "end": 33, + "specifiers": [ + { + "type": "ImportSpecifier", + "start": 8, + "end": 18, + "view": true, + "mutable": false, + "imported": { + "type": "Identifier", + "start": 15, + "end": 18, + "name": "foo" + }, + "local": { + "type": "Identifier", + "start": 15, + "end": 18, + "name": "foo" + } + } + ], + "source": { + "type": "Literal", + "start": 25, + "end": 33, + "value": "module", + "raw": "\"module\"" + } + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/import-with-as-duplicate.js.json b/packages/ojs/external-observablehq-parser/test/output/import-with-as-duplicate.js.json new file mode 100644 index 00000000000..b19998007cf --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/import-with-as-duplicate.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Identifier 'foo' has already been declared (1:28)", + "pos": 28, + "loc": { + "line": 1, + "column": 28 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/import-with-default-as.js.json b/packages/ojs/external-observablehq-parser/test/output/import-with-default-as.js.json new file mode 100644 index 00000000000..d6a93a7d7d4 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/import-with-default-as.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Unexpected keyword 'default' (1:26)", + "pos": 26, + "loc": { + "line": 1, + "column": 26 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/import-with-default.js.json b/packages/ojs/external-observablehq-parser/test/output/import-with-default.js.json new file mode 100644 index 00000000000..9a2ce73876a --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/import-with-default.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Unexpected keyword 'default' (1:19)", + "pos": 19, + "loc": { + "line": 1, + "column": 19 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/import-with-duplicate.js.json b/packages/ojs/external-observablehq-parser/test/output/import-with-duplicate.js.json new file mode 100644 index 00000000000..8cdd25cb596 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/import-with-duplicate.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Identifier 'foo' has already been declared (1:21)", + "pos": 21, + "loc": { + "line": 1, + "column": 21 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/import-with-empty.js.json b/packages/ojs/external-observablehq-parser/test/output/import-with-empty.js.json new file mode 100644 index 00000000000..8f87f71891b --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/import-with-empty.js.json @@ -0,0 +1,47 @@ +{ + "type": "Cell", + "start": 0, + "end": 35, + "id": null, + "body": { + "type": "ImportDeclaration", + "start": 0, + "end": 34, + "specifiers": [ + { + "type": "ImportSpecifier", + "start": 8, + "end": 11, + "view": false, + "mutable": false, + "imported": { + "type": "Identifier", + "start": 8, + "end": 11, + "name": "foo" + }, + "local": { + "type": "Identifier", + "start": 8, + "end": 11, + "name": "foo" + } + } + ], + "injections": [], + "source": { + "type": "Literal", + "start": 26, + "end": 34, + "value": "module", + "raw": "\"module\"" + } + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/import-with.js.json b/packages/ojs/external-observablehq-parser/test/output/import-with.js.json new file mode 100644 index 00000000000..7d7391e30d1 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/import-with.js.json @@ -0,0 +1,74 @@ +{ + "type": "Cell", + "start": 0, + "end": 45, + "id": null, + "body": { + "type": "ImportDeclaration", + "start": 0, + "end": 44, + "specifiers": [ + { + "type": "ImportSpecifier", + "start": 8, + "end": 11, + "view": false, + "mutable": false, + "imported": { + "type": "Identifier", + "start": 8, + "end": 11, + "name": "foo" + }, + "local": { + "type": "Identifier", + "start": 8, + "end": 11, + "name": "foo" + } + } + ], + "injections": [ + { + "type": "ImportSpecifier", + "start": 19, + "end": 29, + "view": false, + "mutable": false, + "imported": { + "type": "Identifier", + "start": 19, + "end": 22, + "name": "bar" + }, + "local": { + "type": "Identifier", + "start": 26, + "end": 29, + "name": "baz" + } + } + ], + "source": { + "type": "Literal", + "start": 36, + "end": 44, + "value": "module", + "raw": "\"module\"" + } + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 19, + "end": 22, + "name": "bar" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/import.js.json b/packages/ojs/external-observablehq-parser/test/output/import.js.json new file mode 100644 index 00000000000..f5555e978ac --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/import.js.json @@ -0,0 +1,65 @@ +{ + "type": "Cell", + "start": 0, + "end": 39, + "id": null, + "body": { + "type": "ImportDeclaration", + "start": 0, + "end": 38, + "specifiers": [ + { + "type": "ImportSpecifier", + "start": 8, + "end": 11, + "view": false, + "mutable": false, + "imported": { + "type": "Identifier", + "start": 8, + "end": 11, + "name": "foo" + }, + "local": { + "type": "Identifier", + "start": 8, + "end": 11, + "name": "foo" + } + }, + { + "type": "ImportSpecifier", + "start": 13, + "end": 23, + "view": false, + "mutable": false, + "imported": { + "type": "Identifier", + "start": 13, + "end": 16, + "name": "bar" + }, + "local": { + "type": "Identifier", + "start": 20, + "end": 23, + "name": "baz" + } + } + ], + "source": { + "type": "Literal", + "start": 30, + "end": 38, + "value": "module", + "raw": "\"module\"" + } + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/leading-semicolon.js.json b/packages/ojs/external-observablehq-parser/test/output/leading-semicolon.js.json new file mode 100644 index 00000000000..7d15ce35d7c --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/leading-semicolon.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Unexpected token (1:1)", + "pos": 1, + "loc": { + "line": 1, + "column": 1 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/legal-arguments.js.json b/packages/ojs/external-observablehq-parser/test/output/legal-arguments.js.json new file mode 100644 index 00000000000..8229139da74 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/legal-arguments.js.json @@ -0,0 +1,54 @@ +{ + "type": "Cell", + "start": 0, + "end": 40, + "id": null, + "body": { + "type": "FunctionExpression", + "start": 0, + "end": 39, + "id": null, + "expression": false, + "generator": false, + "async": false, + "params": [], + "body": { + "type": "BlockStatement", + "start": 11, + "end": 39, + "body": [ + { + "type": "ReturnStatement", + "start": 13, + "end": 37, + "argument": { + "type": "MemberExpression", + "start": 20, + "end": 36, + "object": { + "type": "Identifier", + "start": 20, + "end": 29, + "name": "arguments" + }, + "property": { + "type": "Identifier", + "start": 30, + "end": 36, + "name": "length" + }, + "computed": false, + "optional": false + } + } + ] + } + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/logical-assignment.js.json b/packages/ojs/external-observablehq-parser/test/output/logical-assignment.js.json new file mode 100644 index 00000000000..4b4377c4655 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/logical-assignment.js.json @@ -0,0 +1,106 @@ +{ + "type": "Cell", + "start": 0, + "end": 60, + "id": null, + "body": { + "type": "BlockStatement", + "start": 0, + "end": 59, + "body": [ + { + "type": "VariableDeclaration", + "start": 4, + "end": 17, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 8, + "end": 16, + "id": { + "type": "Identifier", + "start": 8, + "end": 9, + "name": "a" + }, + "init": { + "type": "Literal", + "start": 12, + "end": 16, + "value": null, + "raw": "null" + } + } + ], + "kind": "let" + }, + { + "type": "VariableDeclaration", + "start": 20, + "end": 34, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 24, + "end": 33, + "id": { + "type": "Identifier", + "start": 24, + "end": 25, + "name": "b" + }, + "init": { + "type": "Literal", + "start": 28, + "end": 33, + "value": false, + "raw": "false" + } + } + ], + "kind": "let" + }, + { + "type": "ExpressionStatement", + "start": 37, + "end": 45, + "expression": { + "type": "AssignmentExpression", + "start": 37, + "end": 44, + "operator": "||=", + "left": { + "type": "Identifier", + "start": 37, + "end": 38, + "name": "a" + }, + "right": { + "type": "Identifier", + "start": 43, + "end": 44, + "name": "b" + } + } + }, + { + "type": "ReturnStatement", + "start": 48, + "end": 57, + "argument": { + "type": "Identifier", + "start": 55, + "end": 56, + "name": "a" + } + } + ] + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/markdown-interpolation.md.json b/packages/ojs/external-observablehq-parser/test/output/markdown-interpolation.md.json new file mode 100644 index 00000000000..4a7cdc87287 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/markdown-interpolation.md.json @@ -0,0 +1,153 @@ +{ + "type": "Cell", + "start": 0, + "end": 70, + "id": null, + "body": { + "type": "TemplateLiteral", + "start": 0, + "end": 70, + "expressions": [ + { + "type": "UpdateExpression", + "start": 9, + "end": 24, + "operator": "++", + "prefix": true, + "argument": { + "type": "MutableExpression", + "start": 11, + "end": 24, + "id": { + "type": "Identifier", + "start": 19, + "end": 24, + "name": "count" + } + } + }, + { + "type": "ViewExpression", + "start": 34, + "end": 44, + "id": { + "type": "Identifier", + "start": 41, + "end": 44, + "name": "Foo" + } + }, + { + "type": "Identifier", + "start": 63, + "end": 68, + "name": "value" + } + ], + "quasis": [ + { + "type": "TemplateElement", + "start": 0, + "end": 7, + "value": { + "raw": "Count: ", + "cooked": null + }, + "tail": false + }, + { + "type": "TemplateElement", + "start": 25, + "end": 32, + "value": { + "raw": "\nView: ", + "cooked": null + }, + "tail": false + }, + { + "type": "TemplateElement", + "start": 45, + "end": 61, + "value": { + "raw": "\nRegular Value: ", + "cooked": null + }, + "tail": false + }, + { + "type": "TemplateElement", + "start": 69, + "end": 70, + "value": { + "raw": "\n", + "cooked": null + }, + "tail": true + } + ] + }, + "async": false, + "generator": false, + "tag": { + "type": "CellTag", + "start": 0, + "end": 2, + "body": { + "type": "Identifier", + "start": 0, + "end": 2, + "name": "md" + }, + "input": "md", + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 0, + "end": 2, + "name": "md" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] + }, + "raw": false, + "references": [ + { + "type": "MutableExpression", + "start": 11, + "end": 24, + "id": { + "type": "Identifier", + "start": 19, + "end": 24, + "name": "count" + } + }, + { + "type": "ViewExpression", + "start": 34, + "end": 44, + "id": { + "type": "Identifier", + "start": 41, + "end": 44, + "name": "Foo" + } + }, + { + "type": "Identifier", + "start": 63, + "end": 68, + "name": "value" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/markdown.md.json b/packages/ojs/external-observablehq-parser/test/output/markdown.md.json new file mode 100644 index 00000000000..7973fa1b675 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/markdown.md.json @@ -0,0 +1,82 @@ +{ + "type": "Cell", + "start": 0, + "end": 104, + "id": null, + "body": { + "type": "TemplateLiteral", + "start": 0, + "end": 104, + "expressions": [ + { + "type": "Identifier", + "start": 98, + "end": 101, + "name": "foo" + } + ], + "quasis": [ + { + "type": "TemplateElement", + "start": 0, + "end": 96, + "value": { + "raw": "# Header 1\n\n```\nconst codeBlock = true;\n```\n\nParagraph that references `codeBlock`. Foo value: \"", + "cooked": null + }, + "tail": false + }, + { + "type": "TemplateElement", + "start": 102, + "end": 104, + "value": { + "raw": "\".", + "cooked": null + }, + "tail": true + } + ] + }, + "async": false, + "generator": false, + "tag": { + "type": "CellTag", + "start": 0, + "end": 2, + "body": { + "type": "Identifier", + "start": 0, + "end": 2, + "name": "md" + }, + "input": "md", + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 0, + "end": 2, + "name": "md" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] + }, + "raw": false, + "references": [ + { + "type": "Identifier", + "start": 98, + "end": 101, + "name": "foo" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/member-assignment.js.json b/packages/ojs/external-observablehq-parser/test/output/member-assignment.js.json new file mode 100644 index 00000000000..a2858eebaab --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/member-assignment.js.json @@ -0,0 +1,52 @@ +{ + "type": "Cell", + "start": 0, + "end": 15, + "id": null, + "body": { + "type": "AssignmentExpression", + "start": 0, + "end": 14, + "operator": "=", + "left": { + "type": "MemberExpression", + "start": 0, + "end": 10, + "object": { + "type": "Identifier", + "start": 0, + "end": 6, + "name": "window" + }, + "property": { + "type": "Identifier", + "start": 7, + "end": 10, + "name": "foo" + }, + "computed": false, + "optional": false + }, + "right": { + "type": "Literal", + "start": 13, + "end": 14, + "value": 2, + "raw": "2" + } + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 0, + "end": 6, + "name": "window" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/multiple-input-references.js.json b/packages/ojs/external-observablehq-parser/test/output/multiple-input-references.js.json new file mode 100644 index 00000000000..e66e6aa18b1 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/multiple-input-references.js.json @@ -0,0 +1,248 @@ +{ + "type": "Cell", + "start": 0, + "end": 122, + "id": { + "type": "Identifier", + "start": 0, + "end": 4, + "name": "cell" + }, + "body": { + "type": "BlockStatement", + "start": 7, + "end": 121, + "body": [ + { + "type": "VariableDeclaration", + "start": 11, + "end": 29, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 17, + "end": 28, + "id": { + "type": "Identifier", + "start": 17, + "end": 20, + "name": "sum" + }, + "init": { + "type": "BinaryExpression", + "start": 23, + "end": 28, + "left": { + "type": "Identifier", + "start": 23, + "end": 24, + "name": "a" + }, + "operator": "+", + "right": { + "type": "Identifier", + "start": 27, + "end": 28, + "name": "b" + } + } + } + ], + "kind": "const" + }, + { + "type": "VariableDeclaration", + "start": 32, + "end": 54, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 38, + "end": 53, + "id": { + "type": "Identifier", + "start": 38, + "end": 45, + "name": "product" + }, + "init": { + "type": "BinaryExpression", + "start": 48, + "end": 53, + "left": { + "type": "Identifier", + "start": 48, + "end": 49, + "name": "a" + }, + "operator": "*", + "right": { + "type": "Identifier", + "start": 52, + "end": 53, + "name": "b" + } + } + } + ], + "kind": "const" + }, + { + "type": "VariableDeclaration", + "start": 57, + "end": 82, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 63, + "end": 81, + "id": { + "type": "Identifier", + "start": 63, + "end": 73, + "name": "difference" + }, + "init": { + "type": "BinaryExpression", + "start": 76, + "end": 81, + "left": { + "type": "Identifier", + "start": 76, + "end": 77, + "name": "a" + }, + "operator": "-", + "right": { + "type": "Identifier", + "start": 80, + "end": 81, + "name": "b" + } + } + } + ], + "kind": "const" + }, + { + "type": "ReturnStatement", + "start": 85, + "end": 119, + "argument": { + "type": "ObjectExpression", + "start": 92, + "end": 118, + "properties": [ + { + "type": "Property", + "start": 93, + "end": 96, + "method": false, + "shorthand": true, + "computed": false, + "key": { + "type": "Identifier", + "start": 93, + "end": 96, + "name": "sum" + }, + "kind": "init", + "value": { + "type": "Identifier", + "start": 93, + "end": 96, + "name": "sum" + } + }, + { + "type": "Property", + "start": 98, + "end": 105, + "method": false, + "shorthand": true, + "computed": false, + "key": { + "type": "Identifier", + "start": 98, + "end": 105, + "name": "product" + }, + "kind": "init", + "value": { + "type": "Identifier", + "start": 98, + "end": 105, + "name": "product" + } + }, + { + "type": "Property", + "start": 107, + "end": 117, + "method": false, + "shorthand": true, + "computed": false, + "key": { + "type": "Identifier", + "start": 107, + "end": 117, + "name": "difference" + }, + "kind": "init", + "value": { + "type": "Identifier", + "start": 107, + "end": 117, + "name": "difference" + } + } + ] + } + } + ] + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 23, + "end": 24, + "name": "a" + }, + { + "type": "Identifier", + "start": 27, + "end": 28, + "name": "b" + }, + { + "type": "Identifier", + "start": 48, + "end": 49, + "name": "a" + }, + { + "type": "Identifier", + "start": 52, + "end": 53, + "name": "b" + }, + { + "type": "Identifier", + "start": 76, + "end": 77, + "name": "a" + }, + { + "type": "Identifier", + "start": 80, + "end": 81, + "name": "b" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/mutable-argument.js.json b/packages/ojs/external-observablehq-parser/test/output/mutable-argument.js.json new file mode 100644 index 00000000000..49a61f829f1 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/mutable-argument.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Unexpected keyword 'mutable' (1:12)", + "pos": 12, + "loc": { + "line": 1, + "column": 12 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/mutable-as-property.js.json b/packages/ojs/external-observablehq-parser/test/output/mutable-as-property.js.json new file mode 100644 index 00000000000..50d5c3f6602 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/mutable-as-property.js.json @@ -0,0 +1,68 @@ +{ + "type": "Cell", + "start": 0, + "end": 24, + "id": null, + "body": { + "type": "BinaryExpression", + "start": 0, + "end": 23, + "left": { + "type": "MemberExpression", + "start": 0, + "end": 19, + "object": { + "type": "Identifier", + "start": 0, + "end": 6, + "name": "object" + }, + "property": { + "type": "MutableExpression", + "start": 7, + "end": 18, + "id": { + "type": "Identifier", + "start": 15, + "end": 18, + "name": "foo" + } + }, + "computed": true, + "optional": false + }, + "operator": "+", + "right": { + "type": "Literal", + "start": 22, + "end": 23, + "value": 1, + "raw": "1" + } + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 0, + "end": 6, + "name": "object" + }, + { + "type": "MutableExpression", + "start": 7, + "end": 18, + "id": { + "type": "Identifier", + "start": 15, + "end": 18, + "name": "foo" + } + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/mutable-assign-default.js.json b/packages/ojs/external-observablehq-parser/test/output/mutable-assign-default.js.json new file mode 100644 index 00000000000..45005874093 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/mutable-assign-default.js.json @@ -0,0 +1,74 @@ +{ + "type": "Cell", + "start": 0, + "end": 44, + "id": { + "type": "MutableExpression", + "start": 0, + "end": 13, + "id": { + "type": "Identifier", + "start": 8, + "end": 13, + "name": "state" + } + }, + "body": { + "type": "AwaitExpression", + "start": 16, + "end": 43, + "argument": { + "type": "CallExpression", + "start": 22, + "end": 43, + "callee": { + "type": "MemberExpression", + "start": 22, + "end": 35, + "object": { + "type": "Identifier", + "start": 22, + "end": 29, + "name": "Service" + }, + "property": { + "type": "Identifier", + "start": 30, + "end": 35, + "name": "fetch" + }, + "computed": false, + "optional": false + }, + "arguments": [ + { + "type": "Identifier", + "start": 36, + "end": 42, + "name": "config" + } + ], + "optional": false + } + }, + "async": true, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 22, + "end": 29, + "name": "Service" + }, + { + "type": "Identifier", + "start": 36, + "end": 42, + "name": "config" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/mutable-assignment.js.json b/packages/ojs/external-observablehq-parser/test/output/mutable-assignment.js.json new file mode 100644 index 00000000000..c44b5ac9299 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/mutable-assignment.js.json @@ -0,0 +1,61 @@ +{ + "type": "Cell", + "start": 0, + "end": 27, + "id": null, + "body": { + "type": "BlockStatement", + "start": 0, + "end": 26, + "body": [ + { + "type": "ExpressionStatement", + "start": 4, + "end": 24, + "expression": { + "type": "AssignmentExpression", + "start": 4, + "end": 23, + "operator": "=", + "left": { + "type": "MutableExpression", + "start": 4, + "end": 17, + "id": { + "type": "Identifier", + "start": 12, + "end": 17, + "name": "value" + } + }, + "right": { + "type": "Literal", + "start": 20, + "end": 23, + "value": 101, + "raw": "101" + } + } + } + ] + }, + "async": false, + "generator": false, + "references": [ + { + "type": "MutableExpression", + "start": 4, + "end": 17, + "id": { + "type": "Identifier", + "start": 12, + "end": 17, + "name": "value" + } + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/mutable-block-cell.js.json b/packages/ojs/external-observablehq-parser/test/output/mutable-block-cell.js.json new file mode 100644 index 00000000000..9d9eb2ce7da --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/mutable-block-cell.js.json @@ -0,0 +1,86 @@ +{ + "type": "Cell", + "start": 0, + "end": 41, + "id": { + "type": "MutableExpression", + "start": 0, + "end": 11, + "id": { + "type": "Identifier", + "start": 8, + "end": 11, + "name": "foo" + } + }, + "body": { + "type": "BlockStatement", + "start": 14, + "end": 40, + "body": [ + { + "type": "ReturnStatement", + "start": 18, + "end": 38, + "argument": { + "type": "ObjectExpression", + "start": 25, + "end": 37, + "properties": [ + { + "type": "Property", + "start": 26, + "end": 30, + "method": false, + "shorthand": false, + "computed": false, + "key": { + "type": "Identifier", + "start": 26, + "end": 27, + "name": "x" + }, + "value": { + "type": "Literal", + "start": 29, + "end": 30, + "value": 0, + "raw": "0" + }, + "kind": "init" + }, + { + "type": "Property", + "start": 32, + "end": 36, + "method": false, + "shorthand": false, + "computed": false, + "key": { + "type": "Identifier", + "start": 32, + "end": 33, + "name": "y" + }, + "value": { + "type": "Literal", + "start": 35, + "end": 36, + "value": 0, + "raw": "0" + }, + "kind": "init" + } + ] + } + } + ] + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/mutable-constant.js.json b/packages/ojs/external-observablehq-parser/test/output/mutable-constant.js.json new file mode 100644 index 00000000000..4418ae5e6ed --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/mutable-constant.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Unexpected token (1:8)", + "pos": 8, + "loc": { + "line": 1, + "column": 8 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/mutable-default-value.js.json b/packages/ojs/external-observablehq-parser/test/output/mutable-default-value.js.json new file mode 100644 index 00000000000..1ab79d8f1fc --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/mutable-default-value.js.json @@ -0,0 +1,86 @@ +{ + "type": "Cell", + "start": 0, + "end": 43, + "id": { + "type": "Identifier", + "start": 9, + "end": 11, + "name": "fn" + }, + "body": { + "type": "FunctionExpression", + "start": 0, + "end": 42, + "id": { + "type": "Identifier", + "start": 9, + "end": 11, + "name": "fn" + }, + "expression": false, + "generator": false, + "async": false, + "params": [ + { + "type": "AssignmentPattern", + "start": 12, + "end": 25, + "left": { + "type": "Identifier", + "start": 12, + "end": 13, + "name": "y" + }, + "right": { + "type": "MutableExpression", + "start": 16, + "end": 25, + "id": { + "type": "Identifier", + "start": 24, + "end": 25, + "name": "x" + } + } + } + ], + "body": { + "type": "BlockStatement", + "start": 27, + "end": 42, + "body": [ + { + "type": "ReturnStatement", + "start": 31, + "end": 40, + "argument": { + "type": "Identifier", + "start": 38, + "end": 39, + "name": "y" + } + } + ] + } + }, + "async": false, + "generator": false, + "references": [ + { + "type": "MutableExpression", + "start": 16, + "end": 25, + "id": { + "type": "Identifier", + "start": 24, + "end": 25, + "name": "x" + } + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/mutable-destructure-array.js.json b/packages/ojs/external-observablehq-parser/test/output/mutable-destructure-array.js.json new file mode 100644 index 00000000000..4103075d6cc --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/mutable-destructure-array.js.json @@ -0,0 +1,63 @@ +{ + "type": "Cell", + "start": 0, + "end": 21, + "id": null, + "body": { + "type": "AssignmentExpression", + "start": 1, + "end": 19, + "operator": "=", + "left": { + "type": "ArrayPattern", + "start": 1, + "end": 12, + "elements": [ + { + "type": "MutableExpression", + "start": 2, + "end": 11, + "id": { + "type": "Identifier", + "start": 10, + "end": 11, + "name": "x" + } + } + ] + }, + "right": { + "type": "ArrayExpression", + "start": 15, + "end": 19, + "elements": [ + { + "type": "Literal", + "start": 16, + "end": 18, + "value": 42, + "raw": "42" + } + ] + } + }, + "async": false, + "generator": false, + "references": [ + { + "type": "MutableExpression", + "start": 2, + "end": 11, + "id": { + "type": "Identifier", + "start": 10, + "end": 11, + "name": "x" + } + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/mutable-destructure-object.js.json b/packages/ojs/external-observablehq-parser/test/output/mutable-destructure-object.js.json new file mode 100644 index 00000000000..b8a6f393bb3 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/mutable-destructure-object.js.json @@ -0,0 +1,98 @@ +{ + "type": "Cell", + "start": 0, + "end": 44, + "id": null, + "body": { + "type": "AssignmentExpression", + "start": 1, + "end": 42, + "operator": "=", + "left": { + "type": "ObjectPattern", + "start": 1, + "end": 22, + "properties": [ + { + "type": "Property", + "start": 2, + "end": 21, + "method": false, + "shorthand": false, + "computed": false, + "key": { + "type": "Identifier", + "start": 2, + "end": 10, + "name": "property" + }, + "value": { + "type": "MutableExpression", + "start": 12, + "end": 21, + "id": { + "type": "Identifier", + "start": 20, + "end": 21, + "name": "x" + } + }, + "kind": "init" + } + ] + }, + "right": { + "type": "ObjectExpression", + "start": 25, + "end": 42, + "properties": [ + { + "type": "Property", + "start": 26, + "end": 41, + "method": false, + "shorthand": false, + "computed": false, + "key": { + "type": "Identifier", + "start": 26, + "end": 34, + "name": "property" + }, + "value": { + "type": "Identifier", + "start": 36, + "end": 41, + "name": "value" + }, + "kind": "init" + } + ] + } + }, + "async": false, + "generator": false, + "references": [ + { + "type": "MutableExpression", + "start": 12, + "end": 21, + "id": { + "type": "Identifier", + "start": 20, + "end": 21, + "name": "x" + } + }, + { + "type": "Identifier", + "start": 36, + "end": 41, + "name": "value" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/mutable-destructure-property.js.json b/packages/ojs/external-observablehq-parser/test/output/mutable-destructure-property.js.json new file mode 100644 index 00000000000..2cd94c5e07c --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/mutable-destructure-property.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Unexpected keyword 'mutable' (1:2)", + "pos": 2, + "loc": { + "line": 1, + "column": 2 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/mutable-in-markdown.md.json b/packages/ojs/external-observablehq-parser/test/output/mutable-in-markdown.md.json new file mode 100644 index 00000000000..fcc072312ec --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/mutable-in-markdown.md.json @@ -0,0 +1,177 @@ +{ + "type": "Cell", + "start": 0, + "end": 100, + "id": null, + "body": { + "type": "TemplateLiteral", + "start": 0, + "end": 100, + "expressions": [ + { + "type": "UpdateExpression", + "start": 2, + "end": 19, + "operator": "++", + "prefix": true, + "argument": { + "type": "MutableExpression", + "start": 4, + "end": 19, + "id": { + "type": "Identifier", + "start": 12, + "end": 19, + "name": "counter" + } + } + }, + { + "type": "UpdateExpression", + "start": 35, + "end": 52, + "operator": "++", + "prefix": true, + "argument": { + "type": "MutableExpression", + "start": 37, + "end": 52, + "id": { + "type": "Identifier", + "start": 45, + "end": 52, + "name": "counter" + } + } + }, + { + "type": "UpdateExpression", + "start": 69, + "end": 86, + "operator": "++", + "prefix": true, + "argument": { + "type": "MutableExpression", + "start": 71, + "end": 86, + "id": { + "type": "Identifier", + "start": 79, + "end": 86, + "name": "counter" + } + } + } + ], + "quasis": [ + { + "type": "TemplateElement", + "start": 0, + "end": 0, + "value": { + "raw": "", + "cooked": null + }, + "tail": false + }, + { + "type": "TemplateElement", + "start": 20, + "end": 33, + "value": { + "raw": ". First item\n", + "cooked": null + }, + "tail": false + }, + { + "type": "TemplateElement", + "start": 53, + "end": 67, + "value": { + "raw": ". Second item\n", + "cooked": null + }, + "tail": false + }, + { + "type": "TemplateElement", + "start": 87, + "end": 100, + "value": { + "raw": ". Third item\n", + "cooked": null + }, + "tail": true + } + ] + }, + "async": false, + "generator": false, + "tag": { + "type": "CellTag", + "start": 0, + "end": 2, + "body": { + "type": "Identifier", + "start": 0, + "end": 2, + "name": "md" + }, + "input": "md", + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 0, + "end": 2, + "name": "md" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] + }, + "raw": false, + "references": [ + { + "type": "MutableExpression", + "start": 4, + "end": 19, + "id": { + "type": "Identifier", + "start": 12, + "end": 19, + "name": "counter" + } + }, + { + "type": "MutableExpression", + "start": 37, + "end": 52, + "id": { + "type": "Identifier", + "start": 45, + "end": 52, + "name": "counter" + } + }, + { + "type": "MutableExpression", + "start": 71, + "end": 86, + "id": { + "type": "Identifier", + "start": 79, + "end": 86, + "name": "counter" + } + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/mutable-internal-comment.js.json b/packages/ojs/external-observablehq-parser/test/output/mutable-internal-comment.js.json new file mode 100644 index 00000000000..a835b928e59 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/mutable-internal-comment.js.json @@ -0,0 +1,36 @@ +{ + "type": "Cell", + "start": 0, + "end": 28, + "id": null, + "body": { + "type": "MutableExpression", + "start": 0, + "end": 27, + "id": { + "type": "Identifier", + "start": 22, + "end": 27, + "name": "value" + } + }, + "async": false, + "generator": false, + "references": [ + { + "type": "MutableExpression", + "start": 0, + "end": 27, + "id": { + "type": "Identifier", + "start": 22, + "end": 27, + "name": "value" + } + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/mutable-member.js.json b/packages/ojs/external-observablehq-parser/test/output/mutable-member.js.json new file mode 100644 index 00000000000..8632d5e4755 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/mutable-member.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Unexpected token (1:15)", + "pos": 15, + "loc": { + "line": 1, + "column": 15 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/mutable-reference.js.json b/packages/ojs/external-observablehq-parser/test/output/mutable-reference.js.json new file mode 100644 index 00000000000..bc0edd26d8e --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/mutable-reference.js.json @@ -0,0 +1,49 @@ +{ + "type": "Cell", + "start": 0, + "end": 23, + "id": null, + "body": { + "type": "MemberExpression", + "start": 0, + "end": 22, + "object": { + "type": "MutableExpression", + "start": 0, + "end": 13, + "id": { + "type": "Identifier", + "start": 8, + "end": 13, + "name": "value" + } + }, + "property": { + "type": "Identifier", + "start": 14, + "end": 22, + "name": "property" + }, + "computed": false, + "optional": false + }, + "async": false, + "generator": false, + "references": [ + { + "type": "MutableExpression", + "start": 0, + "end": 13, + "id": { + "type": "Identifier", + "start": 8, + "end": 13, + "name": "value" + } + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/mutable-var.js.json b/packages/ojs/external-observablehq-parser/test/output/mutable-var.js.json new file mode 100644 index 00000000000..0bc8fb0bdcd --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/mutable-var.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Unexpected keyword 'mutable' (2:6)", + "pos": 8, + "loc": { + "line": 2, + "column": 6 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/named-async-function.js.json b/packages/ojs/external-observablehq-parser/test/output/named-async-function.js.json new file mode 100644 index 00000000000..b05a7889c74 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/named-async-function.js.json @@ -0,0 +1,63 @@ +{ + "type": "Cell", + "start": 0, + "end": 40, + "id": { + "type": "Identifier", + "start": 15, + "end": 18, + "name": "foo" + }, + "body": { + "type": "FunctionExpression", + "start": 0, + "end": 39, + "id": { + "type": "Identifier", + "start": 15, + "end": 18, + "name": "foo" + }, + "expression": false, + "generator": false, + "async": true, + "params": [], + "body": { + "type": "BlockStatement", + "start": 21, + "end": 39, + "body": [ + { + "type": "ExpressionStatement", + "start": 23, + "end": 37, + "expression": { + "type": "AwaitExpression", + "start": 23, + "end": 36, + "argument": { + "type": "Identifier", + "start": 29, + "end": 36, + "name": "promise" + } + } + } + ] + } + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 29, + "end": 36, + "name": "promise" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/named-block-cell.js.json b/packages/ojs/external-observablehq-parser/test/output/named-block-cell.js.json new file mode 100644 index 00000000000..9d0276a7ed1 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/named-block-cell.js.json @@ -0,0 +1,37 @@ +{ + "type": "Cell", + "start": 0, + "end": 23, + "id": { + "type": "Identifier", + "start": 0, + "end": 3, + "name": "foo" + }, + "body": { + "type": "BlockStatement", + "start": 6, + "end": 22, + "body": [ + { + "type": "ReturnStatement", + "start": 10, + "end": 20, + "argument": { + "type": "Literal", + "start": 17, + "end": 19, + "value": 42, + "raw": "42" + } + } + ] + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/named-class-with-field.js.json b/packages/ojs/external-observablehq-parser/test/output/named-class-with-field.js.json new file mode 100644 index 00000000000..aa59440ce40 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/named-class-with-field.js.json @@ -0,0 +1,57 @@ +{ + "type": "Cell", + "start": 0, + "end": 33, + "id": { + "type": "Identifier", + "start": 6, + "end": 9, + "name": "Foo" + }, + "body": { + "type": "ClassExpression", + "start": 0, + "end": 32, + "id": { + "type": "Identifier", + "start": 6, + "end": 9, + "name": "Foo" + }, + "superClass": null, + "body": { + "type": "ClassBody", + "start": 10, + "end": 32, + "body": [ + { + "type": "PropertyDefinition", + "start": 14, + "end": 30, + "static": false, + "computed": false, + "key": { + "type": "Identifier", + "start": 14, + "end": 19, + "name": "field" + }, + "value": { + "type": "Literal", + "start": 22, + "end": 29, + "value": "field", + "raw": "\"field\"" + } + } + ] + } + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/named-class-with-method.js.json b/packages/ojs/external-observablehq-parser/test/output/named-class-with-method.js.json new file mode 100644 index 00000000000..ecbfc6db5b3 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/named-class-with-method.js.json @@ -0,0 +1,80 @@ +{ + "type": "Cell", + "start": 0, + "end": 49, + "id": { + "type": "Identifier", + "start": 6, + "end": 9, + "name": "Foo" + }, + "body": { + "type": "ClassExpression", + "start": 0, + "end": 48, + "id": { + "type": "Identifier", + "start": 6, + "end": 9, + "name": "Foo" + }, + "superClass": null, + "body": { + "type": "ClassBody", + "start": 10, + "end": 48, + "body": [ + { + "type": "MethodDefinition", + "start": 14, + "end": 46, + "static": false, + "computed": false, + "key": { + "type": "Identifier", + "start": 14, + "end": 20, + "name": "method" + }, + "kind": "method", + "value": { + "type": "FunctionExpression", + "start": 20, + "end": 46, + "id": null, + "expression": false, + "generator": false, + "async": false, + "params": [], + "body": { + "type": "BlockStatement", + "start": 23, + "end": 46, + "body": [ + { + "type": "ReturnStatement", + "start": 29, + "end": 42, + "argument": { + "type": "Literal", + "start": 36, + "end": 41, + "value": "foo", + "raw": "\"foo\"" + } + } + ] + } + } + } + ] + } + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/named-class-with-private-field.js.json b/packages/ojs/external-observablehq-parser/test/output/named-class-with-private-field.js.json new file mode 100644 index 00000000000..51c455b0323 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/named-class-with-private-field.js.json @@ -0,0 +1,87 @@ +{ + "type": "Cell", + "start": 0, + "end": 49, + "id": { + "type": "Identifier", + "start": 6, + "end": 9, + "name": "Foo" + }, + "body": { + "type": "ClassExpression", + "start": 0, + "end": 48, + "id": { + "type": "Identifier", + "start": 6, + "end": 9, + "name": "Foo" + }, + "superClass": null, + "body": { + "type": "ClassBody", + "start": 10, + "end": 48, + "body": [ + { + "type": "PropertyDefinition", + "start": 14, + "end": 31, + "static": false, + "computed": false, + "key": { + "type": "PrivateIdentifier", + "start": 14, + "end": 20, + "name": "field" + }, + "value": { + "type": "Literal", + "start": 23, + "end": 30, + "value": "field", + "raw": "\"field\"" + } + }, + { + "type": "MethodDefinition", + "start": 34, + "end": 46, + "static": false, + "computed": false, + "key": { + "type": "PrivateIdentifier", + "start": 34, + "end": 41, + "name": "method" + }, + "kind": "method", + "value": { + "type": "FunctionExpression", + "start": 41, + "end": 46, + "id": null, + "expression": false, + "generator": false, + "async": false, + "params": [], + "body": { + "type": "BlockStatement", + "start": 44, + "end": 46, + "body": [] + } + } + } + ] + } + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/named-class-with-static-field.js.json b/packages/ojs/external-observablehq-parser/test/output/named-class-with-static-field.js.json new file mode 100644 index 00000000000..3516e34c3c5 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/named-class-with-static-field.js.json @@ -0,0 +1,57 @@ +{ + "type": "Cell", + "start": 0, + "end": 40, + "id": { + "type": "Identifier", + "start": 6, + "end": 9, + "name": "Foo" + }, + "body": { + "type": "ClassExpression", + "start": 0, + "end": 39, + "id": { + "type": "Identifier", + "start": 6, + "end": 9, + "name": "Foo" + }, + "superClass": null, + "body": { + "type": "ClassBody", + "start": 10, + "end": 39, + "body": [ + { + "type": "PropertyDefinition", + "start": 14, + "end": 37, + "static": true, + "computed": false, + "key": { + "type": "Identifier", + "start": 21, + "end": 26, + "name": "field" + }, + "value": { + "type": "Literal", + "start": 29, + "end": 36, + "value": "field", + "raw": "\"field\"" + } + } + ] + } + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/named-class.js.json b/packages/ojs/external-observablehq-parser/test/output/named-class.js.json new file mode 100644 index 00000000000..19ad4a16fc0 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/named-class.js.json @@ -0,0 +1,36 @@ +{ + "type": "Cell", + "start": 0, + "end": 13, + "id": { + "type": "Identifier", + "start": 6, + "end": 9, + "name": "Foo" + }, + "body": { + "type": "ClassExpression", + "start": 0, + "end": 12, + "id": { + "type": "Identifier", + "start": 6, + "end": 9, + "name": "Foo" + }, + "superClass": null, + "body": { + "type": "ClassBody", + "start": 10, + "end": 12, + "body": [] + } + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/named-empty.js.json b/packages/ojs/external-observablehq-parser/test/output/named-empty.js.json new file mode 100644 index 00000000000..5ac5f5204d3 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/named-empty.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Unexpected end of input (2:0)", + "pos": 6, + "loc": { + "line": 2, + "column": 0 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/named-expression-cell.js.json b/packages/ojs/external-observablehq-parser/test/output/named-expression-cell.js.json new file mode 100644 index 00000000000..c07c27844c3 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/named-expression-cell.js.json @@ -0,0 +1,25 @@ +{ + "type": "Cell", + "start": 0, + "end": 9, + "id": { + "type": "Identifier", + "start": 0, + "end": 3, + "name": "foo" + }, + "body": { + "type": "Literal", + "start": 6, + "end": 8, + "value": 42, + "raw": "42" + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/named-function-in-named-cell.js.json b/packages/ojs/external-observablehq-parser/test/output/named-function-in-named-cell.js.json new file mode 100644 index 00000000000..4592f3c6a91 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/named-function-in-named-cell.js.json @@ -0,0 +1,52 @@ +{ + "type": "Cell", + "start": 0, + "end": 36, + "id": { + "type": "Identifier", + "start": 0, + "end": 3, + "name": "foo" + }, + "body": { + "type": "FunctionExpression", + "start": 6, + "end": 35, + "id": { + "type": "Identifier", + "start": 15, + "end": 18, + "name": "bar" + }, + "expression": false, + "generator": false, + "async": false, + "params": [], + "body": { + "type": "BlockStatement", + "start": 21, + "end": 35, + "body": [ + { + "type": "ReturnStatement", + "start": 23, + "end": 33, + "argument": { + "type": "Literal", + "start": 30, + "end": 32, + "value": 42, + "raw": "42" + } + } + ] + } + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/named-function.js.json b/packages/ojs/external-observablehq-parser/test/output/named-function.js.json new file mode 100644 index 00000000000..f94035431e4 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/named-function.js.json @@ -0,0 +1,52 @@ +{ + "type": "Cell", + "start": 0, + "end": 30, + "id": { + "type": "Identifier", + "start": 9, + "end": 12, + "name": "foo" + }, + "body": { + "type": "FunctionExpression", + "start": 0, + "end": 29, + "id": { + "type": "Identifier", + "start": 9, + "end": 12, + "name": "foo" + }, + "expression": false, + "generator": false, + "async": false, + "params": [], + "body": { + "type": "BlockStatement", + "start": 15, + "end": 29, + "body": [ + { + "type": "ReturnStatement", + "start": 17, + "end": 27, + "argument": { + "type": "Literal", + "start": 24, + "end": 26, + "value": 42, + "raw": "42" + } + } + ] + } + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/named-generator-function.js.json b/packages/ojs/external-observablehq-parser/test/output/named-generator-function.js.json new file mode 100644 index 00000000000..c52b8cf0c09 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/named-generator-function.js.json @@ -0,0 +1,58 @@ +{ + "type": "Cell", + "start": 0, + "end": 30, + "id": { + "type": "Identifier", + "start": 10, + "end": 13, + "name": "foo" + }, + "body": { + "type": "FunctionExpression", + "start": 0, + "end": 29, + "id": { + "type": "Identifier", + "start": 10, + "end": 13, + "name": "foo" + }, + "expression": false, + "generator": true, + "async": false, + "params": [], + "body": { + "type": "BlockStatement", + "start": 16, + "end": 29, + "body": [ + { + "type": "ExpressionStatement", + "start": 18, + "end": 27, + "expression": { + "type": "YieldExpression", + "start": 18, + "end": 26, + "delegate": false, + "argument": { + "type": "Literal", + "start": 24, + "end": 26, + "value": 42, + "raw": "42" + } + } + } + ] + } + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/notification-client.js.json b/packages/ojs/external-observablehq-parser/test/output/notification-client.js.json new file mode 100644 index 00000000000..a155eb5aed8 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/notification-client.js.json @@ -0,0 +1,77 @@ +{ + "type": "Cell", + "start": 0, + "end": 53, + "id": null, + "body": { + "type": "BlockStatement", + "start": 0, + "end": 52, + "body": [ + { + "type": "VariableDeclaration", + "start": 6, + "end": 50, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 10, + "end": 49, + "id": { + "type": "Identifier", + "start": 10, + "end": 11, + "name": "a" + }, + "init": { + "type": "CallExpression", + "start": 14, + "end": 49, + "callee": { + "type": "Identifier", + "start": 14, + "end": 32, + "name": "NotificationClient" + }, + "arguments": [ + { + "type": "Literal", + "start": 33, + "end": 48, + "value": "slack:@claire", + "raw": "\"slack:@claire\"" + } + ], + "optional": false + } + } + ], + "kind": "let" + } + ] + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 14, + "end": 32, + "name": "NotificationClient" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [ + [ + "slack:@claire", + [ + { + "start": 33, + "end": 48 + } + ] + ] + ] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/nullish-coalescing.js.json b/packages/ojs/external-observablehq-parser/test/output/nullish-coalescing.js.json new file mode 100644 index 00000000000..7d0631ef351 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/nullish-coalescing.js.json @@ -0,0 +1,38 @@ +{ + "type": "Cell", + "start": 0, + "end": 31, + "id": { + "type": "Identifier", + "start": 0, + "end": 3, + "name": "foo" + }, + "body": { + "type": "LogicalExpression", + "start": 6, + "end": 30, + "left": { + "type": "Literal", + "start": 6, + "end": 10, + "value": null, + "raw": "null" + }, + "operator": "??", + "right": { + "type": "Literal", + "start": 14, + "end": 30, + "value": "default string", + "raw": "'default string'" + } + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/object-literal.js.json b/packages/ojs/external-observablehq-parser/test/output/object-literal.js.json new file mode 100644 index 00000000000..125a3c84ada --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/object-literal.js.json @@ -0,0 +1,42 @@ +{ + "type": "Cell", + "start": 0, + "end": 12, + "id": null, + "body": { + "type": "ObjectExpression", + "start": 1, + "end": 10, + "properties": [ + { + "type": "Property", + "start": 2, + "end": 9, + "method": false, + "shorthand": false, + "computed": false, + "key": { + "type": "Identifier", + "start": 2, + "end": 5, + "name": "foo" + }, + "value": { + "type": "Literal", + "start": 7, + "end": 9, + "value": 42, + "raw": "42" + }, + "kind": "init" + } + ] + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/optional-chaining.js.json b/packages/ojs/external-observablehq-parser/test/output/optional-chaining.js.json new file mode 100644 index 00000000000..e9fe0488679 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/optional-chaining.js.json @@ -0,0 +1,62 @@ +{ + "type": "Cell", + "start": 0, + "end": 31, + "id": { + "type": "Identifier", + "start": 0, + "end": 7, + "name": "dogName" + }, + "body": { + "type": "ChainExpression", + "start": 10, + "end": 30, + "expression": { + "type": "MemberExpression", + "start": 10, + "end": 30, + "object": { + "type": "MemberExpression", + "start": 10, + "end": 24, + "object": { + "type": "Identifier", + "start": 10, + "end": 20, + "name": "adventurer" + }, + "property": { + "type": "Identifier", + "start": 21, + "end": 24, + "name": "dog" + }, + "computed": false, + "optional": false + }, + "property": { + "type": "Identifier", + "start": 26, + "end": 30, + "name": "name" + }, + "computed": false, + "optional": true + } + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 10, + "end": 20, + "name": "adventurer" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/reserved-function.js.json b/packages/ojs/external-observablehq-parser/test/output/reserved-function.js.json new file mode 100644 index 00000000000..3a14d8f8218 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/reserved-function.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Identifier 'Array' is reserved (1:9)", + "pos": 9, + "loc": { + "line": 1, + "column": 9 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/reserved-import-as.js.json b/packages/ojs/external-observablehq-parser/test/output/reserved-import-as.js.json new file mode 100644 index 00000000000..c4cf152dfb2 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/reserved-import-as.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Identifier 'Array' is reserved (1:15)", + "pos": 15, + "loc": { + "line": 1, + "column": 15 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/reserved-import-view.js.json b/packages/ojs/external-observablehq-parser/test/output/reserved-import-view.js.json new file mode 100644 index 00000000000..c4cf152dfb2 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/reserved-import-view.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Identifier 'Array' is reserved (1:15)", + "pos": 15, + "loc": { + "line": 1, + "column": 15 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/reserved-import-with-as.js.json b/packages/ojs/external-observablehq-parser/test/output/reserved-import-with-as.js.json new file mode 100644 index 00000000000..e932ecd7af0 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/reserved-import-with-as.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Identifier 'Array' is reserved (1:26)", + "pos": 26, + "loc": { + "line": 1, + "column": 26 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/reserved-import-with.js.json b/packages/ojs/external-observablehq-parser/test/output/reserved-import-with.js.json new file mode 100644 index 00000000000..c3b60b4c82c --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/reserved-import-with.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Identifier 'Array' is reserved (1:19)", + "pos": 19, + "loc": { + "line": 1, + "column": 19 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/reserved-import.js.json b/packages/ojs/external-observablehq-parser/test/output/reserved-import.js.json new file mode 100644 index 00000000000..30526173f2a --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/reserved-import.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Identifier 'Array' is reserved (1:8)", + "pos": 8, + "loc": { + "line": 1, + "column": 8 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/reserved-name.js.json b/packages/ojs/external-observablehq-parser/test/output/reserved-name.js.json new file mode 100644 index 00000000000..61bd20bc9e1 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/reserved-name.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Identifier 'Array' is reserved (1:0)", + "pos": 0, + "loc": { + "line": 1, + "column": 0 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/reserved-view.js.json b/packages/ojs/external-observablehq-parser/test/output/reserved-view.js.json new file mode 100644 index 00000000000..a45eb211e47 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/reserved-view.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Identifier 'Array' is reserved (1:7)", + "pos": 7, + "loc": { + "line": 1, + "column": 7 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/secret.js.json b/packages/ojs/external-observablehq-parser/test/output/secret.js.json new file mode 100644 index 00000000000..4b713eae16b --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/secret.js.json @@ -0,0 +1,77 @@ +{ + "type": "Cell", + "start": 0, + "end": 27, + "id": null, + "body": { + "type": "BlockStatement", + "start": 0, + "end": 26, + "body": [ + { + "type": "VariableDeclaration", + "start": 4, + "end": 24, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 8, + "end": 23, + "id": { + "type": "Identifier", + "start": 8, + "end": 9, + "name": "a" + }, + "init": { + "type": "CallExpression", + "start": 12, + "end": 23, + "callee": { + "type": "Identifier", + "start": 12, + "end": 18, + "name": "Secret" + }, + "arguments": [ + { + "type": "Literal", + "start": 19, + "end": 22, + "value": "a", + "raw": "\"a\"" + } + ], + "optional": false + } + } + ], + "kind": "let" + } + ] + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 12, + "end": 18, + "name": "Secret" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [ + [ + "a", + [ + { + "start": 19, + "end": 22 + } + ] + ] + ], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/semicolon.js.json b/packages/ojs/external-observablehq-parser/test/output/semicolon.js.json new file mode 100644 index 00000000000..421e92aefee --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/semicolon.js.json @@ -0,0 +1,14 @@ +{ + "type": "Cell", + "start": 0, + "end": 2, + "id": null, + "body": null, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/sequence-expression.js.json b/packages/ojs/external-observablehq-parser/test/output/sequence-expression.js.json new file mode 100644 index 00000000000..9e771bcccd6 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/sequence-expression.js.json @@ -0,0 +1,41 @@ +{ + "type": "Cell", + "start": 0, + "end": 8, + "id": null, + "body": { + "type": "SequenceExpression", + "start": 0, + "end": 7, + "expressions": [ + { + "type": "Literal", + "start": 0, + "end": 1, + "value": 1, + "raw": "1" + }, + { + "type": "Literal", + "start": 3, + "end": 4, + "value": 2, + "raw": "2" + }, + { + "type": "Literal", + "start": 6, + "end": 7, + "value": 3, + "raw": "3" + } + ] + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/shadowed-view.js.json b/packages/ojs/external-observablehq-parser/test/output/shadowed-view.js.json new file mode 100644 index 00000000000..d0ea1ad1fde --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/shadowed-view.js.json @@ -0,0 +1,98 @@ +{ + "type": "Cell", + "start": 0, + "end": 45, + "id": null, + "body": { + "type": "BlockStatement", + "start": 0, + "end": 44, + "body": [ + { + "type": "VariableDeclaration", + "start": 4, + "end": 14, + "declarations": [ + { + "type": "VariableDeclarator", + "start": 8, + "end": 13, + "id": { + "type": "Identifier", + "start": 8, + "end": 9, + "name": "x" + }, + "init": { + "type": "Literal", + "start": 12, + "end": 13, + "value": 2, + "raw": "2" + } + } + ], + "kind": "let" + }, + { + "type": "ExpressionStatement", + "start": 17, + "end": 23, + "expression": { + "type": "AssignmentExpression", + "start": 17, + "end": 22, + "operator": "=", + "left": { + "type": "Identifier", + "start": 17, + "end": 18, + "name": "x" + }, + "right": { + "type": "Literal", + "start": 21, + "end": 22, + "value": 4, + "raw": "4" + } + } + }, + { + "type": "ReturnStatement", + "start": 26, + "end": 42, + "argument": { + "type": "ViewExpression", + "start": 33, + "end": 41, + "id": { + "type": "Identifier", + "start": 40, + "end": 41, + "name": "x" + } + } + } + ] + }, + "async": false, + "generator": false, + "references": [ + { + "type": "ViewExpression", + "start": 33, + "end": 41, + "id": { + "type": "Identifier", + "start": 40, + "end": 41, + "name": "x" + } + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/simple-await-tagged-template.js.json b/packages/ojs/external-observablehq-parser/test/output/simple-await-tagged-template.js.json new file mode 100644 index 00000000000..7f4a2992c31 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/simple-await-tagged-template.js.json @@ -0,0 +1,77 @@ +{ + "type": "Cell", + "start": 0, + "end": 21, + "id": null, + "body": { + "type": "TaggedTemplateExpression", + "start": 0, + "end": 20, + "tag": { + "type": "Identifier", + "start": 0, + "end": 2, + "name": "md" + }, + "quasi": { + "type": "TemplateLiteral", + "start": 2, + "end": 20, + "expressions": [ + { + "type": "AwaitExpression", + "start": 5, + "end": 18, + "argument": { + "type": "Identifier", + "start": 11, + "end": 18, + "name": "promise" + } + } + ], + "quasis": [ + { + "type": "TemplateElement", + "start": 3, + "end": 3, + "value": { + "raw": "", + "cooked": "" + }, + "tail": false + }, + { + "type": "TemplateElement", + "start": 19, + "end": 19, + "value": { + "raw": "", + "cooked": "" + }, + "tail": true + } + ] + } + }, + "async": true, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 0, + "end": 2, + "name": "md" + }, + { + "type": "Identifier", + "start": 11, + "end": 18, + "name": "promise" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/simple-await-template.js.json b/packages/ojs/external-observablehq-parser/test/output/simple-await-template.js.json new file mode 100644 index 00000000000..cf96365206d --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/simple-await-template.js.json @@ -0,0 +1,60 @@ +{ + "type": "Cell", + "start": 0, + "end": 19, + "id": null, + "body": { + "type": "TemplateLiteral", + "start": 0, + "end": 18, + "expressions": [ + { + "type": "AwaitExpression", + "start": 3, + "end": 16, + "argument": { + "type": "Identifier", + "start": 9, + "end": 16, + "name": "promise" + } + } + ], + "quasis": [ + { + "type": "TemplateElement", + "start": 1, + "end": 1, + "value": { + "raw": "", + "cooked": "" + }, + "tail": false + }, + { + "type": "TemplateElement", + "start": 17, + "end": 17, + "value": { + "raw": "", + "cooked": "" + }, + "tail": true + } + ] + }, + "async": true, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 9, + "end": 16, + "name": "promise" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/simple-await-template.md.json b/packages/ojs/external-observablehq-parser/test/output/simple-await-template.md.json new file mode 100644 index 00000000000..b452dc1dc11 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/simple-await-template.md.json @@ -0,0 +1,86 @@ +{ + "type": "Cell", + "start": 0, + "end": 16, + "id": null, + "body": { + "type": "TemplateLiteral", + "start": 0, + "end": 16, + "expressions": [ + { + "type": "AwaitExpression", + "start": 2, + "end": 15, + "argument": { + "type": "Identifier", + "start": 8, + "end": 15, + "name": "promise" + } + } + ], + "quasis": [ + { + "type": "TemplateElement", + "start": 0, + "end": 0, + "value": { + "raw": "", + "cooked": null + }, + "tail": false + }, + { + "type": "TemplateElement", + "start": 16, + "end": 16, + "value": { + "raw": "" + }, + "tail": true + } + ] + }, + "async": true, + "generator": false, + "tag": { + "type": "CellTag", + "start": 0, + "end": 2, + "body": { + "type": "Identifier", + "start": 0, + "end": 2, + "name": "md" + }, + "input": "md", + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 0, + "end": 2, + "name": "md" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] + }, + "raw": false, + "references": [ + { + "type": "Identifier", + "start": 8, + "end": 15, + "name": "promise" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/simple-identifier.js.json b/packages/ojs/external-observablehq-parser/test/output/simple-identifier.js.json new file mode 100644 index 00000000000..0bf58fc602d --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/simple-identifier.js.json @@ -0,0 +1,26 @@ +{ + "type": "Cell", + "start": 0, + "end": 4, + "id": null, + "body": { + "type": "Identifier", + "start": 0, + "end": 3, + "name": "foo" + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 0, + "end": 3, + "name": "foo" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/spread-element.js.json b/packages/ojs/external-observablehq-parser/test/output/spread-element.js.json new file mode 100644 index 00000000000..f7aeb48f7b0 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/spread-element.js.json @@ -0,0 +1,69 @@ +{ + "type": "Cell", + "start": 0, + "end": 23, + "id": null, + "body": { + "type": "ArrowFunctionExpression", + "start": 0, + "end": 22, + "id": null, + "expression": true, + "generator": false, + "async": false, + "params": [ + { + "type": "ObjectPattern", + "start": 1, + "end": 14, + "properties": [ + { + "type": "Property", + "start": 2, + "end": 5, + "method": false, + "shorthand": true, + "computed": false, + "key": { + "type": "Identifier", + "start": 2, + "end": 5, + "name": "foo" + }, + "kind": "init", + "value": { + "type": "Identifier", + "start": 2, + "end": 5, + "name": "foo" + } + }, + { + "type": "RestElement", + "start": 7, + "end": 13, + "argument": { + "type": "Identifier", + "start": 10, + "end": 13, + "name": "bar" + } + } + ] + } + ], + "body": { + "type": "Identifier", + "start": 19, + "end": 22, + "name": "bar" + } + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/template-literal-semicolon.js.json b/packages/ojs/external-observablehq-parser/test/output/template-literal-semicolon.js.json new file mode 100644 index 00000000000..44566e422a1 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/template-literal-semicolon.js.json @@ -0,0 +1,49 @@ +{ + "type": "Cell", + "start": 0, + "end": 13, + "id": null, + "body": { + "type": "TaggedTemplateExpression", + "start": 0, + "end": 11, + "tag": { + "type": "Identifier", + "start": 0, + "end": 4, + "name": "html" + }, + "quasi": { + "type": "TemplateLiteral", + "start": 4, + "end": 11, + "expressions": [], + "quasis": [ + { + "type": "TemplateElement", + "start": 5, + "end": 10, + "value": { + "raw": "hello", + "cooked": "hello" + }, + "tail": true + } + ] + } + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 0, + "end": 4, + "name": "html" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/this-as-name.js.json b/packages/ojs/external-observablehq-parser/test/output/this-as-name.js.json new file mode 100644 index 00000000000..d7f58a0b003 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/this-as-name.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Assigning to rvalue (1:0)", + "pos": 0, + "loc": { + "line": 1, + "column": 0 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/this.js.json b/packages/ojs/external-observablehq-parser/test/output/this.js.json new file mode 100644 index 00000000000..2d727069db6 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/this.js.json @@ -0,0 +1,18 @@ +{ + "type": "Cell", + "start": 0, + "end": 5, + "id": null, + "body": { + "type": "ThisExpression", + "start": 0, + "end": 4 + }, + "async": false, + "generator": false, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/underline.tex.json b/packages/ojs/external-observablehq-parser/test/output/underline.tex.json new file mode 100644 index 00000000000..d3dfcd0decb --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/underline.tex.json @@ -0,0 +1,71 @@ +{ + "type": "Cell", + "start": 0, + "end": 54, + "id": null, + "body": { + "type": "TemplateLiteral", + "start": 0, + "end": 54, + "expressions": [], + "quasis": [ + { + "type": "TemplateElement", + "start": 0, + "end": 54, + "value": { + "raw": "\\text{This is some text \\underline{with an underline}}", + "cooked": null + }, + "tail": true + } + ] + }, + "async": false, + "generator": false, + "tag": { + "type": "CellTag", + "start": 0, + "end": 9, + "body": { + "type": "MemberExpression", + "start": 0, + "end": 9, + "object": { + "type": "Identifier", + "start": 0, + "end": 3, + "name": "tex" + }, + "property": { + "type": "Identifier", + "start": 4, + "end": 9, + "name": "block" + }, + "computed": false, + "optional": false + }, + "input": "tex.block", + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 0, + "end": 3, + "name": "tex" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] + }, + "raw": true, + "references": [], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/var-statement.js.json b/packages/ojs/external-observablehq-parser/test/output/var-statement.js.json new file mode 100644 index 00000000000..4839ab28691 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/var-statement.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Unexpected token (1:0)", + "pos": 0, + "loc": { + "line": 1, + "column": 0 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/viewof-argument.js.json b/packages/ojs/external-observablehq-parser/test/output/viewof-argument.js.json new file mode 100644 index 00000000000..2e0fa4ef4a0 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/viewof-argument.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Unexpected keyword 'viewof' (1:13)", + "pos": 13, + "loc": { + "line": 1, + "column": 13 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/viewof-assignment.js.json b/packages/ojs/external-observablehq-parser/test/output/viewof-assignment.js.json new file mode 100644 index 00000000000..cbff3e67026 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/viewof-assignment.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Assigning to rvalue (2:2)", + "pos": 4, + "loc": { + "line": 2, + "column": 2 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/viewof-binding.js.json b/packages/ojs/external-observablehq-parser/test/output/viewof-binding.js.json new file mode 100644 index 00000000000..63c1d6aca89 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/viewof-binding.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Unexpected keyword 'viewof' (2:6)", + "pos": 8, + "loc": { + "line": 2, + "column": 6 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/viewof-block-cell.js.json b/packages/ojs/external-observablehq-parser/test/output/viewof-block-cell.js.json new file mode 100644 index 00000000000..f461f8966eb --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/viewof-block-cell.js.json @@ -0,0 +1,68 @@ +{ + "type": "Cell", + "start": 0, + "end": 39, + "id": { + "type": "ViewExpression", + "start": 0, + "end": 10, + "id": { + "type": "Identifier", + "start": 7, + "end": 10, + "name": "foo" + } + }, + "body": { + "type": "BlockStatement", + "start": 13, + "end": 38, + "body": [ + { + "type": "ReturnStatement", + "start": 17, + "end": 36, + "argument": { + "type": "CallExpression", + "start": 24, + "end": 35, + "callee": { + "type": "MemberExpression", + "start": 24, + "end": 33, + "object": { + "type": "Identifier", + "start": 24, + "end": 27, + "name": "DOM" + }, + "property": { + "type": "Identifier", + "start": 28, + "end": 33, + "name": "input" + }, + "computed": false, + "optional": false + }, + "arguments": [], + "optional": false + } + } + ] + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 24, + "end": 27, + "name": "DOM" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/viewof-expression-cell.js.json b/packages/ojs/external-observablehq-parser/test/output/viewof-expression-cell.js.json new file mode 100644 index 00000000000..a27c975d374 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/viewof-expression-cell.js.json @@ -0,0 +1,56 @@ +{ + "type": "Cell", + "start": 0, + "end": 25, + "id": { + "type": "ViewExpression", + "start": 0, + "end": 10, + "id": { + "type": "Identifier", + "start": 7, + "end": 10, + "name": "foo" + } + }, + "body": { + "type": "CallExpression", + "start": 13, + "end": 24, + "callee": { + "type": "MemberExpression", + "start": 13, + "end": 22, + "object": { + "type": "Identifier", + "start": 13, + "end": 16, + "name": "DOM" + }, + "property": { + "type": "Identifier", + "start": 17, + "end": 22, + "name": "input" + }, + "computed": false, + "optional": false + }, + "arguments": [], + "optional": false + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 13, + "end": 16, + "name": "DOM" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/viewof-in-markdown.md.json b/packages/ojs/external-observablehq-parser/test/output/viewof-in-markdown.md.json new file mode 100644 index 00000000000..0b4a09dbce2 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/viewof-in-markdown.md.json @@ -0,0 +1,111 @@ +{ + "type": "Cell", + "start": 0, + "end": 37, + "id": null, + "body": { + "type": "TemplateLiteral", + "start": 0, + "end": 37, + "expressions": [ + { + "type": "MemberExpression", + "start": 16, + "end": 34, + "object": { + "type": "Identifier", + "start": 16, + "end": 22, + "name": "object" + }, + "property": { + "type": "ViewExpression", + "start": 23, + "end": 33, + "id": { + "type": "Identifier", + "start": 30, + "end": 33, + "name": "foo" + } + }, + "computed": true, + "optional": false + } + ], + "quasis": [ + { + "type": "TemplateElement", + "start": 0, + "end": 14, + "value": { + "raw": "# `Code Title ", + "cooked": null + }, + "tail": false + }, + { + "type": "TemplateElement", + "start": 35, + "end": 37, + "value": { + "raw": "`\n", + "cooked": null + }, + "tail": true + } + ] + }, + "async": false, + "generator": false, + "tag": { + "type": "CellTag", + "start": 0, + "end": 2, + "body": { + "type": "Identifier", + "start": 0, + "end": 2, + "name": "md" + }, + "input": "md", + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 0, + "end": 2, + "name": "md" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] + }, + "raw": false, + "references": [ + { + "type": "Identifier", + "start": 16, + "end": 22, + "name": "object" + }, + { + "type": "ViewExpression", + "start": 23, + "end": 33, + "id": { + "type": "Identifier", + "start": 30, + "end": 33, + "name": "foo" + } + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/viewof-internal-comment.js.json b/packages/ojs/external-observablehq-parser/test/output/viewof-internal-comment.js.json new file mode 100644 index 00000000000..693df9d73a6 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/viewof-internal-comment.js.json @@ -0,0 +1,56 @@ +{ + "type": "Cell", + "start": 0, + "end": 39, + "id": { + "type": "ViewExpression", + "start": 0, + "end": 24, + "id": { + "type": "Identifier", + "start": 21, + "end": 24, + "name": "bar" + } + }, + "body": { + "type": "CallExpression", + "start": 27, + "end": 38, + "callee": { + "type": "MemberExpression", + "start": 27, + "end": 36, + "object": { + "type": "Identifier", + "start": 27, + "end": 30, + "name": "DOM" + }, + "property": { + "type": "Identifier", + "start": 31, + "end": 36, + "name": "range" + }, + "computed": false, + "optional": false + }, + "arguments": [], + "optional": false + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 27, + "end": 30, + "name": "DOM" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/viewof-let.js.json b/packages/ojs/external-observablehq-parser/test/output/viewof-let.js.json new file mode 100644 index 00000000000..63c1d6aca89 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/viewof-let.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Unexpected keyword 'viewof' (2:6)", + "pos": 8, + "loc": { + "line": 2, + "column": 6 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/viewof-member-expression.js.json b/packages/ojs/external-observablehq-parser/test/output/viewof-member-expression.js.json new file mode 100644 index 00000000000..096c6849538 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/viewof-member-expression.js.json @@ -0,0 +1,49 @@ +{ + "type": "Cell", + "start": 0, + "end": 16, + "id": null, + "body": { + "type": "MemberExpression", + "start": 0, + "end": 15, + "object": { + "type": "ViewExpression", + "start": 0, + "end": 10, + "id": { + "type": "Identifier", + "start": 7, + "end": 10, + "name": "foo" + } + }, + "property": { + "type": "Identifier", + "start": 11, + "end": 15, + "name": "name" + }, + "computed": false, + "optional": false + }, + "async": false, + "generator": false, + "references": [ + { + "type": "ViewExpression", + "start": 0, + "end": 10, + "id": { + "type": "Identifier", + "start": 7, + "end": 10, + "name": "foo" + } + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/viewof-member.js.json b/packages/ojs/external-observablehq-parser/test/output/viewof-member.js.json new file mode 100644 index 00000000000..a05b825ce38 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/viewof-member.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Unexpected token (1:14)", + "pos": 14, + "loc": { + "line": 1, + "column": 14 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/viewof-orphan.js.json b/packages/ojs/external-observablehq-parser/test/output/viewof-orphan.js.json new file mode 100644 index 00000000000..e5418e13707 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/viewof-orphan.js.json @@ -0,0 +1,11 @@ +{ + "error": { + "type": "SyntaxError", + "message": "Unexpected token (1:7)", + "pos": 7, + "loc": { + "line": 1, + "column": 7 + } + } +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/viewof-property.js.json b/packages/ojs/external-observablehq-parser/test/output/viewof-property.js.json new file mode 100644 index 00000000000..d9c0039b8ce --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/viewof-property.js.json @@ -0,0 +1,68 @@ +{ + "type": "Cell", + "start": 0, + "end": 23, + "id": null, + "body": { + "type": "BinaryExpression", + "start": 0, + "end": 22, + "left": { + "type": "MemberExpression", + "start": 0, + "end": 18, + "object": { + "type": "Identifier", + "start": 0, + "end": 6, + "name": "object" + }, + "property": { + "type": "ViewExpression", + "start": 7, + "end": 17, + "id": { + "type": "Identifier", + "start": 14, + "end": 17, + "name": "foo" + } + }, + "computed": true, + "optional": false + }, + "operator": "+", + "right": { + "type": "Literal", + "start": 21, + "end": 22, + "value": 2, + "raw": "2" + } + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 0, + "end": 6, + "name": "object" + }, + { + "type": "ViewExpression", + "start": 7, + "end": 17, + "id": { + "type": "Identifier", + "start": 14, + "end": 17, + "name": "foo" + } + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/viewof-reference-internal-comment.js.json b/packages/ojs/external-observablehq-parser/test/output/viewof-reference-internal-comment.js.json new file mode 100644 index 00000000000..4a920af55a8 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/viewof-reference-internal-comment.js.json @@ -0,0 +1,36 @@ +{ + "type": "Cell", + "start": 0, + "end": 25, + "id": null, + "body": { + "type": "ViewExpression", + "start": 0, + "end": 24, + "id": { + "type": "Identifier", + "start": 21, + "end": 24, + "name": "bar" + } + }, + "async": false, + "generator": false, + "references": [ + { + "type": "ViewExpression", + "start": 0, + "end": 24, + "id": { + "type": "Identifier", + "start": 21, + "end": 24, + "name": "bar" + } + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/viewof-reference.js.json b/packages/ojs/external-observablehq-parser/test/output/viewof-reference.js.json new file mode 100644 index 00000000000..5210c7b88fa --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/viewof-reference.js.json @@ -0,0 +1,49 @@ +{ + "type": "Cell", + "start": 0, + "end": 21, + "id": null, + "body": { + "type": "MemberExpression", + "start": 0, + "end": 20, + "object": { + "type": "ViewExpression", + "start": 0, + "end": 12, + "id": { + "type": "Identifier", + "start": 7, + "end": 12, + "name": "input" + } + }, + "property": { + "type": "Identifier", + "start": 13, + "end": 20, + "name": "tagName" + }, + "computed": false, + "optional": false + }, + "async": false, + "generator": false, + "references": [ + { + "type": "ViewExpression", + "start": 0, + "end": 12, + "id": { + "type": "Identifier", + "start": 7, + "end": 12, + "name": "input" + } + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/yield-await.js.json b/packages/ojs/external-observablehq-parser/test/output/yield-await.js.json new file mode 100644 index 00000000000..e02477d6610 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/yield-await.js.json @@ -0,0 +1,66 @@ +{ + "type": "Cell", + "start": 0, + "end": 36, + "id": null, + "body": { + "type": "BlockStatement", + "start": 0, + "end": 35, + "body": [ + { + "type": "ExpressionStatement", + "start": 4, + "end": 16, + "expression": { + "type": "YieldExpression", + "start": 4, + "end": 15, + "delegate": false, + "argument": { + "type": "Identifier", + "start": 10, + "end": 15, + "name": "value" + } + } + }, + { + "type": "ExpressionStatement", + "start": 19, + "end": 33, + "expression": { + "type": "AwaitExpression", + "start": 19, + "end": 32, + "argument": { + "type": "Identifier", + "start": 25, + "end": 32, + "name": "promise" + } + } + } + ] + }, + "async": true, + "generator": true, + "references": [ + { + "type": "Identifier", + "start": 10, + "end": 15, + "name": "value" + }, + { + "type": "Identifier", + "start": 25, + "end": 32, + "name": "promise" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/yield-block-cell.js.json b/packages/ojs/external-observablehq-parser/test/output/yield-block-cell.js.json new file mode 100644 index 00000000000..7474f0b3eb8 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/yield-block-cell.js.json @@ -0,0 +1,44 @@ +{ + "type": "Cell", + "start": 0, + "end": 19, + "id": null, + "body": { + "type": "BlockStatement", + "start": 0, + "end": 18, + "body": [ + { + "type": "ExpressionStatement", + "start": 4, + "end": 16, + "expression": { + "type": "YieldExpression", + "start": 4, + "end": 15, + "delegate": false, + "argument": { + "type": "Identifier", + "start": 10, + "end": 15, + "name": "value" + } + } + } + ] + }, + "async": false, + "generator": true, + "references": [ + { + "type": "Identifier", + "start": 10, + "end": 15, + "name": "value" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/yield-expression-cell.js.json b/packages/ojs/external-observablehq-parser/test/output/yield-expression-cell.js.json new file mode 100644 index 00000000000..9eb5eb15411 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/yield-expression-cell.js.json @@ -0,0 +1,32 @@ +{ + "type": "Cell", + "start": 0, + "end": 12, + "id": null, + "body": { + "type": "YieldExpression", + "start": 0, + "end": 11, + "delegate": false, + "argument": { + "type": "Identifier", + "start": 6, + "end": 11, + "name": "value" + } + }, + "async": false, + "generator": true, + "references": [ + { + "type": "Identifier", + "start": 6, + "end": 11, + "name": "value" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/yield-in-function.js.json b/packages/ojs/external-observablehq-parser/test/output/yield-in-function.js.json new file mode 100644 index 00000000000..a522f3ead55 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/yield-in-function.js.json @@ -0,0 +1,66 @@ +{ + "type": "Cell", + "start": 0, + "end": 47, + "id": null, + "body": { + "type": "BlockStatement", + "start": 0, + "end": 46, + "body": [ + { + "type": "FunctionDeclaration", + "start": 4, + "end": 44, + "id": { + "type": "Identifier", + "start": 14, + "end": 19, + "name": "inner" + }, + "expression": false, + "generator": true, + "async": false, + "params": [], + "body": { + "type": "BlockStatement", + "start": 22, + "end": 44, + "body": [ + { + "type": "ExpressionStatement", + "start": 28, + "end": 40, + "expression": { + "type": "YieldExpression", + "start": 28, + "end": 39, + "delegate": false, + "argument": { + "type": "Identifier", + "start": 34, + "end": 39, + "name": "value" + } + } + } + ] + } + } + ] + }, + "async": false, + "generator": false, + "references": [ + { + "type": "Identifier", + "start": 34, + "end": 39, + "name": "value" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/output/yield-star-expression-cell.js.json b/packages/ojs/external-observablehq-parser/test/output/yield-star-expression-cell.js.json new file mode 100644 index 00000000000..3c1a8704cd4 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/output/yield-star-expression-cell.js.json @@ -0,0 +1,32 @@ +{ + "type": "Cell", + "start": 0, + "end": 14, + "id": null, + "body": { + "type": "YieldExpression", + "start": 0, + "end": 13, + "delegate": true, + "argument": { + "type": "Identifier", + "start": 7, + "end": 13, + "name": "values" + } + }, + "async": false, + "generator": true, + "references": [ + { + "type": "Identifier", + "start": 7, + "end": 13, + "name": "values" + } + ], + "fileAttachments": [], + "databaseClients": [], + "secrets": [], + "notificationClients": [] +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-parser/test/parse-test.js b/packages/ojs/external-observablehq-parser/test/parse-test.js new file mode 100644 index 00000000000..fd6a6449254 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/parse-test.js @@ -0,0 +1,80 @@ +import assert from "assert"; +import * as fs from "fs"; +import * as path from "path"; +import {parseCell} from "@observablehq/parser"; + +(async () => { + for (const file of fs.readdirSync(path.join("test", "input"))) { + it(`parse ${file}`, () => { + const extension = file.substring(file.indexOf(".")); // path.extname, but taking the first dot + const infile = path.join("test", "input", file); + const outfile = path.resolve(path.join("test", "output"), `${file}.json`); + + const input = fs.readFileSync(infile, "utf8"); + let cell; + try { + cell = parseCell(input, { + globals: null, + tag: + extension === ".sql" + ? "db.sql" + : extension === ".db.sql" + ? `(await DatabaseClient("database")).sql` + : extension === ".html" + ? "htl.html" + : extension === ".tex" + ? "tex.block" + : extension === ".md" + ? "md" + : undefined, + raw: extension == ".tex" + }); + } catch (error) { + if ( + error instanceof ReferenceError || + error instanceof SyntaxError || + error instanceof TypeError + ) { + if (!error.loc) throw error; // internal unexpected error + cell = { + error: { + type: error.constructor.name, + message: error.message, + pos: error.pos, + loc: { + line: error.loc.line, + column: error.loc.column + } + } + }; + } else { + throw error; + } + } + + const actual = JSON.stringify(cell, stringify, 2); + + let expected; + try { + expected = fs.readFileSync(outfile, "utf8"); + } catch (error) { + if (error.code === "ENOENT" && process.env.CI !== "true") { + console.warn(`! generating ${outfile}`); + fs.writeFileSync(outfile, actual, "utf8"); + return; + } else { + throw error; + } + } + + assert.strictEqual(actual, expected, `${file} must match snapshot`); + }); + } +})(); + +// Convert to a serializable representation. +function stringify(key, value) { + return typeof value === "bigint" ? value.toString() + : value instanceof Map ? [...value] + : value; +} diff --git a/packages/ojs/external-observablehq-parser/test/peek-test.js b/packages/ojs/external-observablehq-parser/test/peek-test.js new file mode 100644 index 00000000000..39484b798a9 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/peek-test.js @@ -0,0 +1,28 @@ +import assert from "assert"; +import {peekId} from "@observablehq/parser"; + +it("peekId", () => { + assert.strictEqual(peekId("a = 1"), "a"); + assert.strictEqual(peekId("viewof a = 1"), "a"); + assert.strictEqual(peekId("mutable a = 1"), "a"); + assert.strictEqual(peekId("mutable async = 1"), "async"); + assert.strictEqual(peekId("class A {"), "A"); + assert.strictEqual(peekId("class Z"), undefined); + assert.strictEqual(peekId("class Z "), "Z"); + assert.strictEqual(peekId("function a"), undefined); + assert.strictEqual(peekId("function a()"), "a"); + assert.strictEqual(peekId("async function a()"), "a"); + assert.strictEqual(peekId("async function* a()"), "a"); + assert.strictEqual(peekId("function* a"), undefined); + assert.strictEqual(peekId("function /* yeah */ a()"), "a"); + assert.strictEqual(peekId("function"), undefined); + assert.strictEqual(peekId("1"), undefined); + assert.strictEqual(peekId("#"), undefined, "Ignores syntax errors"); + assert.strictEqual(peekId("abc /"), undefined, "Needs a = for a name to be identified"); + assert.strictEqual(peekId("({ a: 1 })"), undefined); + assert.strictEqual( + peekId(`function queryAll(text, values) { + return fetch("https://api.observable.localh`), + "queryAll" + ); +}); diff --git a/packages/ojs/external-observablehq-parser/test/references-test.js b/packages/ojs/external-observablehq-parser/test/references-test.js new file mode 100644 index 00000000000..f7541fafa05 --- /dev/null +++ b/packages/ojs/external-observablehq-parser/test/references-test.js @@ -0,0 +1,106 @@ +import assert from "assert"; +import {parseCell} from "@observablehq/parser"; +import {Node} from "acorn"; + +function node(fields) { + return Object.assign(Object.create(Node.prototype), fields); +} + +it("finds references in expressions", () => { + assert.deepStrictEqual(parseCell(`foo + bar`).references, [ + node({type: "Identifier", start: 0, end: 3, name: "foo"}), + node({type: "Identifier", start: 6, end: 9, name: "bar"}) + ]); +}); + +it("finds references in blocks", () => { + assert.deepStrictEqual(parseCell(`{ foo + bar; }`).references, [ + node({type: "Identifier", start: 2, end: 5, name: "foo"}), + node({type: "Identifier", start: 8, end: 11, name: "bar"}) + ]); +}); + +it("finds viewof references", () => { + assert.deepStrictEqual(parseCell(`viewof foo + bar`).references, [ + node({ + type: "ViewExpression", + start: 0, + end: 10, + id: node({type: "Identifier", start: 7, end: 10, name: "foo"}) + }), + node({type: "Identifier", start: 13, end: 16, name: "bar"}) + ]); +}); + +it("finds mutable references", () => { + assert.deepStrictEqual(parseCell(`mutable foo + bar`).references, [ + node({ + type: "MutableExpression", + start: 0, + end: 11, + id: node({type: "Identifier", start: 8, end: 11, name: "foo"}) + }), + node({type: "Identifier", start: 14, end: 17, name: "bar"}) + ]); +}); + +it("finds multiple references", () => { + assert.deepStrictEqual(parseCell(`cell = { + const a = b + c; + const d = c - b; +}`).references, [ + node({type: "Identifier", start: 21, end: 22, name: "b"}), + node({type: "Identifier", start: 25, end: 26, name: "c"}), + node({type: "Identifier", start: 40, end: 41, name: "c"}), + node({type: "Identifier", start: 44, end: 45, name: "b"}) + ]); +}); + +it("doesn’t consider the identifier a reference", () => { + assert.deepStrictEqual(parseCell(`foo = bar`).references, [ + node({type: "Identifier", start: 6, end: 9, name: "bar"}) + ]); +}); + +it("local variables can mask references", () => { + assert.deepStrictEqual(parseCell(`{ let foo; foo + bar; }`).references, [ + node({type: "Identifier", start: 17, end: 20, name: "bar"}) + ]); +}); + +it("local variables can not mask references", () => { + assert.deepStrictEqual(parseCell(`{ foo + bar; { let foo; } }`).references, [ + node({type: "Identifier", start: 2, end: 5, name: "foo"}), + node({type: "Identifier", start: 8, end: 11, name: "bar"}) + ]); +}); + +it("function parameters can mask references", () => { + assert.deepStrictEqual(parseCell(`foo => foo + bar`).references, [ + node({type: "Identifier", start: 13, end: 16, name: "bar"}) + ]); +}); + +it("function rest parameters can mask references", () => { + assert.deepStrictEqual(parseCell(`(...foo) => foo + bar`).references, [ + node({type: "Identifier", start: 18, end: 21, name: "bar"}) + ]); +}); + +it("destructured variables can mask references", () => { + assert.deepStrictEqual(parseCell(`{ let {foo} = null; foo + bar; }`).references, [ + node({type: "Identifier", start: 26, end: 29, name: "bar"}) + ]); +}); + +it("destructured rest variables can mask references", () => { + assert.deepStrictEqual(parseCell(`{ let {...foo} = null; foo + bar; }`).references, [ + node({type: "Identifier", start: 29, end: 32, name: "bar"}) + ]); +}); + +it("ignores globals", () => { + assert.deepStrictEqual(parseCell(`foo + bar`, {globals: ["foo"]}).references, [ + node({type: "Identifier", start: 6, end: 9, name: "bar"}) + ]); +}); diff --git a/packages/ojs/external-observablehq-runtime/.eslintignore b/packages/ojs/external-observablehq-runtime/.eslintignore new file mode 100644 index 00000000000..849ddff3b7e --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/.eslintignore @@ -0,0 +1 @@ +dist/ diff --git a/packages/ojs/external-observablehq-runtime/.eslintrc.json b/packages/ojs/external-observablehq-runtime/.eslintrc.json new file mode 100644 index 00000000000..1f2b77fb2b9 --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/.eslintrc.json @@ -0,0 +1,19 @@ +{ + "extends": "eslint:recommended", + "parserOptions": { + "sourceType": "module", + "ecmaVersion": 2020 + }, + "env": { + "browser": true, + "es6": true, + "es2020": true, + "node": true + }, + "rules": { + "semi": 2, + "no-process-env": 2, + "no-cond-assign": 0, + "no-redeclare": 0 + } +} diff --git a/packages/ojs/external-observablehq-runtime/.gitignore b/packages/ojs/external-observablehq-runtime/.gitignore new file mode 100644 index 00000000000..5566d02f1f4 --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/.gitignore @@ -0,0 +1,6 @@ +*.sublime-workspace +.DS_Store +.esm-cache/ +dist/ +node_modules +npm-debug.log diff --git a/packages/ojs/external-observablehq-runtime/CONTRIBUTING.md b/packages/ojs/external-observablehq-runtime/CONTRIBUTING.md new file mode 100644 index 00000000000..a4463cc0be2 --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/CONTRIBUTING.md @@ -0,0 +1,25 @@ +The Observable runtime is open source and released under the [ISC License](https://github.com/observablehq/runtime/blob/main/LICENSE). We welcome pull requests. If you have a bug report or feature request, please file an [issue](https://github.com/observablehq/runtime/issues). If you want to discuss or ask for help with using the runtime, post in our [forum](https://talk.observablehq.com/) or [community Slack](https://join.slack.com/t/observable-community/shared_invite/zt-1x7gs4fck-UHhEFxUXKHVE8Qt3XmJCig). + +## Development + +Install dependencies: + +``` +yarn +``` + +Run tests with Mocha: + +``` +yarn test +``` + +Build with Rollup: + +``` +yarn prepublishOnly +``` + +## For internal use + +See our checklist for [publishing a new release](https://observablehq.com/@observablehq/publishing-new-open-source-releases). \ No newline at end of file diff --git a/packages/ojs/external-observablehq-runtime/LICENSE b/packages/ojs/external-observablehq-runtime/LICENSE new file mode 100644 index 00000000000..cd2fda3619e --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/LICENSE @@ -0,0 +1,13 @@ +Copyright 2018-2023 Observable, Inc. + +Permission to use, copy, modify, and/or distribute this software for any purpose +with or without fee is hereby granted, provided that the above copyright notice +and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS +OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF +THIS SOFTWARE. diff --git a/packages/ojs/external-observablehq-runtime/README.md b/packages/ojs/external-observablehq-runtime/README.md new file mode 100644 index 00000000000..27d321240e4 --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/README.md @@ -0,0 +1,294 @@ +# @observablehq/runtime + +[![Node CI](https://github.com/observablehq/runtime/workflows/Node%20CI/badge.svg)](https://github.com/observablehq/runtime/actions?workflow=Node+CI) [![Greenkeeper badge](https://badges.greenkeeper.io/observablehq/runtime.svg)](https://greenkeeper.io/) + +The [Observable runtime](https://observablehq.com/@observablehq/how-observable-runs) lets you run Observable notebooks as true reactive programs [in any JavaScript environment](https://observablehq.com/@observablehq/downloading-and-embedding-notebooks): on your personal website, integrated into your web application or interactive dashboard. Take your notebook to any distant shore the web platform reaches. + +For example, to render the “hello” cell from the [“Hello World” notebook](https://observablehq.com/@observablehq/hello-world): + +```html + + + + + +``` + +To render the entire notebook into the body, use [Inspector.into](https://github.com/observablehq/inspector/blob/master/README.md#Inspector_into): + +```js +const runtime = new Runtime(); +const main = runtime.module(define, Inspector.into(document.body)); +``` + +For more control, implement a [custom observer](#observers) in place of the standard inspector. The returned object may implement [*observer*.pending](#observer_pending), [*observer*.fulfilled](#observer_fulfilled) and [*observer*.rejected](#observer_rejected) methods to be notified when the corresponding *variable* changes state. For example: + +```js +const runtime = new Runtime(); +const main = runtime.module(define, name => { + return { + pending() { + console.log(`${name}: pending`); + }, + fulfilled(value) { + console.log(`${name}: fullfilled`, value); + }, + rejected(error) { + console.error(`${name}: rejected`, error); + } + }; +}); +``` + +Variables which are not associated with an *observer*, or aren’t indirectly depended on by a variable that is associated with an *observer*, will not be evaluated. To force a variable to be evaluated, return true. See [*module*.variable](#module_variable). + +## API Reference + +### Runtimes + +# new Runtime(builtins = new Library[, global]) [<>](https://github.com/observablehq/runtime/blob/master/src/runtime.js "Source") + +Returns a new [runtime](#runtimes). If *builtins* is specified, each property on the *builtins* object defines a builtin variable for the runtime. These builtins are available as named inputs to any [defined variables](#variable_define) on any [module](#modules) associated with this runtime. If *builtins* is not specified, it defaults to the [standard library](https://github.com/observablehq/stdlib/blob/master/README.md). If a *global* function is specified, it will be invoked with the name of any unresolved reference, and must return the corresponding value or undefined (to trigger a ReferenceError); if *global* is not specified, unresolved values will be resolved from the global window. + +Many Observable notebooks rely on the [standard library](https://github.com/observablehq/stdlib) builtins. To instead specify a custom set of builtins: + +```js +const runtime = new Runtime({color: "red"}); +``` + +Or to define a new builtin, or override an existing one: + +```js +const runtime = new Runtime(Object.assign(new Library, {color: "red"})); +``` + +To refer to the `color` builtin from a variable: + +```js +const module = runtime.module(); +const inspector = new Inspector(document.querySelector("#hello")); +module.variable(inspector).define(["color"], color => `Hello, ${color}.`); +``` + +This would produce the following output: + +> Hello, red. + +Unlike [variables](#variables), builtins cannot depend on the value of other variables or builtins; they are defined with no inputs. If a builtin is defined as a function, it will be invoked lazily to determine the value of the builtin. If you wish for the value of a builtin to be a function, the builtin must be defined either as a promise that resolves to a function or as a function that returns a function. Builtins may also be defined as generators for dynamic values; see [now](https://github.com/observablehq/stdlib/blob/master/README.md#now) for example. + +# runtime.module([define][, observer]) [<>](https://github.com/observablehq/runtime/blob/master/src/runtime.js "Source") + +Returns a new [module](#modules) for this [runtime](#runtimes). + +If *define* is specified, it is a function which defines the new module’s [variables](#variables) by calling *runtime*.module (with no arguments) and then calling [*module*.variable](#module_variable) on the returned module as desired. If this runtime already has a module for the specified *define* function, the existing module is returned; otherwise, a new module is created, and the *define* function is called, being passed this runtime and the specified *observer* factory function. If *define* is not specified, a new module is created and returned. + +If an *observer* factory function is specified, it is called for each named variable in the returned module, being passed the variable’s name. The [standard inspector](#inspector) is available as a ready-made observer: it displays DOM elements “as-is” and renders interactive displays for other arbitrary values such as numbers and objects. + +# runtime.dispose() [<>](https://github.com/observablehq/runtime/blob/master/src/runtime.js "Source") + +Disposes this runtime, invalidating all active variables and disabling future computation. + +### Modules + +A module is a namespace for [variables](#variables); within a module, variables should typically have unique names. [Imports](#variable_import) allow variables to be referenced across modules. + +# module.variable([observer]) [<>](https://github.com/observablehq/runtime/blob/master/src/module.js "Source") + +Returns a new [variable](#variables) for this [module](#modules). The variable is initially undefined. + +If *observer* is specified, the specified [observer](#observers) will be notified when the returned variable changes state, via the [observer.*pending*](#observer_pending), [observer.*fulfilled*](#observer_fulfilled) and [observer.*rejected*](#observer_rejected) methods. See the [standard inspector](https://github.com/observablehq/inspector/blob/master/README.md) for a convenient default observer implementation. + +A variable without an associated *observer* is only computed if any transitive output of the variable has an *observer*; variables are computed on an as-needed basis for display. This is particularly useful when the runtime has multiple modules (as with [imports](#variable_import)): only the needed variables from imported modules are computed. + +# module.derive(specifiers, source) [<>](https://github.com/observablehq/runtime/blob/master/src/module.js "Source") + +Returns a derived copy of this [module](#modules), where each variable in *specifiers* is replaced by an [import](#variable_import) from the specified *source* module. The *specifiers* are specified as an array of objects with the following properties: + +* *specifier*.name - the name of the variable to import from *source*. +* *specifier*.alias - the name of the variable to redefine in this module. + +If *specifier*.alias is not specified, it defaults to *specifier*.name. A *specifier* may also be specified as a string, in which case the string is treated as both the name and the alias. For example, consider the following module which defines two constants *a* and *b*, and a variable *c* that represents their sum: + +```js +const module0 = runtime.module(); +module0.variable().define("a", 1); +module0.variable().define("b", 2); +module0.variable().define("c", ["a", "b"], (a, b) => a + b); +``` + +To derive a new module that redefines *b*: + +```js +const module1 = runtime.module(); +const module1_0 = module0.derive(["b"], module1); +module1.variable().define("b", 3); +module1.variable().import("c", module1_0); +``` + +The value of *c* in the derived module is now 1 + 3 = 4, whereas the value of *c* in the original module remains 1 + 2 = 3. + +# module.define(\[name, \]\[inputs, \]definition) [<>](https://github.com/observablehq/runtime/blob/master/src/module.js "Source") + +A convenience method for [*variable*.define](#variable_define); equivalent to: + +```js +module.variable().define(name, inputs, definition) +``` + +# module.import(name, [alias, ]from) [<>](https://github.com/observablehq/runtime/blob/master/src/module.js "Source") + +A convenience method for [*variable*.import](#variable_import); equivalent to: + +```js +module.variable().import(name, alias, from) +``` + +# module.redefine(name[, inputs], definition) [<>](https://github.com/observablehq/runtime/blob/master/src/module.js "Source") + +Redefines the *variable* with the specified *name* on this module. If no such variable exists, or if more than one variable has the specified *name*, throws a runtime error. + +# module.value(name) [<>](https://github.com/observablehq/runtime/blob/master/src/module.js "Source") + +Returns a promise to the next value of the *variable* with the specified *name* on this module. If no such variable exists, or if more than one variable has the specified *name*, throws a runtime error. + +### Variables + +A variable defines a piece of state in a reactive program, akin to a cell in a spreadsheet. Variables may be named to allow the definition of derived variables: variables whose value is computed from other variables’ values. Variables are scoped by a [module](#modules) and evaluated by a [runtime](#runtimes). + +# variable.define(\[name, \]\[inputs, \]definition) [<>](https://github.com/observablehq/runtime/blob/master/src/variable.js "Source") + +Redefines this variable to have the specified *name*, taking the variables with the names specified in *inputs* as arguments to the specified *definition* function. If *name* is null or not specified, this variable is anonymous and may not be referred to by other variables. The named *inputs* refer to other variables (possibly [imported](#variable_import)) in this variable’s module. Circular inputs are not allowed; the variable will throw a ReferenceError upon evaluation. If *inputs* is not specified, it defaults to the empty array. If *definition* is not a function, the variable is defined to have the constant value of *definition*. + +The *definition* function may return a promise; derived variables will be computed after the promise resolves. The *definition* function may likewise return a generator; the runtime will pull values from the generator on every animation frame, or if the generator yielded a promise, after the promise is resolved. When the *definition* is invoked, the value of `this` is the variable’s previous value, or undefined if this is the first time the variable is being computed under its current definition. Thus, the previous value is preserved only when input values change; it is *not* preserved if the variable is explicitly redefined. + +For example, consider the following module that starts with a single undefined variable, *a*: + +```js +const runtime = new Runtime(builtins); + +const module = runtime.module(); + +const a = module.variable(); +``` + +To define variable *a* with the name `foo` and the constant value 42: + +```js +a.define("foo", 42); +``` + +This is equivalent to: + +```js +a.define("foo", [], () => 42); +``` + +To define an anonymous variable *b* that takes `foo` as input: + +```js +const b = module.variable(); + +b.define(["foo"], foo => foo * 2); +``` + +This is equivalent to: + +```js +b.define(null, ["foo"], foo => foo * 2); +``` + +Note that the JavaScript symbols in the above example code (*a* and *b*) have no relation to the variable names (`foo` and null); variable names can change when a variable is redefined or deleted. Each variable corresponds to a cell in an Observable notebook, but the cell can be redefined to have a different name or definition. + +If more than one variable has the same *name* at the same time in the same module, these variables’ definitions are temporarily overridden to throw a ReferenceError. When and if the duplicate variables are [deleted](#variable_delete), or are redefined to have unique names, the original definition of the remaining variable (if any) is restored. For example, here variables *a* and *b* will throw a ReferenceError: + +```js +const module = new Runtime(builtins).module(); +const a = module.variable().define("foo", 1); +const b = module.variable().define("foo", 2); +``` + +If *a* or *b* is redefined to have a different name, both *a* and *b* will subsequently resolve to their desired values: + +```js +b.define("bar", 2); +``` + +Likewise deleting *a* or *b* would allow the other variable to resolve to its desired value. + +# variable.import(name, [alias, ]module) [<>](https://github.com/observablehq/runtime/blob/master/src/variable.js "Source") + +Redefines this variable as an alias of the variable with the specified *name* in the specified [*module*](#modules). The subsequent name of this variable is the specified *name*, or if specified, the given *alias*. The order of arguments corresponds to the standard import statement: `import {name as alias} from "module"`. For example, consider a module which defines a variable named `foo`: + +```js +const runtime = new Runtime(builtins); + +const module0 = runtime.module(); + +module0.variable().define("foo", 42); +``` + +To import `foo` into another module: + +```js +const module1 = runtime.module(); + +module1.variable().import("foo", module0); +``` + +Now the variable `foo` is available to other variables in *module1*: + +```js +module1.variable().define(["foo"], foo => `Hello, ${foo}.`); +``` + +This would produce the following output: + +> Hello, 42. + +To import `foo` into *module1* under the alias `bar`: + +```js +module1.variable().import("foo", "bar", module0); +``` + +# variable.delete() [<>](https://github.com/observablehq/runtime/blob/master/src/variable.js "Source") + +Deletes this variable’s current definition and name, if any. Any variable in this module that references this variable as an input will subsequently throw a ReferenceError. If exactly one other variable defined this variable’s previous name, such that that variable throws a ReferenceError due to its duplicate definition, that variable’s original definition is restored. + +### Observers + +An observer watches a [variable](#variables), being notified via asynchronous callback whenever the variable changes state. See the [standard inspector](https://github.com/observablehq/inspector) for reference. + +# observer.pending() + +Called shortly before the variable is computed. For a generator variable, this occurs before the generator is constructed, but not before each subsequent value is pulled from the generator. + +# observer.fulfilled(value) + +Called shortly after the variable is fulfilled with a new *value*. + +# observer.rejected(error) + +Called shortly after the variable is rejected with the given *error*. + +### Library + +For convenience, this module re-exports the [Observable standard library](https://github.com/observablehq/stdlib). + +### Inspector + +For convenience, this module re-exports the [Observable standard inspector](https://github.com/observablehq/inspector). diff --git a/packages/ojs/external-observablehq-runtime/package.json b/packages/ojs/external-observablehq-runtime/package.json new file mode 100644 index 00000000000..7086c29999b --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/package.json @@ -0,0 +1,39 @@ +{ + "name": "external-observablehq-runtime", + "version": "5.9.5", + "author": { + "name": "Quarto Authors, RStudio, PBC.", + "url": "https://quarto.org" + }, + "license": "ISC", + "type": "module", + "main": "src/index.js", + "module": "src/index.js", + "jsdelivr": "dist/runtime.umd.js", + "unpkg": "dist/runtime.umd.js", + "exports": { + "umd": "./dist/runtime.umd.js", + "default": "./src/index.js" + }, + "repository": { + "type": "git", + "url": "https://github.com/quarto-dev/quarto.git" + }, + "files": [ + "dist/**/*.js", + "src/**/*.js" + ], + "scripts": { + "build": "rollup -c", + "test": "mocha 'test/**/*-test.js' && eslint src test", + "prepublishOnly": "rm -rf dist && rollup -c", + "postpublish": "git push && git push --tags" + }, + "_moduleAliases": { + "@observablehq/runtime": "./src/index.js" + }, + "dependencies": { + "@observablehq/inspector": "^5.0.0", + "external-observablehq-stdlib": "*" + } +} diff --git a/packages/ojs/external-observablehq-runtime/rollup.config.js b/packages/ojs/external-observablehq-runtime/rollup.config.js new file mode 100644 index 00000000000..0ec6ef7a35f --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/rollup.config.js @@ -0,0 +1,49 @@ +import node from "@rollup/plugin-node-resolve"; +import {terser} from "rollup-plugin-terser"; +import meta from "./package.json" with {type: "json"}; + +const copyright = `// @observablehq/runtime v${meta.version} Copyright ${(new Date).getFullYear()} Observable, Inc.`; + +function config(output) { + return { + input: "src/index.js", + plugins: [ + node(), + terser({ + toplevel: output.format === "es", + output: {preamble: copyright}, + mangle: { + reserved: [ + "FileAttachment", + "RequireError", + "DuckDBClient", + "SQLiteDatabaseClient", + "Workbook", + "ZipArchive", + "ZipArchiveEntry", + "Runtime", + "RuntimeError", + "Variable", + "Module", + "Library", + "Inspector", + ] + } + }) + ], + output + }; +} + +export default [ + config({ + format: "es", + file: "dist/runtime.js" + }), + config({ + format: "umd", + extend: true, + name: "observablehq", + file: "dist/runtime.umd.js" + }) +]; diff --git a/packages/ojs/external-observablehq-runtime/runtime.sublime-project b/packages/ojs/external-observablehq-runtime/runtime.sublime-project new file mode 100644 index 00000000000..59ba83cde00 --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/runtime.sublime-project @@ -0,0 +1,17 @@ +{ + "folders": [ + { + "path": ".", + "file_exclude_patterns": ["*.sublime-workspace"], + "folder_exclude_patterns": [".esm-cache", "dist"] + } + ], + "build_systems": [ + { + "name": "yarn test", + "cmd": ["yarn", "test"], + "file_regex": "\\((...*?):([0-9]*):([0-9]*)\\)", + "working_dir": "$project_path" + } + ] +} diff --git a/packages/ojs/external-observablehq-runtime/src/array.js b/packages/ojs/external-observablehq-runtime/src/array.js new file mode 100644 index 00000000000..55da06b126f --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/src/array.js @@ -0,0 +1,3 @@ +const prototype = Array.prototype; +export const map = prototype.map; +export const forEach = prototype.forEach; diff --git a/packages/ojs/external-observablehq-runtime/src/constant.js b/packages/ojs/external-observablehq-runtime/src/constant.js new file mode 100644 index 00000000000..dc29774d821 --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/src/constant.js @@ -0,0 +1,3 @@ +export function constant(x) { + return () => x; +} diff --git a/packages/ojs/external-observablehq-runtime/src/errors.js b/packages/ojs/external-observablehq-runtime/src/errors.js new file mode 100644 index 00000000000..2e8c743a47d --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/src/errors.js @@ -0,0 +1,8 @@ +export class RuntimeError extends Error { + constructor(message, input) { + super(message); + this.input = input; + } +} + +RuntimeError.prototype.name = "RuntimeError"; diff --git a/packages/ojs/external-observablehq-runtime/src/generatorish.js b/packages/ojs/external-observablehq-runtime/src/generatorish.js new file mode 100644 index 00000000000..e33f25fd97a --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/src/generatorish.js @@ -0,0 +1,5 @@ +export function generatorish(value) { + return value + && typeof value.next === "function" + && typeof value.return === "function"; +} diff --git a/packages/ojs/external-observablehq-runtime/src/identity.js b/packages/ojs/external-observablehq-runtime/src/identity.js new file mode 100644 index 00000000000..968d0a12996 --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/src/identity.js @@ -0,0 +1,3 @@ +export function identity(x) { + return x; +} diff --git a/packages/ojs/external-observablehq-runtime/src/index.js b/packages/ojs/external-observablehq-runtime/src/index.js new file mode 100644 index 00000000000..4c77e43d84b --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/src/index.js @@ -0,0 +1,4 @@ +export {Inspector} from "@observablehq/inspector"; +export {Library} from "external-observablehq-stdlib"; +export {RuntimeError} from "./errors.js"; +export {Runtime} from "./runtime.js"; diff --git a/packages/ojs/external-observablehq-runtime/src/load.js b/packages/ojs/external-observablehq-runtime/src/load.js new file mode 100644 index 00000000000..f6a03f37dfb --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/src/load.js @@ -0,0 +1,32 @@ +import {Library} from "external-observablehq-stdlib"; +import {Runtime} from "./runtime.js"; + +export function load(notebook, library, observer) { + if (typeof library == "function") observer = library, library = null; + if (typeof observer !== "function") throw new Error("invalid observer"); + if (library == null) library = new Library(); + + const {modules, id} = notebook; + const map = new Map; + const runtime = new Runtime(library); + const main = runtime_module(id); + + function runtime_module(id) { + let module = map.get(id); + if (!module) map.set(id, module = runtime.module()); + return module; + } + + for (const m of modules) { + const module = runtime_module(m.id); + let i = 0; + for (const v of m.variables) { + if (v.from) module.import(v.remote, v.name, runtime_module(v.from)); + else if (module === main) module.variable(observer(v, i, m.variables)).define(v.name, v.inputs, v.value); + else module.define(v.name, v.inputs, v.value); + ++i; + } + } + + return runtime; +} diff --git a/packages/ojs/external-observablehq-runtime/src/module.js b/packages/ojs/external-observablehq-runtime/src/module.js new file mode 100644 index 00000000000..a877c8d028b --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/src/module.js @@ -0,0 +1,172 @@ +import {constant} from "./constant.js"; +import {RuntimeError} from "./errors.js"; +import {identity} from "./identity.js"; +import {rethrow} from "./rethrow.js"; +import {Variable, TYPE_DUPLICATE, TYPE_IMPLICIT, TYPE_NORMAL, no_observer, variable_stale} from "./variable.js"; + +export const variable_variable = Symbol("variable"); +export const variable_invalidation = Symbol("invalidation"); +export const variable_visibility = Symbol("visibility"); + +export function Module(runtime, builtins = []) { + Object.defineProperties(this, { + _runtime: {value: runtime}, + _scope: {value: new Map}, + _builtins: {value: new Map([ + ["@variable", variable_variable], + ["invalidation", variable_invalidation], + ["visibility", variable_visibility], + ...builtins + ])}, + _source: {value: null, writable: true} + }); +} + +Object.defineProperties(Module.prototype, { + _resolve: {value: module_resolve, writable: true, configurable: true}, + redefine: {value: module_redefine, writable: true, configurable: true}, + define: {value: module_define, writable: true, configurable: true}, + derive: {value: module_derive, writable: true, configurable: true}, + import: {value: module_import, writable: true, configurable: true}, + value: {value: module_value, writable: true, configurable: true}, + variable: {value: module_variable, writable: true, configurable: true}, + builtin: {value: module_builtin, writable: true, configurable: true} +}); + +function module_redefine(name) { + const v = this._scope.get(name); + if (!v) throw new RuntimeError(`${name} is not defined`); + if (v._type === TYPE_DUPLICATE) throw new RuntimeError(`${name} is defined more than once`); + return v.define.apply(v, arguments); +} + +function module_define() { + const v = new Variable(TYPE_NORMAL, this); + return v.define.apply(v, arguments); +} + +function module_import() { + const v = new Variable(TYPE_NORMAL, this); + return v.import.apply(v, arguments); +} + +function module_variable(observer, options) { + return new Variable(TYPE_NORMAL, this, observer, options); +} + +async function module_value(name) { + let v = this._scope.get(name); + if (!v) throw new RuntimeError(`${name} is not defined`); + if (v._observer === no_observer) { + v = this.variable(true).define([name], identity); + try { + return await module_revalue(this._runtime, v); + } finally { + v.delete(); + } + } else { + return module_revalue(this._runtime, v); + } +} + +// If the variable is redefined before its value resolves, try again. +async function module_revalue(runtime, variable) { + await runtime._compute(); + try { + return await variable._promise; + } catch (error) { + if (error === variable_stale) return module_revalue(runtime, variable); + throw error; + } +} + +function module_derive(injects, injectModule) { + const map = new Map(); + const modules = new Set(); + const copies = []; + + // Given a module, derives an alias of that module with an initially-empty + // definition. The variables will be copied later in a second pass below. + function alias(source) { + let target = map.get(source); + if (target) return target; + target = new Module(source._runtime, source._builtins); + target._source = source; + map.set(source, target); + copies.push([target, source]); + modules.add(source); + return target; + } + + // Inject the given variables as reverse imports into the derived module. + const derive = alias(this); + for (const inject of injects) { + const {alias, name} = typeof inject === "object" ? inject : {name: inject}; + derive.import(name, alias == null ? name : alias, injectModule); + } + + // Iterate over all the variables (currently) in this module. If any + // represents an import-with (i.e., an import of a module with a _source), the + // transitive import-with must be copied, too, as direct injections may affect + // transitive injections. Note that an import-with can only be created with + // module.derive and hence it’s not possible for an import-with to be added + // later; therefore we only need to apply this check once, now. + for (const module of modules) { + for (const [name, variable] of module._scope) { + if (variable._definition === identity) { // import + if (module === this && derive._scope.has(name)) continue; // overridden by injection + const importedModule = variable._inputs[0]._module; + if (importedModule._source) alias(importedModule); + } + } + } + + // Finally, with the modules resolved, copy the variable definitions. + for (const [target, source] of copies) { + for (const [name, sourceVariable] of source._scope) { + const targetVariable = target._scope.get(name); + if (targetVariable && targetVariable._type !== TYPE_IMPLICIT) continue; // preserve injection + if (sourceVariable._definition === identity) { // import + const sourceInput = sourceVariable._inputs[0]; + const sourceModule = sourceInput._module; + target.import(sourceInput._name, name, map.get(sourceModule) || sourceModule); + } else { // non-import + target.define(name, sourceVariable._inputs.map(variable_name), sourceVariable._definition); + } + } + } + + return derive; +} + +function module_resolve(name) { + let variable = this._scope.get(name), value; + if (!variable) { + variable = new Variable(TYPE_IMPLICIT, this); + if (this._builtins.has(name)) { + variable.define(name, constant(this._builtins.get(name))); + } else if (this._runtime._builtin._scope.has(name)) { + variable.import(name, this._runtime._builtin); + } else { + try { + value = this._runtime._global(name); + } catch (error) { + return variable.define(name, rethrow(error)); + } + if (value === undefined) { + this._scope.set(variable._name = name, variable); + } else { + variable.define(name, constant(value)); + } + } + } + return variable; +} + +function module_builtin(name, value) { + this._builtins.set(name, value); +} + +function variable_name(variable) { + return variable._name; +} diff --git a/packages/ojs/external-observablehq-runtime/src/noop.js b/packages/ojs/external-observablehq-runtime/src/noop.js new file mode 100644 index 00000000000..177804c7aba --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/src/noop.js @@ -0,0 +1 @@ +export function noop() {} diff --git a/packages/ojs/external-observablehq-runtime/src/rethrow.js b/packages/ojs/external-observablehq-runtime/src/rethrow.js new file mode 100644 index 00000000000..6ef615974f5 --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/src/rethrow.js @@ -0,0 +1,5 @@ +export function rethrow(error) { + return () => { + throw error; + }; +} diff --git a/packages/ojs/external-observablehq-runtime/src/runtime.js b/packages/ojs/external-observablehq-runtime/src/runtime.js new file mode 100644 index 00000000000..9e9724aa14a --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/src/runtime.js @@ -0,0 +1,367 @@ +import {Library, FileAttachments} from "external-observablehq-stdlib"; +import {RuntimeError} from "./errors.js"; +import {generatorish} from "./generatorish.js"; +import {load} from "./load.js"; +import {Module, variable_variable, variable_invalidation, variable_visibility} from "./module.js"; +import {noop} from "./noop.js"; +import {Variable, TYPE_IMPLICIT, no_observer, variable_stale} from "./variable.js"; + +const frame = typeof requestAnimationFrame === "function" ? requestAnimationFrame + : typeof setImmediate === "function" ? setImmediate + : f => setTimeout(f, 0); + +export function Runtime(builtins = new Library, global = window_global) { + const builtin = this.module(); + Object.defineProperties(this, { + _dirty: {value: new Set}, + _updates: {value: new Set}, + _precomputes: {value: [], writable: true}, + _computing: {value: null, writable: true}, + _init: {value: null, writable: true}, + _modules: {value: new Map}, + _variables: {value: new Set}, + _disposed: {value: false, writable: true}, + _builtin: {value: builtin}, + _global: {value: global} + }); + if (builtins) for (const name in builtins) { + (new Variable(TYPE_IMPLICIT, builtin)).define(name, [], builtins[name]); + } +} + +Object.defineProperties(Runtime.prototype, { + _precompute: {value: runtime_precompute, writable: true, configurable: true}, + _compute: {value: runtime_compute, writable: true, configurable: true}, + _computeSoon: {value: runtime_computeSoon, writable: true, configurable: true}, + _computeNow: {value: runtime_computeNow, writable: true, configurable: true}, + dispose: {value: runtime_dispose, writable: true, configurable: true}, + module: {value: runtime_module, writable: true, configurable: true}, + fileAttachments: {value: FileAttachments, writable: true, configurable: true}, + load: {value: load, writable: true, configurable: true} +}); + +function runtime_dispose() { + this._computing = Promise.resolve(); + this._disposed = true; + this._variables.forEach(v => { + v._invalidate(); + v._version = NaN; + }); +} + +function runtime_module(define, observer = noop) { + let module; + if (define === undefined) { + if (module = this._init) { + this._init = null; + return module; + } + return new Module(this); + } + module = this._modules.get(define); + if (module) return module; + this._init = module = new Module(this); + this._modules.set(define, module); + try { + define(this, observer); + } finally { + this._init = null; + } + return module; +} + +function runtime_precompute(callback) { + this._precomputes.push(callback); + this._compute(); +} + +function runtime_compute() { + return this._computing || (this._computing = this._computeSoon()); +} + +function runtime_computeSoon() { + return new Promise(frame).then(() => this._disposed ? undefined : this._computeNow()); +} + +async function runtime_computeNow() { + let queue = [], + variables, + variable, + precomputes = this._precomputes; + + // If there are any paused generators, resume them before computing so they + // can update (if synchronous) before computing downstream variables. + if (precomputes.length) { + this._precomputes = []; + for (const callback of precomputes) callback(); + await runtime_defer(3); + } + + // Compute the reachability of the transitive closure of dirty variables. + // Any newly-reachable variable must also be recomputed. + // Any no-longer-reachable variable must be terminated. + variables = new Set(this._dirty); + variables.forEach(function(variable) { + variable._inputs.forEach(variables.add, variables); + const reachable = variable_reachable(variable); + if (reachable > variable._reachable) { + this._updates.add(variable); + } else if (reachable < variable._reachable) { + variable._invalidate(); + } + variable._reachable = reachable; + }, this); + + // Compute the transitive closure of updating, reachable variables. + variables = new Set(this._updates); + variables.forEach(function(variable) { + if (variable._reachable) { + variable._indegree = 0; + variable._outputs.forEach(variables.add, variables); + } else { + variable._indegree = NaN; + variables.delete(variable); + } + }); + + this._computing = null; + this._updates.clear(); + this._dirty.clear(); + + // Compute the indegree of updating variables. + variables.forEach(function(variable) { + variable._outputs.forEach(variable_increment); + }); + + do { + // Identify the root variables (those with no updating inputs). + variables.forEach(function(variable) { + if (variable._indegree === 0) { + queue.push(variable); + } + }); + + // Compute the variables in topological order. + while (variable = queue.pop()) { + variable_compute(variable); + variable._outputs.forEach(postqueue); + variables.delete(variable); + } + + // Any remaining variables are circular, or depend on them. + variables.forEach(function(variable) { + if (variable_circular(variable)) { + variable_error(variable, new RuntimeError("circular definition")); + variable._outputs.forEach(variable_decrement); + variables.delete(variable); + } + }); + } while (variables.size); + + function postqueue(variable) { + if (--variable._indegree === 0) { + queue.push(variable); + } + } +} + +// We want to give generators, if they’re defined synchronously, a chance to +// update before computing downstream variables. This creates a synchronous +// promise chain of the given depth that we’ll await before recomputing +// downstream variables. +function runtime_defer(depth = 0) { + let p = Promise.resolve(); + for (let i = 0; i < depth; ++i) p = p.then(() => {}); + return p; +} + +function variable_circular(variable) { + const inputs = new Set(variable._inputs); + for (const i of inputs) { + if (i === variable) return true; + i._inputs.forEach(inputs.add, inputs); + } + return false; +} + +function variable_increment(variable) { + ++variable._indegree; +} + +function variable_decrement(variable) { + --variable._indegree; +} + +function variable_value(variable) { + return variable._promise.catch(variable._rejector); +} + +function variable_invalidator(variable) { + return new Promise(function(resolve) { + variable._invalidate = resolve; + }); +} + +function variable_intersector(invalidation, variable) { + let node = typeof IntersectionObserver === "function" && variable._observer && variable._observer._node; + let visible = !node, resolve = noop, reject = noop, promise, observer; + if (node) { + observer = new IntersectionObserver(([entry]) => (visible = entry.isIntersecting) && (promise = null, resolve())); + observer.observe(node); + invalidation.then(() => (observer.disconnect(), observer = null, reject())); + } + return function(value) { + if (visible) return Promise.resolve(value); + if (!observer) return Promise.reject(); + if (!promise) promise = new Promise((y, n) => (resolve = y, reject = n)); + return promise.then(() => value); + }; +} + +function variable_compute(variable) { + variable._invalidate(); + variable._invalidate = noop; + variable._pending(); + + const value0 = variable._value; + const version = ++variable._version; + + // Lazily-constructed invalidation variable; only constructed if referenced as an input. + let invalidation = null; + + // If the variable doesn’t have any inputs, we can optimize slightly. + const promise = variable._promise = (variable._inputs.length + ? Promise.all(variable._inputs.map(variable_value)).then(define) + : new Promise(resolve => resolve(variable._definition.call(value0)))) + .then(generate); + + // Compute the initial value of the variable. + function define(inputs) { + if (variable._version !== version) throw variable_stale; + + // Replace any reference to invalidation with the promise, lazily. + for (let i = 0, n = inputs.length; i < n; ++i) { + switch (inputs[i]) { + case variable_invalidation: { + inputs[i] = invalidation = variable_invalidator(variable); + break; + } + case variable_visibility: { + if (!invalidation) invalidation = variable_invalidator(variable); + inputs[i] = variable_intersector(invalidation, variable); + break; + } + case variable_variable: { + inputs[i] = variable; + break; + } + } + } + + return variable._definition.apply(value0, inputs); + } + + // If the value is a generator, then retrieve its first value, and dispose of + // the generator if the variable is invalidated. Note that the cell may + // already have been invalidated here, in which case we need to terminate the + // generator immediately! + function generate(value) { + if (variable._version !== version) throw variable_stale; + if (generatorish(value)) { + (invalidation || variable_invalidator(variable)).then(variable_return(value)); + return variable_generate(variable, version, value); + } + return value; + } + + promise.then((value) => { + variable._value = value; + variable._fulfilled(value); + }, (error) => { + if (error === variable_stale || variable._version !== version) return; + variable._value = undefined; + variable._rejected(error); + }); +} + +function variable_generate(variable, version, generator) { + const runtime = variable._module._runtime; + let currentValue; // so that yield resolves to the yielded value + + // Retrieve the next value from the generator; if successful, invoke the + // specified callback. The returned promise resolves to the yielded value, or + // to undefined if the generator is done. + function compute(onfulfilled) { + return new Promise(resolve => resolve(generator.next(currentValue))).then(({done, value}) => { + return done ? undefined : Promise.resolve(value).then(onfulfilled); + }); + } + + // Retrieve the next value from the generator; if successful, fulfill the + // variable, compute downstream variables, and schedule the next value to be + // pulled from the generator at the start of the next animation frame. If not + // successful, reject the variable, compute downstream variables, and return. + function recompute() { + const promise = compute((value) => { + if (variable._version !== version) throw variable_stale; + currentValue = value; + postcompute(value, promise).then(() => runtime._precompute(recompute)); + variable._fulfilled(value); + return value; + }); + promise.catch((error) => { + if (error === variable_stale || variable._version !== version) return; + postcompute(undefined, promise); + variable._rejected(error); + }); + } + + // After the generator fulfills or rejects, set its current value, promise, + // and schedule any downstream variables for update. + function postcompute(value, promise) { + variable._value = value; + variable._promise = promise; + variable._outputs.forEach(runtime._updates.add, runtime._updates); + return runtime._compute(); + } + + // When retrieving the first value from the generator, the promise graph is + // already established, so we only need to queue the next pull. + return compute((value) => { + if (variable._version !== version) throw variable_stale; + currentValue = value; + runtime._precompute(recompute); + return value; + }); +} + +function variable_error(variable, error) { + variable._invalidate(); + variable._invalidate = noop; + variable._pending(); + ++variable._version; + variable._indegree = NaN; + (variable._promise = Promise.reject(error)).catch(noop); + variable._value = undefined; + variable._rejected(error); +} + +function variable_return(generator) { + return function() { + generator.return(); + }; +} + +function variable_reachable(variable) { + if (variable._observer !== no_observer) return true; // Directly reachable. + const outputs = new Set(variable._outputs); + for (const output of outputs) { + if (output._observer !== no_observer) return true; + output._outputs.forEach(outputs.add, outputs); + } + return false; +} + +function window_global(name) { + return globalThis[name]; +} diff --git a/packages/ojs/external-observablehq-runtime/src/variable.js b/packages/ojs/external-observablehq-runtime/src/variable.js new file mode 100644 index 00000000000..7d1946db9ef --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/src/variable.js @@ -0,0 +1,218 @@ +import {map} from "./array.js"; +import {constant} from "./constant.js"; +import {RuntimeError} from "./errors.js"; +import {identity} from "./identity.js"; +import {noop} from "./noop.js"; + +export const TYPE_NORMAL = 1; // a normal variable +export const TYPE_IMPLICIT = 2; // created on reference +export const TYPE_DUPLICATE = 3; // created on duplicate definition + +export const no_observer = Symbol("no-observer"); + +export function Variable(type, module, observer, options) { + if (!observer) observer = no_observer; + Object.defineProperties(this, { + _observer: {value: observer, writable: true}, + _definition: {value: variable_undefined, writable: true}, + _duplicate: {value: undefined, writable: true}, + _duplicates: {value: undefined, writable: true}, + _indegree: {value: NaN, writable: true}, // The number of computing inputs. + _inputs: {value: [], writable: true}, + _invalidate: {value: noop, writable: true}, + _module: {value: module}, + _name: {value: null, writable: true}, + _outputs: {value: new Set, writable: true}, + _promise: {value: Promise.resolve(undefined), writable: true}, + _reachable: {value: observer !== no_observer, writable: true}, // Is this variable transitively visible? + _rejector: {value: variable_rejector(this)}, + _shadow: {value: initShadow(module, options)}, + _type: {value: type}, + _value: {value: undefined, writable: true}, + _version: {value: 0, writable: true} + }); +} + +Object.defineProperties(Variable.prototype, { + _pending: {value: variable_pending, writable: true, configurable: true}, + _fulfilled: {value: variable_fulfilled, writable: true, configurable: true}, + _rejected: {value: variable_rejected, writable: true, configurable: true}, + _resolve: {value: variable_resolve, writable: true, configurable: true}, + define: {value: variable_define, writable: true, configurable: true}, + delete: {value: variable_delete, writable: true, configurable: true}, + import: {value: variable_import, writable: true, configurable: true} +}); + +function initShadow(module, options) { + if (!options?.shadow) return null; + return new Map( + Object.entries(options.shadow) + .map(([name, definition]) => [name, (new Variable(TYPE_IMPLICIT, module)).define([], definition)]) + ); +} + +function variable_attach(variable) { + variable._module._runtime._dirty.add(variable); + variable._outputs.add(this); +} + +function variable_detach(variable) { + variable._module._runtime._dirty.add(variable); + variable._outputs.delete(this); +} + +function variable_undefined() { + throw variable_undefined; +} + +export function variable_stale() { + throw variable_stale; +} + +function variable_rejector(variable) { + return (error) => { + if (error === variable_stale) throw error; + if (error === variable_undefined) throw new RuntimeError(`${variable._name} is not defined`, variable._name); + if (error instanceof Error && error.message) throw new RuntimeError(error.message, variable._name); + throw new RuntimeError(`${variable._name} could not be resolved`, variable._name); + }; +} + +function variable_duplicate(name) { + return () => { + throw new RuntimeError(`${name} is defined more than once`); + }; +} + +function variable_define(name, inputs, definition) { + switch (arguments.length) { + case 1: { + definition = name, name = inputs = null; + break; + } + case 2: { + definition = inputs; + if (typeof name === "string") inputs = null; + else inputs = name, name = null; + break; + } + } + return variable_defineImpl.call(this, + name == null ? null : String(name), + inputs == null ? [] : map.call(inputs, this._resolve, this), + typeof definition === "function" ? definition : constant(definition) + ); +} + +function variable_resolve(name) { + return this._shadow?.get(name) ?? this._module._resolve(name); +} + +function variable_defineImpl(name, inputs, definition) { + const scope = this._module._scope, runtime = this._module._runtime; + + this._inputs.forEach(variable_detach, this); + inputs.forEach(variable_attach, this); + this._inputs = inputs; + this._definition = definition; + this._value = undefined; + + // Is this an active variable (that may require disposal)? + if (definition === noop) runtime._variables.delete(this); + else runtime._variables.add(this); + + // Did the variable’s name change? Time to patch references! + if (name !== this._name || scope.get(name) !== this) { + let error, found; + + if (this._name) { // Did this variable previously have a name? + if (this._outputs.size) { // And did other variables reference this variable? + scope.delete(this._name); + found = this._module._resolve(this._name); + found._outputs = this._outputs, this._outputs = new Set; + found._outputs.forEach(function(output) { output._inputs[output._inputs.indexOf(this)] = found; }, this); + found._outputs.forEach(runtime._updates.add, runtime._updates); + runtime._dirty.add(found).add(this); + scope.set(this._name, found); + } else if ((found = scope.get(this._name)) === this) { // Do no other variables reference this variable? + scope.delete(this._name); // It’s safe to delete! + } else if (found._type === TYPE_DUPLICATE) { // Do other variables assign this name? + found._duplicates.delete(this); // This variable no longer assigns this name. + this._duplicate = undefined; + if (found._duplicates.size === 1) { // Is there now only one variable assigning this name? + found = found._duplicates.keys().next().value; // Any references are now fixed! + error = scope.get(this._name); + found._outputs = error._outputs, error._outputs = new Set; + found._outputs.forEach(function(output) { output._inputs[output._inputs.indexOf(error)] = found; }); + found._definition = found._duplicate, found._duplicate = undefined; + runtime._dirty.add(error).add(found); + runtime._updates.add(found); + scope.set(this._name, found); + } + } else { + throw new Error; + } + } + + if (this._outputs.size) throw new Error; + + if (name) { // Does this variable have a new name? + if (found = scope.get(name)) { // Do other variables reference or assign this name? + if (found._type === TYPE_DUPLICATE) { // Do multiple other variables already define this name? + this._definition = variable_duplicate(name), this._duplicate = definition; + found._duplicates.add(this); + } else if (found._type === TYPE_IMPLICIT) { // Are the variable references broken? + this._outputs = found._outputs, found._outputs = new Set; // Now they’re fixed! + this._outputs.forEach(function(output) { output._inputs[output._inputs.indexOf(found)] = this; }, this); + runtime._dirty.add(found).add(this); + scope.set(name, this); + } else { // Does another variable define this name? + found._duplicate = found._definition, this._duplicate = definition; // Now they’re duplicates. + error = new Variable(TYPE_DUPLICATE, this._module); + error._name = name; + error._definition = this._definition = found._definition = variable_duplicate(name); + error._outputs = found._outputs, found._outputs = new Set; + error._outputs.forEach(function(output) { output._inputs[output._inputs.indexOf(found)] = error; }); + error._duplicates = new Set([this, found]); + runtime._dirty.add(found).add(error); + runtime._updates.add(found).add(error); + scope.set(name, error); + } + } else { + scope.set(name, this); + } + } + + this._name = name; + } + + // If this redefined variable was previously evaluated, invalidate it. (If the + // variable was never evaluated, then the invalidated value could never have + // been exposed and we can avoid this extra work.) + if (this._version > 0) ++this._version; + + runtime._updates.add(this); + runtime._compute(); + return this; +} + +function variable_import(remote, name, module) { + if (arguments.length < 3) module = name, name = remote; + return variable_defineImpl.call(this, String(name), [module._resolve(String(remote))], identity); +} + +function variable_delete() { + return variable_defineImpl.call(this, null, [], noop); +} + +function variable_pending() { + if (this._observer.pending) this._observer.pending(); +} + +function variable_fulfilled(value) { + if (this._observer.fulfilled) this._observer.fulfilled(value, this._name); +} + +function variable_rejected(error) { + if (this._observer.rejected) this._observer.rejected(error, this._name); +} diff --git a/packages/ojs/external-observablehq-runtime/test/.eslintrc.json b/packages/ojs/external-observablehq-runtime/test/.eslintrc.json new file mode 100644 index 00000000000..7eeefc33b66 --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/test/.eslintrc.json @@ -0,0 +1,5 @@ +{ + "env": { + "mocha": true + } +} diff --git a/packages/ojs/external-observablehq-runtime/test/dispose.html b/packages/ojs/external-observablehq-runtime/test/dispose.html new file mode 100644 index 00000000000..a72df46f5d5 --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/test/dispose.html @@ -0,0 +1,21 @@ + + diff --git a/packages/ojs/external-observablehq-runtime/test/dom.html b/packages/ojs/external-observablehq-runtime/test/dom.html new file mode 100644 index 00000000000..6e39f3cc962 --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/test/dom.html @@ -0,0 +1,14 @@ + + +
+
+ diff --git a/packages/ojs/external-observablehq-runtime/test/hello-world.html b/packages/ojs/external-observablehq-runtime/test/hello-world.html new file mode 100644 index 00000000000..9e3a930f461 --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/test/hello-world.html @@ -0,0 +1,16 @@ + + +

What is your name? +

+
+ diff --git a/packages/ojs/external-observablehq-runtime/test/module/builtin-test.js b/packages/ojs/external-observablehq-runtime/test/module/builtin-test.js new file mode 100644 index 00000000000..c43a70acb07 --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/test/module/builtin-test.js @@ -0,0 +1,23 @@ +import {Runtime} from "@observablehq/runtime"; +import assert from "assert"; +import {valueof} from "../variable/valueof.js"; + +it("module.builtin(name, value) defines a module-specific builtin variable", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + module.builtin("foo", 42); + const bar = module.variable(true).define("bar", ["foo"], foo => foo + 1); + await new Promise(setImmediate); + assert.deepStrictEqual(await valueof(bar), {value: 43}); +}); + +it("module.builtin(name, value) can be overridden by a normal variable", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + module.builtin("foo", 0); + const foo = module.variable(true).define("foo", [], () => 42); + const bar = module.variable(true).define("bar", ["foo"], foo => foo + 1); + await new Promise(setImmediate); + assert.deepStrictEqual(await valueof(foo), {value: 42}); + assert.deepStrictEqual(await valueof(bar), {value: 43}); +}); diff --git a/packages/ojs/external-observablehq-runtime/test/module/redefine-test.js b/packages/ojs/external-observablehq-runtime/test/module/redefine-test.js new file mode 100644 index 00000000000..b155cb21fb8 --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/test/module/redefine-test.js @@ -0,0 +1,36 @@ +import {Runtime} from "@observablehq/runtime"; +import assert from "assert"; +import {valueof} from "../variable/valueof.js"; + +it("module.redefine(name, inputs, definition) can redefine a normal variable", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + const foo = module.variable(true).define("foo", [], () => 42); + assert.strictEqual(module.redefine("foo", [], () => 43), foo); + assert.deepStrictEqual(await valueof(foo), {value: 43}); +}); + +it("module.redefine(name, inputs, definition) can redefine an implicit variable", async () => { + const runtime = new Runtime({foo: 42}); + const module = runtime.module(); + const bar = module.variable(true).define("bar", ["foo"], foo => foo + 1); + module.redefine("foo", [], () => 43); + assert.deepStrictEqual(await valueof(bar), {value: 44}); +}); + +it("module.redefine(name, inputs, definition) can’t redefine a duplicate definition", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + const foo1 = module.variable(true).define("foo", [], () => 1); + const foo2 = module.variable(true).define("foo", [], () => 2); + assert.throws(() => module.redefine("foo", [], () => 3), /foo is defined more than once/); + assert.deepStrictEqual(await valueof(foo1), {error: "RuntimeError: foo is defined more than once"}); + assert.deepStrictEqual(await valueof(foo2), {error: "RuntimeError: foo is defined more than once"}); +}); + +it("module.redefine(name, inputs, definition) throws an error if the specified variable doesn’t exist", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + const foo = module.variable(true).define("foo", [], () => 42); + assert.throws(() => module.redefine("bar", [], () => 43, foo), /bar is not defined/); +}); diff --git a/packages/ojs/external-observablehq-runtime/test/module/value-test.js b/packages/ojs/external-observablehq-runtime/test/module/value-test.js new file mode 100644 index 00000000000..1183e532127 --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/test/module/value-test.js @@ -0,0 +1,125 @@ +import {Runtime} from "@observablehq/runtime"; +import assert from "assert"; + +it("module.value(name) returns a promise to the variable’s next value", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + module.variable(true).define("foo", [], () => 42); + assert.deepStrictEqual(await module.value("foo"), 42); +}); + +it("module.value(name) implicitly makes the variable reachable", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + module.define("foo", [], () => 42); + assert.deepStrictEqual(await module.value("foo"), 42); +}); + +it("module.value(name) supports errors", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + module.define("foo", [], () => { throw new Error(42); }); + await assert.rejects(() => module.value("foo"), /42/); +}); + +it("module.value(name) supports generators", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + module.define("foo", [], function*() { yield 1; yield 2; yield 3; }); + assert.deepStrictEqual(await module.value("foo"), 1); + assert.deepStrictEqual(await module.value("foo"), 2); + assert.deepStrictEqual(await module.value("foo"), 3); + assert.deepStrictEqual(await module.value("foo"), 3); +}); + +it("module.value(name) supports generators that throw", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + module.define("foo", [], function*() { yield 1; throw new Error("fooed"); }); + module.define("bar", ["foo"], foo => foo); + const [foo1, bar1] = await Promise.all([module.value("foo"), module.value("bar")]); + assert.deepStrictEqual(foo1, 1); + assert.deepStrictEqual(bar1, 1); + await assert.rejects(() => module.value("foo"), /fooed/); + await assert.rejects(() => module.value("bar"), /fooed/); +}); + +it("module.value(name) supports async generators", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + module.define("foo", [], async function*() { yield 1; yield 2; yield 3; }); + assert.deepStrictEqual(await module.value("foo"), 1); + assert.deepStrictEqual(await module.value("foo"), 2); + assert.deepStrictEqual(await module.value("foo"), 3); + assert.deepStrictEqual(await module.value("foo"), 3); +}); + +it("module.value(name) supports promises", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + module.define("foo", [], async () => { return await 42; }); + assert.deepStrictEqual(await module.value("foo"), 42); +}); + +it("module.value(name) supports constants", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + module.define("foo", [], 42); + assert.deepStrictEqual(await module.value("foo"), 42); +}); + +it("module.value(name) supports missing variables", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + await assert.rejects(() => module.value("bar"), /bar is not defined/); +}); + +it("module.value(name) returns a promise on error", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + const promise = module.value("bar"); + await assert.rejects(promise, /bar is not defined/); +}); + +it("module.value(name) does not force recomputation", async () => { + let foo = 0; + const runtime = new Runtime(); + const module = runtime.module(); + module.define("foo", [], () => ++foo); + assert.deepStrictEqual(await module.value("foo"), 1); + assert.deepStrictEqual(await module.value("foo"), 1); + assert.deepStrictEqual(await module.value("foo"), 1); +}); + +it("module.value(name) does not expose stale values", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + let resolve; + const variable = module.define("foo", [], new Promise((y) => (resolve = y))); + const value = module.value("foo"); + await new Promise((resolve) => setTimeout(resolve, 100)); + variable.define("foo", [], () => "fresh"); + resolve("stale"); + assert.strictEqual(await value, "fresh"); +}); + +it("module.value(name) does not continue observing", async () => { + const foos = []; + const runtime = new Runtime(); + const module = runtime.module(); + module.define("foo", [], async function*() { + try { + foos.push(1), yield 1; + foos.push(2), yield 2; + foos.push(3), yield 3; + } finally { + foos.push(-1); + } + }); + assert.strictEqual(await module.value("foo"), 1); + assert.deepStrictEqual(foos, [1]); + await runtime._compute(); + assert.deepStrictEqual(foos, [1, 2, -1]); // 2 computed prior to being unobserved + await runtime._compute(); + assert.deepStrictEqual(foos, [1, 2, -1]); // any change would represent a leak +}); diff --git a/packages/ojs/external-observablehq-runtime/test/require.html b/packages/ojs/external-observablehq-runtime/test/require.html new file mode 100644 index 00000000000..888d8a210e8 --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/test/require.html @@ -0,0 +1,13 @@ + + +
+ diff --git a/packages/ojs/external-observablehq-runtime/test/runtime/builtins-test.js b/packages/ojs/external-observablehq-runtime/test/runtime/builtins-test.js new file mode 100644 index 00000000000..7f9cc7c7d86 --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/test/runtime/builtins-test.js @@ -0,0 +1,34 @@ +import {Runtime} from "@observablehq/runtime"; +import assert from "assert"; +import {valueof} from "../variable/valueof.js"; + +it("new Runtime(builtins) allows builtins to be defined as promises", async () => { + const runtime = new Runtime({color: Promise.resolve("red")}); + const main = runtime.module(); + const foo = main.variable(true).define(null, ["color"], color => color); + assert.deepStrictEqual(await valueof(foo), {value: "red"}); +}); + +it("new Runtime(builtins) allows builtins to be defined as functions", async () => { + const runtime = new Runtime({color: () => "red"}); + const main = runtime.module(); + const foo = main.variable(true).define(null, ["color"], color => color); + assert.deepStrictEqual(await valueof(foo), {value: "red"}); +}); + +it("new Runtime(builtins) allows builtins to be defined as async functions", async () => { + const runtime = new Runtime({color: async () => "red"}); + const main = runtime.module(); + const foo = main.variable(true).define(null, ["color"], color => color); + assert.deepStrictEqual(await valueof(foo), {value: "red"}); +}); + +it("new Runtime(builtins) allows builtins to be defined as generators", async () => { + let i = 0; + const runtime = new Runtime({i: function*() { while (i < 3) yield ++i; }}); + const main = runtime.module(); + const foo = main.variable(true).define(null, ["i"], i => i); + assert.deepStrictEqual(await valueof(foo), {value: 1}); + assert.deepStrictEqual(await valueof(foo), {value: 2}); + assert.deepStrictEqual(await valueof(foo), {value: 3}); +}); diff --git a/packages/ojs/external-observablehq-runtime/test/variable/define-test.js b/packages/ojs/external-observablehq-runtime/test/variable/define-test.js new file mode 100644 index 00000000000..5f48083c653 --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/test/variable/define-test.js @@ -0,0 +1,534 @@ +import {Runtime} from "@observablehq/runtime"; +import assert from "assert"; +import {valueof} from "./valueof.js"; + +it("variable.define(name, inputs, definition) can define a variable", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + const foo = module.variable(true).define("foo", [], () => 42); + assert.deepStrictEqual(await valueof(foo), {value: 42}); +}); + +it("variable.define(inputs, function) can define an anonymous variable", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + const foo = module.variable(true).define([], () => 42); + assert.deepStrictEqual(await valueof(foo), {value: 42}); +}); + +it("variable.define(name, function) can define a named variable", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + const foo = module.variable(true).define("foo", () => 42); + const bar = module.variable(true).define("bar", ["foo"], foo => foo); + assert.deepStrictEqual(await valueof(foo), {value: 42}); + assert.deepStrictEqual(await valueof(bar), {value: 42}); +}); + +it("variable.define(function) can define an anonymous variable", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + const foo = module.variable(true).define(() => 42); + assert.deepStrictEqual(await valueof(foo), {value: 42}); +}); + +it("variable.define(null, inputs, value) can define an anonymous constant", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + const foo = module.variable(true).define(null, [], 42); + assert.deepStrictEqual(await valueof(foo), {value: 42}); +}); + +it("variable.define(inputs, value) can define an anonymous constant", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + const foo = module.variable(true).define([], 42); + assert.deepStrictEqual(await valueof(foo), {value: 42}); +}); + +it("variable.define(null, value) can define an anonymous constant", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + const foo = module.variable(true).define(null, 42); + assert.deepStrictEqual(await valueof(foo), {value: 42}); +}); + +it("variable.define(value) can define an anonymous constant", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + const foo = module.variable(true).define(42); + assert.deepStrictEqual(await valueof(foo), {value: 42}); +}); + +it("variable.define detects missing inputs", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + const foo = module.variable(true); + const bar = module.variable(true).define("bar", ["foo"], foo => foo); + assert.deepStrictEqual(await valueof(foo), {value: undefined}); + assert.deepStrictEqual(await valueof(bar), {error: "RuntimeError: foo is not defined"}); + foo.define("foo", 1); + assert.deepStrictEqual(await valueof(foo), {value: 1}); + assert.deepStrictEqual(await valueof(bar), {value: 1}); +}); + +it("variable.define detects duplicate names", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + const foo = module.variable(true).define("foo", 1); + const bar = module.variable(true).define("foo", 2); + assert.deepStrictEqual(await valueof(foo), {error: "RuntimeError: foo is defined more than once"}); + assert.deepStrictEqual(await valueof(bar), {error: "RuntimeError: foo is defined more than once"}); + bar.define("bar", 2); + assert.deepStrictEqual(await valueof(foo), {value: 1}); + assert.deepStrictEqual(await valueof(bar), {value: 2}); +}); + +it("variable.define recomputes reachability as expected", async () => { + const runtime = new Runtime(); + const main = runtime.module(); + const module = runtime.module(); + const quux = module.define("quux", [], () => 42); + const baz = module.define("baz", ["quux"], quux => `baz-${quux}`); + const bar = module.define("bar", ["quux"], quux => `bar-${quux}`); + const foo = main.variable(true).define("foo", ["bar", "baz", "quux"], (bar, baz, quux) => [bar, baz, quux]); + main.variable().import("bar", module); + main.variable().import("baz", module); + main.variable().import("quux", module); + await runtime._compute(); + assert.strictEqual(quux._reachable, true); + assert.strictEqual(baz._reachable, true); + assert.strictEqual(bar._reachable, true); + assert.strictEqual(foo._reachable, true); + assert.deepStrictEqual(await valueof(foo), {value: ["bar-42", "baz-42", 42]}); + foo.define("foo", [], () => "foo"); + await runtime._compute(); + assert.strictEqual(quux._reachable, false); + assert.strictEqual(baz._reachable, false); + assert.strictEqual(bar._reachable, false); + assert.strictEqual(foo._reachable, true); + assert.deepStrictEqual(await valueof(foo), {value: "foo"}); +}); + +it("variable.define correctly detects reachability for unreachable cycles", async () => { + let returned = false; + const runtime = new Runtime(); + const main = runtime.module(); + const module = runtime.module(); + const bar = module.define("bar", ["baz"], baz => `bar-${baz}`); + const baz = module.define("baz", ["quux"], quux => `baz-${quux}`); + const quux = module.define("quux", ["zapp"], function*(zapp) { try { while (true) yield `quux-${zapp}`; } finally { returned = true; }}); + const zapp = module.define("zapp", ["bar"], bar => `zaap-${bar}`); + await runtime._compute(); + assert.strictEqual(bar._reachable, false); + assert.strictEqual(baz._reachable, false); + assert.strictEqual(quux._reachable, false); + assert.strictEqual(zapp._reachable, false); + assert.deepStrictEqual(await valueof(bar), {value: undefined}); + assert.deepStrictEqual(await valueof(baz), {value: undefined}); + assert.deepStrictEqual(await valueof(quux), {value: undefined}); + assert.deepStrictEqual(await valueof(zapp), {value: undefined}); + main.variable().import("bar", module); + const foo = main.variable(true).define("foo", ["bar"], bar => bar); + await runtime._compute(); + assert.strictEqual(foo._reachable, true); + assert.strictEqual(bar._reachable, true); + assert.strictEqual(baz._reachable, true); + assert.strictEqual(quux._reachable, true); + assert.strictEqual(zapp._reachable, true); + assert.deepStrictEqual(await valueof(bar), {error: "RuntimeError: circular definition"}); + assert.deepStrictEqual(await valueof(baz), {error: "RuntimeError: circular definition"}); + assert.deepStrictEqual(await valueof(quux), {error: "RuntimeError: circular definition"}); + assert.deepStrictEqual(await valueof(zapp), {error: "RuntimeError: circular definition"}); + assert.deepStrictEqual(await valueof(foo), {error: "RuntimeError: circular definition"}); + foo.define("foo", [], () => "foo"); + await runtime._compute(); + assert.strictEqual(foo._reachable, true); + assert.strictEqual(bar._reachable, false); + assert.strictEqual(baz._reachable, false); + assert.strictEqual(quux._reachable, false); + assert.strictEqual(zapp._reachable, false); + assert.deepStrictEqual(await valueof(bar), {error: "RuntimeError: circular definition"}); + assert.deepStrictEqual(await valueof(baz), {error: "RuntimeError: circular definition"}); + assert.deepStrictEqual(await valueof(quux), {error: "RuntimeError: circular definition"}); + assert.deepStrictEqual(await valueof(zapp), {error: "RuntimeError: circular definition"}); + assert.deepStrictEqual(await valueof(foo), {value: "foo"}); + assert.strictEqual(returned, false); // Generator is never finalized because it has never run. +}); + +it("variable.define terminates previously reachable generators", async () => { + let returned = false; + const runtime = new Runtime(); + const main = runtime.module(); + const module = runtime.module(); + const bar = module.define("bar", [], function*() { try { while (true) yield 1; } finally { returned = true; }}); + const foo = main.variable(true).define("foo", ["bar"], bar => bar); + main.variable().import("bar", module); + assert.deepStrictEqual(await valueof(foo), {value: 1}); + foo.define("foo", [], () => "foo"); + assert.deepStrictEqual(await valueof(foo), {value: "foo"}); + assert.strictEqual(bar._generator, undefined); + assert.strictEqual(returned, true); +}); + +it("variable.define does not terminate reachable generators", async () => { + let returned = false; + const runtime = new Runtime(); + const main = runtime.module(); + const module = runtime.module(); + const bar = module.define("bar", [], function*() { try { while (true) yield 1; } finally { returned = true; }}); + const baz = main.variable(true).define("baz", ["bar"], bar => bar); + const foo = main.variable(true).define("foo", ["bar"], bar => bar); + main.variable().import("bar", module); + assert.deepStrictEqual(await valueof(foo), {value: 1}); + assert.deepStrictEqual(await valueof(baz), {value: 1}); + foo.define("foo", [], () => "foo"); + assert.deepStrictEqual(await valueof(foo), {value: "foo"}); + assert.deepStrictEqual(await valueof(baz), {value: 1}); + assert.strictEqual(returned, false); + bar._invalidate(); + await runtime._compute(); + assert.strictEqual(returned, true); +}); + +it("variable.define detects duplicate declarations", async () => { + const runtime = new Runtime(); + const main = runtime.module(); + const v1 = main.variable(true).define("foo", [], () => 1); + const v2 = main.variable(true).define("foo", [], () => 2); + const v3 = main.variable(true).define(null, ["foo"], foo => foo); + assert.deepStrictEqual(await valueof(v1), {error: "RuntimeError: foo is defined more than once"}); + assert.deepStrictEqual(await valueof(v2), {error: "RuntimeError: foo is defined more than once"}); + assert.deepStrictEqual(await valueof(v3), {error: "RuntimeError: foo is defined more than once"}); +}); + +it("variable.define detects missing inputs and erroneous inputs", async () => { + const runtime = new Runtime(); + const main = runtime.module(); + const v1 = main.variable(true).define("foo", ["baz"], () => 1); + const v2 = main.variable(true).define("bar", ["foo"], () => 2); + assert.deepStrictEqual(await valueof(v1), {error: "RuntimeError: baz is not defined"}); + assert.deepStrictEqual(await valueof(v2), {error: "RuntimeError: baz is not defined"}); +}); + +it("variable.define allows masking of builtins", async () => { + const runtime = new Runtime({color: "red"}); + const main = runtime.module(); + const mask = main.define("color", "green"); + const foo = main.variable(true).define(null, ["color"], color => color); + assert.deepStrictEqual(await valueof(foo), {value: "green"}); + mask.delete(); + assert.deepStrictEqual(await valueof(foo), {value: "red"}); +}); + +it("variable.define supports promises", async () => { + const runtime = new Runtime(); + const main = runtime.module(); + const foo = main.variable(true).define("foo", [], () => new Promise(resolve => setImmediate(() => resolve(42)))); + assert.deepStrictEqual(await valueof(foo), {value: 42}); +}); + +it("variable.define supports generator cells", async () => { + let i = 0; + const runtime = new Runtime(); + const main = runtime.module(); + const foo = main.variable(true).define("foo", [], function*() { while (i < 3) yield ++i; }); + assert.deepStrictEqual(await valueof(foo), {value: 1}); + assert.deepStrictEqual(await valueof(foo), {value: 2}); + assert.deepStrictEqual(await valueof(foo), {value: 3}); +}); + +it("variable.define supports generator objects", async () => { + function* range(n) { for (let i = 0; i < n; ++i) yield i; } + const runtime = new Runtime(); + const main = runtime.module(); + const foo = main.variable(true).define("foo", [], () => range(3)); + assert.deepStrictEqual(await valueof(foo), {value: 0}); + assert.deepStrictEqual(await valueof(foo), {value: 1}); + assert.deepStrictEqual(await valueof(foo), {value: 2}); +}); + +it("variable.define supports a promise that resolves to a generator object", async () => { + function* range(n) { for (let i = 0; i < n; ++i) yield i; } + const runtime = new Runtime(); + const main = runtime.module(); + const foo = main.variable(true).define("foo", [], async () => range(3)); + assert.deepStrictEqual(await valueof(foo), {value: 0}); + assert.deepStrictEqual(await valueof(foo), {value: 1}); + assert.deepStrictEqual(await valueof(foo), {value: 2}); +}); + +it("variable.define supports generators that yield promises", async () => { + let i = 0; + const runtime = new Runtime(); + const main = runtime.module(); + const foo = main.variable(true).define("foo", [], function*() { while (i < 3) yield Promise.resolve(++i); }); + assert.deepStrictEqual(await valueof(foo), {value: 1}); + assert.deepStrictEqual(await valueof(foo), {value: 2}); + assert.deepStrictEqual(await valueof(foo), {value: 3}); +}); + +it("variable.define allows a variable to be redefined", async () => { + const runtime = new Runtime(); + const main = runtime.module(); + const foo = main.variable(true).define("foo", [], () => 1); + const bar = main.variable(true).define("bar", ["foo"], foo => new Promise(resolve => setImmediate(() => resolve(foo)))); + assert.deepStrictEqual(await valueof(foo), {value: 1}); + assert.deepStrictEqual(await valueof(bar), {value: 1}); + foo.define("foo", [], () => 2); + assert.deepStrictEqual(await valueof(foo), {value: 2}); + assert.deepStrictEqual(await valueof(bar), {value: 2}); +}); + +it("variable.define recomputes downstream values when a variable is renamed", async () => { + const runtime = new Runtime(); + const main = runtime.module(); + const foo = main.variable(true).define("foo", [], () => 1); + const bar = main.variable(true).define("bar", [], () => 2); + const baz = main.variable(true).define("baz", ["foo", "bar"], (foo, bar) => foo + bar); + assert.deepStrictEqual(await valueof(foo), {value: 1}); + assert.deepStrictEqual(await valueof(bar), {value: 2}); + assert.deepStrictEqual(await valueof(baz), {value: 3}); + foo.define("quux", [], () => 10); + assert.deepStrictEqual(await valueof(foo), {value: 10}); + assert.deepStrictEqual(await valueof(bar), {value: 2}); + assert.deepStrictEqual(await valueof(baz), {error: "RuntimeError: foo is not defined"}); +}); + +it("variable.define ignores an asynchronous result from a redefined variable", async () => { + const runtime = new Runtime(); + const main = runtime.module(); + const foo = main.variable(true).define("foo", [], () => new Promise(resolve => setTimeout(() => resolve("fail"), 150))); + await new Promise(setImmediate); + foo.define("foo", [], () => "success"); + await new Promise(resolve => setTimeout(resolve, 250)); + assert.deepStrictEqual(await valueof(foo), {value: "success"}); + assert.deepStrictEqual(foo._value, "success"); +}); + +it("variable.define ignores an asynchronous result from a redefined input", async () => { + const runtime = new Runtime(); + const main = runtime.module(); + const bar = main.variable().define("bar", [], () => new Promise(resolve => setTimeout(() => resolve("fail"), 150))); + const foo = main.variable(true).define("foo", ["bar"], bar => bar); + await new Promise(setImmediate); + bar.define("bar", [], () => "success"); + await new Promise(resolve => setTimeout(resolve, 250)); + assert.deepStrictEqual(await valueof(foo), {value: "success"}); + assert.deepStrictEqual(foo._value, "success"); +}); + +it("variable.define does not try to compute unreachable variables", async () => { + const runtime = new Runtime(); + const main = runtime.module(); + let evaluated = false; + const foo = main.variable(true).define("foo", [], () => 1); + const bar = main.variable().define("bar", ["foo"], (foo) => evaluated = foo); + assert.deepStrictEqual(await valueof(foo), {value: 1}); + assert.deepStrictEqual(await valueof(bar), {value: undefined}); + assert.strictEqual(evaluated, false); +}); + +it("variable.define does not try to compute unreachable variables that are outputs of reachable variables", async () => { + const runtime = new Runtime(); + const main = runtime.module(); + let evaluated = false; + const foo = main.variable(true).define("foo", [], () => 1); + const bar = main.variable(true).define("bar", [], () => 2); + const baz = main.variable().define("baz", ["foo", "bar"], (foo, bar) => evaluated = foo + bar); + assert.deepStrictEqual(await valueof(foo), {value: 1}); + assert.deepStrictEqual(await valueof(bar), {value: 2}); + assert.deepStrictEqual(await valueof(baz), {value: undefined}); + assert.strictEqual(evaluated, false); +}); + +it("variable.define can reference whitelisted globals", async () => { + const runtime = new Runtime(null, name => name === "magic" ? 21 : undefined); + const module = runtime.module(); + const foo = module.variable(true).define(["magic"], magic => magic * 2); + assert.deepStrictEqual(await valueof(foo), {value: 42}); +}); + +it("variable.define captures the value of whitelisted globals", async () => { + let magic = 0; + const runtime = new Runtime(null, name => name === "magic" ? ++magic : undefined); + const module = runtime.module(); + const foo = module.variable(true).define(["magic"], magic => magic * 2); + assert.deepStrictEqual(await valueof(foo), {value: 2}); + assert.deepStrictEqual(await valueof(foo), {value: 2}); +}); + +it("variable.define can override whitelisted globals", async () => { + const runtime = new Runtime(null, name => name === "magic" ? 1 : undefined); + const module = runtime.module(); + module.variable().define("magic", [], () => 2); + const foo = module.variable(true).define(["magic"], magic => magic * 2); + assert.deepStrictEqual(await valueof(foo), {value: 4}); +}); + +it("variable.define can dynamically override whitelisted globals", async () => { + const runtime = new Runtime(null, name => name === "magic" ? 1 : undefined); + const module = runtime.module(); + const foo = module.variable(true).define(["magic"], magic => magic * 2); + assert.deepStrictEqual(await valueof(foo), {value: 2}); + module.variable().define("magic", [], () => 2); + assert.deepStrictEqual(await valueof(foo), {value: 4}); +}); + +it("variable.define cannot reference non-whitelisted globals", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + const foo = module.variable(true).define(["magic"], magic => magic * 2); + assert.deepStrictEqual(await valueof(foo), {error: "RuntimeError: magic is not defined"}); +}); + +it("variable.define correctly handles globals that throw", async () => { + const runtime = new Runtime(null, name => { if (name === "oops") throw new Error("oops"); }); + const module = runtime.module(); + const foo = module.variable(true).define(["oops"], oops => oops); + assert.deepStrictEqual(await valueof(foo), {error: "RuntimeError: oops"}); +}); + +it("variable.define allows other variables to begin computation before a generator may resume", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + const main = runtime.module(); + let i = 0; + let genIteration = 0; + let valIteration = 0; + const onGenFulfilled = value => { + if (genIteration === 0) { + assert.strictEqual(valIteration, 0); + assert.strictEqual(value, 1); + assert.strictEqual(i, 1); + } else if (genIteration === 1) { + assert.strictEqual(valIteration, 1); + assert.strictEqual(value, 2); + assert.strictEqual(i, 2); + } else if (genIteration === 2) { + assert.strictEqual(valIteration, 2); + assert.strictEqual(value, 3); + assert.strictEqual(i, 3); + } else { + assert.fail(); + } + genIteration++; + }; + const onValFulfilled = value => { + if (valIteration === 0) { + assert.strictEqual(genIteration, 1); + assert.strictEqual(value, 1); + assert.strictEqual(i, 1); + } else if (valIteration === 1) { + assert.strictEqual(genIteration, 2); + assert.strictEqual(value, 2); + assert.strictEqual(i, 2); + } else if (valIteration === 2) { + assert.strictEqual(genIteration, 3); + assert.strictEqual(value, 3); + assert.strictEqual(i, 3); + } else { + assert.fail(); + } + valIteration++; + }; + const gen = module.variable({fulfilled: onGenFulfilled}).define("gen", [], function*() { + i++; + yield i; + i++; + yield i; + i++; + yield i; + }); + main.variable().import("gen", module); + const val = main.variable({fulfilled: onValFulfilled}).define("val", ["gen"], i => i); + assert.strictEqual(await gen._promise, undefined, "gen cell undefined"); + assert.strictEqual(await val._promise, undefined, "val cell undefined"); + await runtime._compute(); + assert.strictEqual(await gen._promise, 1, "gen cell 1"); + assert.strictEqual(await val._promise, 1, "val cell 1"); + await runtime._compute(); + assert.strictEqual(await gen._promise, 2, "gen cell 2"); + assert.strictEqual(await val._promise, 2, "val cell 2"); + await runtime._compute(); + assert.strictEqual(await gen._promise, 3, "gen cell 3"); + assert.strictEqual(await val._promise, 3, "val cell 3"); +}); + +it("variable.define allows other variables to begin computation before a generator may resume", async () => { + const runtime = new Runtime(); + const main = runtime.module(); + let i = 0; + let j = 0; + const gen = main.variable().define("gen", [], function*() { + i++; + yield i; + i++; + yield i; + i++; + yield i; + }); + const val = main.variable(true).define("val", ["gen"], gen => { + j++; + assert.strictEqual(gen, j, "gen = j"); + assert.strictEqual(gen, i, "gen = i"); + return gen; + }); + assert.strictEqual(await gen._promise, undefined, "gen = undefined"); + assert.strictEqual(await val._promise, undefined, "val = undefined"); + await runtime._compute(); + assert.strictEqual(await gen._promise, 1, "gen cell 1"); + assert.strictEqual(await val._promise, 1, "val cell 1"); + await runtime._compute(); + assert.strictEqual(await gen._promise, 2, "gen cell 2"); + assert.strictEqual(await val._promise, 2, "val cell 2"); + await runtime._compute(); + assert.strictEqual(await gen._promise, 3, "gen cell 3"); + assert.strictEqual(await val._promise, 3, "val cell 3"); +}); + +it("variable.define does not report stale fulfillments", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + const values = []; + const errors = []; + const variable = module.variable({ + fulfilled(value) { + values.push(value); + }, + rejected(error) { + errors.push(error); + } + }); + const promise = new Promise((resolve) => setTimeout(() => resolve("value1"), 250)); + variable.define(() => promise); + await runtime._computing; + variable.define(() => "value2"); + await promise; + assert.deepStrictEqual(await valueof(variable), {value: "value2"}); + assert.deepStrictEqual(values, ["value2"]); + assert.deepStrictEqual(errors, []); +}); + +it("variable.define does not report stale rejections", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + const values = []; + const errors = []; + const variable = module.variable({ + fulfilled(value) { + values.push(value); + }, + rejected(error) { + errors.push(error); + } + }); + const promise = new Promise((resolve, reject) => setTimeout(() => reject("error1"), 250)); + variable.define(() => promise); + await runtime._computing; + variable.define(() => Promise.reject("error2")); + await promise.catch(() => {}); + assert.deepStrictEqual(await valueof(variable), {error: "error2"}); + assert.deepStrictEqual(values, []); + assert.deepStrictEqual(errors, ["error2"]); +}); diff --git a/packages/ojs/external-observablehq-runtime/test/variable/delete-test.js b/packages/ojs/external-observablehq-runtime/test/variable/delete-test.js new file mode 100644 index 00000000000..a595479aad8 --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/test/variable/delete-test.js @@ -0,0 +1,15 @@ +import {Runtime} from "@observablehq/runtime"; +import assert from "assert"; +import {valueof} from "./valueof.js"; + +it("variable.delete allows a variable to be deleted", async () => { + const runtime = new Runtime(); + const main = runtime.module(); + const foo = main.variable(true).define("foo", [], () => 1); + const bar = main.variable(true).define("bar", ["foo"], foo => new Promise(resolve => setImmediate(() => resolve(foo)))); + assert.deepStrictEqual(await valueof(foo), {value: 1}); + assert.deepStrictEqual(await valueof(bar), {value: 1}); + foo.delete(); + assert.deepStrictEqual(await valueof(foo), {value: undefined}); + assert.deepStrictEqual(await valueof(bar), {error: "RuntimeError: foo is not defined"}); +}); diff --git a/packages/ojs/external-observablehq-runtime/test/variable/derive-test.js b/packages/ojs/external-observablehq-runtime/test/variable/derive-test.js new file mode 100644 index 00000000000..86e823344ac --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/test/variable/derive-test.js @@ -0,0 +1,290 @@ +import {Runtime} from "@observablehq/runtime"; +import assert from "assert"; +import {identity} from "../../src/identity.js"; +import {valueof, promiseInspector, sleep} from "./valueof.js"; + +it("module.derive(overrides, module) injects variables into a copied module", async () => { + const runtime = new Runtime(); + const module0 = runtime.module(); + const a0 = module0.variable(true).define("a", [], () => 1); + const b0 = module0.variable(true).define("b", [], () => 2); + const c0 = module0.variable(true).define("c", ["a", "b"], (a, b) => a + b); + const module1 = runtime.module(); + const module1_0 = module0.derive([{name: "d", alias: "b"}], module1); + const c1 = module1_0.variable(true).define(null, ["c"], c => c); + const d1 = module1.define("d", [], () => 42); + assert.deepStrictEqual(await valueof(a0), {value: 1}); + assert.deepStrictEqual(await valueof(b0), {value: 2}); + assert.deepStrictEqual(await valueof(c0), {value: 3}); + assert.deepStrictEqual(await valueof(c1), {value: 43}); + assert.deepStrictEqual(await valueof(d1), {value: 42}); +}); + +it("module.derive(…) copies module-specific builtins", async () => { + const runtime = new Runtime(); + const module0 = runtime.module(); + module0.builtin("a", 1); + const b0 = module0.variable(true).define("b", ["a"], a => a + 1); + const module1_0 = module0.derive([], module0); + const c1 = module1_0.variable(true).define("c", ["a"], a => a + 2); + assert.deepStrictEqual(await valueof(b0), {value: 2}); + assert.deepStrictEqual(await valueof(c1), {value: 3}); +}); + +it("module.derive(…) can inject into modules that inject into modules", async () => { + const runtime = new Runtime(); + + // Module A + // a = 1 + // b = 2 + // c = a + b + const A = runtime.module(); + A.define("a", 1); + A.define("b", 2); + A.define("c", ["a", "b"], (a, b) => a + b); + + // Module B + // d = 3 + // import {c as e} with {d as b} from "A" + const B = runtime.module(); + B.define("d", 3); + const BA = A.derive([{name: "d", alias: "b"}], B); + B.import("c", "e", BA); + + // Module C + // f = 4 + // import {e as g} with {f as d} from "B" + const C = runtime.module(); + C.define("f", 4); + const CB = B.derive([{name: "f", alias: "d"}], C); + const g = C.variable(true).import("e", "g", CB); + + assert.deepStrictEqual(await valueof(g), {value: 5}); + assert.strictEqual(g._module, C); + assert.strictEqual(g._inputs[0]._module, CB); + assert.strictEqual(g._inputs[0]._inputs[0]._module._source, BA); + assert.strictEqual(C._source, null); + assert.strictEqual(CB._source, B); + assert.strictEqual(BA._source, A); +}); + +it("module.derive(…) can inject into modules that inject into modules that inject into modules", async () => { + const runtime = new Runtime(); + + // Module A + // a = 1 + // b = 2 + // c = a + b + const A = runtime.module(); + A.define("a", 1); + A.define("b", 2); + A.define("c", ["a", "b"], (a, b) => a + b); + + // Module B + // d = 3 + // import {c as e} with {d as b} from "A" + const B = runtime.module(); + B.define("d", 3); + const BA = A.derive([{name: "d", alias: "b"}], B); + B.import("c", "e", BA); + + // Module C + // f = 4 + // import {e as g} with {f as d} from "B" + const C = runtime.module(); + C.define("f", 4); + const CB = B.derive([{name: "f", alias: "d"}], C); + C.import("e", "g", CB); + + // Module D + // h = 5 + // import {g as i} with {h as f} from "C" + const D = runtime.module(); + D.define("h", 5); + const DC = C.derive([{name: "h", alias: "f"}], D); + const i = D.variable(true).import("g", "i", DC); + + assert.deepStrictEqual(await valueof(i), {value: 6}); + assert.strictEqual(i._module, D); + assert.strictEqual(i._inputs[0]._module, DC); + assert.strictEqual(i._inputs[0]._module._source, C); + assert.strictEqual(i._inputs[0]._inputs[0]._module._source, CB); + assert.strictEqual(i._inputs[0]._inputs[0]._module._source._source, B); +}); + +it("module.derive(…) does not copy non-injected modules", async () => { + const runtime = new Runtime(); + + // Module A + // a = 1 + // b = 2 + // c = a + b + const A = runtime.module(); + A.define("a", 1); + A.define("b", 2); + A.define("c", ["a", "b"], (a, b) => a + b); + + // Module B + // import {c as e} from "A" + const B = runtime.module(); + B.import("c", "e", A); + + // Module C + // f = 4 + // import {e as g} with {f as d} from "B" + const C = runtime.module(); + C.define("f", 4); + const CB = B.derive([{name: "f", alias: "d"}], C); + const g = C.variable(true).import("e", "g", CB); + + assert.deepStrictEqual(await valueof(g), {value: 3}); + assert.strictEqual(g._module, C); + assert.strictEqual(g._inputs[0]._module, CB); + assert.strictEqual(g._inputs[0]._inputs[0]._module, A); +}); + +it("module.derive(…) does not copy non-injected modules, again", async () => { + const runtime = new Runtime(); + const A = runtime.module(); + A.define("a", () => ({})); + const B = runtime.module(); + B.import("a", A); + const C = runtime.module(); + const CB = B.derive([], C); + const a1 = C.variable(true).import("a", "a1", CB); + const a2 = C.variable(true).import("a", "a2", A); + const {value: v1} = await valueof(a1); + const {value: v2} = await valueof(a2); + assert.deepStrictEqual(v1, {}); + assert.strictEqual(v1, v2); +}); + +it("module.derive() supports lazy import-with", async () => { + let resolve2, promise2 = new Promise((resolve) => resolve2 = resolve); + + function define1(runtime, observer) { + const main = runtime.module(); + main.define("module 1", ["@variable"], async (v) => runtime.module(await promise2).derive([{name: "b"}], v._module)); + main.define("c", ["module 1", "@variable"], (_, v) => v.import("c", _)); + main.variable(observer("b")).define("b", [], () => 3); + main.variable(observer("imported c")).define("imported c", ["c"], c => c); + return main; + } + + function define2(runtime, observer) { + const main = runtime.module(); + main.variable(observer("a")).define("a", [], () => 1); + main.variable(observer("b")).define("b", [], () => 2); + main.variable(observer("c")).define("c", ["a", "b"], (a, b) => a + b); + return main; + } + + const runtime = new Runtime(); + const inspectorC = promiseInspector(); + runtime.module(define1, name => { + if (name === "imported c") { + return inspectorC; + } + }); + + await sleep(); + resolve2(define2); + assert.deepStrictEqual(await inspectorC, 4); +}); + +it("module.derive() supports lazy transitive import-with", async () => { + let resolve2, promise2 = new Promise((resolve) => resolve2 = resolve); + let resolve3, promise3 = new Promise((resolve) => resolve3 = resolve); + let module2_1; + let module3_2; + let variableC_1; + + // Module 1 + // b = 4 + // imported c = c + // import {c} with {b} from "2" + function define1(runtime, observer) { + const main = runtime.module(); + main.define("module 2", ["@variable"], async (v) => (module2_1 = runtime.module(await promise2).derive([{name: "b"}], v._module))); + variableC_1 = main.define("c", ["module 2", "@variable"], (_, v) => v.import("c", _)); + main.variable(observer("b")).define("b", [], () => 4); + main.variable(observer("imported c")).define("imported c", ["c"], c => c); + return main; + } + + // Module 2 + // b = 3 + // c + // import {c} with {b} from "3" + function define2(runtime, observer) { + const main = runtime.module(); + main.define("module 3", ["@variable"], async (v) => (module3_2 = runtime.module(await promise3).derive([{name: "b"}], v._module))); + main.define("c", ["module 3", "@variable"], (_, v) => v.import("c", _)); + main.variable(observer("b")).define("b", [], () => 3); + main.variable(observer()).define(["c"], c => c); + return main; + } + + // Module 3 + // a = 1 + // b = 2 + // c = a + b + function define3(runtime, observer) { + const main = runtime.module(); + main.variable(observer("a")).define("a", [], () => 1); + main.variable(observer("b")).define("b", [], () => 2); + main.variable(observer("c")).define("c", ["a", "b"], (a, b) => a + b); + return main; + } + + const runtime = new Runtime(); + const inspectorC = promiseInspector(); + runtime.module(define1, name => { + if (name === "imported c") { + return inspectorC; + } + }); + + // Initially c in module 1 is not an import; it’s a placeholder that depends + // on an internal variable called “module 2”. Also, only one module yet + // exists, because module 2 has not yet loaded. + await sleep(); + const module1 = runtime.module(define1); + const c1 = module1._scope.get("c"); + assert.strictEqual(c1, variableC_1); + assert.deepStrictEqual(c1._inputs.map(i => i._name), ["module 2", "@variable"]); + assert.strictEqual(runtime._modules.size, 1); + + // After module 2 loads, the variable c in module 1 has been redefined; it is + // now an import of c from a derived copy of module 2, module 2'. In addition, + // the variable b in module 2' is now an import from module 1. + resolve2(define2); + await sleep(); + const module2 = runtime.module(define2); + assert.deepStrictEqual(c1._inputs.map(i => i._name), ["c"]); + assert.strictEqual(c1._definition, identity); + assert.strictEqual(c1._inputs[0]._module, module2_1); + assert.strictEqual(module2_1._source, module2); + assert.strictEqual(runtime._modules.size, 2); + const b2_1 = module2_1._scope.get("b"); + assert.deepStrictEqual(b2_1._inputs.map(i => i._name), ["b"]); + assert.deepStrictEqual(b2_1._definition, identity); + assert.deepStrictEqual(b2_1._inputs[0]._module, module1); + + // After module 3 loads, the variable c in module 2' has been redefined; it is + // now an import of c from a derived copy of module 3, module 3'. In addition, + // the variable b in module 3' is now an import from module 2'. + resolve3(define3); + await sleep(); + const module3 = runtime.module(define3); + const c2_1 = module2_1._scope.get("c"); + assert.strictEqual(c2_1._module, module2_1); + assert.strictEqual(c2_1._definition, identity); + assert.strictEqual(c2_1._inputs[0]._module, module3_2); + assert.strictEqual(module3_2._source, module3); + const b3_2 = module3_2._scope.get("b"); + assert.deepStrictEqual(b3_2._inputs.map(i => i._name), ["b"]); + assert.deepStrictEqual(b3_2._definition, identity); + assert.deepStrictEqual(b3_2._inputs[0]._module, module2_1); + assert.deepStrictEqual(await inspectorC, 5); +}); diff --git a/packages/ojs/external-observablehq-runtime/test/variable/import-test.js b/packages/ojs/external-observablehq-runtime/test/variable/import-test.js new file mode 100644 index 00000000000..1534d7b77b3 --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/test/variable/import-test.js @@ -0,0 +1,235 @@ +import {Runtime} from "@observablehq/runtime"; +import assert from "assert"; +import {valueof, promiseInspector, sleep} from "./valueof.js"; + +it("variable.import(name, module) imports a variable from another module", async () => { + const runtime = new Runtime(); + const main = runtime.module(); + const module = runtime.module(); + module.define("foo", [], () => 42); + main.import("foo", module); + const bar = main.variable(true).define("bar", ["foo"], foo => `bar-${foo}`); + assert.deepStrictEqual(await valueof(bar), {value: "bar-42"}); +}); + +it("variable.import(name, alias, module) imports a variable from another module under an alias", async () => { + const runtime = new Runtime(); + const main = runtime.module(); + const module = runtime.module(); + module.define("foo", [], () => 42); + main.import("foo", "baz", module); + const bar = main.variable(true).define("bar", ["baz"], baz => `bar-${baz}`); + assert.deepStrictEqual(await valueof(bar), {value: "bar-42"}); +}); + +it("variable.import(name, module) does not compute the imported variable unless referenced", async () => { + const runtime = new Runtime(); + const main = runtime.module(); + const module = runtime.module(); + const foo = module.define("foo", [], () => assert.fail()); + main.import("foo", module); + await runtime._computing; + assert.strictEqual(foo._reachable, false); +}); + +it("variable.import(name, module) can import a variable that depends on a mutable from another module", async () => { + const runtime = new Runtime(); + const main = runtime.module(); + const module = runtime.module(); + module.define("mutable foo", [], () => 13); + module.define("bar", ["mutable foo"], (foo) => foo); + main.import("bar", module); + const baz = main.variable(true).define("baz", ["bar"], bar => `baz-${bar}`); + assert.deepStrictEqual(await valueof(baz), {value: "baz-13"}); +}); + +it("variable.import() allows non-circular imported values from circular imports", async () => { + const runtime = new Runtime(); + const a = runtime.module(); + const b = runtime.module(); + a.define("foo", [], () => "foo"); + b.define("bar", [], () => "bar"); + a.import("bar", b); + b.import("foo", a); + const afoobar = a.variable(true).define("foobar", ["foo", "bar"], (foo, bar) => 'a' + foo + bar); + const bfoobar = b.variable(true).define("foobar", ["foo", "bar"], (foo, bar) => 'b' + foo + bar); + assert.deepStrictEqual(await valueof(afoobar), {value: "afoobar"}); + assert.deepStrictEqual(await valueof(bfoobar), {value: "bfoobar"}); +}); + +it("variable.import() fails when importing creates a circular reference", async () => { + const runtime = new Runtime(); + const a = runtime.module(); + const b = runtime.module(); + a.import("bar", b); + a.define("foo", ["bar"], (bar) => `foo${bar}`); + b.import("foo", a); + b.define("bar", ["foo"], (foo) => `${foo}bar`); + const afoobar = a.variable(true).define("foobar", ["foo", "bar"], (foo, bar) => 'a' + foo + bar); + const bbarfoo = b.variable(true).define("barfoo", ["bar", "foo"], (bar, foo) => 'b' + bar + foo); + assert.deepStrictEqual(await valueof(afoobar), {error: "RuntimeError: circular definition"}); + assert.deepStrictEqual(await valueof(bbarfoo), {error: "RuntimeError: circular definition"}); +}); + +it("variable.import() allows direct circular import-with if the resulting variables are not circular", async () => { + const runtime = new Runtime(); + let a1, b1, a2, b2; + + // Module 1 + // a = 1 + // b + // import {b} with {a} from "2" + function define1() { + const main = runtime.module(); + a1 = main.variable(true).define("a", () => 1); + b1 = main.variable(true).define(["b"], (b) => b); + const child1 = runtime.module(define2).derive(["a"], main); + main.import("b", child1); + return main; + } + + // Module 2 + // b = 2 + // a + // import {a} with {b} from "1" + function define2() { + const main = runtime.module(); + b2 = main.variable(true).define("b", () => 2); + a2 = main.variable(true).define(["a"], (a) => a); + const child1 = runtime.module(define1).derive(["b"], main); + main.import("a", child1); + return main; + } + + define1(); + + assert.deepStrictEqual(await valueof(a1), {value: 1}); + assert.deepStrictEqual(await valueof(b1), {value: 2}); + assert.deepStrictEqual(await valueof(a2), {value: 1}); + assert.deepStrictEqual(await valueof(b2), {value: 2}); +} +); + +it("variable.import() allows indirect circular import-with if the resulting variables are not circular", async () => { + const runtime = new Runtime(); + let a, b, c, importA, importB, importC; + + // Module 1 + // a = 1 + // c + // import {c} with {a} from "3" + function define1() { + const main = runtime.module(); + a = main.variable(true).define("a", () => 1); + importC = main.variable(true).define(["c"], (c) => c); + const child3 = runtime.module(define3).derive(["a"], main); + main.import("c", child3); + return main; + } + + // Module 2 + // b = 2 + // a + // import {a} with {b} from "1" + function define2() { + const main = runtime.module(); + b = main.variable(true).define("b", () => 2); + importA = main.variable(true).define(["a"], (a) => a); + const child1 = runtime.module(define1).derive(["b"], main); + main.import("a", child1); + return main; + } + + // Module 3 + // c = 3 + // b + // import {b} with {c} from "2" + function define3() { + const main = runtime.module(); + c = main.variable(true).define("c", () => 3); + importB = main.variable(true).define(["b"], (b) => b); + const child2 = runtime.module(define2).derive(["c"], main); + main.import("b", child2); + return main; + } + + define1(); + + assert.deepStrictEqual(await valueof(a), {value: 1}); + assert.deepStrictEqual(await valueof(b), {value: 2}); + assert.deepStrictEqual(await valueof(c), {value: 3}); + assert.deepStrictEqual(await valueof(importA), {value: 1}); + assert.deepStrictEqual(await valueof(importB), {value: 2}); + assert.deepStrictEqual(await valueof(importC), {value: 3}); +}); + +it("variable.import() supports lazy imports", async () => { + let resolve2, promise2 = new Promise((resolve) => resolve2 = resolve); + + function define1(runtime, observer) { + const main = runtime.module(); + main.define("module 1", async () => runtime.module(await promise2)); + main.define("a", ["module 1", "@variable"], (_, v) => v.import("a", _)); + main.variable(observer("imported a")).define("imported a", ["a"], a => a); + return main; + } + + function define2(runtime, observer) { + const main = runtime.module(); + main.variable(observer("a")).define("a", [], () => 1); + return main; + } + + const runtime = new Runtime(); + const inspectorA = promiseInspector(); + runtime.module(define1, name => { + if (name === "imported a") { + return inspectorA; + } + }); + + await sleep(); + resolve2(define2); + assert.deepStrictEqual(await inspectorA, 1); +}); + +it("variable.import() supports lazy transitive imports", async () => { + let resolve2, promise2 = new Promise((resolve) => resolve2 = resolve); + let resolve3, promise3 = new Promise((resolve) => resolve3 = resolve); + + function define1(runtime, observer) { + const main = runtime.module(); + main.define("module 1", async () => runtime.module(await promise2)); + main.define("b", ["module 1", "@variable"], (_, v) => v.import("b", _)); + main.variable(observer("a")).define("a", ["b"], b => b + 1); + return main; + } + + function define2(runtime, observer) { + const main = runtime.module(); + main.define("module 1", async () => runtime.module(await promise3)); + main.define("c", ["module 1", "@variable"], (_, v) => v.import("c", _)); + main.variable(observer("b")).define("b", ["c"], c => c + 1); + return main; + } + + function define3(runtime, observer) { + const main = runtime.module(); + main.variable(observer("c")).define("c", [], () => 1); + return main; + } + + const runtime = new Runtime(); + const inspectorA = promiseInspector(); + runtime.module(define1, name => { + if (name === "a") { + return inspectorA; + } + }); + + await sleep(); + resolve2(define2); + await sleep(); + resolve3(define3); + assert.deepStrictEqual(await inspectorA, 3); +}); diff --git a/packages/ojs/external-observablehq-runtime/test/variable/shadow-test.js b/packages/ojs/external-observablehq-runtime/test/variable/shadow-test.js new file mode 100644 index 00000000000..db4e0ce7ce4 --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/test/variable/shadow-test.js @@ -0,0 +1,68 @@ +import {Runtime} from "@observablehq/runtime"; +import {valueof} from "./valueof.js"; +import assert from "assert"; + +it("module.variable(…, {shadow}) can define a shadow input", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + + module.define("val", [], 1000); + const a = module.variable(true, {shadow: {val: 100}}).define("a", ["val"], (val) => val); + + assert.deepStrictEqual(await valueof(a), {value: 100}); +}); + +it("module.variable(…, {shadow}) can define shadow inputs that differ between variables", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + + module.define("val", [], 1000); + const a = module.variable(true, {shadow: {val: 100}}).define("a", ["val"], (val) => val); + const b = module.variable(true, {shadow: {val: 200}}).define("b", ["val"], (val) => val); + assert.deepStrictEqual(await valueof(a), {value: 100}); + assert.deepStrictEqual(await valueof(b), {value: 200}); +}); + +it("module.variable(…, {shadow}) variables that are downstream will also use the shadow input", async () => { + const runtime = new Runtime(); + const module = runtime.module(); + + module.define("val", [], 1000); + const a = module.variable(true, {shadow: {val: 100}}).define("a", ["val"], (val) => val); + const b = module.variable(true, {shadow: {val: 200}}).define("b", ["val"], (val) => val); + const c = module.variable(true).define("c", ["a", "b"], (a, b) => `${a}, ${b}`); + + assert.deepStrictEqual(await valueof(a), {value: 100}); + assert.deepStrictEqual(await valueof(b), {value: 200}); + assert.deepStrictEqual(await valueof(c), { value: "100, 200" }); +}); + +it("module.variable(…, {shadow}) variables a->b->c that shadow the same inputs will each use their own shadows", async () => { + const runtime = new Runtime(); + const main = runtime.module(); + + const a = main + .variable(true, {shadow: {val: 100}}) + .define("a", ["val"], (val) => val); + const b = main + .variable(true, {shadow: {val: 200}}) + .define("b", ["val", "a"], (val, a) => `${val}, ${a}`); + const c = main + .variable(true, {shadow: {val: 300}}) + .define("c", ["val", "b", "a"], (val, b, a) => `${val}, (${b}), ${a}`); + + assert.deepStrictEqual(await valueof(a), {value: 100}); + assert.deepStrictEqual(await valueof(b), {value: "200, 100"}); + assert.deepStrictEqual(await valueof(c), {value: "300, (200, 100), 100"}); +}); + +it("module.variable(…, {shadow}) can shadow a non-existent variable", async () => { + const runtime = new Runtime(); + const main = runtime.module(); + + const a = main + .variable(true, {shadow: {val: 100}}) + .define("a", ["val"], (val) => val); + + assert.deepStrictEqual(await valueof(a), {value: 100}); +}); diff --git a/packages/ojs/external-observablehq-runtime/test/variable/valueof.js b/packages/ojs/external-observablehq-runtime/test/variable/valueof.js new file mode 100644 index 00000000000..07c28d70984 --- /dev/null +++ b/packages/ojs/external-observablehq-runtime/test/variable/valueof.js @@ -0,0 +1,24 @@ +export async function valueof(variable) { + await variable._module._runtime._compute(); + try { return {value: await variable._promise}; } + catch (error) { return {error: error.toString()}; } +} + +export function promiseInspector() { + let fulfilled, rejected; + const promise = new Promise((resolve, reject) => { + fulfilled = resolve; + rejected = reject; + }); + promise.fulfilled = fulfilled; + promise.rejected = rejected; + return promise; +} + +export function sleep(ms = 50) { + return delay(undefined, ms); +} + +export function delay(value, ms) { + return new Promise((resolve) => setTimeout(() => resolve(value), ms)); +} diff --git a/packages/ojs/external-observablehq-stdlib/.eslintignore b/packages/ojs/external-observablehq-stdlib/.eslintignore new file mode 100644 index 00000000000..849ddff3b7e --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/.eslintignore @@ -0,0 +1 @@ +dist/ diff --git a/packages/ojs/external-observablehq-stdlib/.eslintrc.json b/packages/ojs/external-observablehq-stdlib/.eslintrc.json new file mode 100644 index 00000000000..48aa23da012 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/.eslintrc.json @@ -0,0 +1,20 @@ +{ + "extends": "eslint:recommended", + "parserOptions": { + "sourceType": "module", + "ecmaVersion": 2020 + }, + "env": { + "es6": true, + "node": true, + "browser": true + }, + "rules": { + "no-cond-assign": 0, + "no-constant-condition": 0, + "no-sparse-arrays": 0, + "no-unexpected-multiline": 0, + "comma-dangle": ["error", "never"], + "semi": [2, "always"] + } +} diff --git a/packages/ojs/external-observablehq-stdlib/.gitignore b/packages/ojs/external-observablehq-stdlib/.gitignore new file mode 100644 index 00000000000..10a0d3c90b2 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/.gitignore @@ -0,0 +1,7 @@ +*.sublime-workspace +.DS_Store +.esm-cache/ +dist/ +node_modules +npm-debug.log +.nyc_output diff --git a/packages/ojs/external-observablehq-stdlib/.prettierrc b/packages/ojs/external-observablehq-stdlib/.prettierrc new file mode 100644 index 00000000000..b4cd986af6b --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/.prettierrc @@ -0,0 +1,4 @@ +{ + "bracketSpacing": false, + "trailingComma": "none" +} diff --git a/packages/ojs/external-observablehq-stdlib/CONTRIBUTING.md b/packages/ojs/external-observablehq-stdlib/CONTRIBUTING.md new file mode 100644 index 00000000000..f9e2e81520c --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/CONTRIBUTING.md @@ -0,0 +1 @@ +See checklist for [publishing a new release](https://observablehq.com/@observablehq/publishing-new-open-source-releases). \ No newline at end of file diff --git a/packages/ojs/external-observablehq-stdlib/LICENSE b/packages/ojs/external-observablehq-stdlib/LICENSE new file mode 100644 index 00000000000..dfa2847a1a9 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/LICENSE @@ -0,0 +1,13 @@ +Copyright 2018-2022 Observable, Inc. + +Permission to use, copy, modify, and/or distribute this software for any purpose +with or without fee is hereby granted, provided that the above copyright notice +and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS +OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF +THIS SOFTWARE. diff --git a/packages/ojs/external-observablehq-stdlib/README.md b/packages/ojs/external-observablehq-stdlib/README.md new file mode 100644 index 00000000000..96f824ec7a6 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/README.md @@ -0,0 +1,982 @@ +# @quarto/external-observablehq-stdlib, a fork of @observablehq/stdlib + +We track here a number of small changes required to make the +observable stdlib work in the RStudio IDE. The important bits are: + +- The build process (and as a result `dist/stdlib.js`) needs to use a [fork of + `d3-require`](https://github.com/quarto-dev/external-d3-d3-require) to support a + require() function that works from inside IPython's HTMLwidgets as + well as the observable runtime. + +- We can't call `Object.fromEntries` because the RStudio IDE uses an + old version of the JS stdlib. + +# @observablehq/stdlib + +[![Node CI](https://github.com/observablehq/stdlib/workflows/Node%20CI/badge.svg)](https://github.com/observablehq/stdlib/actions?workflow=Node+CI) + +The Observable standard library. + +For examples, see https://observablehq.com/@observablehq/stdlib. + +## API Reference + +* [DOM](#dom) - create HTML and SVG elements. +* [Files](#files) - read local files into memory. +* [FileAttachments](#file-attachments) - read remote files. +* [Generators](#generators) - utilities for generators and iterators. +* [Promises](#promises) - utilities for promises. +* [require](#require) - load third-party libraries. +* [html](#html) - render HTML. +* [md](#markdown) - render Markdown. +* [svg](#svg) - render SVG. +* [tex](#tex) - render LaTeX. +* [now](#now) - the current value of Date.now. +* [width](#width) - the current page width. +* [invalidation](#invalidation) - dispose resources. +* [visibility](#visibility) - wait for visibility. + +### DOM + +# DOM.canvas(width, height) [<>](https://github.com/observablehq/stdlib/blob/main/src/dom/canvas.js "Source") + +Returns a new canvas element with the specified *width* and *height*. For example, to create a 960×500 canvas: + +```js +DOM.canvas(960, 500) +``` + +This is equivalent to using the [html](#html) tagged template literal: + +```js +html`` +``` + +If you are using [2D Canvas](https://www.w3.org/TR/2dcontext/) (rather than [WebGL](https://webglfundamentals.org/)), you should use [DOM.context2d](#DOM_context2d) instead of DOM.canvas for automatic pixel density scaling. + +# DOM.context2d(width, height[, dpi]) [<>](https://github.com/observablehq/stdlib/blob/main/src/dom/context2d.js "Source") + +Returns a new canvas context with the specified *width* and *height* and the specified device pixel ratio *dpi*. If *dpi* is not specified, it defaults to [*window*.devicePixelRatio](https://developer.mozilla.org/docs/Web/API/Window/devicePixelRatio). To access the context’s canvas, use [*context*.canvas](https://developer.mozilla.org/docs/Web/API/CanvasRenderingContext2D/canvas). For example, to create a 960×500 canvas: + +```js +{ + const context = DOM.context2d(960, 500); + return context.canvas; +} +``` + +If you are using [WebGL](https://webglfundamentals.org/) (rather than [2D Canvas](https://www.w3.org/TR/2dcontext/)), you should use [DOM.canvas](#DOM_canvas) or the [html](#html) tagged template literal instead of DOM.context2d. + +# DOM.download(object\[, name\]\[, value\]) [<>](https://github.com/observablehq/stdlib/blob/main/src/dom/download.js "Source") + +Returns an anchor element containing a button that when clicked will download a file representing the specified *object*. The *object* should be anything supported by [URL.createObjectURL](https://developer.mozilla.org/docs/Web/API/URL/createObjectURL) such as a [file](https://developer.mozilla.org/docs/Web/API/File) or a [blob](https://developer.mozilla.org/docs/Web/API/Blob). For example, to create a button to download a Canvas element as a PNG: + +```js +DOM.download(await new Promise(resolve => canvas.toBlob(resolve))) +``` + +The *object* may also be specified as a function, in which case the function is called when the download button is clicked. For example: + +```js +DOM.download(() => new Promise(resolve => canvas.toBlob(resolve))) +``` + +If the *object* is a promise, or if it is a function that returns a promise, the promise will be awaited before downloading. If necessary, an additional click may be required to download the asynchronous value. + +# DOM.element(name[, attributes]) [<>](https://github.com/observablehq/stdlib/blob/main/src/dom/element.js "Source") + +Returns a new element with the specified *name*. For example, to create an empty H1 element: + +```js +DOM.element("h1") +``` + +This is equivalent to using the [html](#html) tagged template literal: + +```js +html`

` +``` + +If *attributes* is specified, sets any attributes in the specified object before returning the new element. For example: + +```js +DOM.element("a", {target: "_blank"}) +``` + +This is equivalent to using the [html](#html) tagged template literal: + +```js +html`` +``` + +If the *name* has the prefix `svg:`, `math:` or `xhtml:`, uses [*document*.createElementNS](https://developer.mozilla.org/docs/Web/API/Document/createElementNS) instead of [*document*.createElement](https://developer.mozilla.org/docs/Web/API/Document/createElement). For example, to create an empty SVG element (see also [DOM.svg](#DOM_svg)): + +```js +DOM.element("svg:svg") +``` + +This is equivalent to using the [svg](#svg) (or [html](#html)) tagged template literal: + +```js +svg`` +``` + +In general, you probably want to use the [html](#html) or [svg](#svg) tagged template literal instead of DOM.element. + +# DOM.input([type]) [<>](https://github.com/observablehq/stdlib/blob/main/src/dom/input.js "Source") + +Returns a new input element with the specified *type*. If *type* is not specified or null, a text input is created. For example, to create a new file input: + +```js +DOM.input("file") +``` + +This is equivalent to using the [html](#html) tagged template literal: + +```js +html`` +``` + +In general, you probably want to use the [html](#html) tagged template literal instead of DOM.input. + +# DOM.range(\[min, \]\[max\]\[, step\]) [<>](https://github.com/observablehq/stdlib/blob/main/src/dom/range.js "Source") + +Returns a new range input element. (See also [DOM.input](#input).) If *max* is specified, sets the maximum value of the range to the specified number; if *max* is not specified or null, sets the maximum value of the range to 1. If *min* is specified, sets the minimum value of the range to the specified number; if *min* is not specified or null, sets the minimum value of the range to 0. If *step* is specified, sets the step value of the range to the specified number; if *step* is not specified or null, sets the step value of the range to `any`. For example, to create a slider that ranges the integers from -180 to +180, inclusive: + +```js +DOM.range(-180, 180, 1) +``` + +This is equivalent to using the [html](#html) tagged template literal: + +```js +html`` +``` + +In general, you probably want to use the [html](#html) tagged template literal instead of DOM.input. + +# DOM.select(values) [<>](https://github.com/observablehq/stdlib/blob/main/src/dom/select.js "Source") + +Returns a new select element with an option for each string in the specified *values* array. For example, to create a drop-down menu of three colors: + +```js +DOM.select(["red", "green", "blue"]) +``` + +This is equivalent to using the [html](#html) tagged template literal: + +```js +html`` +``` + +Or, from an array of data: + +```js +html`` +``` + +In general, you probably want to use the [html](#html) tagged template literal instead of DOM.select, particularly if you want greater control of the display, such as to customize the displayed option labels. + +# DOM.svg(width, height) [<>](https://github.com/observablehq/stdlib/blob/main/src/dom/svg.js "Source") + +Returns a new SVG element with the specified *width* and *height*. For example, to create a 960×500 blank SVG: + +```js +DOM.svg(960, 500) +``` + +This is equivalent to using the [svg](#svg) tagged template literal: + +```js +svg`` +``` + +To create responsive SVG, set the max-width to 100% and the height to auto: + +```js +svg`` +``` + +In general, you probably want to use the [html](#html) or [svg](#svg) tagged template literal instead of DOM.svg. + +# DOM.text(string) [<>](https://github.com/observablehq/stdlib/blob/main/src/dom/text.js "Source") + +Returns a new text node with the specified *string* value. For example, to say hello: + +```js +DOM.text("Hello, world!") +``` + +This is equivalent to using the [html](#html) tagged template literal: + + +```js +html`Hello, world!` +``` + +In general, you probably want to use the [html](#html) tagged template literal instead of DOM.text. + +# DOM.uid([name]) [<>](https://github.com/observablehq/stdlib/blob/main/src/dom/uid.js "Source") + +Returns a new unique *identifier*. If *name* is specified, the *identifier*.id will be derived from the specified *name*, which may be useful for debugging. If DOM.uid is called repeatedly with the same *name*, every returned *identifier* is still unique (that is, different). Identifiers are useful in SVG: use *identifier*.href for IRI references, such as the [xlink:href](https://www.w3.org/TR/SVG/animate.html#HrefAttribute) attribute; use *identifier*.toString for functional notation, such as the [clip-path](https://www.w3.org/TR/SVG/masking.html#ClipPathProperty) presentation attribute. + +For example, to [clip the Mona Lisa](https://observablehq.com/@mbostock/svg-clipping-test) to a circle of radius 320px: + +```js +{ + const clip = DOM.uid("clip"); + return svg` + + + + + + +`; +} +``` + +The use of DOM.uid is strongly recommended over hand-coding as it ensures that your identifiers are still unique if your code is imported into another notebook. Because *identifier*.href and *identifier*.toString return absolute rather than local IRIs, it also works well in conjunction with a notebook’s [base URL](https://developer.mozilla.org/docs/Web/HTML/Element/base). + +### Files + +See [Reading Local Files](https://observablehq.com/@mbostock/reading-local-files) for examples. + +# Files.buffer(file) [<>](https://github.com/observablehq/stdlib/blob/main/src/files/buffer.js "Source") + +Reads the specified *file*, returning a promise of the ArrayBuffer yielded by [*fileReader*.readAsArrayBuffer](https://developer.mozilla.org/docs/Web/API/FileReader/readAsArrayBuffer). This is useful for reading binary files, such as shapefiles and ZIP archives. + +# Files.text(file) [<>](https://github.com/observablehq/stdlib/blob/main/src/files/text.js "Source") + +Reads the specified *file*, returning a promise of the string yielded by [*fileReader*.readAsText](https://developer.mozilla.org/docs/Web/API/FileReader/readAsText). This is useful for reading text files, such as plain text, CSV, Markdown and HTML. + +# Files.url(file) [<>](https://github.com/observablehq/stdlib/blob/main/src/files/url.js "Source") + +Reads the specified *file*, returning a promise of the data URL yielded by [*fileReader*.readAsDataURL](https://developer.mozilla.org/docs/Web/API/FileReader/readAsDataURL). This is useful for reading a file into memory, represented as a data URL. For example, to display a local file as an image: + +```js +Files.url(file).then(url => { + var image = new Image; + image.src = url; + return image; +}) +``` + +A data URL may be significantly less efficient than [URL.createObjectURL](https://developer.mozilla.org/docs/Web/API/URL/createObjectURL) method for large files. For example: + +```js +{ + const image = new Image; + image.src = URL.createObjectURL(file); + invalidation.then(() => URL.revokeObjectURL(image.src)); + return image; +} +``` + +### File Attachments + +See [File Attachments](https://observablehq.com/@observablehq/file-attachments) on Observable for examples. + +# FileAttachment(name) [<>](https://github.com/observablehq/stdlib/blob/main/src/fileAttachment.js "Source") + +Returns the file attachment with the given *name*, or throws an error if there is no file with the given name. + +```js +photo = FileAttachment("sunset.jpg") +``` + +FileAttachments work similarly to the [Fetch API](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch), providing methods that return promises to the file’s contents in a handful of convenient forms. + +# *attachment*.url() [<>](https://github.com/observablehq/stdlib/blob/main/src/fileAttachment.js "Source") + +Returns a promise to the URL at which the file may be retrieved. + +```js +const url = await FileAttachment("file.txt").url(); +``` + +# *attachment*.text() [<>](https://github.com/observablehq/stdlib/blob/main/src/fileAttachment.js "Source") + +Returns a promise to the file’s contents as a JavaScript string. + +```js +const hello = await FileAttachment("hello.txt").text(); +``` + +# *attachment*.json() [<>](https://github.com/observablehq/stdlib/blob/main/src/fileAttachment.js "Source") + +Returns a promise to the file’s contents, parsed as JSON into JavaScript values. + +```js +const logs = await FileAttachment("weekend-logs.json").json(); +``` + +# *attachment*.csv({array = false, typed = false} = {}) [<>](https://github.com/observablehq/stdlib/blob/main/src/fileAttachment.js "Source") + +Returns a promise to the file’s contents, parsed as comma-separated values (CSV) into an array. + +```js +const data = await FileAttachment("cars.csv").csv(); +``` + +If array is true, an array of arrays is returned; otherwise, the first row is assumed to be the header row and an array of objects is returned, and the returned array has a data.columns property that is an array of column names. (See d3.csvParseRows.) If typed is true, [automatic type inference](https://observablehq.com/@d3/d3-autotype) is applied; only use this feature if you know your data is compatible. + +# *attachment*.tsv({array = false, typed = false} = {}) [<>](https://github.com/observablehq/stdlib/blob/main/src/fileAttachment.js "Source") + +Returns a promise to the file’s contents, parsed as tab-separated values (TSV) into an array. + +```js +const data = await FileAttachment("cars.tsv").tsv(); +``` + +If array is true, an array of arrays is returned; otherwise, the first row is assumed to be the header row and an array of objects is returned, and the returned array has a data.columns property that is an array of column names. (See d3.tsvParseRows.) If typed is true, [automatic type inference](https://observablehq.com/@d3/d3-autotype) is applied to each row independently; if typed is “auto”, the type inference is based on a sample of rows. Only use this feature if you know your data is compatible. + +# *attachment*.image(options) [<>](https://github.com/observablehq/stdlib/blob/main/src/fileAttachment.js "Source") + +Returns a promise to a file loaded as an [Image](https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/Image). The promise resolves when the image has finished loading, making this useful for reading the image pixels in Canvas, or for loading the image into a WebGL texture. Consider [*attachment*.url](#attachment_url) if you want to embed an image in HTML or Markdown. + +```js +const image = await FileAttachment("sunset.jpg").image(); +``` + +If desired, additional image properties can be passed in as *options*. + +```js +const image = await FileAttachment("sunset.jpg").image({width: 400, height: 400}); +``` + +# *attachment*.arrayBuffer() [<>](https://github.com/observablehq/stdlib/blob/main/src/fileAttachment.js "Source") + +Returns a promise to the file’s contents as an [ArrayBuffer](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/ArrayBuffer). + +```js +const city = shapefile.read(await FileAttachment("sf.shp").arrayBuffer()); +``` + +# *attachment*.stream() [<>](https://github.com/observablehq/stdlib/blob/main/src/fileAttachment.js "Source") + +Returns a promise to a [ReadableStream](https://developer.mozilla.org/en-US/docs/Web/API/Streams_API) of the file’s contents. + +```js +const stream = await FileAttachment("metrics.csv").stream(); +const reader = stream.getReader(); +let done, value; +while (({done, value} = await reader.read()), !done) { + yield value; +} +``` + +# *attachment*.blob() [<>](https://github.com/observablehq/stdlib/blob/main/src/fileAttachment.js "Source") + +Returns a promise to a [Blob](https://developer.mozilla.org/en-US/docs/Web/API/Blob) containing the raw contents of the file. + +```js +const blob = await FileAttachment("binary-data.dat").blob(); +``` + +# *attachment*.sqlite() [<>](https://github.com/observablehq/stdlib/blob/main/src/fileAttachment.js "Source") + +Returns a promise to the file loaded as a [SQLite database client](https://observablehq.com/@observablehq/databases). + +```js +const db = await FileAttachment("chinook.db").sqlite(); +``` + +# *attachment*.xlsx() [<>](https://github.com/observablehq/stdlib/blob/main/src/xlsx.js "Source") + +Returns a promise to the file loaded as a [Workbook](https://observablehq.com/@observablehq/xlsx). + +```js +const workbook = await FileAttachment("profit-and-loss.xlsx").xlsx(); +const sheet = workbook.sheet("Sheet1", {range: "B4:AF234", headers: true}); +``` + +# *attachment*.xml() [<>](https://github.com/observablehq/stdlib/blob/main/src/fileAttachment.js "Source") + +Returns a promise to an [XMLDocument](https://developer.mozilla.org/en-US/docs/Web/API/XMLDocument) containing the contents of the file. + +```js +const document = await FileAttachment("cars.xml").xml(); +``` + +# *attachment*.html() [<>](https://github.com/observablehq/stdlib/blob/main/src/fileAttachment.js "Source") + +Returns a promise to an [HTMLDocument](https://developer.mozilla.org/en-US/docs/Web/API/HTMLDocument) containing the contents of the file. + +```js +const document = await FileAttachment("index.html").html(); +``` + +# *attachment*.zip() [<>](https://github.com/observablehq/stdlib/blob/main/src/fileAttachment.js "Source") + +Returns a promise to a [ZipArchive](#zip-archives) containing the contents of the file. + +```js +const archive = await FileAttachment("archive.zip").zip(); +``` + +# FileAttachments(resolve) [<>](https://github.com/observablehq/stdlib/blob/main/src/fileAttachment.js "Source") + +*Note: this function is not part of the Observable standard library (in notebooks), but is provided by this module as a means for defining custom file attachment implementations when working directly with the Observable runtime.* + +Returns a [*FileAttachment*](#FileAttachment) function given the specified *resolve* function. The *resolve* function is a function that takes a *name* and returns either an object {url, mimeType} representing the requested file if it exists, or null if the file does not exist. The url field (though not the object itself!) may be represented as a Promise if the URL is not yet known, such as for a file that is currently being uploaded. The mimeType must be a string, or undefined if the mime type is not known. For backwards compatibility, the *resolve* function may instead return just a URL, either a string or a promise. + +#### Zip archives + +# *archive*.filenames [<>](https://github.com/observablehq/stdlib/blob/main/src/fileAttachment.js "Source") + +Returns an array of paths representing the files contained within the archive. + +```js +const archive = await FileAttachment("archive.zip").zip(); +console.log(archive.filenames); +``` + +# *archive*.file(path) [<>](https://github.com/observablehq/stdlib/blob/main/src/fileAttachment.js "Source") + +Returns a [file attachment](#file-attachments) for the file with the specified *path*. One of the file attachment methods can then be called to access the contents of the file. For example, to read a text file, use [*attachment*.text](#attachment_text). + +```js +const archive = await FileAttachment("archive.zip").zip(); +const text = await archive.file("readme.txt").text(); +``` + +### Generators + +# Generators.disposable(value, dispose) [<>](https://github.com/observablehq/stdlib/blob/main/src/generators/disposable.js "Source") + +Returns a new generator that yields the specified *value* exactly once. The [*generator*.return](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Generator/return) method of the generator will call the specified *dispose* function, passing in the specified *value*. When this generator is the return value of a cell, this allows resources associated with the specified *value* to be disposed automatically when a cell is re-evaluated: *generator*.return is called by the Observable runtime on invalidation. For example, to define a cell that creates a self-disposing [Tensor](https://js.tensorflow.org/): + +```js +x = Generators.disposable(tf.tensor2d([[0.0, 2.0], [4.0, 6.0]]), x => x.dispose()) +``` + +See also [invalidation](#invalidation). + +# Generators.filter(iterator, test) [<>](https://github.com/observablehq/stdlib/blob/main/src/generators/filter.js "Source") + +Returns a generator that yields a subset of values from the specified *iterator*, if and only if the specified *test* function returns truthy for the given value. The *test* function is invoked with the current value from the *iterator* and the current index, starting at 0 and increasing by one. For example, to yield only odd integers in [0, 100]: + +```js +x = Generators.filter(Generators.range(100), x => x & 1) +``` + +This method assumes that the specified *iterator* is synchronous; if the *iterator* yields a promise, this method does not wait for the promise to resolve before continuing. If the specified *iterator* is a generator, this method also does not (currently) wrap the specified generator’s [return](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Generator/return) and [throw](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Generator/throw) methods. + +# Generators.input(input) [<>](https://github.com/observablehq/stdlib/blob/main/src/generators/input.js "Source") + +Returns a new generator that yields promises to the current value of the specified *input* element; each promise resolves when the *input* element emits an event. (The promise resolves when the event is emitted, even if the value of the input is unchanged.) If the initial value of the *input* is not undefined, the returned generator’s first yielded value is a resolved promise with the initial value of the *input*. + +The type of event that triggers promise resolution depends on the *input*.type as follows: + +* For button, submit and checkbox inputs, *click* events. +* For file inputs, *change* events. +* For all other types, *input* events. + +The resolved value is likewise dependent on the *input*.type as follows: + +* For range and number inputs, *input*.valueAsNumber. +* For date inputs, *input*.valueAsDate. +* For checkbox inputs, *input*.checked. +* For single-file inputs (*input*.multiple is falsey), *input*.files[0]. +* For multi-file inputs (*input*.multiple is truthy), *input*.files. +* For all other types, *input*.value. + +The specified *input* need not be an HTMLInputElement, but it must support the *target*.addEventListener and *target*.removeEventListener methods of the [EventTarget interface](https://developer.mozilla.org/docs/Web/API/EventTarget/addEventListener). + +Generators.input is used by Observable’s [viewof operator](https://observablehq.com/@observablehq/a-brief-introduction-to-viewof) to define the current value of a view, and is based on [Generators.observe](#Generators_observe). One often does not use Generators.input directly, but it can be used to define a [generator cell](https://observablehq.com/@mbostock/generator-cells-functions-and-objects) exposing the current value of an input, and you can also read the yielded values by hand. For example, to accumulate the first four values: + +```js +{ + const values = []; + for (const value of Generators.input(element)) { + if (values.push(await value) >= 4) { + return values; + } + } +} +``` + +Generators.input is lossy and may skip values: if more than one event is emitted before the next promise is pulled from the generator (more than once per animation frame), then the next promise returned by the generator will be resolved with the latest *input* value, potentially skipping intermediate values. See [Generators.queue](#Generators_queue) for a non-debouncing generator. + +# Generators.map(iterator, transform) [<>](https://github.com/observablehq/stdlib/blob/main/src/generators/map.js "Source") + +Returns a generator that yields transformed values from the specified *iterator*, applying the specified *transform* function to each value. The *transform* function is invoked with the current value from the *iterator* and the current index, starting at 0 and increasing by one. For example, to yield perfect squares: + +```js +x = Generators.map(Generators.range(100), x => x * x) +``` + +This method assumes that the specified *iterator* is synchronous; if the *iterator* yields a promise, this method does not wait for the promise to resolve before continuing. If the specified *iterator* is a generator, this method also does not (currently) wrap the specified generator’s [return](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Generator/return) and [throw](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Generator/throw) methods. + +# Generators.observe(initialize) [<>](https://github.com/observablehq/stdlib/blob/main/src/generators/observe.js "Source") + +Returns a generator that yields promises to an observable value, adapting a push-based data source (such as an [Observable](https://github.com/tc39/proposal-observable/blob/master/README.md), an [EventEmitter](https://nodejs.org/api/events.html#events_class_eventemitter) or an [EventTarget](https://developer.mozilla.org/docs/Web/API/EventTarget)) to a pull-based one. + +The specified *initialize* function is invoked before Generators.observe returns, being passed a *change* function; calling *change* triggers the resolution of the current promise with the passed value. The *initialize* function may also return a *dispose* function; this function will be called when the generator is [disposed](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Generator/return). (See [invalidation](#invalidation).) + +For example, to observe the current value of a text input element, you might say: + +```js +Generators.observe(change => { + + // An event listener to yield the element’s new value. + const inputted = () => change(element.value); + + // Attach the event listener. + element.addEventListener("input", inputted); + + // Yield the element’s initial value. + change(element.value); + + // Detach the event listener when the generator is disposed. + return () => element.removeEventListener("input", inputted); +}) +``` + +(See also [Generators.input](#Generators_input).) + +Generators.observe is typically used to define a [generator cell](https://observablehq.com/@mbostock/generator-cells-functions-and-objects), but you can also read the yielded values by hand. For example, to accumulate the first four values: + +```js +{ + const generator = Generators.observe(…); + const values = []; + for (const value of generator) { + if (values.push(await value) >= 4) { + return values; + } + } +} +``` + +Generators.observe is lossy and may skip values: if *change* is called more than once before the next promise is pulled from the generator (more than once per animation frame), then the next promise returned by the generator will be resolved with the latest value passed to *change*, potentially skipping intermediate values. See [Generators.queue](#Generators_queue) for a non-debouncing generator. + +# Generators.queue(initialize) [<>](https://github.com/observablehq/stdlib/blob/main/src/generators/queue.js "Source") + +Returns a generator that yields promises to an observable value, adapting a push-based data source (such as an [Observable](https://github.com/tc39/proposal-observable/blob/master/README.md), an [EventEmitter](https://nodejs.org/api/events.html#events_class_eventemitter) or an [EventTarget](https://developer.mozilla.org/docs/Web/API/EventTarget)) to a pull-based one. The specified *initialize* function is invoked before Generators.queue returns, being passed a *change* function; calling *change* triggers the resolution of the current promise with the passed value. The *initialize* function may also return a *dispose* function; this function will be called when the generator is [disposed](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Generator/return). (See [invalidation](#invalidation).) + +For example, to observe the value of a text input element, you might say: + +```js +Generators.queue(change => { + + // An event listener to yield the element’s new value. + const inputted = () => change(element.value); + + // Attach the event listener. + element.addEventListener("input", inputted); + + // Yield the element’s initial value. + change(element.value); + + // Detach the event listener when the generator is disposed. + return () => element.removeEventListener("input", inputted); +}) +``` + +(See also [Generators.input](#Generators_input).) + +Generators.queue is typically used to define a [generator cell](https://observablehq.com/@mbostock/generator-cells-functions-and-objects), but you can also read the yielded values by hand. For example, to accumulate the first four values: + +```js +{ + const generator = Generators.queue(…); + const values = []; + for (const value of generator) { + if (values.push(await value) >= 4) { + return values; + } + } +} +``` + +Generators.queue is non-lossy and, as a result, may yield “stale” values: if *change* is called more than once before the next promise is pulled from the generator (more than once per animation frame), the passed values are queued in order and the generator will return resolved promises until the queue is empty again. See [Generators.observe](#Generators_observe) for a debouncing generator. + +# Generators.range([start, ]stop[, step]) [<>](https://github.com/observablehq/stdlib/blob/main/src/generators/range.js "Source") + +Returns a generator yielding an arithmetic progression, similar to the Python built-in [range](https://docs.python.org/3/library/stdtypes.html#typesseq-range). This method is often used to iterate over a sequence of uniformly-spaced numeric values, such as the indexes of an array or the ticks of a linear scale. (See also [d3.range](https://github.com/d3/d3-array/blob/main/README.md#range).) + +For example, to iterator over the integers from 0 to 100: + +```js +i = { + for (const i of Generators.range(0, 100, 1)) { + yield i; + } +} +``` + +Or more simply: + +```js +i = Generators.range(100) +``` + +If *step* is omitted, it defaults to 1. If *start* is omitted, it defaults to 0. The *stop* value is exclusive; it is not included in the result. If *step* is positive, the last element is the largest *start* + *i* \* *step* less than *stop*; if *step* is negative, the last element is the smallest *start* + *i* \* *step* greater than *stop*. If the returned array would contain an infinite number of values, an empty range is returned. + +The arguments are not required to be integers; however, the results are more predictable if they are. The values in the returned array are defined as *start* + *i* \* *step*, where *i* is an integer from zero to the total number of elements in the returned array minus one. For example: + +```js +Generators.range(0, 1, 0.2) // 0, 0.2, 0.4, 0.6000000000000001, 0.8 +``` + +This unexpected behavior is due to IEEE 754 double-precision floating point, which defines 0.2 * 3 = 0.6000000000000001. Use [d3-format](https://github.com/d3/d3-format) to format numbers for human consumption with appropriate rounding. + +Likewise, if the returned array should have a specific length, consider using [*array*.map](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array/map) on an integer range. For example: + +```js +[...Generators.range(0, 1, 1 / 49)] // BAD: returns 50 elements! +``` + +```js +[...Generators.range(49)].map(d => d / 49) // GOOD: returns 49 elements. +``` + + +# Generators.valueAt(iterator, index) [<>](https://github.com/observablehq/stdlib/blob/main/src/generators/valueAt.js "Source") + +Returns the value from the specified *iterator* at the specified *index*. For example, to return the first element from the iterator: + +```js +first = Generators.valueAt(iterator, 0) +``` + +This method assumes that the specified *iterator* is synchronous; if the *iterator* yields a promise, this method does not wait for the promise to resolve before continuing. + +# Generators.worker(source) [<>](https://github.com/observablehq/stdlib/blob/main/src/generators/worker.js "Source") + +Returns a new [disposable generator](#Generators_disposable) that yields a [dedicated Worker](https://developer.mozilla.org/docs/Web/API/Web_Workers_API) running the specified JavaScript *source*. For example, to create a worker that echos messages sent to it: + +```js +worker = Generators.worker(` +onmessage = function({data}) { + postMessage({echo: data}); +}; +`) +``` + +The worker will be automatically [terminated](https://developer.mozilla.org/docs/Web/API/Worker/terminate) when [*generator*.return](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Generator/return) is called. + +### Promises + +# Promises.delay(duration[, value]) [<>](https://github.com/observablehq/stdlib/blob/main/src/promises/delay.js "Source") + +Returns a promise that resolves with the specified *value* after the specified *duration* in milliseconds. For example, to define a cell that increments approximately every second: + +```js +i = { + let i = 0; + yield i; + while (true) { + yield Promises.delay(1000, ++i); + } +} +``` + +If you desire precise synchronization, such as a timer that ticks exactly every second, use [Promises.tick](#Promises_tick) instead of Promises.delay. + +# Promises.tick(duration[, value]) [<>](https://github.com/observablehq/stdlib/blob/main/src/promises/tick.js "Source") + +Returns a promise that resolves with the specified *value* at the next integer multiple of *milliseconds* since the UNIX epoch. This is much like [Promises.delay](#Promises_delay), except it allows promises to be synchronized. For example, to define a cell that increments every second, on the second: + +```js +i = { + let i = 0; + yield i; + while (true) { + yield Promises.tick(1000, ++i); + } +} +``` + +Or, as an async generator: + +```js +i = { + let i = 0; + while (true) { + yield i++; + await Promises.tick(1000); + } +} +``` + +# Promises.when(date[, value]) [<>](https://github.com/observablehq/stdlib/blob/main/src/promises/when.js "Source") + +Returns a promise that resolves with the specified *value* at the specified *date*. This method relies on [setTimeout](https://developer.mozilla.org/docs/Web/API/WindowOrWorkerGlobalScope/setTimeout), and thus the specified *date* must be no longer than 2,147,483,647 milliseconds (24.9 days) from now. + +### Specials + +# invalidation + +A promise that resolves when the current cell is re-evaluated: when the cell’s code changes, when it is run using Shift-Enter, or when a referenced input changes. This promise is typically used to dispose of resources that were allocated by the cell. For example, to abort a fetch if the cell is invalidated: + +```js +{ + const controller = new AbortController; + invalidation.then(() => controller.abort()); + const response = await fetch(url, {signal: controller.signal}); + return response.json(); +} +``` + +The invalidation promise is provided by the runtime rather than the standard library because it resolves to a new promise each time a cell is evaluated. See also [Generators.disposable](#Generators_disposable). + +# now [<>](https://github.com/observablehq/stdlib/blob/main/src/now.js "Source") + +The current value of [Date.now](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Date/now). For example, to display the current time in Markdown: + +```js +md`The current time is: ${new Date(now).toISOString()}` +``` + +# width [<>](https://github.com/observablehq/stdlib/blob/main/src/width.js "Source") + +The current width of cells. For example, to make a rounded rectangle in SVG that resizes to fit the page: + +```js +html` + +` +``` + +# visibility([value]) [<>](https://github.com/observablehq/runtime/blob/main/src/runtime.js "Source") + +Returns a promise that resolves with the specified *value* when this cell is visible in the viewport. The visibility function is provided by the runtime rather than the standard library because it resolves to a different function for each cell. + +### HTML + +# html\`string\` [<>](https://github.com/observablehq/stdlib/blob/main/src/html.js "Source") + +Returns the HTML element represented by the specified HTML *string* literal. This function is intended to be used as a [tagged template literal](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Template_literals#Tagged_template_literals_and_escape_sequences). Leading and trailing whitespace is automatically trimmed. For example, to create an H1 element whose content is “Hello, world!”: + +```js +html`

Hello, world!` +``` + +If the resulting HTML fragment is not a single HTML element or node, is it wrapped in a DIV element. For example, this expression: + +```js +html`Hello, world!` +``` + +Is equivalent to this expression: + +```js +html`
Hello, world!
` +``` + +If an embedded expression is a DOM element, it is embedded in generated HTML. For example, to embed [TeX](#tex) within HTML: + +```js +html`I like ${tex`\KaTeX`} for math.` +``` + +If an embedded expression is an array, the elements of the array are embedded in the generated HTML. For example, to create a table from an array of values: + +```js +html` + ${["zero", "one", "two"].map((name, i) => html` + + `)} +
${name}${i}
` +``` + +# svg\`string\` [<>](https://github.com/observablehq/stdlib/blob/main/src/svg.js "Source") + +Returns the SVG element represented by the specified SVG *string* literal. This function is intended to be used as a [tagged template literal](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Template_literals#Tagged_template_literals_and_escape_sequences). Leading and trailing whitespace is automatically trimmed. For example, to create an SVG element whose content is a circle: + +```js +svg` + +` +``` + +If the resulting SVG fragment is not a single SVG element, is it wrapped in a G element. For example, this expression: + +```js +svg` + + +` +``` + +Is equivalent to this expression: + +```js +svg` + + +` +``` + +If an embedded expression is a DOM element, it is embedded in generated SVG. If an embedded expression is an array, the elements of the array are embedded in the generated SVG. + +### Markdown + +# md\`string\` [<>](https://github.com/observablehq/stdlib/blob/main/src/md.js "Source") + +Returns the HTML element represented by the specified Markdown *string* literal. Implemented by [Marked](https://github.com/markedjs/marked). Leading and trailing whitespace is automatically trimmed. For example, to create an H1 element whose content is “Hello, world!”: + +```js +md`# Hello, world!` +``` + +If an embedded expression is a DOM element, it is embedded in generated HTML. For example, to embed [LaTeX](#tex) within Markdown: + +```js +md`My *favorite* number is ${tex`\tau`}.` +``` + +If an embedded expression is an array, the elements of the array are embedded in the generated HTML. The elements may either be strings, which are interpreted as Markdown, or DOM elements. For example, given an array of data: + +```js +elements = [ + {symbol: "Co", name: "Cobalt", number: 27}, + {symbol: "Cu", name: "Copper", number: 29}, + {symbol: "Sn", name: "Tin", number: 50}, + {symbol: "Pb", name: "Lead", number: 82} +] +``` + +To create a table: + +```js +md` +| Name | Symbol | Atomic number | +|-----------|-------------|---------------|${elements.map(e => ` +| ${e.name} | ${e.symbol} | ${e.number} |`)} +` +``` + +### TeX + +# tex\`string\` [<>](https://github.com/observablehq/stdlib/blob/main/src/tex.js "Source") + +Returns the HTML element represented by the specified LaTeX *string* literal. Implemented by [KaTeX](https://github.com/Khan/KaTeX). + +```js +tex`E = mc^2` +``` + +# tex.block\`string\` [<>](https://github.com/observablehq/stdlib/blob/main/src/tex.js "Source") + +Equivalent to [tex](#tex), but uses KaTeX’s display mode to produce a bigger block element rather than a smaller inline element. + +```js +tex.block`E = mc^2` +``` + +# tex.options(options) [<>](https://github.com/observablehq/stdlib/blob/main/src/tex.js "Source") + +Returns a function equivalent to [tex](#tex), but with the specified *options*. + +```js +tex.options({displayMode: true})`E = mc^2` +``` + +### require + +# require(names…) [<>](https://github.com/d3/d3-require/blob/main/index.js "Source") + +Returns a promise of the [asynchronous module definition](https://github.com/amdjs/amdjs-api/blob/master/AMD.md) (AMD) with the specified *names*, loaded from npm. Each module *name* can be a package (or scoped package) name optionally followed by the at sign (`@`) and a semver range. For example, to load [d3-array](https://github.com/d3/d3-array): + +```js +d3 = require("d3-array") +``` + +Or, to load [d3-array](https://github.com/d3/d3-array) and [d3-color](https://github.com/d3/d3-color) and merge them into a single object: + +```js +d3 = require("d3-array", "d3-color") +``` + +Or, to load [d3-array](https://github.com/d3/d3-array) 1.1.x: + +```js +d3 = require("d3-array@1.1") +``` + +See [d3-require](https://github.com/d3/d3-require) for more information. + +# require.resolve(name) [<>](https://github.com/d3/d3-require/blob/main/index.js "Source") + +Returns a promise to the resolved URL to require the module with the specified *name*. For example: + +```js +require.resolve("d3-array") // "https://cdn.jsdelivr.net/npm/d3-array@2.0.3/dist/d3-array.min.js" +``` + +# require.alias(aliases) [<>](https://github.com/d3/d3-require/blob/main/index.js "Source") + +Returns a [require function](#require) with the specified *aliases*. For each key in the specified *aliases* object, any require of that key is substituted with the corresponding value. For example: + +```js +React = require("react@16/umd/react.production.min.js") +``` +```js +ReactDOM = require("react-dom@16/umd/react-dom.production.min.js") +``` +```js +Semiotic = require.alias({"react": React, "react-dom": ReactDOM})("semiotic@1") +``` + +Equivalently: + +```js +r = require.alias({ + "react": "react@16/umd/react.production.min.js", + "react-dom": "react-dom@16/umd/react-dom.production.min.js", + "semiotic": "semiotic@1" +}) +``` + +Then to require the libraries: + +```js +React = r("react") +``` +```js +ReactDOM = r("react-dom") +``` +```js +Semiotic = r("semiotic") +``` + +## Installing + +The Observable standard library is built-in to Observable, so you don’t normally need to install or instantiate it directly. If you use NPM, `npm install @observablehq/stdlib`. + +# Library([resolve]) [<>](https://github.com/observablehq/stdlib/blob/main/src/library.js "Source") + +Returns a new standard library object. If a *resolve* function is specified, it is a function that returns a promise to the URL of the module with the specified *name*; this is used internally by [require](#require) (and by extension, [md](#md) and [tex](#tex)). See [d3-require](https://github.com/d3/d3-require/blob/main/README.md) for details. + +For example, to create the default standard library, and then use it to create a [canvas](#DOM_canvas): + +```js +const library = new Library(); +const canvas = library.DOM.canvas(960, 500); +``` + +The properties on the returned *library* instance correspond to the symbols (documented above) that are available in Observable notebooks. However, note that the library fields (such as *library*.now) are *definitions*, not values: the values may be wrapped in a function which, when invoked, returns the corresponding value. + +# Library.resolve(name[, base]) [<>](https://github.com/observablehq/stdlib/blob/main/src/library.js "Source") + +An alias for [d3.require.resolve](https://github.com/d3/d3-require/blob/main/README.md#require_resolve). diff --git a/packages/ojs/external-observablehq-stdlib/bin/resolve-dependencies.js b/packages/ojs/external-observablehq-stdlib/bin/resolve-dependencies.js new file mode 100644 index 00000000000..e04c7ff74f8 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/bin/resolve-dependencies.js @@ -0,0 +1,119 @@ +const extensionRe = /\.[^/]*$/; +const mains = ["unpkg", "jsdelivr", "browser", "main"]; + +(async () => { + console.log(`import {dependency} from "./dependency.js";`); + { + const info = await resolve("d3"); + console.log(`export const d3 = dependency("${info.name}", "${info.version}", "${info.export}");`); + } + { + const info = await resolve("@observablehq/inputs"); + console.log(`export const inputs = dependency("${info.name}", "${info.version}", "${info.export}");`); + } + { + const info = await resolve("@observablehq/plot"); + console.log(`export const plot = dependency("${info.name}", "${info.version}", "${info.export}");`); + } + { + const info = await resolve("@observablehq/graphviz"); + console.log(`export const graphviz = dependency("${info.name}", "${info.version}", "${info.export}");`); + } + { + const info = await resolve("@observablehq/highlight.js"); + console.log(`export const highlight = dependency("${info.name}", "${info.version}", "${info.export}");`); + } + { + const info = await resolve("@observablehq/katex"); + console.log(`export const katex = dependency("${info.name}", "${info.version}", "${info.export}");`); + } + { + const info = await resolve("lodash"); + console.log(`export const lodash = dependency("${info.name}", "${info.version}", "${info.export.replace(/\.js$/, ".min.js")}");`); + } + { + const info = await resolve("htl"); + console.log(`export const htl = dependency("${info.name}", "${info.version}", "${info.export}");`); + } + { + const info = await resolve("jszip"); + console.log(`export const jszip = dependency("${info.name}", "${info.version}", "dist/jszip.min.js");`); + } + { + const info = await resolve("marked@0.3.12"); + console.log(`export const marked = dependency("${info.name}", "${info.version}", "marked.min.js");`); + } + { + const info = await resolve("sql.js"); + console.log(`export const sql = dependency("${info.name}", "${info.version}", "${info.export}");`); + } + { + const info = await resolve("vega"); + console.log(`export const vega = dependency("${info.name}", "${info.version}", "${info.export}");`); + } + { + const info = await resolve("vega-lite"); + console.log(`export const vegalite = dependency("${info.name}", "${info.version}", "${info.export}");`); + } + { + const info = await resolve("vega-lite-api"); + console.log(`export const vegaliteApi = dependency("${info.name}", "${info.version}", "${info.export}");`); + } + { + const info = await resolve("apache-arrow@4"); + console.log(`export const arrow4 = dependency("${info.name}", "${info.version}", "${info.export}");`); + } + { + const info = await resolve("apache-arrow@9"); + console.log(`export const arrow9 = dependency("${info.name}", "${info.version}", "+esm");`); + } + { + const info = await resolve("apache-arrow@11"); + console.log(`export const arrow11 = dependency("${info.name}", "${info.version}", "+esm");`); + } + { + const info = await resolve("arquero"); + console.log(`export const arquero = dependency("${info.name}", "${info.version}", "${info.export}");`); + } + { + const info = await resolve("topojson-client"); + console.log(`export const topojson = dependency("${info.name}", "${info.version}", "${info.export}");`); + } + { + const info = await resolve("exceljs"); + console.log(`export const exceljs = dependency("${info.name}", "${info.version}", "${info.export}");`); + } + { + const info = await resolve("mermaid"); + console.log(`export const mermaid = dependency("${info.name}", "${info.version}", "${info.export.replace(/\.core\.js$/, ".min.js")}");`); + } + { + const info = await resolve("leaflet"); + console.log(`export const leaflet = dependency("${info.name}", "${info.version}", "${info.export.replace(/-src\.js$/, ".js")}");`); + } + { + const info = await resolve("@duckdb/duckdb-wasm"); + console.log(`export const duckdb = dependency("${info.name}", "${info.version}", "+esm");`); + } +})(); + +async function resolve(specifier) { + const response = await fetch(`https://cdn.jsdelivr.net/npm/${specifier}/package.json`); + const info = await response.json(); + return { + name: info.name, + version: info.version, + export: main(info) + }; +} + +// https://github.com/d3/d3-require/blob/4056a786912e9335a86b41c2b1cdfa392bd14289/src/index.js#L20-L27 +function main(meta) { + for (const key of mains) { + const value = meta[key]; + if (typeof value === "string") { + return (extensionRe.test(value) ? value : `${value}.js`).replace(/^\.\//, ""); + } + } + return "index.js"; +} diff --git a/packages/ojs/external-observablehq-stdlib/package.json b/packages/ojs/external-observablehq-stdlib/package.json new file mode 100644 index 00000000000..1a6dc6e7b98 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/package.json @@ -0,0 +1,39 @@ +{ + "name": "external-observablehq-stdlib", + "version": "5.8.4", + "author": { + "name": "Quarto authors, RStudio, PBC.", + "url": "https://quarto.org" + }, + "license": "ISC", + "type": "module", + "main": "src/index.js", + "module": "src/index.js", + "jsdelivr": "dist/stdlib.js", + "unpkg": "dist/stdlib.js", + "exports": { + "umd": "./dist/stdlib.js", + "default": "./src/index.js" + }, + "repository": { + "type": "git", + "url": "https://github.com/quarto-dev/quarto.git" + }, + "files": [ + "dist/**/*.js", + "src/**/*.js" + ], + "engines": { + "node": ">=14.5.0" + }, + "scripts": { + "test": "mocha 'test/**/*-test.js' && eslint src test", + "prepublishOnly": "rm -rf dist && rollup -c", + "postpublish": "git push && git push --tags" + }, + "dependencies": { + "d3-array": "^3.2.0", + "d3-dsv": "^3.0.1", + "external-d3-d3-require": "*" + } +} diff --git a/packages/ojs/external-observablehq-stdlib/rollup.config.js b/packages/ojs/external-observablehq-stdlib/rollup.config.js new file mode 100644 index 00000000000..256503709c6 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/rollup.config.js @@ -0,0 +1,35 @@ +import node from "@rollup/plugin-node-resolve"; +import {terser} from "rollup-plugin-terser"; +import meta from "./package.json" assert {type: "json"}; + +const copyright = `// @quarto/external-observablehq-stdlib ${meta.version} Fork changes are Copyright ${( +new Date).getFullYear()} RStudio, PBC.// @observablehq/stdlib v${meta.version} Copyright ${(new Date).getFullYear()} Observable, Inc.`; + +export default [ + { + input: "src/index.js", + plugins: [ + node(), + terser({ + output: {preamble: copyright}, + mangle: { + reserved: [ + "FileAttachment", + "RequireError", + "DuckDBClient", + "SQLiteDatabaseClient", + "Workbook", + "ZipArchive", + "ZipArchiveEntry" + ] + } + }) + ], + output: { + format: "umd", + extend: true, + name: "observablehq", + file: "dist/stdlib.js" + } + } +]; diff --git a/packages/ojs/external-observablehq-stdlib/src/arquero.js b/packages/ojs/external-observablehq-stdlib/src/arquero.js new file mode 100644 index 00000000000..04df5a482df --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/arquero.js @@ -0,0 +1,4 @@ +export function isArqueroTable(value) { + // Arquero tables have a `toArrowBuffer` function + return value && typeof value.toArrowBuffer === "function"; +} diff --git a/packages/ojs/external-observablehq-stdlib/src/arrow.js b/packages/ojs/external-observablehq-stdlib/src/arrow.js new file mode 100644 index 00000000000..6dced761757 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/arrow.js @@ -0,0 +1,65 @@ +import {arrow11 as arrow} from "./dependencies.js"; +import {cdn} from "./require.js"; + +// Returns true if the vaue is an Apache Arrow table. This uses a “duck” test +// (instead of strict instanceof) because we want it to work with a range of +// Apache Arrow versions at least 7.0.0 or above. +// https://arrow.apache.org/docs/7.0/js/classes/Arrow_dom.Table.html +export function isArrowTable(value) { + return ( + value && + typeof value.getChild === "function" && + typeof value.toArray === "function" && + value.schema && + Array.isArray(value.schema.fields) + ); +} + +export function getArrowTableSchema(table) { + return table.schema.fields.map(getArrowFieldSchema); +} + +function getArrowFieldSchema(field) { + return { + name: field.name, + type: getArrowType(field.type), + nullable: field.nullable, + databaseType: String(field.type) + }; +} + +// https://github.com/apache/arrow/blob/89f9a0948961f6e94f1ef5e4f310b707d22a3c11/js/src/enum.ts#L140-L141 +function getArrowType(type) { + switch (type.typeId) { + case 2: // Int + return "integer"; + case 3: // Float + case 7: // Decimal + return "number"; + case 4: // Binary + case 15: // FixedSizeBinary + return "buffer"; + case 5: // Utf8 + return "string"; + case 6: // Bool + return "boolean"; + case 8: // Date + case 9: // Time + case 10: // Timestamp + return "date"; + case 12: // List + case 16: // FixedSizeList + return "array"; + case 13: // Struct + case 14: // Union + return "object"; + case 11: // Interval + case 17: // Map + default: + return "other"; + } +} + +export async function loadArrow() { + return await import(`${cdn}${arrow.resolve()}`); +} diff --git a/packages/ojs/external-observablehq-stdlib/src/dependencies.js b/packages/ojs/external-observablehq-stdlib/src/dependencies.js new file mode 100644 index 00000000000..54aaaee53f6 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/dependencies.js @@ -0,0 +1,24 @@ +import {dependency} from "./dependency.js"; +export const d3 = dependency("d3", "7.8.5", "dist/d3.min.js"); +export const inputs = dependency("@observablehq/inputs", "0.10.6", "dist/inputs.min.js"); +export const plot = dependency("@observablehq/plot", "0.6.11", "dist/plot.umd.min.js"); +export const graphviz = dependency("@observablehq/graphviz", "0.2.1", "dist/graphviz.min.js"); +export const highlight = dependency("@observablehq/highlight.js", "2.0.0", "highlight.min.js"); +export const katex = dependency("@observablehq/katex", "0.11.1", "dist/katex.min.js"); +export const lodash = dependency("lodash", "4.17.21", "lodash.min.js"); +export const htl = dependency("htl", "0.3.1", "dist/htl.min.js"); +export const jszip = dependency("jszip", "3.10.1", "dist/jszip.min.js"); +export const marked = dependency("marked", "0.3.12", "marked.min.js"); +export const sql = dependency("sql.js", "1.8.0", "dist/sql-wasm.js"); +export const vega = dependency("vega", "5.22.1", "build/vega.min.js"); +export const vegalite = dependency("vega-lite", "5.6.0", "build/vega-lite.min.js"); +export const vegaliteApi = dependency("vega-lite-api", "5.0.0", "build/vega-lite-api.min.js"); +export const arrow4 = dependency("apache-arrow", "4.0.1", "Arrow.es2015.min.js"); +export const arrow9 = dependency("apache-arrow", "9.0.0", "+esm"); +export const arrow11 = dependency("apache-arrow", "11.0.0", "+esm"); +export const arquero = dependency("arquero", "4.8.8", "dist/arquero.min.js"); +export const topojson = dependency("topojson-client", "3.1.0", "dist/topojson-client.min.js"); +export const exceljs = dependency("exceljs", "4.3.0", "dist/exceljs.min.js"); +export const mermaid = dependency("mermaid", "9.2.2", "dist/mermaid.min.js"); +export const leaflet = dependency("leaflet", "1.9.3", "dist/leaflet.js"); +export const duckdb = dependency("@duckdb/duckdb-wasm", "1.24.0", "+esm"); diff --git a/packages/ojs/external-observablehq-stdlib/src/dependency.js b/packages/ojs/external-observablehq-stdlib/src/dependency.js new file mode 100644 index 00000000000..032add0ff30 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/dependency.js @@ -0,0 +1,7 @@ +export function dependency(name, version, main) { + return { + resolve(path = main) { + return `${name}@${version}/${path}`; + } + }; +} diff --git a/packages/ojs/external-observablehq-stdlib/src/dom/canvas.js b/packages/ojs/external-observablehq-stdlib/src/dom/canvas.js new file mode 100644 index 00000000000..aa35d8cdb76 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/dom/canvas.js @@ -0,0 +1,6 @@ +export function canvas(width, height) { + var canvas = document.createElement("canvas"); + canvas.width = width; + canvas.height = height; + return canvas; +} diff --git a/packages/ojs/external-observablehq-stdlib/src/dom/context2d.js b/packages/ojs/external-observablehq-stdlib/src/dom/context2d.js new file mode 100644 index 00000000000..c41e3f9c2fe --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/dom/context2d.js @@ -0,0 +1,10 @@ +export function context2d(width, height, dpi) { + if (dpi == null) dpi = devicePixelRatio; + var canvas = document.createElement("canvas"); + canvas.width = width * dpi; + canvas.height = height * dpi; + canvas.style.width = width + "px"; + var context = canvas.getContext("2d"); + context.scale(dpi, dpi); + return context; +} diff --git a/packages/ojs/external-observablehq-stdlib/src/dom/download.js b/packages/ojs/external-observablehq-stdlib/src/dom/download.js new file mode 100644 index 00000000000..e15b407bc88 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/dom/download.js @@ -0,0 +1,31 @@ +export function download(value, name = "untitled", label = "Save") { + const a = document.createElement("a"); + const b = a.appendChild(document.createElement("button")); + b.textContent = label; + a.download = name; + + async function reset() { + await new Promise(requestAnimationFrame); + URL.revokeObjectURL(a.href); + a.removeAttribute("href"); + b.textContent = label; + b.disabled = false; + } + + a.onclick = async event => { + b.disabled = true; + if (a.href) return reset(); // Already saved. + b.textContent = "Saving…"; + try { + const object = await (typeof value === "function" ? value() : value); + b.textContent = "Download"; + a.href = URL.createObjectURL(object); // eslint-disable-line require-atomic-updates + } catch (ignore) { + b.textContent = label; + } + if (event.eventPhase) return reset(); // Already downloaded. + b.disabled = false; + }; + + return a; +} diff --git a/packages/ojs/external-observablehq-stdlib/src/dom/element.js b/packages/ojs/external-observablehq-stdlib/src/dom/element.js new file mode 100644 index 00000000000..286e68345d6 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/dom/element.js @@ -0,0 +1,23 @@ +var namespaces = { + math: "http://www.w3.org/1998/Math/MathML", + svg: "http://www.w3.org/2000/svg", + xhtml: "http://www.w3.org/1999/xhtml", + xlink: "http://www.w3.org/1999/xlink", + xml: "http://www.w3.org/XML/1998/namespace", + xmlns: "http://www.w3.org/2000/xmlns/" +}; + +export function element(name, attributes) { + var prefix = name += "", i = prefix.indexOf(":"), value; + if (i >= 0 && (prefix = name.slice(0, i)) !== "xmlns") name = name.slice(i + 1); + var element = namespaces.hasOwnProperty(prefix) // eslint-disable-line no-prototype-builtins + ? document.createElementNS(namespaces[prefix], name) + : document.createElement(name); + if (attributes) for (var key in attributes) { + prefix = key, i = prefix.indexOf(":"), value = attributes[key]; + if (i >= 0 && (prefix = key.slice(0, i)) !== "xmlns") key = key.slice(i + 1); + if (namespaces.hasOwnProperty(prefix)) element.setAttributeNS(namespaces[prefix], key, value); // eslint-disable-line no-prototype-builtins + else element.setAttribute(key, value); + } + return element; +} diff --git a/packages/ojs/external-observablehq-stdlib/src/dom/index.js b/packages/ojs/external-observablehq-stdlib/src/dom/index.js new file mode 100644 index 00000000000..1ec468a05da --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/dom/index.js @@ -0,0 +1,10 @@ +export {canvas} from "./canvas.js"; +export {context2d} from "./context2d.js"; +export {download} from "./download.js"; +export {element} from "./element.js"; +export {input} from "./input.js"; +export {range} from "./range.js"; +export {select} from "./select.js"; +export {svg} from "./svg.js"; +export {text} from "./text.js"; +export {uid} from "./uid.js"; diff --git a/packages/ojs/external-observablehq-stdlib/src/dom/input.js b/packages/ojs/external-observablehq-stdlib/src/dom/input.js new file mode 100644 index 00000000000..0ae0f9f0f03 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/dom/input.js @@ -0,0 +1,5 @@ +export function input(type) { + var input = document.createElement("input"); + if (type != null) input.type = type; + return input; +} diff --git a/packages/ojs/external-observablehq-stdlib/src/dom/range.js b/packages/ojs/external-observablehq-stdlib/src/dom/range.js new file mode 100644 index 00000000000..69210dcd933 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/dom/range.js @@ -0,0 +1,9 @@ +export function range(min, max, step) { + if (arguments.length === 1) max = min, min = null; + var input = document.createElement("input"); + input.min = min = min == null ? 0 : +min; + input.max = max = max == null ? 1 : +max; + input.step = step == null ? "any" : step = +step; + input.type = "range"; + return input; +} diff --git a/packages/ojs/external-observablehq-stdlib/src/dom/select.js b/packages/ojs/external-observablehq-stdlib/src/dom/select.js new file mode 100644 index 00000000000..040f41ba113 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/dom/select.js @@ -0,0 +1,9 @@ +export function select(values) { + var select = document.createElement("select"); + Array.prototype.forEach.call(values, function(value) { + var option = document.createElement("option"); + option.value = option.textContent = value; + select.appendChild(option); + }); + return select; +} diff --git a/packages/ojs/external-observablehq-stdlib/src/dom/svg.js b/packages/ojs/external-observablehq-stdlib/src/dom/svg.js new file mode 100644 index 00000000000..9280bed4482 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/dom/svg.js @@ -0,0 +1,7 @@ +export function svg(width, height) { + var svg = document.createElementNS("http://www.w3.org/2000/svg", "svg"); + svg.setAttribute("viewBox", [0, 0, width, height]); + svg.setAttribute("width", width); + svg.setAttribute("height", height); + return svg; +} diff --git a/packages/ojs/external-observablehq-stdlib/src/dom/text.js b/packages/ojs/external-observablehq-stdlib/src/dom/text.js new file mode 100644 index 00000000000..86e82bae868 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/dom/text.js @@ -0,0 +1,3 @@ +export function text(value) { + return document.createTextNode(value); +} diff --git a/packages/ojs/external-observablehq-stdlib/src/dom/uid.js b/packages/ojs/external-observablehq-stdlib/src/dom/uid.js new file mode 100644 index 00000000000..aae7d9d67b4 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/dom/uid.js @@ -0,0 +1,14 @@ +var count = 0; + +export function uid(name) { + return new Id("O-" + (name == null ? "" : name + "-") + ++count); +} + +function Id(id) { + this.id = id; + this.href = new URL(`#${id}`, location) + ""; +} + +Id.prototype.toString = function() { + return "url(" + this.href + ")"; +}; diff --git a/packages/ojs/external-observablehq-stdlib/src/duckdb.js b/packages/ojs/external-observablehq-stdlib/src/duckdb.js new file mode 100644 index 00000000000..6e42cbf4ee5 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/duckdb.js @@ -0,0 +1,314 @@ +import {isArqueroTable} from "./arquero.js"; +import {getArrowTableSchema, isArrowTable, loadArrow} from "./arrow.js"; +import {duckdb} from "./dependencies.js"; +import {FileAttachment} from "./fileAttachment.js"; +import {cdn} from "./require.js"; + +// Adapted from https://observablehq.com/@cmudig/duckdb-client +// Copyright 2021 CMU Data Interaction Group +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, +// this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright notice, +// this list of conditions and the following disclaimer in the documentation +// and/or other materials provided with the distribution. +// +// 3. Neither the name of the copyright holder nor the names of its contributors +// may be used to endorse or promote products derived from this software +// without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// POSSIBILITY OF SUCH DAMAGE. + +let promise; + +export class DuckDBClient { + constructor(db) { + Object.defineProperties(this, { + _db: {value: db} + }); + } + + async queryStream(query, params) { + const connection = await this._db.connect(); + let reader, batch; + try { + if (params?.length > 0) { + const statement = await connection.prepare(query); + reader = await statement.send(...params); + } else { + reader = await connection.send(query); + } + batch = await reader.next(); + if (batch.done) throw new Error("missing first batch"); + } catch (error) { + await connection.close(); + throw error; + } + return { + schema: getArrowTableSchema(batch.value), + async *readRows() { + try { + while (!batch.done) { + yield batch.value.toArray(); + batch = await reader.next(); + } + } finally { + await connection.close(); + } + } + }; + } + + async query(query, params) { + const result = await this.queryStream(query, params); + const results = []; + for await (const rows of result.readRows()) { + for (const row of rows) { + results.push(row); + } + } + results.schema = result.schema; + return results; + } + + async queryRow(query, params) { + const result = await this.queryStream(query, params); + const reader = result.readRows(); + try { + const {done, value} = await reader.next(); + return done || !value.length ? null : value[0]; + } finally { + await reader.return(); + } + } + + async sql(strings, ...args) { + return await this.query(strings.join("?"), args); + } + + queryTag(strings, ...params) { + return [strings.join("?"), params]; + } + + escape(name) { + return `"${name}"`; + } + + async describeTables() { + const tables = await this.query(`SHOW TABLES`); + return tables.map(({name}) => ({name})); + } + + async describeColumns({table} = {}) { + const columns = await this.query(`DESCRIBE ${this.escape(table)}`); + return columns.map(({column_name, column_type, null: nullable}) => ({ + name: column_name, + type: getDuckDBType(column_type), + nullable: nullable !== "NO", + databaseType: column_type + })); + } + + static async of(sources = {}, config = {}) { + const db = await createDuckDB(); + if (config.query?.castTimestampToDate === undefined) { + config = {...config, query: {...config.query, castTimestampToDate: true}}; + } + if (config.query?.castBigIntToDouble === undefined) { + config = {...config, query: {...config.query, castBigIntToDouble: true}}; + } + await db.open(config); + await Promise.all( + Object.entries(sources).map(async ([name, source]) => { + if (source instanceof FileAttachment) { // bare file + await insertFile(db, name, source); + } else if (isArrowTable(source)) { // bare arrow table + await insertArrowTable(db, name, source); + } else if (Array.isArray(source)) { // bare array of objects + await insertArray(db, name, source); + } else if (isArqueroTable(source)) { + await insertArqueroTable(db, name, source); + } else if ("data" in source) { // data + options + const {data, ...options} = source; + if (isArrowTable(data)) { + await insertArrowTable(db, name, data, options); + } else { + await insertArray(db, name, data, options); + } + } else if ("file" in source) { // file + options + const {file, ...options} = source; + await insertFile(db, name, file, options); + } else { + throw new Error(`invalid source: ${source}`); + } + }) + ); + return new DuckDBClient(db); + } +} + +Object.defineProperty(DuckDBClient.prototype, "dialect", { + value: "duckdb" +}); + +async function insertFile(database, name, file, options) { + const url = await file.url(); + if (url.startsWith("blob:")) { + const buffer = await file.arrayBuffer(); + await database.registerFileBuffer(file.name, new Uint8Array(buffer)); + } else { + await database.registerFileURL(file.name, url, 4); // duckdb.DuckDBDataProtocol.HTTP + } + const connection = await database.connect(); + try { + switch (file.mimeType) { + case "text/csv": + case "text/tab-separated-values": { + return await connection.insertCSVFromPath(file.name, { + name, + schema: "main", + ...options + }).catch(async (error) => { + // If initial attempt to insert CSV resulted in a conversion + // error, try again, this time treating all columns as strings. + if (error.toString().includes("Could not convert")) { + return await insertUntypedCSV(connection, file, name); + } + throw error; + }); + } + case "application/json": + return await connection.insertJSONFromPath(file.name, { + name, + schema: "main", + ...options + }); + default: + if (/\.arrow$/i.test(file.name)) { + const buffer = new Uint8Array(await file.arrayBuffer()); + return await connection.insertArrowFromIPCStream(buffer, { + name, + schema: "main", + ...options + }); + } + if (/\.parquet$/i.test(file.name)) { + return await connection.query( + `CREATE VIEW '${name}' AS SELECT * FROM parquet_scan('${file.name}')` + ); + } + throw new Error(`unknown file type: ${file.mimeType}`); + } + } finally { + await connection.close(); + } +} + +async function insertUntypedCSV(connection, file, name) { + const statement = await connection.prepare( + `CREATE TABLE '${name}' AS SELECT * FROM read_csv_auto(?, ALL_VARCHAR=TRUE)` + ); + return await statement.send(file.name); +} + +async function insertArrowTable(database, name, table, options) { + const connection = await database.connect(); + try { + await connection.insertArrowTable(table, { + name, + schema: "main", + ...options + }); + } finally { + await connection.close(); + } +} + +async function insertArqueroTable(database, name, source) { + // TODO When we have stdlib versioning and can upgrade Arquero to version 5, + // we can then call source.toArrow() directly, with insertArrowTable() + const arrow = await loadArrow(); + const table = arrow.tableFromIPC(source.toArrowBuffer()); + return await insertArrowTable(database, name, table); +} + +async function insertArray(database, name, array, options) { + const arrow = await loadArrow(); + const table = arrow.tableFromJSON(array); + return await insertArrowTable(database, name, table, options); +} + +async function loadDuckDB() { + const module = await import(`${cdn}${duckdb.resolve()}`); + const bundle = await module.selectBundle({ + mvp: { + mainModule: `${cdn}${duckdb.resolve("dist/duckdb-mvp.wasm")}`, + mainWorker: `${cdn}${duckdb.resolve("dist/duckdb-browser-mvp.worker.js")}` + }, + eh: { + mainModule: `${cdn}${duckdb.resolve("dist/duckdb-eh.wasm")}`, + mainWorker: `${cdn}${duckdb.resolve("dist/duckdb-browser-eh.worker.js")}` + } + }); + const logger = new module.ConsoleLogger(); + return {module, bundle, logger}; +} + +async function createDuckDB() { + if (promise === undefined) promise = loadDuckDB(); + const {module, bundle, logger} = await promise; + const worker = await module.createWorker(bundle.mainWorker); + const db = new module.AsyncDuckDB(logger, worker); + await db.instantiate(bundle.mainModule); + return db; +} + +// https://duckdb.org/docs/sql/data_types/overview +function getDuckDBType(type) { + switch (type) { + case "BIGINT": + case "HUGEINT": + case "UBIGINT": + return "bigint"; + case "DOUBLE": + case "REAL": + case "FLOAT": + return "number"; + case "INTEGER": + case "SMALLINT": + case "TINYINT": + case "USMALLINT": + case "UINTEGER": + case "UTINYINT": + return "integer"; + case "BOOLEAN": + return "boolean"; + case "DATE": + case "TIMESTAMP": + case "TIMESTAMP WITH TIME ZONE": + return "date"; + case "VARCHAR": + case "UUID": + return "string"; + // case "BLOB": + // case "INTERVAL": + // case "TIME": + default: + if (/^DECIMAL\(/.test(type)) return "integer"; + return "other"; + } +} diff --git a/packages/ojs/external-observablehq-stdlib/src/fileAttachment.js b/packages/ojs/external-observablehq-stdlib/src/fileAttachment.js new file mode 100644 index 00000000000..7f44ba68629 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/fileAttachment.js @@ -0,0 +1,168 @@ +import {autoType, csvParse, csvParseRows, tsvParse, tsvParseRows} from "d3-dsv"; +import {arrow4, arrow9, arrow11, jszip, exceljs} from "./dependencies.js"; +import {cdn, requireDefault} from "./require.js"; +import {SQLiteDatabaseClient} from "./sqlite.js"; +import {inferSchema, coerceRow} from "./table.js"; +import {Workbook} from "./xlsx.js"; + +async function remote_fetch(file) { + const response = await fetch(await file.url()); + if (!response.ok) throw new Error(`Unable to load file: ${file.name}`); + return response; +} + +export function enforceSchema(source, schema) { + const types = new Map(schema.map(({name, type}) => [name, type])); + return Object.assign(source.map(d => coerceRow(d, types, schema)), {schema}); +} + +async function dsv(file, delimiter, {array = false, typed = false} = {}) { + const text = await file.text(); + const parse = (delimiter === "\t" + ? (array ? tsvParseRows : tsvParse) + : (array ? csvParseRows : csvParse)); + if (typed === "auto" && !array) { + const source = parse(text); + return enforceSchema(source, inferSchema(source, source.columns)); + } + return parse(text, typed && autoType); +} + +export class AbstractFile { + constructor(name, mimeType) { + Object.defineProperty(this, "name", {value: name, enumerable: true}); + if (mimeType !== undefined) Object.defineProperty(this, "mimeType", {value: mimeType + "", enumerable: true}); + } + async blob() { + return (await remote_fetch(this)).blob(); + } + async arrayBuffer() { + return (await remote_fetch(this)).arrayBuffer(); + } + async text() { + return (await remote_fetch(this)).text(); + } + async json() { + return (await remote_fetch(this)).json(); + } + async stream() { + return (await remote_fetch(this)).body; + } + async csv(options) { + return dsv(this, ",", options); + } + async tsv(options) { + return dsv(this, "\t", options); + } + async image(props) { + const url = await this.url(); + return new Promise((resolve, reject) => { + const i = new Image(); + if (new URL(url, document.baseURI).origin !== new URL(location).origin) { + i.crossOrigin = "anonymous"; + } + Object.assign(i, props); + i.onload = () => resolve(i); + i.onerror = () => reject(new Error(`Unable to load file: ${this.name}`)); + i.src = url; + }); + } + async arrow({version = 4} = {}) { + switch (version) { + case 4: { + const [Arrow, response] = await Promise.all([requireDefault(arrow4.resolve()), remote_fetch(this)]); + return Arrow.Table.from(response); + } + case 9: { + const [Arrow, response] = await Promise.all([import(`${cdn}${arrow9.resolve()}`), remote_fetch(this)]); + return Arrow.tableFromIPC(response); + } + case 11: { + const [Arrow, response] = await Promise.all([import(`${cdn}${arrow11.resolve()}`), remote_fetch(this)]); + return Arrow.tableFromIPC(response); + } + default: throw new Error(`unsupported arrow version: ${version}`); + } + } + async sqlite() { + return SQLiteDatabaseClient.open(remote_fetch(this)); + } + async zip() { + const [JSZip, buffer] = await Promise.all([requireDefault(jszip.resolve()), this.arrayBuffer()]); + return new ZipArchive(await JSZip.loadAsync(buffer)); + } + async xml(mimeType = "application/xml") { + return (new DOMParser).parseFromString(await this.text(), mimeType); + } + async html() { + return this.xml("text/html"); + } + async xlsx() { + const [ExcelJS, buffer] = await Promise.all([requireDefault(exceljs.resolve()), this.arrayBuffer()]); + return new Workbook(await new ExcelJS.Workbook().xlsx.load(buffer)); + } +} + +export class FileAttachment extends AbstractFile { + constructor(url, name, mimeType) { + super(name, mimeType); + Object.defineProperty(this, "_url", {value: url}); + } + async url() { + return (await this._url) + ""; + } +} + +export function NoFileAttachments(name) { + throw new Error(`File not found: ${name}`); +} + +export function FileAttachments(resolve) { + return Object.assign( + name => { + const result = resolve(name += ""); + if (result == null) throw new Error(`File not found: ${name}`); + if (typeof result === "object" && "url" in result) { + const {url, mimeType} = result; + return new FileAttachment(url, name, mimeType); + } + return new FileAttachment(result, name); + }, + {prototype: FileAttachment.prototype} // instanceof + ); +} + +export class ZipArchive { + constructor(archive) { + Object.defineProperty(this, "_", {value: archive}); + this.filenames = Object.keys(archive.files).filter(name => !archive.files[name].dir); + } + file(path) { + const object = this._.file(path += ""); + if (!object || object.dir) throw new Error(`file not found: ${path}`); + return new ZipArchiveEntry(object); + } +} + +class ZipArchiveEntry extends AbstractFile { + constructor(object) { + super(object.name); + Object.defineProperty(this, "_", {value: object}); + Object.defineProperty(this, "_url", {writable: true}); + } + async url() { + return this._url || (this._url = this.blob().then(URL.createObjectURL)); + } + async blob() { + return this._.async("blob"); + } + async arrayBuffer() { + return this._.async("arraybuffer"); + } + async text() { + return this._.async("text"); + } + async json() { + return JSON.parse(await this.text()); + } +} diff --git a/packages/ojs/external-observablehq-stdlib/src/files/buffer.js b/packages/ojs/external-observablehq-stdlib/src/files/buffer.js new file mode 100644 index 00000000000..215a78d87aa --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/files/buffer.js @@ -0,0 +1,8 @@ +export function buffer(file) { + return new Promise(function(resolve, reject) { + var reader = new FileReader; + reader.onload = function() { resolve(reader.result); }; + reader.onerror = reject; + reader.readAsArrayBuffer(file); + }); +} diff --git a/packages/ojs/external-observablehq-stdlib/src/files/index.js b/packages/ojs/external-observablehq-stdlib/src/files/index.js new file mode 100644 index 00000000000..1bc3cfe402f --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/files/index.js @@ -0,0 +1,3 @@ +export {buffer} from "./buffer.js"; +export {text} from "./text.js"; +export {url} from "./url.js"; diff --git a/packages/ojs/external-observablehq-stdlib/src/files/text.js b/packages/ojs/external-observablehq-stdlib/src/files/text.js new file mode 100644 index 00000000000..76acae6738d --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/files/text.js @@ -0,0 +1,8 @@ +export function text(file) { + return new Promise(function(resolve, reject) { + var reader = new FileReader; + reader.onload = function() { resolve(reader.result); }; + reader.onerror = reject; + reader.readAsText(file); + }); +} diff --git a/packages/ojs/external-observablehq-stdlib/src/files/url.js b/packages/ojs/external-observablehq-stdlib/src/files/url.js new file mode 100644 index 00000000000..0b2244496b1 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/files/url.js @@ -0,0 +1,8 @@ +export function url(file) { + return new Promise(function(resolve, reject) { + var reader = new FileReader; + reader.onload = function() { resolve(reader.result); }; + reader.onerror = reject; + reader.readAsDataURL(file); + }); +} diff --git a/packages/ojs/external-observablehq-stdlib/src/fromEntries.js b/packages/ojs/external-observablehq-stdlib/src/fromEntries.js new file mode 100644 index 00000000000..985faddf642 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/fromEntries.js @@ -0,0 +1,7 @@ +export function fromEntries(obj) { + const result = {}; + for (const [key, value] of obj) { + result[key] = value; + } + return result; +} \ No newline at end of file diff --git a/packages/ojs/external-observablehq-stdlib/src/generators/disposable.js b/packages/ojs/external-observablehq-stdlib/src/generators/disposable.js new file mode 100644 index 00000000000..85c23a90728 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/generators/disposable.js @@ -0,0 +1,14 @@ +import {that} from "../that.js"; + +export function disposable(value, dispose) { + let done = false; + if (typeof dispose !== "function") { + throw new Error("dispose is not a function"); + } + return { + [Symbol.iterator]: that, + next: () => done ? {done: true} : (done = true, {done: false, value}), + return: () => (done = true, dispose(value), {done: true}), + throw: () => ({done: done = true}) + }; +} diff --git a/packages/ojs/external-observablehq-stdlib/src/generators/filter.js b/packages/ojs/external-observablehq-stdlib/src/generators/filter.js new file mode 100644 index 00000000000..a30c949ddc8 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/generators/filter.js @@ -0,0 +1,8 @@ +export function* filter(iterator, test) { + var result, index = -1; + while (!(result = iterator.next()).done) { + if (test(result.value, ++index)) { + yield result.value; + } + } +} diff --git a/packages/ojs/external-observablehq-stdlib/src/generators/index.js b/packages/ojs/external-observablehq-stdlib/src/generators/index.js new file mode 100644 index 00000000000..70f9883bcd5 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/generators/index.js @@ -0,0 +1,9 @@ +export {disposable} from "./disposable.js"; +export {filter} from "./filter.js"; +export {input} from "./input.js"; +export {map} from "./map.js"; +export {observe} from "./observe.js"; +export {queue} from "./queue.js"; +export {range} from "./range.js"; +export {valueAt} from "./valueAt.js"; +export {worker} from "./worker.js"; diff --git a/packages/ojs/external-observablehq-stdlib/src/generators/input.js b/packages/ojs/external-observablehq-stdlib/src/generators/input.js new file mode 100644 index 00000000000..b3ee81981b8 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/generators/input.js @@ -0,0 +1,33 @@ +import {observe} from "./observe.js"; + +export function input(input) { + return observe(function(change) { + var event = eventof(input), value = valueof(input); + function inputted() { change(valueof(input)); } + input.addEventListener(event, inputted); + if (value !== undefined) change(value); + return function() { input.removeEventListener(event, inputted); }; + }); +} + +function valueof(input) { + switch (input.type) { + case "range": + case "number": return input.valueAsNumber; + case "date": return input.valueAsDate; + case "checkbox": return input.checked; + case "file": return input.multiple ? input.files : input.files[0]; + case "select-multiple": return Array.from(input.selectedOptions, o => o.value); + default: return input.value; + } +} + +function eventof(input) { + switch (input.type) { + case "button": + case "submit": + case "checkbox": return "click"; + case "file": return "change"; + default: return "input"; + } +} diff --git a/packages/ojs/external-observablehq-stdlib/src/generators/map.js b/packages/ojs/external-observablehq-stdlib/src/generators/map.js new file mode 100644 index 00000000000..5578721b7b1 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/generators/map.js @@ -0,0 +1,6 @@ +export function* map(iterator, transform) { + var result, index = -1; + while (!(result = iterator.next()).done) { + yield transform(result.value, ++index); + } +} diff --git a/packages/ojs/external-observablehq-stdlib/src/generators/observe.js b/packages/ojs/external-observablehq-stdlib/src/generators/observe.js new file mode 100644 index 00000000000..59fec0ebf1f --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/generators/observe.js @@ -0,0 +1,33 @@ +import {that} from "../that.js"; + +export function observe(initialize) { + let stale = false; + let value; + let resolve; + const dispose = initialize(change); + + if (dispose != null && typeof dispose !== "function") { + throw new Error(typeof dispose.then === "function" + ? "async initializers are not supported" + : "initializer returned something, but not a dispose function"); + } + + function change(x) { + if (resolve) resolve(x), resolve = null; + else stale = true; + return value = x; + } + + function next() { + return {done: false, value: stale + ? (stale = false, Promise.resolve(value)) + : new Promise(_ => (resolve = _))}; + } + + return { + [Symbol.iterator]: that, + throw: () => ({done: true}), + return: () => (dispose != null && dispose(), {done: true}), + next + }; +} diff --git a/packages/ojs/external-observablehq-stdlib/src/generators/queue.js b/packages/ojs/external-observablehq-stdlib/src/generators/queue.js new file mode 100644 index 00000000000..51693c76c17 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/generators/queue.js @@ -0,0 +1,32 @@ +import {that} from "../that.js"; + +export function queue(initialize) { + let resolve; + const queue = []; + const dispose = initialize(push); + + if (dispose != null && typeof dispose !== "function") { + throw new Error(typeof dispose.then === "function" + ? "async initializers are not supported" + : "initializer returned something, but not a dispose function"); + } + + function push(x) { + queue.push(x); + if (resolve) resolve(queue.shift()), resolve = null; + return x; + } + + function next() { + return {done: false, value: queue.length + ? Promise.resolve(queue.shift()) + : new Promise(_ => (resolve = _))}; + } + + return { + [Symbol.iterator]: that, + throw: () => ({done: true}), + return: () => (dispose != null && dispose(), {done: true}), + next + }; +} diff --git a/packages/ojs/external-observablehq-stdlib/src/generators/range.js b/packages/ojs/external-observablehq-stdlib/src/generators/range.js new file mode 100644 index 00000000000..79898ab5caf --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/generators/range.js @@ -0,0 +1,9 @@ +export function* range(start, stop, step) { + start = +start; + stop = +stop; + step = (n = arguments.length) < 2 ? (stop = start, start = 0, 1) : n < 3 ? 1 : +step; + var i = -1, n = Math.max(0, Math.ceil((stop - start) / step)) | 0; + while (++i < n) { + yield start + i * step; + } +} diff --git a/packages/ojs/external-observablehq-stdlib/src/generators/valueAt.js b/packages/ojs/external-observablehq-stdlib/src/generators/valueAt.js new file mode 100644 index 00000000000..ee2943ed3e0 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/generators/valueAt.js @@ -0,0 +1,9 @@ +export function valueAt(iterator, i) { + if (!isFinite(i = +i) || i < 0 || i !== i | 0) return; + var result, index = -1; + while (!(result = iterator.next()).done) { + if (++index === i) { + return result.value; + } + } +} diff --git a/packages/ojs/external-observablehq-stdlib/src/generators/worker.js b/packages/ojs/external-observablehq-stdlib/src/generators/worker.js new file mode 100644 index 00000000000..069ee8f5a91 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/generators/worker.js @@ -0,0 +1,10 @@ +import {disposable} from "./disposable.js"; + +export function worker(source) { + const url = URL.createObjectURL(new Blob([source], {type: "text/javascript"})); + const worker = new Worker(url); + return disposable(worker, () => { + worker.terminate(); + URL.revokeObjectURL(url); + }); +} diff --git a/packages/ojs/external-observablehq-stdlib/src/html.js b/packages/ojs/external-observablehq-stdlib/src/html.js new file mode 100644 index 00000000000..9061e30cf07 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/html.js @@ -0,0 +1,9 @@ +import {template} from "./template.js"; + +export const html = template(function(string) { + var template = document.createElement("template"); + template.innerHTML = string.trim(); + return document.importNode(template.content, true); +}, function() { + return document.createElement("span"); +}); diff --git a/packages/ojs/external-observablehq-stdlib/src/index.js b/packages/ojs/external-observablehq-stdlib/src/index.js new file mode 100644 index 00000000000..d81e973ecd7 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/index.js @@ -0,0 +1,16 @@ +export {FileAttachments, AbstractFile} from "./fileAttachment.js"; +export {Library} from "./library.js"; +export {getArrowTableSchema, isArrowTable} from "./arrow.js"; +export {isArqueroTable} from "./arquero.js"; +export { + makeQueryTemplate, + loadDataSource, + arrayIsPrimitive, + isDataArray, + isDatabaseClient, + __table as applyDataTableOperations, + getTypeValidator, + inferSchema, + getSchema +} from "./table.js"; +export {observe} from "./generators/observe.js"; diff --git a/packages/ojs/external-observablehq-stdlib/src/leaflet.js b/packages/ojs/external-observablehq-stdlib/src/leaflet.js new file mode 100644 index 00000000000..44917af54a7 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/leaflet.js @@ -0,0 +1,12 @@ +import {leaflet as ll} from "./dependencies.js"; + +export async function leaflet(require) { + const L = await require(ll.resolve()); + if (!L._style) { + const link = document.createElement("link"); + link.rel = "stylesheet"; + link.href = await require.resolve(ll.resolve("dist/leaflet.css")); + L._style = document.head.appendChild(link); + } + return L; +} diff --git a/packages/ojs/external-observablehq-stdlib/src/library.js b/packages/ojs/external-observablehq-stdlib/src/library.js new file mode 100644 index 00000000000..d0b2517bcc0 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/library.js @@ -0,0 +1,105 @@ +import {requireFrom, resolveFrom} from "external-d3-d3-require"; +import * as DOM from "./dom/index.js"; +import * as Files from "./files/index.js"; +import {AbstractFile, FileAttachment, NoFileAttachments} from "./fileAttachment.js"; +import * as Generators from "./generators/index.js"; +import {DuckDBClient} from "./duckdb.js"; +import {html} from "./html.js"; +import {leaflet} from "./leaflet.js"; +import {md} from "./md.js"; +import {mermaid} from "./mermaid.js"; +import {Mutable} from "./mutable.js"; +import {now} from "./now.js"; +import * as Promises from "./promises/index.js"; +import {resolve} from "./resolve.js"; +import {requirer, requireDefault, setDefaultRequire} from "./require.js"; +import {SQLite, SQLiteDatabaseClient} from "./sqlite.js"; +import {svg} from "./svg.js"; +import {tex} from "./tex.js"; +import {vl} from "./vegalite.js"; +import {width} from "./width.js"; +import {arquero, arrow4, d3, graphviz, htl, inputs, lodash, plot, topojson} from "./dependencies.js"; +import {__query} from "./table.js"; + +export const Library = Object.assign(Object.defineProperties(function Library(resolver) { + const require = requirer(resolver); + Object.defineProperties(this, properties({ + FileAttachment: () => NoFileAttachments, + Mutable: () => Mutable, + now, + width, + + // Tagged template literals + dot: () => require(graphviz.resolve()), + htl: () => require(htl.resolve()), + html: () => html, + md: () => md(require), + svg: () => svg, + tex: () => tex(require), + + // Recommended libraries + // https://observablehq.com/@observablehq/recommended-libraries + _: () => require(lodash.resolve()), + aq: () => require.alias({"apache-arrow": arrow4.resolve()})(arquero.resolve()), // TODO upgrade to apache-arrow@9 + Arrow: () => require(arrow4.resolve()), // TODO upgrade to apache-arrow@9 + d3: () => require(d3.resolve()), + DuckDBClient: () => DuckDBClient, + Inputs: () => require(inputs.resolve()).then(Inputs => ({...Inputs, file: Inputs.fileOf(AbstractFile)})), + L: () => leaflet(require), + mermaid: () => mermaid(require), + Plot: () => require(plot.resolve()), + __query: () => __query, + require: () => require, + resolve: () => resolve, // deprecated; use async require.resolve instead + SQLite: () => SQLite(require), + SQLiteDatabaseClient: () => SQLiteDatabaseClient, + topojson: () => require(topojson.resolve()), + vl: () => vl(require), + + // Sample datasets + // https://observablehq.com/@observablehq/sample-datasets + aapl: () => new FileAttachment("https://static.observableusercontent.com/files/3ccff97fd2d93da734e76829b2b066eafdaac6a1fafdec0faf6ebc443271cfc109d29e80dd217468fcb2aff1e6bffdc73f356cc48feb657f35378e6abbbb63b9").csv({typed: true}), + alphabet: () => new FileAttachment("https://static.observableusercontent.com/files/75d52e6c3130b1cae83cda89305e17b50f33e7420ef205587a135e8562bcfd22e483cf4fa2fb5df6dff66f9c5d19740be1cfaf47406286e2eb6574b49ffc685d").csv({typed: true}), + cars: () => new FileAttachment("https://static.observableusercontent.com/files/048ec3dfd528110c0665dfa363dd28bc516ffb7247231f3ab25005036717f5c4c232a5efc7bb74bc03037155cb72b1abe85a33d86eb9f1a336196030443be4f6").csv({typed: true}), + citywages: () => new FileAttachment("https://static.observableusercontent.com/files/39837ec5121fcc163131dbc2fe8c1a2e0b3423a5d1e96b5ce371e2ac2e20a290d78b71a4fb08b9fa6a0107776e17fb78af313b8ea70f4cc6648fad68ddf06f7a").csv({typed: true}), + diamonds: () => new FileAttachment("https://static.observableusercontent.com/files/87942b1f5d061a21fa4bb8f2162db44e3ef0f7391301f867ab5ba718b225a63091af20675f0bfe7f922db097b217b377135203a7eab34651e21a8d09f4e37252").csv({typed: true}), + flare: () => new FileAttachment("https://static.observableusercontent.com/files/a6b0d94a7f5828fd133765a934f4c9746d2010e2f342d335923991f31b14120de96b5cb4f160d509d8dc627f0107d7f5b5070d2516f01e4c862b5b4867533000").csv({typed: true}), + industries: () => new FileAttachment("https://static.observableusercontent.com/files/76f13741128340cc88798c0a0b7fa5a2df8370f57554000774ab8ee9ae785ffa2903010cad670d4939af3e9c17e5e18e7e05ed2b38b848ac2fc1a0066aa0005f").csv({typed: true}), + miserables: () => new FileAttachment("https://static.observableusercontent.com/files/31d904f6e21d42d4963ece9c8cc4fbd75efcbdc404bf511bc79906f0a1be68b5a01e935f65123670ed04e35ca8cae3c2b943f82bf8db49c5a67c85cbb58db052").json(), + olympians: () => new FileAttachment("https://static.observableusercontent.com/files/31ca24545a0603dce099d10ee89ee5ae72d29fa55e8fc7c9ffb5ded87ac83060d80f1d9e21f4ae8eb04c1e8940b7287d179fe8060d887fb1f055f430e210007c").csv({typed: true}), + penguins: () => new FileAttachment("https://static.observableusercontent.com/files/715db1223e067f00500780077febc6cebbdd90c151d3d78317c802732252052ab0e367039872ab9c77d6ef99e5f55a0724b35ddc898a1c99cb14c31a379af80a").csv({typed: true}), + pizza: () => new FileAttachment("https://static.observableusercontent.com/files/c653108ab176088cacbb338eaf2344c4f5781681702bd6afb55697a3f91b511c6686ff469f3e3a27c75400001a2334dbd39a4499fe46b50a8b3c278b7d2f7fb5").csv({typed: true}), + weather: () => new FileAttachment("https://static.observableusercontent.com/files/693a46b22b33db0f042728700e0c73e836fa13d55446df89120682d55339c6db7cc9e574d3d73f24ecc9bc7eb9ac9a1e7e104a1ee52c00aab1e77eb102913c1f").csv({typed: true}), + + // Note: these are namespace objects, and thus exposed directly rather than + // being wrapped in a function. This allows library.Generators to resolve, + // rather than needing module.value. + DOM, + Files, + Generators, + Promises + })); +}, { + resolve: { + get: () => requireDefault.resolve, + enumerable: true, + configurable: true + }, + require: { + get: () => requireDefault, + set: setDefaultRequire, + enumerable: true, + configurable: true + } +}), { + resolveFrom, + requireFrom +}); + +function properties(values) { + return Object.fromEntries(Object.entries(values).map(property)); +} + +function property([key, value]) { + return [key, ({value, writable: true, enumerable: true})]; +} diff --git a/packages/ojs/external-observablehq-stdlib/src/md.js b/packages/ojs/external-observablehq-stdlib/src/md.js new file mode 100644 index 00000000000..9643e2b01a5 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/md.js @@ -0,0 +1,41 @@ +import {highlight, marked} from "./dependencies.js"; +import {template} from "./template.js"; + +export function md(require) { + return require(marked.resolve()).then(function(marked) { + return template( + function(string) { + var root = document.createElement("div"); + root.innerHTML = marked(string, {langPrefix: ""}).trim(); + var code = root.querySelectorAll("pre code[class]"); + if (code.length > 0) { + require(highlight.resolve()).then(function(hl) { + code.forEach(function(block) { + function done() { + hl.highlightBlock(block); + block.parentNode.classList.add("observablehq--md-pre"); + } + if (hl.getLanguage(block.className)) { + done(); + } else { + require(highlight.resolve("async-languages/index.js")) + .then(index => { + if (index.has(block.className)) { + return require(highlight.resolve("async-languages/" + index.get(block.className))).then(language => { + hl.registerLanguage(block.className, language); + }); + } + }) + .then(done, done); + } + }); + }); + } + return root; + }, + function() { + return document.createElement("div"); + } + ); + }); +} diff --git a/packages/ojs/external-observablehq-stdlib/src/mermaid.js b/packages/ojs/external-observablehq-stdlib/src/mermaid.js new file mode 100644 index 00000000000..276e8f363bf --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/mermaid.js @@ -0,0 +1,12 @@ +import {mermaid as merd} from "./dependencies.js"; +import {uid} from "./dom/uid.js"; + +export async function mermaid(require) { + const mer = await require(merd.resolve()); + mer.initialize({securityLevel: "loose", theme: "neutral"}); + return function mermaid() { + const root = document.createElement("div"); + root.innerHTML = mer.render(uid().id, String.raw.apply(String, arguments)); + return root.removeChild(root.firstChild); + }; +} diff --git a/packages/ojs/external-observablehq-stdlib/src/mutable.js b/packages/ojs/external-observablehq-stdlib/src/mutable.js new file mode 100644 index 00000000000..bd39cb7b12f --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/mutable.js @@ -0,0 +1,10 @@ +import {observe} from "./generators/observe.js"; + +export function Mutable(value) { + let change; + Object.defineProperties(this, { + generator: {value: observe(_ => void (change = _))}, + value: {get: () => value, set: x => change(value = x)} // eslint-disable-line no-setter-return + }); + if (value !== undefined) change(value); +} diff --git a/packages/ojs/external-observablehq-stdlib/src/now.js b/packages/ojs/external-observablehq-stdlib/src/now.js new file mode 100644 index 00000000000..3424a4966ed --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/now.js @@ -0,0 +1,5 @@ +export function* now() { + while (true) { + yield Date.now(); + } +} diff --git a/packages/ojs/external-observablehq-stdlib/src/promises/delay.js b/packages/ojs/external-observablehq-stdlib/src/promises/delay.js new file mode 100644 index 00000000000..ee975deb04c --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/promises/delay.js @@ -0,0 +1,7 @@ +export function delay(duration, value) { + return new Promise(function(resolve) { + setTimeout(function() { + resolve(value); + }, duration); + }); +} diff --git a/packages/ojs/external-observablehq-stdlib/src/promises/index.js b/packages/ojs/external-observablehq-stdlib/src/promises/index.js new file mode 100644 index 00000000000..25e40a89dc9 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/promises/index.js @@ -0,0 +1,3 @@ +export {delay} from "./delay.js"; +export {tick} from "./tick.js"; +export {when} from "./when.js"; diff --git a/packages/ojs/external-observablehq-stdlib/src/promises/tick.js b/packages/ojs/external-observablehq-stdlib/src/promises/tick.js new file mode 100644 index 00000000000..c72e2bce16b --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/promises/tick.js @@ -0,0 +1,5 @@ +import {when} from "./when.js"; + +export function tick(duration, value) { + return when(Math.ceil((Date.now() + 1) / duration) * duration, value); +} diff --git a/packages/ojs/external-observablehq-stdlib/src/promises/when.js b/packages/ojs/external-observablehq-stdlib/src/promises/when.js new file mode 100644 index 00000000000..56c3819dd90 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/promises/when.js @@ -0,0 +1,20 @@ +var timeouts = new Map; + +function timeout(now, time) { + var t = new Promise(function(resolve) { + timeouts.delete(time); + var delay = time - now; + if (!(delay > 0)) throw new Error("invalid time"); + if (delay > 0x7fffffff) throw new Error("too long to wait"); + setTimeout(resolve, delay); + }); + timeouts.set(time, t); + return t; +} + +export function when(time, value) { + var now; + return (now = timeouts.get(time = +time)) ? now.then(() => value) + : (now = Date.now()) >= time ? Promise.resolve(value) + : timeout(now, time).then(() => value); +} diff --git a/packages/ojs/external-observablehq-stdlib/src/require.js b/packages/ojs/external-observablehq-stdlib/src/require.js new file mode 100644 index 00000000000..9a6e3988093 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/require.js @@ -0,0 +1,14 @@ +import {require as initialRequire, requireFrom} from "external-d3-d3-require"; + +// TODO Allow this to be overridden using the Library’s resolver. +export const cdn = "https://cdn.observableusercontent.com/npm/"; + +export let requireDefault = initialRequire; + +export function setDefaultRequire(require) { + requireDefault = require; +} + +export function requirer(resolver) { + return resolver == null ? requireDefault : requireFrom(resolver); +} diff --git a/packages/ojs/external-observablehq-stdlib/src/resolve.js b/packages/ojs/external-observablehq-stdlib/src/resolve.js new file mode 100644 index 00000000000..bd3b6af9e22 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/resolve.js @@ -0,0 +1,6 @@ +export function resolve(name, base) { + if (/^(\w+:)|\/\//i.test(name)) return name; + if (/^[.]{0,2}\//i.test(name)) return new URL(name, base == null ? location : base).href; + if (!name.length || /^[\s._]/.test(name) || /\s$/.test(name)) throw new Error("illegal name"); + return "https://unpkg.com/" + name; +} diff --git a/packages/ojs/external-observablehq-stdlib/src/sqlite.js b/packages/ojs/external-observablehq-stdlib/src/sqlite.js new file mode 100644 index 00000000000..9331ccc6826 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/sqlite.js @@ -0,0 +1,126 @@ +import {sql} from "./dependencies.js"; +import {requireDefault} from "./require.js"; +import {fromEntries} from "./fromEntries.js"; + +export async function SQLite(require) { + const [init, dist] = await Promise.all([require(sql.resolve()), require.resolve(sql.resolve("dist/"))]); + return init({locateFile: file => `${dist}${file}`}); +} + +export class SQLiteDatabaseClient { + constructor(db) { + Object.defineProperties(this, { + _db: {value: db} + }); + } + static async open(source) { + const [SQL, buffer] = await Promise.all([SQLite(requireDefault), Promise.resolve(source).then(load)]); + return new SQLiteDatabaseClient(new SQL.Database(buffer)); + } + async query(query, params) { + return await exec(this._db, query, params); + } + async queryRow(query, params) { + return (await this.query(query, params))[0] || null; + } + async explain(query, params) { + const rows = await this.query(`EXPLAIN QUERY PLAN ${query}`, params); + return element("pre", {className: "observablehq--inspect"}, [ + text(rows.map(row => row.detail).join("\n")) + ]); + } + async describeTables({schema} = {}) { + return this.query(`SELECT NULLIF(schema, 'main') AS schema, name FROM pragma_table_list() WHERE type = 'table'${schema == null ? "" : ` AND schema = ?`} AND name NOT LIKE 'sqlite_%' ORDER BY schema, name`, schema == null ? [] : [schema]); + } + async describeColumns({schema, table} = {}) { + if (table == null) throw new Error(`missing table`); + const rows = await this.query(`SELECT name, type, "notnull" FROM pragma_table_info(?${schema == null ? "" : `, ?`}) ORDER BY cid`, schema == null ? [table] : [table, schema]); + if (!rows.length) throw new Error(`table not found: ${table}`); + return rows.map(({name, type, notnull}) => ({name, type: sqliteType(type), databaseType: type, nullable: !notnull})); + } + async describe(object) { + const rows = await (object === undefined + ? this.query(`SELECT name FROM sqlite_master WHERE type = 'table'`) + : this.query(`SELECT * FROM pragma_table_info(?)`, [object])); + if (!rows.length) throw new Error("Not found"); + const {columns} = rows; + return element("table", {value: rows}, [ + element("thead", [element("tr", columns.map(c => element("th", [text(c)])))]), + element("tbody", rows.map(r => element("tr", columns.map(c => element("td", [text(r[c])]))))) + ]); + } + async sql() { + return this.query(...this.queryTag.apply(this, arguments)); + } + queryTag(strings, ...params) { + return [strings.join("?"), params]; + } +} + +Object.defineProperty(SQLiteDatabaseClient.prototype, "dialect", { + value: "sqlite" +}); + +// https://www.sqlite.org/datatype3.html +function sqliteType(type) { + switch (type) { + case "NULL": + return "null"; + case "INT": + case "INTEGER": + case "TINYINT": + case "SMALLINT": + case "MEDIUMINT": + case "BIGINT": + case "UNSIGNED BIG INT": + case "INT2": + case "INT8": + return "integer"; + case "TEXT": + case "CLOB": + return "string"; + case "REAL": + case "DOUBLE": + case "DOUBLE PRECISION": + case "FLOAT": + case "NUMERIC": + return "number"; + case "BLOB": + return "buffer"; + case "DATE": + case "DATETIME": + return "string"; // TODO convert strings to Date instances in sql.js + default: + return /^(?:(?:(?:VARYING|NATIVE) )?CHARACTER|(?:N|VAR|NVAR)CHAR)\(/.test(type) ? "string" + : /^(?:DECIMAL|NUMERIC)\(/.test(type) ? "number" + : "other"; + } +} + +function load(source) { + return typeof source === "string" ? fetch(source).then(load) + : source instanceof Response || source instanceof Blob ? source.arrayBuffer().then(load) + : source instanceof ArrayBuffer ? new Uint8Array(source) + : source; +} + +async function exec(db, query, params) { + const [result] = await db.exec(query, params); + if (!result) return []; + const {columns, values} = result; + const rows = values.map(row => fromEntries(row.map((value, i) => [columns[i], value]))); + rows.columns = columns; + return rows; +} + +function element(name, props, children) { + if (arguments.length === 2) children = props, props = undefined; + const element = document.createElement(name); + if (props !== undefined) for (const p in props) element[p] = props[p]; + if (children !== undefined) for (const c of children) element.appendChild(c); + return element; +} + +function text(value) { + return document.createTextNode(value); +} diff --git a/packages/ojs/external-observablehq-stdlib/src/svg.js b/packages/ojs/external-observablehq-stdlib/src/svg.js new file mode 100644 index 00000000000..ff2aa473f9e --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/svg.js @@ -0,0 +1,9 @@ +import {template} from "./template.js"; + +export const svg = template(function(string) { + var root = document.createElementNS("http://www.w3.org/2000/svg", "g"); + root.innerHTML = string.trim(); + return root; +}, function() { + return document.createElementNS("http://www.w3.org/2000/svg", "g"); +}); diff --git a/packages/ojs/external-observablehq-stdlib/src/table.js b/packages/ojs/external-observablehq-stdlib/src/table.js new file mode 100644 index 00000000000..0d53b78882e --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/table.js @@ -0,0 +1,957 @@ +import {greatest, reverse} from "d3-array"; +import {FileAttachment} from "./fileAttachment.js"; +import {isArqueroTable} from "./arquero.js"; +import {isArrowTable, loadArrow} from "./arrow.js"; +import {DuckDBClient} from "./duckdb.js"; + +const nChecks = 20; // number of values to check in each array + +// We support two levels of DatabaseClient. The simplest DatabaseClient +// implements only the client.sql tagged template literal. More advanced +// DatabaseClients implement client.query and client.queryStream, which support +// streaming and abort, and the client.queryTag tagged template literal is used +// to translate the contents of a SQL cell or Table cell into the appropriate +// arguments for calling client.query or client.queryStream. For table cells, we +// additionally require client.describeColumns. The client.describeTables method +// is optional. +export function isDatabaseClient(value, mode) { + return ( + value && + (typeof value.sql === "function" || + (typeof value.queryTag === "function" && + (typeof value.query === "function" || + typeof value.queryStream === "function"))) && + (mode !== "table" || typeof value.describeColumns === "function") && + value !== __query // don’t match our internal helper + ); +} + +// Returns true if the value is a typed array (for a single-column table), or if +// it’s an array. In the latter case, the elements of the array must be +// consistently typed: either plain objects or primitives or dates. +export function isDataArray(value) { + return ( + (Array.isArray(value) && + (isQueryResultSetSchema(value.schema) || + isQueryResultSetColumns(value.columns) || + arrayContainsObjects(value) || + arrayContainsPrimitives(value) || + arrayContainsDates(value))) || + isTypedArray(value) + ); +} + +// Given an array, checks that the given value is an array that does not contain +// any primitive values (at least for the first few values that we check), and +// that the first object contains enumerable keys (see computeSchema for how we +// infer the columns). We assume that the contents of the table are homogenous, +// but we don’t currently enforce this. +// https://observablehq.com/@observablehq/database-client-specification#§1 +function arrayContainsObjects(value) { + const n = Math.min(nChecks, value.length); + for (let i = 0; i < n; ++i) { + const v = value[i]; + if (v === null || typeof v !== "object") return false; + } + return n > 0 && objectHasEnumerableKeys(value[0]); +} + +// Using a for-in loop here means that we can abort after finding at least one +// enumerable key (whereas Object.keys would require materializing the array of +// all keys, which would be considerably slower if the value has many keys!). +// This function assumes that value is an object; see arrayContainsObjects. +function objectHasEnumerableKeys(value) { + for (const _ in value) return true; + return false; +} + +function isQueryResultSetSchema(schemas) { + return ( + Array.isArray(schemas) && + schemas.every(isColumnSchema) + ); +} + +function isQueryResultSetColumns(columns) { + return (Array.isArray(columns) && columns.every((name) => typeof name === "string")); +} + +function isColumnSchema(schema) { + return schema && typeof schema.name === "string" && typeof schema.type === "string"; +} + +// Returns true if the value represents an array of primitives (i.e., a +// single-column table). This should only be passed values for which +// isDataArray returns true. +export function arrayIsPrimitive(value) { + return ( + isTypedArray(value) || + arrayContainsPrimitives(value) || + arrayContainsDates(value) + ); +} + +// Given an array, checks that the first n elements are primitives (number, +// string, boolean, bigint) of a consistent type. +function arrayContainsPrimitives(value) { + const n = Math.min(nChecks, value.length); + if (!(n > 0)) return false; + let type; + let hasPrimitive = false; // ensure we encounter 1+ primitives + for (let i = 0; i < n; ++i) { + const v = value[i]; + if (v == null) continue; // ignore null and undefined + const t = typeof v; + if (type === undefined) { + switch (t) { + case "number": + case "boolean": + case "string": + case "bigint": + type = t; + break; + default: + return false; + } + } else if (t !== type) { + return false; + } + hasPrimitive = true; + } + return hasPrimitive; +} + +// Given an array, checks that the first n elements are dates. +function arrayContainsDates(value) { + const n = Math.min(nChecks, value.length); + if (!(n > 0)) return false; + let hasDate = false; // ensure we encounter 1+ dates + for (let i = 0; i < n; ++i) { + const v = value[i]; + if (v == null) continue; // ignore null and undefined + if (!(v instanceof Date)) return false; + hasDate = true; + } + return hasDate; +} + +function isTypedArray(value) { + return ( + value instanceof Int8Array || + value instanceof Int16Array || + value instanceof Int32Array || + value instanceof Uint8Array || + value instanceof Uint8ClampedArray || + value instanceof Uint16Array || + value instanceof Uint32Array || + value instanceof Float32Array || + value instanceof Float64Array + ); +} + +// __query is used by table cells; __query.sql is used by SQL cells. +export const __query = Object.assign( + async (source, operations, invalidation, name) => { + source = await loadTableDataSource(await source, name); + if (isDatabaseClient(source)) return evaluateQuery(source, makeQueryTemplate(operations, source), invalidation); + if (isDataArray(source)) return __table(source, operations); + if (!source) throw new Error("missing data source"); + throw new Error("invalid data source"); + }, + { + sql(source, invalidation, name) { + return async function () { + return evaluateQuery(await loadSqlDataSource(await source, name), arguments, invalidation); + }; + } + } +); + +export async function loadDataSource(source, mode, name) { + switch (mode) { + case "chart": return loadChartDataSource(source); + case "table": return loadTableDataSource(source, name); + case "sql": return loadSqlDataSource(source, name); + } + return source; +} + +// We use a weak map to cache loaded data sources by key so that we don’t have +// to e.g. create separate SQLiteDatabaseClients every time we’re querying the +// same SQLite file attachment. Since this is a weak map, unused references will +// be garbage collected when they are no longer desired. Note: the name should +// be consistent, as it is not part of the cache key! +function sourceCache(loadSource) { + const cache = new WeakMap(); + return (source, name) => { + if (!source || typeof source !== "object") throw new Error("invalid data source"); + let promise = cache.get(source); + if (!promise || (isDataArray(source) && source.length !== promise._numRows)) { + // Warning: do not await here! We need to populate the cache synchronously. + promise = loadSource(source, name); + promise._numRows = source.length; // This will be undefined for DatabaseClients + cache.set(source, promise); + } + return promise; + }; +} + +const loadChartDataSource = sourceCache(async (source) => { + if (source instanceof FileAttachment) { + switch (source.mimeType) { + case "text/csv": return source.csv({typed: "auto"}); + case "text/tab-separated-values": return source.tsv({typed: "auto"}); + case "application/json": return source.json(); + } + throw new Error(`unsupported file type: ${source.mimeType}`); + } + return source; +}); + +const loadTableDataSource = sourceCache(async (source, name) => { + if (source instanceof FileAttachment) { + switch (source.mimeType) { + case "text/csv": return source.csv(); + case "text/tab-separated-values": return source.tsv(); + case "application/json": return source.json(); + case "application/x-sqlite3": return source.sqlite(); + } + if (/\.(arrow|parquet)$/i.test(source.name)) return loadDuckDBClient(source, name); + throw new Error(`unsupported file type: ${source.mimeType}`); + } + if (isArrowTable(source) || isArqueroTable(source)) return loadDuckDBClient(source, name); + if (isDataArray(source) && arrayIsPrimitive(source)) + return Array.from(source, (value) => ({value})); + return source; +}); + +const loadSqlDataSource = sourceCache(async (source, name) => { + if (source instanceof FileAttachment) { + switch (source.mimeType) { + case "text/csv": + case "text/tab-separated-values": + case "application/json": return loadDuckDBClient(source, name); + case "application/x-sqlite3": return source.sqlite(); + } + if (/\.(arrow|parquet)$/i.test(source.name)) return loadDuckDBClient(source, name); + throw new Error(`unsupported file type: ${source.mimeType}`); + } + if (isDataArray(source)) return loadDuckDBClient(await asArrowTable(source, name), name); + if (isArrowTable(source) || isArqueroTable(source)) return loadDuckDBClient(source, name); + return source; +}); + +async function asArrowTable(array, name) { + const arrow = await loadArrow(); + return arrayIsPrimitive(array) + ? arrow.tableFromArrays({[name]: array}) + : arrow.tableFromJSON(array); +} + +function loadDuckDBClient( + source, + name = source instanceof FileAttachment + ? getFileSourceName(source) + : "__table" +) { + return DuckDBClient.of({[name]: source}); +} + +function getFileSourceName(file) { + return file.name + .replace(/@\d+(?=\.|$)/, "") // strip Observable file version number + .replace(/\.\w+$/, ""); // strip file extension +} + +async function evaluateQuery(source, args, invalidation) { + if (!source) throw new Error("missing data source"); + + // If this DatabaseClient supports abort and streaming, use that. + if (typeof source.queryTag === "function") { + const abortController = new AbortController(); + const options = {signal: abortController.signal}; + invalidation.then(() => abortController.abort("invalidated")); + if (typeof source.queryStream === "function") { + return accumulateQuery( + source.queryStream(...source.queryTag.apply(source, args), options) + ); + } + if (typeof source.query === "function") { + return source.query(...source.queryTag.apply(source, args), options); + } + } + + // Otherwise, fallback to the basic sql tagged template literal. + if (typeof source.sql === "function") { + return source.sql.apply(source, args); + } + + // TODO: test if source is a file attachment, and support CSV etc. + throw new Error("source does not implement query, queryStream, or sql"); +} + +// Generator function that yields accumulated query results client.queryStream +async function* accumulateQuery(queryRequest) { + let then = performance.now(); + const queryResponse = await queryRequest; + const values = []; + values.done = false; + values.error = null; + values.schema = queryResponse.schema; + try { + for await (const rows of queryResponse.readRows()) { + if (performance.now() - then > 150 && values.length > 0) { + yield values; + then = performance.now(); + } + for (const value of rows) { + values.push(value); + } + } + values.done = true; + yield values; + } catch (error) { + values.error = error; + yield values; + } +} + +/** + * Returns a SQL query in the form [[parts], ...params] where parts is an array + * of sub-strings and params are the parameter values to be inserted between each + * sub-string. + */ +export function makeQueryTemplate(operations, source) { + const escaper = + typeof source.escape === "function" ? source.escape : (i) => i; + const {select, from, filter, sort, slice} = operations; + if (!from.table) + throw new Error("missing from table"); + if (select.columns && select.columns.length === 0) + throw new Error("at least one column must be selected"); + const names = new Map(operations.names?.map(({column, name}) => [column, name])); + const columns = select.columns ? select.columns.map((column) => { + const override = names.get(column); + return override ? `${escaper(column)} AS ${escaper(override)}` : escaper(column); + }).join(", ") : "*"; + const args = [ + [`SELECT ${columns} FROM ${formatTable(from.table, escaper)}`] + ]; + for (let i = 0; i < filter.length; ++i) { + appendSql(i ? `\nAND ` : `\nWHERE `, args); + appendWhereEntry(filter[i], args, escaper); + } + for (let i = 0; i < sort.length; ++i) { + appendSql(i ? `, ` : `\nORDER BY `, args); + appendOrderBy(sort[i], args, escaper); + } + if (source.dialect === "mssql" || source.dialect === "oracle") { + if (slice.to !== null || slice.from !== null) { + if (!sort.length) { + if (!select.columns) + throw new Error( + "at least one column must be explicitly specified. Received '*'." + ); + appendSql(`\nORDER BY `, args); + appendOrderBy( + {column: select.columns[0], direction: "ASC"}, + args, + escaper + ); + } + appendSql(`\nOFFSET ${slice.from || 0} ROWS`, args); + appendSql( + `\nFETCH NEXT ${ + slice.to !== null ? slice.to - (slice.from || 0) : 1e9 + } ROWS ONLY`, + args + ); + } + } else { + if (slice.to !== null || slice.from !== null) { + appendSql( + `\nLIMIT ${slice.to !== null ? slice.to - (slice.from || 0) : 1e9}`, + args + ); + } + if (slice.from !== null) { + appendSql(` OFFSET ${slice.from}`, args); + } + } + return args; +} + +function formatTable(table, escaper) { + if (typeof table === "object") { // i.e., not a bare string specifier + let from = ""; + if (table.database != null) from += escaper(table.database) + "."; + if (table.schema != null) from += escaper(table.schema) + "."; + from += escaper(table.table); + return from; + } else { + return escaper(table); + } +} + +function appendSql(sql, args) { + const strings = args[0]; + strings[strings.length - 1] += sql; +} + +function appendOrderBy({column, direction}, args, escaper) { + appendSql(`${escaper(column)} ${direction.toUpperCase()}`, args); +} + +function appendWhereEntry({type, operands}, args, escaper) { + if (operands.length < 1) throw new Error("Invalid operand length"); + + // Unary operations + // We treat `v` and `nv` as `NULL` and `NOT NULL` unary operations in SQL, + // since the database already validates column types. + if (operands.length === 1 || type === "v" || type === "nv") { + appendOperand(operands[0], args, escaper); + switch (type) { + case "n": + case "nv": + appendSql(` IS NULL`, args); + return; + case "nn": + case "v": + appendSql(` IS NOT NULL`, args); + return; + default: + throw new Error("Invalid filter operation"); + } + } + + // Binary operations + if (operands.length === 2) { + if (["in", "nin"].includes(type)) { + // Fallthrough to next parent block. + } else if (["c", "nc"].includes(type)) { + // TODO: Case (in)sensitive? + appendOperand(operands[0], args, escaper); + switch (type) { + case "c": + appendSql(` LIKE `, args); + break; + case "nc": + appendSql(` NOT LIKE `, args); + break; + } + appendOperand(likeOperand(operands[1]), args, escaper); + return; + } else { + appendOperand(operands[0], args, escaper); + switch (type) { + case "eq": + appendSql(` = `, args); + break; + case "ne": + appendSql(` <> `, args); + break; + case "gt": + appendSql(` > `, args); + break; + case "lt": + appendSql(` < `, args); + break; + case "gte": + appendSql(` >= `, args); + break; + case "lte": + appendSql(` <= `, args); + break; + default: + throw new Error("Invalid filter operation"); + } + appendOperand(operands[1], args, escaper); + return; + } + } + + // List operations + appendOperand(operands[0], args, escaper); + switch (type) { + case "in": + appendSql(` IN (`, args); + break; + case "nin": + appendSql(` NOT IN (`, args); + break; + default: + throw new Error("Invalid filter operation"); + } + appendListOperands(operands.slice(1), args); + appendSql(")", args); +} + +function appendOperand(o, args, escaper) { + if (o.type === "column") { + appendSql(escaper(o.value), args); + } else { + args.push(o.value); + args[0].push(""); + } +} + +// TODO: Support column operands here? +function appendListOperands(ops, args) { + let first = true; + for (const op of ops) { + if (first) first = false; + else appendSql(",", args); + args.push(op.value); + args[0].push(""); + } +} + +function likeOperand(operand) { + return {...operand, value: `%${operand.value}%`}; +} + +// Comparator function that moves null values (undefined, null, NaN) to the +// end of the array. +function defined(a, b) { + return (a == null || !(a >= a)) - (b == null || !(b >= b)); +} + +// Comparator function that sorts values in ascending order, with null values at +// the end. +function ascendingDefined(a, b) { + return defined(a, b) || (a < b ? -1 : a > b ? 1 : 0); +} + +// Comparator function that sorts values in descending order, with null values +// at the end. +function descendingDefined(a, b) { + return defined(a, b) || (a > b ? -1 : a < b ? 1 : 0); +} + +// Functions for checking type validity +const isValidNumber = (value) => typeof value === "number" && !Number.isNaN(value); +const isValidInteger = (value) => Number.isInteger(value) && !Number.isNaN(value); +const isValidString = (value) => typeof value === "string"; +const isValidBoolean = (value) => typeof value === "boolean"; +const isValidBigint = (value) => typeof value === "bigint"; +const isValidDate = (value) => value instanceof Date && !isNaN(value); +const isValidBuffer = (value) => value instanceof ArrayBuffer; +const isValidArray = (value) => Array.isArray(value); +const isValidObject = (value) => typeof value === "object" && value !== null; +const isValidOther = (value) => value != null; + +// Function to get the correct validity checking function based on type +export function getTypeValidator(colType) { + switch (colType) { + case "string": + return isValidString; + case "bigint": + return isValidBigint; + case "boolean": + return isValidBoolean; + case "number": + return isValidNumber; + case "integer": + return isValidInteger; + case "date": + return isValidDate; + case "buffer": + return isValidBuffer; + case "array": + return isValidArray; + case "object": + return isValidObject; + case "other": + default: + return isValidOther; + } +} + +// Accepts dates in the form of ISOString and LocaleDateString, with or without time +const DATE_TEST = /^(([-+]\d{2})?\d{4}(-\d{2}(-\d{2}))|(\d{1,2})\/(\d{1,2})\/(\d{2,4}))([T ]\d{2}:\d{2}(:\d{2}(\.\d{3})?)?(Z|[-+]\d{2}:\d{2})?)?$/; + +export function coerceToType(value, type) { + switch (type) { + case "string": + return typeof value === "string" || value == null ? value : String(value); + case "boolean": + if (typeof value === "string") { + const trimValue = value.trim().toLowerCase(); + return trimValue === "true" + ? true + : trimValue === "false" + ? false + : null; + } + return typeof value === "boolean" || value == null + ? value + : Boolean(value); + case "bigint": + return typeof value === "bigint" || value == null + ? value + : Number.isInteger(typeof value === "string" && !value.trim() ? NaN : +value) + ? BigInt(value) // eslint-disable-line no-undef + : undefined; + case "integer": // not a target type for coercion, but can be inferred + case "number": { + return typeof value === "number" + ? value + : value == null || (typeof value === "string" && !value.trim()) + ? NaN + : Number(value); + } + case "date": { + if (value instanceof Date || value == null) return value; + if (typeof value === "number") return new Date(value); + const trimValue = String(value).trim(); + if (typeof value === "string" && !trimValue) return null; + return new Date(DATE_TEST.test(trimValue) ? trimValue : NaN); + } + case "array": + case "object": + case "buffer": + case "other": + return value; + default: + throw new Error(`Unable to coerce to type: ${type}`); + } +} + +export function getSchema(source) { + const {columns} = source; + let {schema} = source; + if (!isQueryResultSetSchema(schema)) { + schema = inferSchema(source, isQueryResultSetColumns(columns) ? columns : undefined); + return {schema, inferred: true}; + } + return {schema, inferred: false}; +} + +// This function infers a schema from the source data, if one doesn't already +// exist, and merges type assertions into that schema. If the schema was +// inferred or if there are type assertions, it then coerces the rows in the +// source data to the types specified in the schema. +function applyTypes(source, operations) { + const input = source; + let {schema, inferred} = getSchema(source); + const types = new Map(schema.map(({name, type}) => [name, type])); + if (operations.types) { + for (const {name, type} of operations.types) { + types.set(name, type); + // update schema with user-selected type + if (schema === input.schema) schema = schema.slice(); // copy on write + const colIndex = schema.findIndex((col) => col.name === name); + if (colIndex > -1) schema[colIndex] = {...schema[colIndex], type}; + } + source = source.map(d => coerceRow(d, types, schema)); + } else if (inferred) { + // Coerce data according to new schema, unless that happened due to + // operations.types, above. + source = source.map(d => coerceRow(d, types, schema)); + } + return {source, schema}; +} + +function applyNames(source, operations) { + if (!operations.names) return source; + const overridesByName = new Map(operations.names.map((n) => [n.column, n])); + return source.map((d) => + Object.fromEntries(Object.keys(d).map((k) => { + const override = overridesByName.get(k); + return [override?.name ?? k, d[k]]; + })) + ); +} + +// This function applies table cell operations to an in-memory table (array of +// objects); it should be equivalent to the corresponding SQL query. TODO Use +// DuckDBClient for data arrays, too, and then we wouldn’t need our own __table +// function to do table operations on in-memory data? +export function __table(source, operations) { + const errors = new Map(); + const input = source; + const typed = applyTypes(source, operations); + source = typed.source; + let schema = typed.schema; + if (operations.derive) { + // Derived columns may depend on coerced values from the original data source, + // so we must evaluate derivations after the initial inference and coercion + // step. + const derivedSource = []; + operations.derive.map(({name, value}) => { + let columnErrors = []; + // Derived column formulas may reference renamed columns, so we must + // compute derivations on the renamed source. However, we don't modify the + // source itself with renamed names until after the other operations are + // applied, because operations like filter and sort reference original + // column names. + // TODO Allow derived columns to reference other derived columns. + applyNames(source, operations).map((row, index) => { + let resolved; + try { + // TODO Support referencing `index` and `rows` in the derive function. + resolved = value(row); + } catch (error) { + columnErrors.push({index, error}); + resolved = undefined; + } + if (derivedSource[index]) { + derivedSource[index] = {...derivedSource[index], [name]: resolved}; + } else { + derivedSource.push({[name]: resolved}); + } + }); + if (columnErrors.length) errors.set(name, columnErrors); + }); + // Since derived columns are untyped by default, we do a pass of type + // inference and coercion after computing the derived values. + const typedDerived = applyTypes(derivedSource, operations); + // Merge derived source and schema with the source dataset. + source = source.map((row, i) => ({...row, ...typedDerived.source[i]})); + schema = [...schema, ...typedDerived.schema]; + } + for (const {type, operands} of operations.filter) { + const [{value: column}] = operands; + const values = operands.slice(1).map(({value}) => value); + switch (type) { + // valid (matches the column type) + case "v": { + const [colType] = values; + const isValid = getTypeValidator(colType); + source = source.filter(d => isValid(d[column])); + break; + } + // not valid (doesn't match the column type) + case "nv": { + const [colType] = values; + const isValid = getTypeValidator(colType); + source = source.filter(d => !isValid(d[column])); + break; + } + case "eq": { + const [value] = values; + if (value instanceof Date) { + const time = +value; // compare as primitive + source = source.filter((d) => +d[column] === time); + } else { + source = source.filter((d) => d[column] === value); + } + break; + } + case "ne": { + const [value] = values; + source = source.filter((d) => d[column] !== value); + break; + } + case "c": { + const [value] = values; + source = source.filter( + (d) => typeof d[column] === "string" && d[column].includes(value) + ); + break; + } + case "nc": { + const [value] = values; + source = source.filter( + (d) => typeof d[column] === "string" && !d[column].includes(value) + ); + break; + } + case "in": { + const set = new Set(values); // TODO support dates? + source = source.filter((d) => set.has(d[column])); + break; + } + case "nin": { + const set = new Set(values); // TODO support dates? + source = source.filter((d) => !set.has(d[column])); + break; + } + case "n": { + source = source.filter((d) => d[column] == null); + break; + } + case "nn": { + source = source.filter((d) => d[column] != null); + break; + } + case "lt": { + const [value] = values; + source = source.filter((d) => d[column] < value); + break; + } + case "lte": { + const [value] = values; + source = source.filter((d) => d[column] <= value); + break; + } + case "gt": { + const [value] = values; + source = source.filter((d) => d[column] > value); + break; + } + case "gte": { + const [value] = values; + source = source.filter((d) => d[column] >= value); + break; + } + default: + throw new Error(`unknown filter type: ${type}`); + } + } + for (const {column, direction} of reverse(operations.sort)) { + const compare = direction === "desc" ? descendingDefined : ascendingDefined; + if (source === input) source = source.slice(); // defensive copy + source.sort((a, b) => compare(a[column], b[column])); + } + let {from, to} = operations.slice; + from = from == null ? 0 : Math.max(0, from); + to = to == null ? Infinity : Math.max(0, to); + if (from > 0 || to < Infinity) { + source = source.slice(Math.max(0, from), Math.max(0, to)); + } + // Preserve the schema for all columns. + let fullSchema = schema.slice(); + if (operations.select.columns) { + if (schema) { + const schemaByName = new Map(schema.map((s) => [s.name, s])); + schema = operations.select.columns.map((c) => schemaByName.get(c)); + } + source = source.map((d) => + Object.fromEntries(operations.select.columns.map((c) => [c, d[c]])) + ); + } + if (operations.names) { + const overridesByName = new Map(operations.names.map((n) => [n.column, n])); + if (schema) { + schema = schema.map((s) => { + const override = overridesByName.get(s.name); + return ({...s, ...(override ? {name: override.name} : null)}); + }); + } + if (fullSchema) { + fullSchema = fullSchema.map((s) => { + const override = overridesByName.get(s.name); + return ({...s, ...(override ? {name: override.name} : null)}); + }); + } + source = applyNames(source, operations); + } + if (source !== input) { + if (schema) source.schema = schema; + } + source.fullSchema = fullSchema; + source.errors = errors; + return source; +} + +export function coerceRow(object, types, schema) { + const coerced = {}; + for (const col of schema) { + const type = types.get(col.name); + const value = object[col.name]; + coerced[col.name] = type === "raw" ? value : coerceToType(value, type); + } + return coerced; +} + +function createTypeCount() { + return { + boolean: 0, + integer: 0, + number: 0, + date: 0, + string: 0, + array: 0, + object: 0, + bigint: 0, + buffer: 0, + defined: 0 + }; +} + +// Caution: the order below matters! 🌶️ The first one that passes the ≥90% test +// should be the one that we chose, and therefore these types should be listed +// from most specific to least specific. +const types = [ + "boolean", + "integer", + "number", + "date", + "bigint", + "array", + "object", + "buffer" + // Note: "other" and "string" are intentionally omitted; see below! +]; + +// We need to show *all* keys present in the array of Objects +function getAllKeys(rows) { + const keys = new Set(); + for (const row of rows) { + // avoid crash if row is null or undefined + if (row) { + // only enumerable properties + for (const key in row) { + // only own properties + if (Object.prototype.hasOwnProperty.call(row, key)) { + // unique properties, in the order they appear + keys.add(key); + } + } + } + } + return Array.from(keys); +} + +export function inferSchema(source, columns = getAllKeys(source)) { + const schema = []; + const sampleSize = 100; + const sample = source.slice(0, sampleSize); + const typeCounts = {}; + for (const col of columns) { + const colCount = typeCounts[col] = createTypeCount(); + for (const d of sample) { + let value = d[col]; + if (value == null) continue; + const type = typeof value; + if (type !== "string") { + ++colCount.defined; + if (Array.isArray(value)) ++colCount.array; + else if (value instanceof Date) ++colCount.date; + else if (value instanceof ArrayBuffer) ++colCount.buffer; + else if (type === "number") { + ++colCount.number; + if (Number.isInteger(value)) ++colCount.integer; + } + // bigint, boolean, or object + else if (type in colCount) ++colCount[type]; + } else { + value = value.trim(); + if (!value) continue; + ++colCount.defined; + ++colCount.string; + if (/^(true|false)$/i.test(value)) { + ++colCount.boolean; + } else if (value && !isNaN(value)) { + ++colCount.number; + if (Number.isInteger(+value)) ++colCount.integer; + } else if (DATE_TEST.test(value)) ++colCount.date; + } + } + // Chose the non-string, non-other type with the greatest count that is also + // ≥90%; or if no such type meets that criterion, fallback to string if + // ≥90%; and lastly fallback to other. + const minCount = Math.max(1, colCount.defined * 0.9); + const type = + greatest(types, (type) => + colCount[type] >= minCount ? colCount[type] : NaN + ) ?? (colCount.string >= minCount ? "string" : "other"); + schema.push({ + name: col, + type: type, + inferred: type + }); + } + return schema; +} diff --git a/packages/ojs/external-observablehq-stdlib/src/template.js b/packages/ojs/external-observablehq-stdlib/src/template.js new file mode 100644 index 00000000000..f28cb714e35 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/template.js @@ -0,0 +1,65 @@ +export function template(render, wrapper) { + return function(strings) { + var string = strings[0], + parts = [], part, + root = null, + node, nodes, + walker, + i, n, j, m, k = -1; + + // Concatenate the text using comments as placeholders. + for (i = 1, n = arguments.length; i < n; ++i) { + part = arguments[i]; + if (part instanceof Node) { + parts[++k] = part; + string += ""; + } else if (Array.isArray(part)) { + for (j = 0, m = part.length; j < m; ++j) { + node = part[j]; + if (node instanceof Node) { + if (root === null) { + parts[++k] = root = document.createDocumentFragment(); + string += ""; + } + root.appendChild(node); + } else { + root = null; + string += node; + } + } + root = null; + } else { + string += part; + } + string += strings[i]; + } + + // Render the text. + root = render(string); + + // Walk the rendered content to replace comment placeholders. + if (++k > 0) { + nodes = new Array(k); + walker = document.createTreeWalker(root, NodeFilter.SHOW_COMMENT, null, false); + while (walker.nextNode()) { + node = walker.currentNode; + if (/^o:/.test(node.nodeValue)) { + nodes[+node.nodeValue.slice(2)] = node; + } + } + for (i = 0; i < k; ++i) { + if (node = nodes[i]) { + node.parentNode.replaceChild(parts[i], node); + } + } + } + + // Is the rendered content + // … a parent of a single child? Detach and return the child. + // … a document fragment? Replace the fragment with an element. + // … some other node? Return it. + return root.childNodes.length === 1 ? root.removeChild(root.firstChild) + : root.nodeType === 11 ? ((node = wrapper()).appendChild(root), node) + : root; + }; +} diff --git a/packages/ojs/external-observablehq-stdlib/src/tex.js b/packages/ojs/external-observablehq-stdlib/src/tex.js new file mode 100644 index 00000000000..43058a51f2f --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/tex.js @@ -0,0 +1,35 @@ +import {katex} from "./dependencies.js"; + +var raw = String.raw; + +function style(href) { + return new Promise(function(resolve, reject) { + var link = document.createElement("link"); + link.rel = "stylesheet"; + link.href = href; + link.onerror = reject; + link.onload = resolve; + document.head.appendChild(link); + }); +} + +export function tex(require) { + return Promise.all([ + require(katex.resolve()), + require.resolve(katex.resolve("dist/katex.min.css")).then(style) + ]).then(function(values) { + var katex = values[0], tex = renderer(); + + function renderer(options) { + return function() { + var root = document.createElement("div"); + katex.render(raw.apply(String, arguments), root, options); + return root.removeChild(root.firstChild); + }; + } + + tex.options = renderer; + tex.block = renderer({displayMode: true}); + return tex; + }); +} diff --git a/packages/ojs/external-observablehq-stdlib/src/that.js b/packages/ojs/external-observablehq-stdlib/src/that.js new file mode 100644 index 00000000000..9d7131f8293 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/that.js @@ -0,0 +1,3 @@ +export function that() { + return this; +} diff --git a/packages/ojs/external-observablehq-stdlib/src/vegalite.js b/packages/ojs/external-observablehq-stdlib/src/vegalite.js new file mode 100644 index 00000000000..3cacadda2b7 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/vegalite.js @@ -0,0 +1,6 @@ +import {vega, vegalite, vegaliteApi} from "./dependencies.js"; + +export async function vl(require) { + const [v, vl, api] = await Promise.all([vega, vegalite, vegaliteApi].map(d => require(d.resolve()))); + return api.register(v, vl); +} diff --git a/packages/ojs/external-observablehq-stdlib/src/width.js b/packages/ojs/external-observablehq-stdlib/src/width.js new file mode 100644 index 00000000000..ced638eb248 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/width.js @@ -0,0 +1,15 @@ +import {observe} from "./generators/observe.js"; + +export function width() { + return observe(function(change) { + var width = change(document.body.clientWidth); + function resized() { + var w = document.body.clientWidth; + if (w !== width) change(width = w); + } + window.addEventListener("resize", resized); + return function() { + window.removeEventListener("resize", resized); + }; + }); +} diff --git a/packages/ojs/external-observablehq-stdlib/src/xlsx.js b/packages/ojs/external-observablehq-stdlib/src/xlsx.js new file mode 100644 index 00000000000..e5a77fcf79c --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/src/xlsx.js @@ -0,0 +1,109 @@ +export class Workbook { + constructor(workbook) { + Object.defineProperties(this, { + _: {value: workbook}, + sheetNames: { + value: workbook.worksheets.map((s) => s.name), + enumerable: true + } + }); + } + sheet(name, options) { + const sname = + typeof name === "number" + ? this.sheetNames[name] + : this.sheetNames.includes((name += "")) + ? name + : null; + if (sname == null) throw new Error(`Sheet not found: ${name}`); + const sheet = this._.getWorksheet(sname); + return extract(sheet, options); + } +} + +function extract(sheet, {range, headers} = {}) { + let [[c0, r0], [c1, r1]] = parseRange(range, sheet); + const headerRow = headers ? sheet._rows[r0++] : null; + let names = new Set(["#"]); + for (let n = c0; n <= c1; n++) { + const value = headerRow ? valueOf(headerRow.findCell(n + 1)) : null; + let name = (value && value + "") || toColumn(n); + while (names.has(name)) name += "_"; + names.add(name); + } + names = new Array(c0).concat(Array.from(names)); + + const output = new Array(r1 - r0 + 1); + for (let r = r0; r <= r1; r++) { + const row = (output[r - r0] = Object.create(null, {"#": {value: r + 1}})); + const _row = sheet.getRow(r + 1); + if (_row.hasValues) + for (let c = c0; c <= c1; c++) { + const value = valueOf(_row.findCell(c + 1)); + if (value != null) row[names[c + 1]] = value; + } + } + + output.columns = names.filter(() => true); // Filter sparse columns + return output; +} + +function valueOf(cell) { + if (!cell) return; + const {value} = cell; + if (value && typeof value === "object" && !(value instanceof Date)) { + if (value.formula || value.sharedFormula) { + return value.result && value.result.error ? NaN : value.result; + } + if (value.richText) { + return richText(value); + } + if (value.text) { + let {text} = value; + if (text.richText) text = richText(text); + return value.hyperlink && value.hyperlink !== text + ? `${value.hyperlink} ${text}` + : text; + } + return value; + } + return value; +} + +function richText(value) { + return value.richText.map((d) => d.text).join(""); +} + +function parseRange(specifier = ":", {columnCount, rowCount}) { + specifier += ""; + if (!specifier.match(/^[A-Z]*\d*:[A-Z]*\d*$/)) + throw new Error("Malformed range specifier"); + const [[c0 = 0, r0 = 0], [c1 = columnCount - 1, r1 = rowCount - 1]] = + specifier.split(":").map(fromCellReference); + return [ + [c0, r0], + [c1, r1] + ]; +} + +// Returns the default column name for a zero-based column index. +// For example: 0 -> "A", 1 -> "B", 25 -> "Z", 26 -> "AA", 27 -> "AB". +function toColumn(c) { + let sc = ""; + c++; + do { + sc = String.fromCharCode(64 + (c % 26 || 26)) + sc; + } while ((c = Math.floor((c - 1) / 26))); + return sc; +} + +// Returns the zero-based indexes from a cell reference. +// For example: "A1" -> [0, 0], "B2" -> [1, 1], "AA10" -> [26, 9]. +function fromCellReference(s) { + const [, sc, sr] = s.match(/^([A-Z]*)(\d*)$/); + let c = 0; + if (sc) + for (let i = 0; i < sc.length; i++) + c += Math.pow(26, sc.length - i - 1) * (sc.charCodeAt(i) - 64); + return [c ? c - 1 : undefined, sr ? +sr - 1 : undefined]; +} diff --git a/packages/ojs/external-observablehq-stdlib/stdlib.sublime-project b/packages/ojs/external-observablehq-stdlib/stdlib.sublime-project new file mode 100644 index 00000000000..59ba83cde00 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/stdlib.sublime-project @@ -0,0 +1,17 @@ +{ + "folders": [ + { + "path": ".", + "file_exclude_patterns": ["*.sublime-workspace"], + "folder_exclude_patterns": [".esm-cache", "dist"] + } + ], + "build_systems": [ + { + "name": "yarn test", + "cmd": ["yarn", "test"], + "file_regex": "\\((...*?):([0-9]*):([0-9]*)\\)", + "working_dir": "$project_path" + } + ] +} diff --git a/packages/ojs/external-observablehq-stdlib/test/.eslintrc.json b/packages/ojs/external-observablehq-stdlib/test/.eslintrc.json new file mode 100644 index 00000000000..7eeefc33b66 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/test/.eslintrc.json @@ -0,0 +1,5 @@ +{ + "env": { + "mocha": true + } +} diff --git a/packages/ojs/external-observablehq-stdlib/test/DOM/uid-test.js b/packages/ojs/external-observablehq-stdlib/test/DOM/uid-test.js new file mode 100644 index 00000000000..99df4daf093 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/test/DOM/uid-test.js @@ -0,0 +1,11 @@ +import assert from "assert"; +import {uid} from "../../src/dom/uid.js"; + +it("uid", () => { + global.location = "https://test.com/"; + const hi = uid("hi"); + assert.deepEqual(hi, {id: "O-hi-1", href: "https://test.com/#O-hi-1"}); + assert.strictEqual(hi.toString(), "url(https://test.com/#O-hi-1)"); + const anon = uid(); + assert.strictEqual(anon.toString(), "url(https://test.com/#O-2)"); +}); diff --git a/packages/ojs/external-observablehq-stdlib/test/fileAttachments-test.js b/packages/ojs/external-observablehq-stdlib/test/fileAttachments-test.js new file mode 100644 index 00000000000..64225552dd1 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/test/fileAttachments-test.js @@ -0,0 +1,69 @@ +import assert from "assert"; +import {enforceSchema} from "../src/fileAttachment.js"; +import {FileAttachments} from "../src/index.js"; +import {inferSchema} from "../src/table.js"; + +it("FileAttachments is exported by stdlib", () => { + assert.strictEqual(typeof FileAttachments, "function"); + assert.strictEqual(FileAttachments.name, "FileAttachments"); +}); + +it("FileAttachment ensures that URLs are strings", async () => { + const FileAttachment = FileAttachments((name) => + new URL(`https://example.com/${name}.js`) + ); + const file = FileAttachment("filename"); + assert.strictEqual(file.constructor.name, "FileAttachment"); + assert.strictEqual(await file.url(), "https://example.com/filename.js"); +}); + +it("FileAttachment returns instances of FileAttachment", async () => { + const FileAttachment = FileAttachments((name) => + new URL(`https://example.com/${name}.js`) + ); + const file = FileAttachment("filename"); + assert.ok(file instanceof FileAttachment); +}); + +it("FileAttachment cannot be used as a constructor", async () => { + const FileAttachment = FileAttachments((name) => + new URL(`https://example.com/${name}.js`) + ); + assert.throws(() => new FileAttachment("filename"), /FileAttachment is not a constructor/); +}); + +it("FileAttachment works with Promises that resolve to URLs", async () => { + const FileAttachment = FileAttachments(async (name) => + new URL(`https://example.com/${name}.js`) + ); + const file = FileAttachment("otherfile"); + assert.strictEqual(file.constructor.name, "FileAttachment"); + assert.strictEqual(await file.url(), "https://example.com/otherfile.js"); +}); + +it("enforceSchema coerces an array of objects", () => { + const source = [{a: "0", b: "1", c: "2"}]; + assert.deepStrictEqual( + enforceSchema(source, inferSchema(source)), + Object.assign( + [{a: 0, b: 1, c: 2}], + {schema: [ + { + inferred: "integer", + name: "a", + type: "integer" + }, + { + inferred: "integer", + name: "b", + type: "integer" + }, + { + inferred: "integer", + name: "c", + type: "integer" + } + ]} + ) + ); +}); diff --git a/packages/ojs/external-observablehq-stdlib/test/generators/disposable-test.js b/packages/ojs/external-observablehq-stdlib/test/generators/disposable-test.js new file mode 100644 index 00000000000..ae60d30d595 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/test/generators/disposable-test.js @@ -0,0 +1,24 @@ +import assert from "assert"; +import {disposable} from "../../src/generators/disposable.js"; + +it("disposable(value, dispose) yields the specified value", async () => { + const foo = {}; + const generator = disposable(foo, () => {}); + assert.deepStrictEqual(generator.next(), {done: false, value: foo}); + assert.deepStrictEqual(generator.next(), {done: true}); +}); + +it("disposable(value, dispose) defines generator.return", async () => { + let passedFoo; + const foo = {}; + const generator = disposable(foo, _ => (passedFoo = _)); + assert.deepStrictEqual(generator.return(), {done: true}); + assert.strictEqual(passedFoo, foo); + assert.deepStrictEqual(generator.next(), {done: true}); +}); + +it("disposable(value, dispose) defines generator.throw", async () => { + const generator = disposable(42, () => {}); + assert.deepStrictEqual(generator.throw(new Error()), {done: true}); + assert.deepStrictEqual(generator.next(), {done: true}); +}); diff --git a/packages/ojs/external-observablehq-stdlib/test/generators/generators-test.js b/packages/ojs/external-observablehq-stdlib/test/generators/generators-test.js new file mode 100644 index 00000000000..12790222778 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/test/generators/generators-test.js @@ -0,0 +1,58 @@ +import assert from "assert"; +import {filter} from "../../src/generators/filter.js"; +import {map} from "../../src/generators/map.js"; +import {range} from "../../src/generators/range.js"; +import {valueAt} from "../../src/generators/valueAt.js"; +import {observe} from "../../src/generators/observe.js"; +import {queue} from "../../src/generators/queue.js"; +import {Library} from "../../src/library.js"; + +it("library.Generators.observe is a function", () => { + const library = new Library(); + assert.strictEqual(typeof library.Generators.observe, "function"); +}); + +it("filter(value, fn) filters", () => { + function* input() { + yield* [1, 2, 3, 4]; + } + assert.deepStrictEqual(Array.from(filter(input(), i => i % 2 === 0)), [2, 4]); +}); + +it("map(value, fn) maps", () => { + function* input() { + yield* [1, 2, 3, 4]; + } + assert.deepStrictEqual(Array.from(map(input(), i => i * 2)), [2, 4, 6, 8]); +}); + +it("range(start, stop) generates a range", () => { + assert.deepStrictEqual(Array.from(range(1, 4)), [1, 2, 3]); + assert.deepStrictEqual(Array.from(range(1, 5, 2)), [1, 3]); + assert.deepStrictEqual(Array.from(range(3)), [0, 1, 2]); +}); + +it("valueAt(generator, i) picks a value", () => { + function* input() { + yield* [1, 2, 3, 4]; + } + assert.strictEqual(valueAt(input(), 2), 3); + assert.strictEqual(valueAt(input()), undefined); +}); + +it("observe only yields the most recent value", async () => { + let o = observe(change => { + change(1); + change(2); + }); + assert.strictEqual(await o.next().value, 2); +}); + +it("queue yields all values", async () => { + let q = queue(change => { + change(1); + change(2); + }); + assert.strictEqual(await q.next().value, 1); + assert.strictEqual(await q.next().value, 2); +}); diff --git a/packages/ojs/external-observablehq-stdlib/test/index-test.js b/packages/ojs/external-observablehq-stdlib/test/index-test.js new file mode 100644 index 00000000000..d25f94fb3cb --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/test/index-test.js @@ -0,0 +1,49 @@ +import assert from "assert"; +import {Library} from "../src/index.js"; + +it("new Library returns a library with the expected keys", () => { + assert.deepStrictEqual(Object.keys(new Library()).sort(), [ + "Arrow", + "DOM", + "DuckDBClient", + "FileAttachment", + "Files", + "Generators", + "Inputs", + "L", + "Mutable", + "Plot", + "Promises", + "SQLite", + "SQLiteDatabaseClient", + "_", + "__query", + "aapl", + "alphabet", + "aq", + "cars", + "citywages", + "d3", + "diamonds", + "dot", + "flare", + "htl", + "html", + "industries", + "md", + "mermaid", + "miserables", + "now", + "olympians", + "penguins", + "pizza", + "require", + "resolve", + "svg", + "tex", + "topojson", + "vl", + "weather", + "width" + ]); +}); diff --git a/packages/ojs/external-observablehq-stdlib/test/invalidation.js b/packages/ojs/external-observablehq-stdlib/test/invalidation.js new file mode 100644 index 00000000000..e90fe292d71 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/test/invalidation.js @@ -0,0 +1,47 @@ +export default typeof AbortController === "undefined" || typeof performance === "undefined" ? mockit : it; + +function mockit(description, run) { + return it(description, withMock(run)); +} + +mockit.skip = (description, run) => { + return it.skip(description, withMock(run)); +}; + +mockit.only = (description, run) => { + return it.only(description, withMock(run)); +}; + +class MockAbortController { + constructor() { + this.signal = {aborted: false}; + } + abort() { + this.signal.aborted = true; + } +} + +class MockPerformance { + static now() { + return Date.now(); + } +} + +function withMock(run) { + return async () => { + global.AbortController = MockAbortController; + global.performance = MockPerformance; + try { + return await run(); + } finally { + delete global.AbortController; + delete global.performance; + } + }; +} + +export function invalidator() { + let invalidate; + const invalidation = new Promise((resolve) => (invalidate = resolve)); + return [invalidation, invalidate]; +} diff --git a/packages/ojs/external-observablehq-stdlib/test/promises/delay-test.js b/packages/ojs/external-observablehq-stdlib/test/promises/delay-test.js new file mode 100644 index 00000000000..ac9810b5aa3 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/test/promises/delay-test.js @@ -0,0 +1,31 @@ +import assert from "assert"; +import {delay} from "../../src/promises/delay.js"; +import {tick} from "../../src/promises/tick.js"; + +it("delay(duration) resolves with undefined", async () => { + assert.strictEqual(await delay(50), undefined); +}); + +it("delay(duration) resolves after the specified duration", async () => { + const then = Date.now(); + await delay(150); + const delta = Date.now() - then; + assert.ok(130 <= delta && delta <= 170); +}); + +it("delay(duration, value) resolves with the specified value", async () => { + assert.strictEqual(await delay(50, "foo"), "foo"); +}); + +it("delay(duration, value) resolves with the specified value after the specified duration", async () => { + const then = Date.now(); + assert.strictEqual(await delay(150, "foo"), "foo"); + const delta = Date.now() - then; + assert.ok(130 <= delta && delta <= 170); +}); + +it("tick(1000) resolves near the second boundary", async () => { + await tick(1000); + const now = Date.now(); + assert.ok(now % 1000 < 10, `${now % 1000} deviation from the second`); +}); diff --git a/packages/ojs/external-observablehq-stdlib/test/query-test.js b/packages/ojs/external-observablehq-stdlib/test/query-test.js new file mode 100644 index 00000000000..b59505a3563 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/test/query-test.js @@ -0,0 +1,111 @@ +import assert from "assert"; +import {__query} from "../src/table.js"; +import it, {invalidator} from "./invalidation.js"; + +describe("__query.sql", () => { + it("evaluates using db.sql with the expected parameters", async () => { + const [invalidation] = invalidator(); + const data = [{x: 1}, {x: 2}]; + let args; + const db = { + async sql() { + args = Array.from(arguments); + return data; + } + }; + assert.strictEqual(await __query.sql(db, invalidation)`SELECT * FROM data WHERE ${1}`, data); + assert.deepStrictEqual(args, [[`SELECT * FROM data WHERE `, ``], 1]); + }); + + it("evaluates using db.query and db.queryTag with the expected parameters", async () => { + const [invalidation] = invalidator(); + const data = [{x: 1}, {x: 2}]; + let queryTagArgs; + let querySource; + let queryParameters; + const db = { + queryTag(strings, ...args) { + queryTagArgs = Array.from(arguments); + return [strings.join("?"), args]; + }, + async query(source, parameters) { + querySource = source; + queryParameters = parameters; + return data; + } + }; + assert.strictEqual(await __query.sql(db, invalidation)`SELECT * FROM data WHERE ${1}`, data); + assert.deepStrictEqual(queryTagArgs, [[`SELECT * FROM data WHERE `, ""], 1]); + assert.strictEqual(querySource, `SELECT * FROM data WHERE ?`); + assert.deepStrictEqual(queryParameters, [1]); + }); + + it("evaluates using db.queryStream and db.queryTag with the expected parameters", async () => { + const [invalidation] = invalidator(); + const data1 = [{x: 1}, {x: 2}]; + const data2 = [{x: 3}, {x: 4}]; + const schema = [{name: "x", type: "number", nullable: false}]; + let queryTagArgs; + let querySource; + let queryParameters; + const db = { + queryTag(strings, ...args) { + queryTagArgs = Array.from(arguments); + return [strings.join("?"), args]; + }, + async queryStream(source, parameters) { + querySource = source; + queryParameters = parameters; + await new Promise((resolve) => setTimeout(resolve, 100)); + return { + schema, + async *readRows() { + await new Promise((resolve) => setTimeout(resolve, 100)); + yield data1; + await new Promise((resolve) => setTimeout(resolve, 100)); + yield data2; + } + }; + } + }; + let i = 0; + let previousResult; + for await (const result of await __query.sql(db, invalidation)`SELECT * FROM data WHERE ${1}`) { + switch (++i) { + case 1: + previousResult = result; + assert.deepStrictEqual(result, Object.assign([...data1], {done: false, error: null, schema})); + break; + case 2: + assert.strictEqual(result, previousResult); + assert.deepStrictEqual(result, Object.assign([...data1, ...data2], {done: true, error: null, schema})); + break; + default: + assert.fail("unexpected batch"); + } + } + assert.strictEqual(i, 2); + assert.deepStrictEqual(queryTagArgs, [[`SELECT * FROM data WHERE `, ""], 1]); + assert.strictEqual(querySource, `SELECT * FROM data WHERE ?`); + assert.deepStrictEqual(queryParameters, [1]); + }); + + it("sends an abort signal to db.query when the invalidation promise resolves", async () => { + const [invalidation, invalidate] = invalidator(); + const data = [{x: 1}, {x: 2}]; + let queryOptions; + const db = { + queryTag(strings, ...args) { + return [strings.join("?"), args]; + }, + async query(source, parameters, options) { + queryOptions = options; + return data; + } + }; + assert.strictEqual(await __query.sql(db, invalidation)`SELECT * FROM data WHERE ${1}`, data); + assert.strictEqual(queryOptions.signal.aborted, false); + await invalidate(); + assert.strictEqual(queryOptions.signal.aborted, true); + }); +}); diff --git a/packages/ojs/external-observablehq-stdlib/test/table-test.js b/packages/ojs/external-observablehq-stdlib/test/table-test.js new file mode 100644 index 00000000000..ea4e47133e1 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/test/table-test.js @@ -0,0 +1,1348 @@ +import { + coerceToType, + getTypeValidator, + inferSchema, + makeQueryTemplate, + __table, + getSchema +} from "../src/table.js"; +import assert from "assert"; + +export const EMPTY_TABLE_DATA = { + source: { + name: null, + type: null + }, + operations: { + select: { + columns: null + }, + from: { + table: null, + mimeType: null + }, + filter: [], + sort: [], + slice: { + from: null, + to: null + } + }, + ui: { + showCharts: true + } +}; + +const baseOperations = { + ...EMPTY_TABLE_DATA.operations, + select: {columns: ["col1", "col2"]}, + from: { + table: "table1", + mimeType: null + } +}; + +function escape(identifier) { + return `\`${identifier.replace(/`/g, "``")}\``; +} + +describe("makeQueryTemplate", () => { + it("makeQueryTemplate null table", () => { + const source = {}; + assert.throws(() => makeQueryTemplate(EMPTY_TABLE_DATA.operations, source), /missing from table/); + }); + + it("makeQueryTemplate no selected columns", () => { + const source = {name: "db", dialect: "postgres"}; + const operationsColumnsEmpty = {...baseOperations, select: {columns: []}}; + assert.throws(() => makeQueryTemplate(operationsColumnsEmpty, source), /at least one column must be selected/); + }); + + it("makeQueryTemplate select all", () => { + const source = {name: "db", dialect: "postgres"}; + const operationsColumnsNull = {...baseOperations, select: {columns: null}}; + assert.deepStrictEqual(makeQueryTemplate(operationsColumnsNull, source), [["SELECT * FROM table1"]]); + }); + + it("makeQueryTemplate invalid filter operation", () => { + const source = {name: "db", dialect: "postgres"}; + const invalidFilters = [ + { + type: "n", + operands: [ + {type: "column", value: "col1"}, + {type: "resolved", value: "val1"} + ] + }, + { + type: "eq", + operands: [{type: "column", value: "col1"}] + }, + { + type: "lt", + operands: [ + {type: "column", value: "col1"}, + {type: "resolved", value: "val1"}, + {type: "resolved", value: "val2"} + ] + } + ]; + + invalidFilters.map((filter) => { + const operations = { + ...baseOperations, + filter: [filter] + }; + assert.throws(() => makeQueryTemplate(operations, source), /Invalid filter operation/); + }); + }); + + it("makeQueryTemplate filter", () => { + const source = {name: "db", dialect: "postgres"}; + const operations = { + ...baseOperations, + filter: [ + { + type: "eq", + operands: [ + {type: "column", value: "col1"}, + {type: "resolved", value: "val1"} + ] + } + ] + }; + + const [parts, ...params] = makeQueryTemplate(operations, source); + assert.deepStrictEqual(parts.join("?"), "SELECT col1, col2 FROM table1\nWHERE col1 = ?"); + assert.deepStrictEqual(params, ["val1"]); + }); + + it("makeQueryTemplate filter and escape filters column", () => { + const source = {name: "db", dialect: "postgres", escape: (i) => `_${i}_`}; + const operations = { + ...baseOperations, + filter: [ + { + type: "eq", + operands: [ + {type: "column", value: "col2"}, + {type: "resolved", value: "val1"} + ] + } + ] + }; + + const [parts, ...params] = makeQueryTemplate(operations, source); + assert.deepStrictEqual( + parts.join("?"), + "SELECT _col1_, _col2_ FROM _table1_\nWHERE _col2_ = ?" + ); + assert.deepStrictEqual(params, ["val1"]); + }); + + it("makeQueryTemplate filter and escape filters column only once", () => { + const source = {name: "db", dialect: "postgres", escape: (i) => `_${i}_`}; + const operations = { + ...baseOperations, + filter: [ + { + type: "eq", + operands: [ + {type: "column", value: "col2"}, + {type: "resolved", value: "val1"} + ] + } + ] + }; + + makeQueryTemplate(operations, source); + const [parts, ...params] = makeQueryTemplate(operations, source); + assert.deepStrictEqual( + parts.join("?"), + "SELECT _col1_, _col2_ FROM _table1_\nWHERE _col2_ = ?" + ); + assert.deepStrictEqual(params, ["val1"]); + }); + + it("makeQueryTemplate filter list", () => { + const source = {name: "db", dialect: "postgres"}; + const operations = { + ...baseOperations, + filter: [ + { + type: "in", + operands: [ + {type: "column", value: "col1"}, + {type: "resolved", value: "val1"}, + {type: "resolved", value: "val2"}, + {type: "resolved", value: "val3"} + ] + }, + { + type: "nin", + operands: [ + {type: "column", value: "col1"}, + {type: "resolved", value: "val4"} + ] + } + ] + }; + + const [parts, ...params] = makeQueryTemplate(operations, source); + assert.deepStrictEqual(parts.join("?"), "SELECT col1, col2 FROM table1\nWHERE col1 IN (?,?,?)\nAND col1 NOT IN (?)"); + assert.deepStrictEqual(params, ["val1", "val2", "val3", "val4"]); + }); + + it("makeQueryTemplate filter valid and not valid", () => { + const source = {name: "db", dialect: "postgres"}; + const operations = { + ...baseOperations, + filter: [ + { + type: "v", + operands: [ + {type: "column", value: "col1"}, + {type: "primitive", value: "string"} + ] + }, + { + type: "nv", + operands: [ + {type: "column", value: "col2"}, + {type: "primitive", value: "number"} + ] + } + ] + }; + const [parts] = makeQueryTemplate(operations, source); + assert.deepStrictEqual(parts.join("?"), "SELECT col1, col2 FROM table1\nWHERE col1 IS NOT NULL\nAND col2 IS NULL"); + }); + + it("makeQueryTemplate select", () => { + const source = {name: "db", dialect: "mysql"}; + const operations = { + ...baseOperations, + select: { + columns: ["col1", "col2", "col3"] + } + }; + + const [parts, ...params] = makeQueryTemplate(operations, source); + assert.deepStrictEqual(parts.join("?"), "SELECT col1, col2, col3 FROM table1"); + assert.deepStrictEqual(params, []); + }); + + it("makeQueryTemplate sort", () => { + const source = {name: "db", dialect: "mysql"}; + const operations = { + ...baseOperations, + sort: [ + {column: "col1", direction: "asc"}, + {column: "col2", direction: "desc"} + ] + }; + + const [parts, ...params] = makeQueryTemplate(operations, source); + assert.deepStrictEqual(parts.join("?"), "SELECT col1, col2 FROM table1\nORDER BY col1 ASC, col2 DESC"); + assert.deepStrictEqual(params, []); + }); + + it("makeQueryTemplate sort and escape sort column", () => { + const source = {name: "db", dialect: "mysql", escape: (i) => `_${i}_`}; + const operations = { + ...baseOperations, + sort: [ + {column: "col1", direction: "asc"}, + {column: "col2", direction: "desc"} + ] + }; + + const [parts, ...params] = makeQueryTemplate(operations, source); + assert.deepStrictEqual( + parts.join("?"), + "SELECT _col1_, _col2_ FROM _table1_\nORDER BY _col1_ ASC, _col2_ DESC" + ); + assert.deepStrictEqual(params, []); + }); + + it("makeQueryTemplate slice", () => { + const source = {name: "db", dialect: "mysql"}; + const operations = {...baseOperations}; + + operations.slice = {from: 10, to: 20}; + let [parts, ...params] = makeQueryTemplate(operations, source); + assert.deepStrictEqual(parts.join("?"), "SELECT col1, col2 FROM table1\nLIMIT 10 OFFSET 10"); + assert.deepStrictEqual(params, []); + + operations.slice = {from: null, to: 20}; + [parts, ...params] = makeQueryTemplate(operations, source); + assert.deepStrictEqual(parts.join("?"), "SELECT col1, col2 FROM table1\nLIMIT 20"); + assert.deepStrictEqual(params, []); + + operations.slice = {from: 10, to: null}; + [parts, ...params] = makeQueryTemplate(operations, source); + assert.deepStrictEqual(parts.join("?"), `SELECT col1, col2 FROM table1\nLIMIT ${1e9} OFFSET 10`); + assert.deepStrictEqual(params, []); + }); + + it("makeQueryTemplate select, sort, slice, filter indexed", () => { + const source = {name: "db", dialect: "postgres"}; + const operations = { + ...baseOperations, + select: { + columns: ["col1", "col2", "col3"] + }, + sort: [{column: "col1", direction: "asc"}], + slice: {from: 10, to: 100}, + filter: [ + { + type: "gte", + operands: [ + {type: "column", value: "col1"}, + {type: "resolved", value: "val1"} + ] + }, + { + type: "eq", + operands: [ + {type: "column", value: "col2"}, + {type: "resolved", value: "val2"} + ] + } + ] + }; + + const [parts, ...params] = makeQueryTemplate(operations, source); + assert.deepStrictEqual(parts.join("?"), "SELECT col1, col2, col3 FROM table1\nWHERE col1 >= ?\nAND col2 = ?\nORDER BY col1 ASC\nLIMIT 90 OFFSET 10"); + assert.deepStrictEqual(params, ["val1", "val2"]); + }); + + it("makeQueryTemplate select, slice and escape column name with mssql syntax", () => { + const source = {name: "db", dialect: "mssql", escape: (i) => `_${i}_`}; + const operations = { + ...baseOperations, + select: { + columns: ["col1", "col2", "col3"] + }, + slice: {to: 100} + }; + + const [parts] = makeQueryTemplate(operations, source); + assert.deepStrictEqual( + parts.join("?"), + "SELECT _col1_, _col2_, _col3_ FROM _table1_\nORDER BY _col1_ ASC\nOFFSET 0 ROWS\nFETCH NEXT 100 ROWS ONLY" + ); + }); + + it("makeQueryTemplate select, sort, slice, filter indexed with mssql syntax", () => { + const source = {name: "db", dialect: "mssql"}; + const operations = { + ...baseOperations, + select: { + columns: ["col1", "col2", "col3"] + }, + sort: [{column: "col2", direction: "desc"}], + slice: {from: 10, to: 100}, + filter: [ + { + type: "gte", + operands: [ + {type: "column", value: "col1"}, + {type: "resolved", value: "val1"} + ] + }, + { + type: "eq", + operands: [ + {type: "column", value: "col2"}, + {type: "resolved", value: "val2"} + ] + } + ] + }; + + const [parts, ...params] = makeQueryTemplate(operations, source); + assert.deepStrictEqual(parts.join("?"), "SELECT col1, col2, col3 FROM table1\nWHERE col1 >= ?\nAND col2 = ?\nORDER BY col2 DESC\nOFFSET 10 ROWS\nFETCH NEXT 90 ROWS ONLY"); + assert.deepStrictEqual(params, ["val1", "val2"]); + }); + + it("makeQueryTemplate throw if no columns are explicitly specified for mssql dialect", () => { + const source = {name: "db", dialect: "mssql"}; + const operations = { + ...baseOperations, + select: { + columns: null + }, + sort: [], + slice: {from: 10, to: 100} + }; + + assert.throws(() => { + makeQueryTemplate(operations, source); + }, Error); + }); + + it("makeQueryTemplate the sort and slice if no columns are explicitly BUT sort has value for mssql dialect", () => { + const source = {name: "db", dialect: "mssql"}; + const operations = { + ...baseOperations, + select: { + columns: null + }, + sort: [{column: "col2", direction: "desc"}], + slice: {from: 10, to: 100} + }; + + const [parts, ...params] = makeQueryTemplate(operations, source); + assert.deepStrictEqual(parts.join("?"), "SELECT * FROM table1\nORDER BY col2 DESC\nOFFSET 10 ROWS\nFETCH NEXT 90 ROWS ONLY"); + assert.deepStrictEqual(params, []); + }); + + it("makeQueryTemplate throw if no columns are explicitly specified for oracle dialect", () => { + const source = {name: "db", dialect: "oracle"}; + const operations = { + ...baseOperations, + select: { + columns: null + }, + sort: [], + slice: {from: 10, to: 100} + }; + + assert.throws(() => { + makeQueryTemplate(operations, source); + }, Error); + }); + + it("makeQueryTemplate select, sort, slice, filter indexed with oracle syntax", () => { + const source = {name: "db", dialect: "oracle"}; + const operations = { + ...baseOperations, + select: { + columns: ["col1", "col2", "col3"] + }, + sort: [{column: "col2", direction: "desc"}], + slice: {from: 10, to: 100}, + filter: [ + { + type: "gte", + operands: [ + {type: "column", value: "col1"}, + {type: "resolved", value: "val1"} + ] + }, + { + type: "eq", + operands: [ + {type: "column", value: "col2"}, + {type: "resolved", value: "val2"} + ] + } + ] + }; + + const [parts, ...params] = makeQueryTemplate(operations, source); + assert.deepStrictEqual( + parts.join("?"), + "SELECT col1, col2, col3 FROM table1\nWHERE col1 >= ?\nAND col2 = ?\nORDER BY col2 DESC\nOFFSET 10 ROWS\nFETCH NEXT 90 ROWS ONLY" + ); + assert.deepStrictEqual(params, ["val1", "val2"]); + }); + + it("makeQueryTemplate names", () => { + const source = {name: "db", dialect: "mysql", escape}; + let operations = { + ...baseOperations, + select: { + columns: ["col1", "col2", "col3"] + }, + names: [ + {column: "col1", name: "name1"}, + {column: "col2", name: "name2"}, + {column: "col3", name: "name3"} + ] + }; + + const [parts, ...params] = makeQueryTemplate(operations, source); + assert.deepStrictEqual(parts.join("?"), "SELECT `col1` AS `name1`, `col2` AS `name2`, `col3` AS `name3` FROM `table1`"); + assert.deepStrictEqual(params, []); + }); +}); + +describe("__table", () => { + let source; + + beforeEach(() => { + source = [ + {a: 1, b: 2, c: 3}, + {a: 2, b: 4, c: 6}, + {a: 3, b: 6, c: 9} + ]; + source.schema = [ + {name: "a", type: "integer", inferred: "integer"}, + {name: "b", type: "integer", inferred: "integer"}, + {name: "c", type: "integer", inferred: "integer"} + ]; + }); + + it("__table no operations", () => { + assert.deepStrictEqual( + __table(source, EMPTY_TABLE_DATA.operations), + source + ); + }); + + it("__table columns", () => { + const operationsNullColumns = { + ...EMPTY_TABLE_DATA.operations, + select: {columns: null} + }; + assert.deepStrictEqual(__table(source, operationsNullColumns), source); + const operationsEmptyColumns = { + ...EMPTY_TABLE_DATA.operations, + select: {columns: []} + }; + const expectedEmpty = [{}, {}, {}]; + expectedEmpty.schema = []; + expectedEmpty.fullSchema = source.schema; + expectedEmpty.errors = new Map(); + assert.deepStrictEqual( + __table(source, operationsEmptyColumns), + expectedEmpty + ); + const operationsSelectedColumns = { + ...EMPTY_TABLE_DATA.operations, + select: {columns: ["a"]} + }; + const expectedSelected = [{a: 1}, {a: 2}, {a: 3}]; + expectedSelected.schema = [{name: "a", type: "integer", inferred: "integer"}]; + expectedSelected.fullSchema = source.schema; + expectedSelected.errors = new Map(); + assert.deepStrictEqual( + __table(source, operationsSelectedColumns), + expectedSelected + ); + }); + + it("__table unknown filter", () => { + const operations = { + ...EMPTY_TABLE_DATA.operations, + filter: [{type: "xyz", operands: [{type: "column", value: "a"}]}] + }; + assert.throws( + () => __table(source, operations), + /unknown filter type: xyz/ + ); + }); + + it("__table filter lt + gt", () => { + const operationsEquals = { + ...EMPTY_TABLE_DATA.operations, + filter: [ + { + type: "eq", + operands: [ + {type: "column", value: "a"}, + {type: "resolved", value: 1} + ] + } + ] + }; + const expectedEq = [{a: 1, b: 2, c: 3}]; + expectedEq.schema = source.schema; + expectedEq.fullSchema = source.schema; + expectedEq.errors = new Map(); + assert.deepStrictEqual(__table(source, operationsEquals), expectedEq); + const operationsComparison = { + ...EMPTY_TABLE_DATA.operations, + filter: [ + { + type: "lt", + operands: [ + {type: "column", value: "a"}, + {type: "resolved", value: 3} + ] + }, + { + type: "gt", + operands: [ + {type: "column", value: "b"}, + {type: "resolved", value: 2} + ] + } + ] + }; + const expectedLtGt = [{a: 2, b: 4, c: 6}]; + expectedLtGt.schema = source.schema; + expectedLtGt.fullSchema = source.schema; + expectedLtGt.errors = new Map(); + assert.deepStrictEqual(__table(source, operationsComparison), expectedLtGt); + }); + + it("__table filter lte + gte", () => { + const operationsEquals = { + ...EMPTY_TABLE_DATA.operations, + filter: [ + { + type: "eq", + operands: [ + {type: "column", value: "a"}, + {type: "resolved", value: 1} + ] + } + ] + }; + const expectedEq = [{a: 1, b: 2, c: 3}]; + expectedEq.schema = source.schema; + expectedEq.fullSchema = source.schema; + expectedEq.errors = new Map(); + assert.deepStrictEqual(__table(source, operationsEquals), expectedEq); + const operationsComparison = { + ...EMPTY_TABLE_DATA.operations, + filter: [ + { + type: "lte", + operands: [ + {type: "column", value: "a"}, + {type: "resolved", value: 2.5} + ] + }, + { + type: "gte", + operands: [ + {type: "column", value: "b"}, + {type: "resolved", value: 2.5} + ] + } + ] + }; + const expectedLteGte = [{a: 2, b: 4, c: 6}]; + expectedLteGte.schema = source.schema; + expectedLteGte.fullSchema = source.schema; + expectedLteGte.errors = new Map(); + assert.deepStrictEqual( + __table(source, operationsComparison), + expectedLteGte + ); + }); + + it("__table filter eq date", () => { + const operationsEquals = { + ...EMPTY_TABLE_DATA.operations, + filter: [ + { + type: "eq", + operands: [ + {type: "column", value: "a"}, + {type: "resolved", value: new Date("2021-01-02")} + ] + } + ] + }; + const source = [ + {a: new Date("2021-01-01")}, + {a: new Date("2021-01-02")}, + {a: new Date("2021-01-03")} + ]; + const expected = [{a: new Date("2021-01-02")}]; + expected.schema = [{name: "a", type: "date", inferred: "date"}]; + expected.fullSchema = expected.schema; + expected.errors = new Map(); + assert.deepStrictEqual(__table(source, operationsEquals), expected); + }); + + it("__table sort", () => { + const operationsDesc = { + ...EMPTY_TABLE_DATA.operations, + sort: [{column: "a", direction: "desc"}] + }; + const expectedDesc = [ + {a: 3, b: 6, c: 9}, + {a: 2, b: 4, c: 6}, + {a: 1, b: 2, c: 3} + ]; + expectedDesc.schema = source.schema; + expectedDesc.fullSchema = source.schema; + expectedDesc.errors = new Map(); + assert.deepStrictEqual(__table(source, operationsDesc), expectedDesc); + const operationsAsc = { + ...EMPTY_TABLE_DATA.operations, + sort: [{column: "a", direction: "asc"}] + }; + const expectedAsc = [ + {a: 1, b: 2, c: 3}, + {a: 2, b: 4, c: 6}, + {a: 3, b: 6, c: 9} + ]; + expectedAsc.schema = source.schema; + expectedAsc.fullSchema = source.schema; + expectedAsc.errors = new Map(); + assert.deepStrictEqual(__table(source, operationsAsc), expectedAsc); + const sourceExtended = [...source, {a: 1, b: 3, c: 3}, {a: 1, b: 5, c: 3}]; + const operationsMulti = { + ...EMPTY_TABLE_DATA.operations, + sort: [ + {column: "a", direction: "desc"}, + {column: "b", direction: "desc"} + ] + }; + const expectedExtended = [ + {a: 3, b: 6, c: 9}, + {a: 2, b: 4, c: 6}, + {a: 1, b: 5, c: 3}, + {a: 1, b: 3, c: 3}, + {a: 1, b: 2, c: 3} + ]; + expectedExtended.schema = source.schema; + expectedExtended.fullSchema = source.schema; + expectedExtended.errors = new Map(); + assert.deepStrictEqual( + __table(sourceExtended, operationsMulti), + expectedExtended + ); + }); + + it("__table sort missing values", () => { + const sourceWithMissing = [ + {a: 1}, {a: null}, {a: undefined}, {a: 10}, {a: 5}, {a: NaN}, {a: null}, {a: 20} + ]; + const operationsDesc = { + ...EMPTY_TABLE_DATA.operations, + sort: [{column: "a", direction: "desc"}] + }; + const expectedDesc = [ + {a: 20}, {a: 10}, {a: 5}, {a: 1}, {a: NaN}, {a: NaN}, {a: NaN}, {a: NaN} + ]; + expectedDesc.schema = [{name: "a", type: "number", inferred: "number"}]; + expectedDesc.fullSchema = expectedDesc.schema; + expectedDesc.errors = new Map(); + assert.deepStrictEqual( + __table(sourceWithMissing, operationsDesc), + expectedDesc + ); + const operationsAsc = { + ...EMPTY_TABLE_DATA.operations, + sort: [{column: "a", direction: "asc"}] + }; + const expectedAsc = [ + {a: 1}, {a: 5}, {a: 10}, {a: 20}, {a: NaN}, {a: NaN}, {a: NaN}, {a: NaN} + ]; + expectedAsc.schema = [{name: "a", type: "number", inferred: "number"}]; + expectedAsc.fullSchema = expectedAsc.schema; + expectedAsc.errors = new Map(); + assert.deepStrictEqual( + __table(sourceWithMissing, operationsAsc), + expectedAsc + ); + }); + + it("__table sort does not mutate input", () => { + const operations = { + ...EMPTY_TABLE_DATA.operations, + sort: [{column: "a", direction: "desc"}] + }; + const sorted = [ + {a: 3, b: 6, c: 9}, + {a: 2, b: 4, c: 6}, + {a: 1, b: 2, c: 3} + ]; + sorted.schema = source.schema; + sorted.fullSchema = source.schema; + sorted.errors = new Map(); + assert.deepStrictEqual(__table(source, operations), sorted); + const originalOrder = [ + {a: 1, b: 2, c: 3}, + {a: 2, b: 4, c: 6}, + {a: 3, b: 6, c: 9} + ]; + originalOrder.schema = source.schema; + assert.deepStrictEqual(source, originalOrder); + }); + + it("__table slice", () => { + const operationsToNull = { + ...EMPTY_TABLE_DATA.operations, + slice: {from: 1, to: null} + }; + const expectedToNull = [ + {a: 2, b: 4, c: 6}, + {a: 3, b: 6, c: 9} + ]; + expectedToNull.schema = source.schema; + expectedToNull.fullSchema = source.schema; + expectedToNull.errors = new Map(); + assert.deepStrictEqual(__table(source, operationsToNull), expectedToNull); + const operationsFromNull = { + ...EMPTY_TABLE_DATA.operations, + slice: {from: null, to: 1} + }; + const expectedFromNull = [{a: 1, b: 2, c: 3}]; + expectedFromNull.schema = source.schema; + expectedFromNull.fullSchema = source.schema; + expectedFromNull.errors = new Map(); + assert.deepStrictEqual( + __table(source, operationsFromNull), + expectedFromNull + ); + const operations = { + ...EMPTY_TABLE_DATA.operations, + slice: {from: 1, to: 2} + }; + const expectedSlice = [{a: 2, b: 4, c: 6}]; + expectedSlice.schema = source.schema; + expectedSlice.fullSchema = source.schema; + expectedSlice.errors = new Map(); + assert.deepStrictEqual(__table(source, operations), expectedSlice); + }); + + it("__table retains schema and columns info", () => { + source.columns = ["a", "b", "c"]; + assert.deepStrictEqual( + __table(source, EMPTY_TABLE_DATA.operations).columns, + ["a", "b", "c"] + ); + source.schema = [ + {name: "a", type: "number", inferred: "number"}, + {name: "b", type: "number", inferred: "number"}, + {name: "c", type: "number", inferred: "number"} + ]; + assert.deepStrictEqual( + __table(source, EMPTY_TABLE_DATA.operations).schema, + [ + {name: "a", type: "number", inferred: "number"}, + {name: "b", type: "number", inferred: "number"}, + {name: "c", type: "number", inferred: "number"} + ] + ); + }); + + it("__table names", () => { + const operations = { + ...EMPTY_TABLE_DATA.operations, + names: [{column: "a", name: "nameA"}] + }; + const expected = [ + {nameA: 1, b: 2, c: 3}, + {nameA: 2, b: 4, c: 6}, + {nameA: 3, b: 6, c: 9} + ]; + const schema = [ + {name: "nameA", type: "integer", inferred: "integer"}, + {name: "b", type: "integer", inferred: "integer"}, + {name: "c", type: "integer", inferred: "integer"} + ]; + expected.schema = schema; + expected.fullSchema = schema; + expected.errors = new Map(); + assert.deepStrictEqual(__table(source, operations), expected); + source.columns = ["a", "b", "c"]; + }); + + it("__table type assertions", () => { + const operations = { + ...EMPTY_TABLE_DATA.operations, + types: [{name: "a", type: "string"}] + }; + const expected = [ + {a: "1", b: 2, c: 3}, + {a: "2", b: 4, c: 6}, + {a: "3", b: 6, c: 9} + ]; + expected.schema = [ + {name: "a", type: "string", inferred: "integer"}, + {name: "b", type: "integer", inferred: "integer"}, + {name: "c", type: "integer", inferred: "integer"} + ]; + expected.fullSchema = expected.schema; + expected.errors = new Map(); + assert.deepStrictEqual(__table(source, operations), expected); + source.columns = ["a", "b", "c"]; + }); + + it("__table derived columns", () => { + const operations = { + ...EMPTY_TABLE_DATA.operations, + derive: [{name: "d", value: (row) => row.a ** 2}] + }; + const expected = [ + {a: 1, b: 2, c: 3, d: 1}, + {a: 2, b: 4, c: 6, d: 4}, + {a: 3, b: 6, c: 9, d: 9} + ]; + expected.schema = [ + {name: "a", type: "integer", inferred: "integer"}, + {name: "b", type: "integer", inferred: "integer"}, + {name: "c", type: "integer", inferred: "integer"}, + {name: "d", type: "integer", inferred: "integer"} + ]; + expected.fullSchema = expected.schema; + expected.errors = new Map(); + assert.deepStrictEqual(__table(source, operations), expected); + }); + + it("__table derived columns with errors", () => { + const functionWithError = (row) => row.a.b.c; + const operations = { + ...EMPTY_TABLE_DATA.operations, + derive: [{name: "d", value: functionWithError}] + }; + let error; + try { + functionWithError(source[0]); + } catch (e) { + error = e; + } + const expected = [ + {a: 1, b: 2, c: 3, d: undefined}, + {a: 2, b: 4, c: 6, d: undefined}, + {a: 3, b: 6, c: 9, d: undefined} + ]; + expected.schema = [ + {name: "a", type: "integer", inferred: "integer"}, + {name: "b", type: "integer", inferred: "integer"}, + {name: "c", type: "integer", inferred: "integer"}, + {name: "d", type: "other", inferred: "other"} + ]; + expected.fullSchema = expected.schema; + expected.errors = new Map([["d", [{index: 0, error}, {index: 1, error}, {index: 2, error}]]]); + assert.deepStrictEqual(__table(source, operations), expected); + }); +}); + +describe("getTypeValidator filters accurately", () => { + let source = [ + {label: "string", value: "string"}, + {label: "object", value: {}}, + {label: "buffer", value: new ArrayBuffer()}, + {label: "boolean", value: true}, + {label: "array", value: [1, 2, 3]}, + {label: "number", value: 10.1}, + {label: "integer", value: 10}, + {label: "date", value: new Date(1)}, + // eslint-disable-next-line no-undef + {label: "bigint", value: BigInt(10)}, + {label: "null", value: null}, + {label: "NaN", value: NaN}, + {label: "undefined"} + ]; + + it("filters strings", () => { + const isValid = getTypeValidator("string"); + assert.deepStrictEqual(source.filter(d => isValid(d.value)), [{label: "string", value: "string"}]); + }); + + it("filters buffers", () => { + const isValid = getTypeValidator("buffer"); + assert.deepStrictEqual(source.filter(d => isValid(d.value)), [{label: "buffer", value: new ArrayBuffer()}]); + }); + + it("filters numbers", () => { + const isValid = getTypeValidator("number"); + assert.deepStrictEqual(source.filter(d => isValid(d.value)), [{label: "number", value: 10.1}, {label: "integer", value: 10}]); + }); + + it("filters integers", () => { + const isValid = getTypeValidator("integer"); + assert.deepStrictEqual( + source.filter((d) => isValid(d.value)), + [{label: "integer", value: 10}] + ); + }); + + it("filters booleans", () => { + const isValid = getTypeValidator("boolean"); + assert.deepStrictEqual(source.filter(d => isValid(d.value)), [{label: "boolean", value: true}]); + }); + + it("filters arrays", () => { + const isValid = getTypeValidator("array"); + assert.deepStrictEqual(source.filter(d => isValid(d.value)), [{label: "array", value: [1, 2, 3]}]); + }); + + it("filters dates", () => { + const isValid = getTypeValidator("date"); + assert.deepStrictEqual(source.filter(d => isValid(d.value)), [{label: "date", value: new Date(1)}]); + }); + + it("filters BigInts", () => { + const isValid = getTypeValidator("bigint"); + // eslint-disable-next-line no-undef + assert.deepStrictEqual(source.filter(d => isValid(d.value)), [{label: "bigint", value: BigInt(10)}]); + }); + + it("filters objects", () => { + const isValid = getTypeValidator("object"); + assert.deepStrictEqual(source.filter(d => isValid(d.value)), + [ + {label: "object", value: {}}, + {label: "buffer", value: new ArrayBuffer()}, + {label: "array", value: [1, 2, 3]}, + {label: "date", value: new Date(1)}] + ); + }); + + it("filters other", () => { + const isValid = getTypeValidator("other"); + assert.deepStrictEqual(source.filter(d => isValid(d.value)), + [ + {label: "string", value: "string"}, + {label: "object", value: {}}, + {label: "buffer", value: new ArrayBuffer()}, + {label: "boolean", value: true}, + {label: "array", value: [1, 2, 3]}, + {label: "number", value: 10.1}, + {label: "integer", value: 10}, + {label: "date", value: new Date(1)}, + // eslint-disable-next-line no-undef + {label: "bigint", value: BigInt(10)}, + {label: "NaN", value: NaN} + ] + ); + }); +}); + +describe("inferSchema", () => { + it("infers schema", () => { + assert.deepStrictEqual( + inferSchema( + [ + {a: 1, b: 2, c: 3}, + {a: "", b: 4, c: 6}, + {a: "", b: 6, c: 9} + ] + ), + [ + {name: "a", type: "integer", inferred: "integer"}, + {name: "b", type: "integer", inferred: "integer"}, + {name: "c", type: "integer", inferred: "integer"} + ] + ); + }); + + it("infers numbers", () => { + assert.deepStrictEqual( + inferSchema([{a: 1.2}, {a: 3.4}, {a: 5.67}]), + [{name: "a", type: "number", inferred: "number"}] + ); + }); + + it("infers booleans", () => { + assert.deepStrictEqual( + inferSchema([{a: "true"}, {a: false}, {a: "false"}]), + [{name: "a", type: "boolean", inferred: "boolean"}] + ); + }); + + it("infers dates", () => { + assert.deepStrictEqual( + inferSchema( + [{a: "1/2/20"}, {a: "2020-11-12 12:23:00"}, {a: new Date()}, {a: "2020-01-12"}] + ), + [{name: "a", type: "date", inferred: "date"}] + ); + }); + + it("infers strings", () => { + assert.deepStrictEqual( + inferSchema([{a: "cat"}, {a: "dog"}, {a: "1,000"}, {a: "null"}]), + [{name: "a", type: "string", inferred: "string"}] + ); + assert.deepStrictEqual( + inferSchema([{a: "10n"}, {a: "22n"}, {a: "0n"}]), // not considered bigints + [{name: "a", type: "string", inferred: "string"}] + ); + }); + + it("infers arrays", () => { + assert.deepStrictEqual( + inferSchema([{a: ["cat"]}, {a: ["dog"]}, {a: []}]), + [{name: "a", type: "array", inferred: "array"}] + ); + }); + + it("infers objects", () => { + assert.deepStrictEqual( + inferSchema([{a: {d: ["cat"]}}, {a: {d: "dog"}}, {a: {d: 12}}]), + [{name: "a", type: "object", inferred: "object"}] + ); + }); + + it("infers bigints", () => { + assert.deepStrictEqual( + inferSchema([{a: 10n}, {a: 22n}, {a: 1n}]), + [{name: "a", type: "bigint", inferred: "bigint"}] + ); + }); + + it("infers buffers", () => { + assert.deepStrictEqual( + inferSchema([{a: new ArrayBuffer()}, {a: new ArrayBuffer()}]), + [{name: "a", type: "buffer", inferred: "buffer"}] + ); + }); + + it("infers other", () => { + assert.deepStrictEqual( + inferSchema([{a: Symbol("a")}, {a: Symbol("b")}]), + [{name: "a", type: "other", inferred: "other"}] + ); + assert.deepStrictEqual( + inferSchema([{a: null}, {a: null}]), + [{name: "a", type: "other", inferred: "other"}] + ); + }); + + it("infers mixed integers and numbers as numbers", () => { + assert.deepStrictEqual( + inferSchema([0.1, 0.2, 0.3, 0.4, 0.5, 1, 2, 3, 4, 5].map((x) => ({x}))), + [{name: "x", type: "number", inferred: "number"}] + ); + }); + + it("infers mixed integers and NaNs as numbers", () => { + assert.deepStrictEqual( + inferSchema([NaN, NaN, NaN, 1, 2, 3, 4, 5].map((x) => ({x}))), + [{name: "x", type: "number", inferred: "number"}] + ); + }); + + it("infers mixed integers and strings as integers", () => { + assert.deepStrictEqual( + inferSchema(["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "x"].map((x) => ({x}))), + [{name: "x", type: "integer", inferred: "integer"}] + ); + }); + + it("infers boolean-ish strings and strings as strings", () => { + assert.deepStrictEqual( + inferSchema(["true", "false", "pants on fire"].map((x) => ({x}))), + [{name: "x", type: "string", inferred: "string"}] + ); + }); + + it("infers boolean-ish strings and strings as booleans", () => { + assert.deepStrictEqual( + inferSchema(["true", "false", "true", "false", "true", "false", "true", "false", "true", "false", "pants on fire"].map((x) => ({x}))), + [{name: "x", type: "boolean", inferred: "boolean"}] + ); + }); + + it("infers booleans and strings as booleans", () => { + assert.deepStrictEqual( + inferSchema([true, false, true, false, true, false, true, false, true, false, "pants on fire"].map((x) => ({x}))), + [{name: "x", type: "boolean", inferred: "boolean"}] + ); + }); + + it("infers numbers and strings as numbers", () => { + assert.deepStrictEqual( + inferSchema([0.1, 0.2, 0.1, 0.2, 0.1, 0.2, 0.1, 0.2, 0.1, 0.2, "x"].map((x) => ({x}))), + [{name: "x", type: "number", inferred: "number"}] + ); + }); + + it("infers number-ish strings and strings as numbers", () => { + assert.deepStrictEqual( + inferSchema(["0.1", "0.2", "0.1", "0.2", "0.1", "0.2", "0.1", "0.2", "0.1", "0.2", "x"].map((x) => ({x}))), + [{name: "x", type: "number", inferred: "number"}] + ); + }); +}); + +describe("coerceToType", () => { + it("coerces to integer", () => { + // "integer" is not a target type for coercion, but can be inferred. So it + // will be handled as an alias for "number". + assert.deepStrictEqual(coerceToType("1.2", "integer"), 1.2); + assert.deepStrictEqual(coerceToType(" 1.2", "integer"), 1.2); + assert.deepStrictEqual(coerceToType(" 1.2 ", "integer"), 1.2); + assert.deepStrictEqual(coerceToType(1.2, "integer"), 1.2); + assert.deepStrictEqual(coerceToType("10", "integer"), 10); + assert.deepStrictEqual(coerceToType(0, "integer"), 0); + assert.deepStrictEqual(coerceToType("A", "integer"), NaN); + assert.deepStrictEqual(coerceToType("", "integer"), NaN); + assert.deepStrictEqual(coerceToType(" ", "integer"), NaN); + assert.deepStrictEqual(coerceToType(null, "integer"), NaN); + }); + + it("coerces to number", () => { + assert.deepStrictEqual(coerceToType("1.2", "number"), 1.2); + assert.deepStrictEqual(coerceToType(" 1.2", "number"), 1.2); + assert.deepStrictEqual(coerceToType(" 1.2 ", "number"), 1.2); + assert.deepStrictEqual(coerceToType(0, "number"), 0); + assert.deepStrictEqual(coerceToType("", "number"), NaN); + assert.deepStrictEqual(coerceToType(" ", "number"), NaN); + assert.deepStrictEqual(coerceToType("A", "number"), NaN); + assert.deepStrictEqual(coerceToType(null, "number"), NaN); + assert.deepStrictEqual(coerceToType(undefined, "number"), NaN); + assert.deepStrictEqual(coerceToType({a: 1}, "number"), NaN); + }); + + it("coerces to boolean", () => { + assert.deepStrictEqual(coerceToType("true", "boolean"), true); + assert.deepStrictEqual(coerceToType("True ", "boolean"), true); + assert.deepStrictEqual(coerceToType(true, "boolean"), true); + assert.deepStrictEqual(coerceToType("False", "boolean"), false); + assert.deepStrictEqual(coerceToType(false, "boolean"), false); + assert.deepStrictEqual(coerceToType(1, "boolean"), true); + assert.deepStrictEqual(coerceToType(2, "boolean"), true); + assert.deepStrictEqual(coerceToType(0, "boolean"), false); + assert.deepStrictEqual(coerceToType({}, "boolean"), true); + assert.deepStrictEqual(coerceToType(new Date(), "boolean"), true); + assert.deepStrictEqual(coerceToType("A", "boolean"), null); + assert.deepStrictEqual(coerceToType("", "boolean"), null); + assert.deepStrictEqual(coerceToType(" ", "boolean"), null); + assert.deepStrictEqual(coerceToType(null, "boolean"), null); + assert.deepStrictEqual(coerceToType(undefined, "boolean"), undefined); + }); + + it("coerces to date", () => { + const invalidDate = new Date(NaN); + assert.deepStrictEqual( + coerceToType("12/12/2020", "date"), + new Date("12/12/2020") + ); + // with whitespace + assert.deepStrictEqual( + coerceToType("12/12/2020 ", "date"), + new Date("12/12/2020") + ); + assert.deepStrictEqual( + coerceToType("2022-01-01T12:34:00Z", "date"), + new Date("2022-01-01T12:34:00Z") + ); + assert.deepStrictEqual( + coerceToType({a: 1}, "date").toString(), + invalidDate.toString() + ); + assert.deepStrictEqual( + coerceToType(true, "date").toString(), + invalidDate.toString() + ); + assert.deepStrictEqual( + coerceToType("2020-1-12", "date").toString(), + invalidDate.toString() + ); + assert.deepStrictEqual( + coerceToType(1675356739000, "date"), + new Date(1675356739000) + ); + assert.deepStrictEqual(coerceToType(undefined, "date"), undefined); + assert.deepStrictEqual(coerceToType(null, "date"), null); + assert.deepStrictEqual(coerceToType("", "date"), null); + assert.deepStrictEqual(coerceToType(" ", "date"), null); + assert.deepStrictEqual(coerceToType({toString: () => " "}, "date").toString(), invalidDate.toString()); + assert.deepStrictEqual(coerceToType({toString: () => "2020-01-01"}, "date"), new Date("2020-01-01")); + }); + + it("coerces to string", () => { + assert.deepStrictEqual(coerceToType(true, "string"), "true"); + assert.deepStrictEqual(coerceToType(false, "string"), "false"); + assert.deepStrictEqual(coerceToType(10, "string"), "10"); + assert.deepStrictEqual(coerceToType({a: 1}, "string"), "[object Object]"); + assert.deepStrictEqual(coerceToType(0, "string"), "0"); + assert.deepStrictEqual(coerceToType("", "string"), ""); + assert.deepStrictEqual(coerceToType(" ", "string"), " "); + assert.deepStrictEqual(coerceToType(" foo", "string"), " foo"); + assert.deepStrictEqual(coerceToType(" foo ", "string"), " foo "); + assert.deepStrictEqual(coerceToType(null, "string"), null); + assert.deepStrictEqual(coerceToType(undefined, "string"), undefined); + assert.deepStrictEqual(coerceToType(NaN, "string"), "NaN"); + }); + + it("coerces to bigint", () => { + assert.deepStrictEqual(coerceToType("32", "bigint"), 32n); + assert.deepStrictEqual(coerceToType(" 32", "bigint"), 32n); + assert.deepStrictEqual(coerceToType(32n, "bigint"), 32n); + assert.deepStrictEqual(coerceToType(0, "bigint"), 0n); + assert.deepStrictEqual(coerceToType(false, "bigint"), 0n); + assert.deepStrictEqual(coerceToType(true, "bigint"), 1n); + assert.deepStrictEqual(coerceToType(null, "bigint"), null); + assert.deepStrictEqual(coerceToType(undefined, "bigint"), undefined); + assert.deepStrictEqual(coerceToType(1.1, "bigint"), undefined); + assert.deepStrictEqual(coerceToType("1.1", "bigint"), undefined); + assert.deepStrictEqual(coerceToType(" 32n", "bigint"), undefined); + assert.deepStrictEqual(coerceToType("A", "bigint"), undefined); + assert.deepStrictEqual(coerceToType("", "bigint"), undefined); + assert.deepStrictEqual(coerceToType(" ", "bigint"), undefined); + assert.deepStrictEqual(coerceToType(NaN, "bigint"), undefined); + }); + + it("coerces to array", () => { + // "array" is not a target type for coercion, but can be inferred. + assert.deepStrictEqual(coerceToType([1, 2, 3], "array"), [1, 2, 3]); + assert.deepStrictEqual(coerceToType(null, "array"), null); + assert.deepStrictEqual(coerceToType(undefined, "array"), undefined); + }); + + it("coerces to object", () => { + // "object" is not a target type for coercion, but can be inferred. + assert.deepStrictEqual(coerceToType({a: 1, b: 2}, "object"), {a: 1, b: 2}); + assert.deepStrictEqual(coerceToType(null, "object"), null); + assert.deepStrictEqual(coerceToType(undefined, "object"), undefined); + }); + + it("coerces to buffer", () => { + // "buffer" is not a target type for coercion, but can be inferred. + assert.deepStrictEqual( + coerceToType(new ArrayBuffer(), "buffer"), + new ArrayBuffer() + ); + assert.deepStrictEqual(coerceToType("A", "buffer"), "A"); + assert.deepStrictEqual(coerceToType(null, "buffer"), null); + assert.deepStrictEqual(coerceToType(undefined, "buffer"), undefined); + }); + + it("coerces to other", () => { + // "other" is not a target type for coercion, but can be inferred. + assert.deepStrictEqual(coerceToType(0, "other"), 0); + assert.deepStrictEqual(coerceToType("a", "other"), "a"); + assert.deepStrictEqual(coerceToType(null, "other"), null); + assert.deepStrictEqual(coerceToType(undefined, "other"), undefined); + }); + + // Note: if type is "raw", coerceToType() will not be called. Instead, values + // will be returned from coerceRow(). +}); + +describe("getSchema", () => { + let source; + + beforeEach(() => { + source = [ + {a: 1, b: "foo"}, + {a: 2, b: "bar"} + ]; + source.schema = [ + {name: "a", type: "integer", inferred: "integer"}, + {name: "b", type: "string", inferred: "string"} + ]; + }); + + + it("respects schema from source, if one exists", () => { + const {schema, inferred} = getSchema(source); + assert.strictEqual(inferred, false); + assert.strictEqual(schema, source.schema); + }); + + it("infers schema if source has no schema", () => { + source.schema = undefined; + const {schema, inferred} = getSchema(source); + assert.strictEqual(inferred, true); + assert.deepStrictEqual(schema,[ + {name: "a", type: "integer", inferred: "integer"}, + {name: "b", type: "string", inferred: "string"} + ]); + }); + + it("infers schema if schema is invalid", () => { + source.schema = ["number"]; + const {schema, inferred} = getSchema(source); + assert.strictEqual(inferred, true); + assert.deepStrictEqual(schema,[ + {name: "a", type: "integer", inferred: "integer"}, + {name: "b", type: "string", inferred: "string"} + ]); + }); +}); diff --git a/packages/ojs/external-observablehq-stdlib/test/xlsx-test.js b/packages/ojs/external-observablehq-stdlib/test/xlsx-test.js new file mode 100644 index 00000000000..807c8aaee18 --- /dev/null +++ b/packages/ojs/external-observablehq-stdlib/test/xlsx-test.js @@ -0,0 +1,316 @@ +import assert from "assert"; +import {Workbook} from "../src/xlsx.js"; +import ExcelJS from "exceljs"; + +function exceljs(contents) { + const workbook = new ExcelJS.Workbook(); + for (const [sheet, rows] of Object.entries(contents)) { + const ws = workbook.addWorksheet(sheet); + for (const row of rows) ws.addRow(row); + } + return workbook; +} + +it("FileAttachment.xlsx reads sheet names", () => { + const workbook = new Workbook(exceljs({Sheet1: []})); + assert.deepStrictEqual(workbook.sheetNames, ["Sheet1"]); +}); + +it("FileAttachment.xlsx sheet(name) throws on unknown sheet name", () => { + const workbook = new Workbook(exceljs({Sheet1: []})); + assert.throws(() => workbook.sheet("bad")); +}); + +it("FileAttachment.xlsx reads sheets", () => { + const workbook = new Workbook( + exceljs({ + Sheet1: [ + ["one", "two", "three"], + [1, 2, 3] + ] + }) + ); + assert.deepEqual( + workbook.sheet(0), + Object.assign( + [ + {A: "one", B: "two", C: "three"}, + {A: 1, B: 2, C: 3} + ], + {columns: ["#", "A", "B", "C"]} + ) + ); + assert.deepEqual( + workbook.sheet("Sheet1"), + Object.assign( + [ + {A: "one", B: "two", C: "three"}, + {A: 1, B: 2, C: 3} + ], + {columns: ["#", "A", "B", "C"]} + ) + ); + assert.strictEqual(workbook.sheet(0)[0]["#"], 1); + assert.strictEqual(workbook.sheet(0)[1]["#"], 2); +}); + +it("FileAttachment.xlsx reads sheets with different types", () => { + assert.deepEqual( + new Workbook( + exceljs({ + Sheet1: [ + [], + [null, undefined], + ["hello", "", "0", "1"], + [1, 1.2], + [true, false], + [new Date(Date.UTC(2020, 0, 1)), {}] + ] + }) + ).sheet(0), + Object.assign( + [ + {}, + {}, + {A: "hello", B: "", C: "0", D: "1"}, + {A: 1, B: 1.2}, + {A: true, B: false}, + {A: new Date(Date.UTC(2020, 0, 1)), B: {}} + ], + {columns: ["#", "A", "B", "C", "D"]} + ) + ); + assert.deepEqual( + new Workbook( + exceljs({ + Sheet1: [ + [ + {richText: [{text: "two"}, {text: "three"}]}, // A + {text: "plain text"}, // B + {text: "https://example.com", hyperlink: "https://example.com"}, // C + { + text: {richText: [{text: "https://example.com"}]}, // D + hyperlink: "https://example.com" + }, + {text: `link&"'?`, hyperlink: 'https://example.com?q="'}, // E + { + text: {richText: [{text: "first"}, {text: "second"}]}, // F + hyperlink: "https://example.com" + } + ] + ] + }) + ).sheet(0), + Object.assign( + [ + { + A: "twothree", + B: "plain text", + C: "https://example.com", + D: "https://example.com", + E: `https://example.com?q=" link&"'?`, + F: "https://example.com firstsecond" + } + ], + {columns: ["#", "A", "B", "C", "D", "E", "F"]} + ) + ); + assert.deepEqual( + new Workbook( + exceljs({ + Sheet1: [ + [ + {formula: "=B2*5", result: 10}, + {sharedFormula: "=B2*6", result: 12}, + {sharedFormula: "=Z2*6", result: {error: "#REF!"}} + ] + ] + }) + ).sheet(0), + Object.assign([{A: 10, B: 12, C: NaN}], { + columns: ["#", "A", "B", "C"] + }) + ); +}); + +it("FileAttachment.xlsx reads sheets with headers", () => { + const workbook = new Workbook( + exceljs({ + Sheet1: [ + [null, "one", "one", "two", "A", "0"], + [1, null, 3, 4, 5, "zero"], + [6, 7, 8, 9, 10] + ] + }) + ); + assert.deepEqual( + workbook.sheet(0, {headers: true}), + Object.assign( + [ + {A: 1, one_: 3, two: 4, A_: 5, 0: "zero"}, + {A: 6, one: 7, one_: 8, two: 9, A_: 10} + ], + {columns: ["#", "A", "one", "one_", "two", "A_", "0"]} + ) + ); +}); + +it("FileAttachment.xlsx throws on invalid ranges", () => { + const workbook = new Workbook(exceljs({Sheet1: []})); + const malformed = new Error("Malformed range specifier"); + + assert.throws( + () => assert.deepStrictEqual(workbook.sheet(0, {range: 0})), + malformed + ); + assert.throws( + () => assert.deepStrictEqual(workbook.sheet(0, {range: ""})), + malformed + ); + assert.throws( + () => assert.deepStrictEqual(workbook.sheet(0, {range: "-:"})), + malformed + ); + assert.throws( + () => assert.deepStrictEqual(workbook.sheet(0, {range: " :"})), + malformed + ); + assert.throws( + () => assert.deepStrictEqual(workbook.sheet(0, {range: "a1:"})), + malformed, + "lowercase" + ); + assert.throws( + () => assert.deepStrictEqual(workbook.sheet(0, {range: "1A:"})), + malformed + ); +}); + +it("FileAttachment.xlsx reads sheet ranges", () => { + const workbook = new Workbook( + exceljs({ + Sheet1: [ + [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], + [10, 11, 12, 13, 14, 15, 16, 17, 18, 19], + [20, 21, 22, 23, 24, 25, 26, 27, 28, 29], + [30, 31, 32, 33, 34, 35, 36, 37, 38, 39] + ] + }) + ); + + // undefined + // ":" + const entireSheet = [ + {A: 0, B: 1, C: 2, D: 3, E: 4, F: 5, G: 6, H: 7, I: 8, J: 9}, + {A: 10, B: 11, C: 12, D: 13, E: 14, F: 15, G: 16, H: 17, I: 18, J: 19}, + {A: 20, B: 21, C: 22, D: 23, E: 24, F: 25, G: 26, H: 27, I: 28, J: 29}, + {A: 30, B: 31, C: 32, D: 33, E: 34, F: 35, G: 36, H: 37, I: 38, J: 39} + ]; + Object.assign(entireSheet, {columns: ["#", ...Object.keys(entireSheet[0])]}); + assert.deepEqual(workbook.sheet(0), entireSheet); + assert.deepEqual(workbook.sheet(0, {range: ":"}), entireSheet); + + // "B2:C3" + assert.deepEqual( + workbook.sheet(0, {range: "B2:C3"}), + Object.assign( + [ + {B: 11, C: 12}, + {B: 21, C: 22} + ], + {columns: ["#", "B", "C"]} + ) + ); + + // ":C3" + assert.deepEqual( + workbook.sheet(0, {range: ":C3"}), + Object.assign( + [ + {A: 0, B: 1, C: 2}, + {A: 10, B: 11, C: 12}, + {A: 20, B: 21, C: 22} + ], + {columns: ["#", "A", "B", "C"]} + ) + ); + + // "B2:" + assert.deepEqual( + workbook.sheet(0, {range: "B2:"}), + Object.assign( + [ + {B: 11, C: 12, D: 13, E: 14, F: 15, G: 16, H: 17, I: 18, J: 19}, + {B: 21, C: 22, D: 23, E: 24, F: 25, G: 26, H: 27, I: 28, J: 29}, + {B: 31, C: 32, D: 33, E: 34, F: 35, G: 36, H: 37, I: 38, J: 39} + ], + {columns: ["#", "B", "C", "D", "E", "F", "G", "H", "I", "J"]} + ) + ); + + // "H:" + assert.deepEqual( + workbook.sheet(0, {range: "H:"}), + Object.assign( + [ + {H: 7, I: 8, J: 9}, + {H: 17, I: 18, J: 19}, + {H: 27, I: 28, J: 29}, + {H: 37, I: 38, J: 39} + ], + {columns: ["#", "H", "I", "J"]} + ) + ); + + // ":C" + assert.deepEqual( + workbook.sheet(0, {range: ":C"}), + Object.assign( + [ + {A: 0, B: 1, C: 2}, + {A: 10, B: 11, C: 12}, + {A: 20, B: 21, C: 22}, + {A: 30, B: 31, C: 32} + ], + {columns: ["#", "A", "B", "C"]} + ) + ); + + // ":Z" + assert.deepEqual( + workbook.sheet(0, {range: ":Z"}), + Object.assign(entireSheet.slice(), { + columns: [..."#ABCDEFGHIJKLMNOPQRSTUVWXYZ"] + }) + ); + + // "2:" + assert.deepEqual( + workbook.sheet(0, {range: "2:"}), + Object.assign(entireSheet.slice(1), {columns: entireSheet.columns}) + ); + + // ":2" + assert.deepEqual( + workbook.sheet(0, {range: ":2"}), + Object.assign(entireSheet.slice(0, 2), {columns: entireSheet.columns}) + ); +}); + +it("FileAttachment.xlsx derives column names such as A AA AAA…", () => { + const l0 = 26 * 26 * 23; + const workbook = new Workbook( + exceljs({ + Sheet1: [Array.from({length: l0}).fill(1)] + }) + ); + assert.deepStrictEqual( + workbook.sheet(0).columns.filter((d) => d.match(/^A+$/)), + ["A", "AA", "AAA"] + ); +}); + +it("FileAttachment.sheet headers protects __proto__ of row objects", () => { + const workbook = new Workbook(exceljs({Sheet1: [["__proto__"], [{a: 1}]]})); + assert.notStrictEqual(workbook.sheet(0, {headers: true})[0].a, 1); +}); diff --git a/packages/ojs/package-lock.json b/packages/ojs/package-lock.json new file mode 100644 index 00000000000..de3e4d0f094 --- /dev/null +++ b/packages/ojs/package-lock.json @@ -0,0 +1,1109 @@ +{ + "name": "quarto-ojs", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "quarto-ojs", + "workspaces": [ + "quarto-ojs-runtime", + "external-asg017-unofficial-observablehq-compiler", + "external-d3-d3-require", + "external-observablehq-parser", + "external-observablehq-runtime", + "external-observablehq-stdlib" + ] + }, + "external-asg017-unofficial-observablehq-compiler": { + "name": "external-alex-garcia-unofficial-observablehq-compiler", + "version": "0.0.7", + "license": "ISC", + "dependencies": { + "@observablehq/parser": "4.2", + "acorn-walk": "^7.0.0" + } + }, + "external-d3-d3-require": { + "version": "1.3.1", + "license": "ISC" + }, + "external-observablehq-parser": { + "version": "6.0.2", + "license": "ISC", + "dependencies": { + "acorn": "8.17.0", + "acorn-walk": "8.3.5" + }, + "engines": { + "node": ">=14.5.0" + } + }, + "external-observablehq-parser/node_modules/acorn-walk": { + "version": "8.3.5", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.5.tgz", + "integrity": "sha512-HEHNfbars9v4pgpW6SO1KSPkfoS0xVOM/9UzkJltjlsHZmJasxg8aXkuZa7SMf8vKGIBhpUsPluQSqhJFCqebw==", + "license": "MIT", + "dependencies": { + "acorn": "^8.11.0" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "external-observablehq-runtime": { + "version": "5.9.5", + "license": "ISC", + "dependencies": { + "@observablehq/inspector": "^5.0.0", + "external-observablehq-stdlib": "*" + } + }, + "external-observablehq-stdlib": { + "version": "5.8.4", + "license": "ISC", + "dependencies": { + "d3-array": "^3.2.0", + "d3-dsv": "^3.0.1", + "external-d3-d3-require": "*" + }, + "engines": { + "node": ">=14.5.0" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.13", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", + "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.0", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/source-map": { + "version": "0.3.11", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz", + "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.6.0.tgz", + "integrity": "sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.31", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", + "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@napi-rs/lzma-linux-x64-gnu": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/@napi-rs/lzma-linux-x64-gnu/-/lzma-linux-x64-gnu-1.5.1.tgz", + "integrity": "sha512-oTXEIha4SsuXdTA4Iyskj0kpdx2yVXdhd75c2v3xGrHFfVMsbhTPZU/nMPL4sWKo4pBHm3aucLaqGlF696dTyQ==", + "cpu": [ + "x64" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^22.20 || ^24.12 || >=25" + } + }, + "node_modules/@observablehq/inputs": { + "version": "0.10.6", + "resolved": "https://registry.npmjs.org/@observablehq/inputs/-/inputs-0.10.6.tgz", + "integrity": "sha512-fOcpJvyBwPqr9I1QdW55J5x36nxRbfyqRQXVT3li9AvMpy6m14WPo5K0m4cPCxr4IlLIDtM/lq6z1GL3ElA14g==", + "license": "ISC", + "dependencies": { + "htl": "0.3", + "isoformat": "^0.2.0" + }, + "engines": { + "node": ">=14.5.0" + } + }, + "node_modules/@observablehq/inspector": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@observablehq/inspector/-/inspector-5.0.1.tgz", + "integrity": "sha512-euwWxwDa6KccU4G3D2JBD7GI/2McJh/z7HHEzJKbj2TDa7zhI37eTbTxiwE9rgTWBagvVBel+hAmnJRYBYOv2Q==", + "license": "ISC", + "dependencies": { + "isoformat": "^0.2.0" + } + }, + "node_modules/@observablehq/parser": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@observablehq/parser/-/parser-4.2.0.tgz", + "integrity": "sha512-i1v95BrUB4urKEBIL1CEPWCU8DovxKyMlWf03pEfpOfi5/DiESQ58QRQM6Ws+Sy/nwKXnIx8IMj4kX28Bif4xQ==", + "license": "ISC", + "dependencies": { + "acorn": "^7.1.1", + "acorn-walk": "^7.0.0" + } + }, + "node_modules/@observablehq/parser/node_modules/acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/@rollup/plugin-node-resolve": { + "version": "16.0.3", + "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-16.0.3.tgz", + "integrity": "sha512-lUYM3UBGuM93CnMPG1YocWu7X802BrNF3jW2zny5gQyLQgRFJhV1Sq0Zi74+dh/6NBx1DxFC4b4GXg9wUCG5Qg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@rollup/pluginutils": "^5.0.1", + "@types/resolve": "1.20.2", + "deepmerge": "^4.2.2", + "is-module": "^1.0.0", + "resolve": "^1.22.1" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "rollup": "^2.78.0||^3.0.0||^4.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } + } + }, + "node_modules/@rollup/plugin-terser": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-terser/-/plugin-terser-1.0.0.tgz", + "integrity": "sha512-FnCxhTBx6bMOYQrar6C8h3scPt8/JwIzw3+AJ2K++6guogH5fYaIFia+zZuhqv0eo1RN7W1Pz630SyvLbDjhtQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "serialize-javascript": "^7.0.3", + "smob": "^1.0.0", + "terser": "^5.17.4" + }, + "engines": { + "node": ">=20.0.0" + }, + "peerDependencies": { + "rollup": "^2.0.0||^3.0.0||^4.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } + } + }, + "node_modules/@rollup/pluginutils": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.4.0.tgz", + "integrity": "sha512-MfPp06CjRLfXQ3wY0R8vJDYBy/MvVcc9OulEfR0B8Iv9ko+GCNaRZ+EpJYFl27LhKsZK0o420sYCRHCjfCgeUg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "^1.0.0", + "estree-walker": "^2.0.2", + "picomatch": "^4.0.2" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } + } + }, + "node_modules/@rollup/rollup-android-arm-eabi": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.64.6.tgz", + "integrity": "sha512-FkO19Fowv/OQeJZPVfdetJaI3/VpbZmBsnmAlR/rQ+b3QwfiGQiOpVegpSRH331kelvHTVw9hXYG3DwjAaRzyQ==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-android-arm64": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.64.6.tgz", + "integrity": "sha512-si5/Etm6MphPc2xYHnk455Shls/hoMjTy3mhXge4OPmvCw7TwC4KP4fKokAlKLV4XaQvLvgSHfafPcblLMYYdQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-darwin-arm64": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.64.6.tgz", + "integrity": "sha512-PQCl3q7b0BgvVt72i2xrWM6I5KliwwVe4GpWW5QDGyUQawDS9aPZss/aGyFqBmxdRxlE8wDc9CaxiQ5DHRSp/Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-darwin-x64": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.64.6.tgz", + "integrity": "sha512-l9DFl1Itb1YYdSrP1K3U8ih44AOHa/p+Q4WMMDfGvH5qVWp+ajfgS1DlYo4yCRh8wJ2ZJv0Fqccf+ULAmMFjmg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-freebsd-arm64": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.64.6.tgz", + "integrity": "sha512-bR4GR3205N9+od0+l5Dd9/iZTDpJkIe6d6Ydp2qbcQZJLmKBdYQQRp8gbWpbMt92twKJY66o1vK4NkoKQODIrA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-freebsd-x64": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.64.6.tgz", + "integrity": "sha512-XTVNaDzcFl2TeBglvxdGgsCv9JGtAGRAoJENmGBR/XvDH2mA2K0IXc2aMfP0dR8mexSXSKifJ85FixoXX1wfTw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-linux-arm-gnueabihf": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.64.6.tgz", + "integrity": "sha512-qWc6qbc+25ugG9vqPR9P422KJBbVfZ05mjcMggoq8tsfWP+eRfC+/tiDdIlRF5VL2pDVZWN9zAhWsmu7R1+7Dw==", + "cpu": [ + "arm" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm-musleabihf": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.64.6.tgz", + "integrity": "sha512-V4Nwkp8844X/Xnww3PI1LYS0YPei8XQEVG70R+5MPZGO7AhYoun4hCN7Svs4U3wbQLZbwiz+9xRFhUZZdRl8Ww==", + "cpu": [ + "arm" + ], + "dev": true, + "libc": [ + "musl" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-gnu": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.64.6.tgz", + "integrity": "sha512-xb72A1aPaaIsp+a88VtRae/ovIEXislbUMyp7b9AQQU7ZkP2m/+ik6DW9TQcJyw5R8/RIailF9zExYwkjR++UA==", + "cpu": [ + "arm64" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-musl": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.64.6.tgz", + "integrity": "sha512-pbcs1BVBwC43hZkjhjlF8Rx8m5G0KnhLZs9Azy/gqccP6UsNSzJr0hKGIAVPqzAH1O/NdPxxC9GVGb4msQg/aw==", + "cpu": [ + "arm64" + ], + "dev": true, + "libc": [ + "musl" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-loong64-gnu": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.64.6.tgz", + "integrity": "sha512-EKOC8os6Vsg487ZLKUqzLF99Jsmnq6tu7O7mAELakNpcA+8KadktFf/JYdRuHe/DzCUXmN38pUKu4XBcKlqGbQ==", + "cpu": [ + "loong64" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-loong64-musl": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.64.6.tgz", + "integrity": "sha512-v/SQ68GnSlr/HyjB79sNXesGDwkOPu9JjbHfmWaymCiM+nZsQ9TstG1KfA4MuEvTr2d3PoY8PhFxj9bt0e32JA==", + "cpu": [ + "loong64" + ], + "dev": true, + "libc": [ + "musl" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-ppc64-gnu": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.64.6.tgz", + "integrity": "sha512-G3pmliMQ7r15zFFNwBlaT/xTdSLi4lfgI7CUrQueyKYheNVhrd8JrWCE6Ll8xf4AA1RZFqq+mNJYntiElsVOyA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-ppc64-musl": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.64.6.tgz", + "integrity": "sha512-XQTB/IPoB/wG6x/wu9uomAt8YH61IAr5iZTubMiad/lu88sotq2ocz9hJd556+Jz2kIkF7ZQZIsUuWE3OWqtcA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "libc": [ + "musl" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-gnu": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.64.6.tgz", + "integrity": "sha512-O5mpokth6+ydMuwiGtY8fIjvOBfH7u6SzmDNmZ3k6GK5C6iEAC2q2ZN/T5L9jYILx0IcCT0KnfMDihQ5yQFSBw==", + "cpu": [ + "riscv64" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-musl": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.64.6.tgz", + "integrity": "sha512-aIFxbAD9v3TvIaEDsKmukjcDg1JS4/tFXw8SHyQQgzOwzWCQ4cyDK7Ju1pQKqUXDFkEu/BZCFDCDATsKhQcB/Q==", + "cpu": [ + "riscv64" + ], + "dev": true, + "libc": [ + "musl" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-s390x-gnu": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.64.6.tgz", + "integrity": "sha512-fuNo1UwBc6BxnHDOxxguQL/InhheMN3RJcJMb0b4xP8r5Q3CNCrJbVg0eCIFuJ4e/zAfjR2gYbOfbzO/G7CIyw==", + "cpu": [ + "s390x" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-gnu": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.64.6.tgz", + "integrity": "sha512-05v6wFKDKJPZs9xlytVrrRu6IbRuoSvlH9xNwEOafXsKyjBFZPvAcZz2VIAB/M+lblYeKa9iOYC4RDVdfcAAaw==", + "cpu": [ + "x64" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-musl": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.64.6.tgz", + "integrity": "sha512-wJXKcdMjvkc/FaavZXNP1yW4i0pfOmhZAIWRSLG2yJ0PB0TWi7dkLErhX0u0vptDcXKKO/m1Y/YTeuyvb2MXwg==", + "cpu": [ + "x64" + ], + "dev": true, + "libc": [ + "musl" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-openbsd-x64": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.64.6.tgz", + "integrity": "sha512-cwg7/h0ThvJwy8CBkmACdiHAxRWpbsCmIsjOt+Zzx0hTnIcSUmKYEV03bGg+hD827OnwUsbKh1ZZDW754xWyBA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ] + }, + "node_modules/@rollup/rollup-openharmony-arm64": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.64.6.tgz", + "integrity": "sha512-T0RkYIJbdYXJEQFw+tMBO09KDFdgmNxkHsof3wWAABrvnx15Yh8RytmrgYy9+q9cBeBNZF66MMQZC+5nzEz6vg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ] + }, + "node_modules/@rollup/rollup-win32-arm64-msvc": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.64.6.tgz", + "integrity": "sha512-KlfpmF1AAIdAWxt8QQNClbpLFlAUfYOzqIuJ7IXEStMHpFRuH78RG6FjqPb3Rqhh0K89F5npvG+/i3Fjl6IveQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-ia32-msvc": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.64.6.tgz", + "integrity": "sha512-MrTLjd7Jlt9/ZavJZYG61KQv9Iy9bzbY+yXy73Xvwoa2uP66wvDShkyBr5Chz/yrE6lbD/zHMuTmKQVNQqBApg==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-gnu": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.64.6.tgz", + "integrity": "sha512-8fWDH1CkPI8GdBKAxzHDza7UmgficsKo2+MVbvUgOGhB0629w5sHMg3Qu5y7TZsrYKHHWpz8fla4KvoT7WsO3Q==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-msvc": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.64.6.tgz", + "integrity": "sha512-9/c9PWdr5GCIHkkxiHM1HjNBQMVdftP4O8QTcoUAaRza2FSqJ4axbf8QAnBuE6BIGQDl71SaRPeDdDYid5ecTw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@types/estree": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz", + "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/resolve": { + "version": "1.20.2", + "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz", + "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/acorn": { + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.17.0.tgz", + "integrity": "sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==", + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-walk": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", + "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "license": "MIT", + "engines": { + "node": ">= 10" + } + }, + "node_modules/d3-array": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz", + "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==", + "license": "ISC", + "dependencies": { + "internmap": "1 - 2" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-dsv": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz", + "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==", + "license": "ISC", + "dependencies": { + "commander": "7", + "iconv-lite": "0.6", + "rw": "1" + }, + "bin": { + "csv2json": "bin/dsv2json.js", + "csv2tsv": "bin/dsv2dsv.js", + "dsv2dsv": "bin/dsv2dsv.js", + "dsv2json": "bin/dsv2json.js", + "json2csv": "bin/json2dsv.js", + "json2dsv": "bin/json2dsv.js", + "json2tsv": "bin/json2dsv.js", + "tsv2csv": "bin/dsv2dsv.js", + "tsv2json": "bin/dsv2json.js" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/deepmerge": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/estree-walker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", + "dev": true, + "license": "MIT" + }, + "node_modules/external-alex-garcia-unofficial-observablehq-compiler": { + "resolved": "external-asg017-unofficial-observablehq-compiler", + "link": true + }, + "node_modules/external-d3-d3-require": { + "resolved": "external-d3-d3-require", + "link": true + }, + "node_modules/external-observablehq-parser": { + "resolved": "external-observablehq-parser", + "link": true + }, + "node_modules/external-observablehq-runtime": { + "resolved": "external-observablehq-runtime", + "link": true + }, + "node_modules/external-observablehq-stdlib": { + "resolved": "external-observablehq-stdlib", + "link": true + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz", + "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==", + "dev": true, + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/htl": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/htl/-/htl-0.3.1.tgz", + "integrity": "sha512-1LBtd+XhSc+++jpOOt0lCcEycXs/zTQSupOISnVAUmvGBpV7DH+C2M6hwV7zWYfpTMMg9ch4NO0lHiOTAMHdVA==", + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/internmap": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz", + "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==", + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/is-core-module": { + "version": "2.17.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.17.0.tgz", + "integrity": "sha512-J/vG0zBCbIKOQFfufSwyXdMrsohyJIUNkrnmo6WZGzoM7tr/lsbfW5b2BvisL6zsyMzK9UxV9L6c7AoFbyXHOA==", + "dev": true, + "license": "MIT", + "dependencies": { + "hasown": "^2.0.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", + "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==", + "dev": true, + "license": "MIT" + }, + "node_modules/isoformat": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/isoformat/-/isoformat-0.2.1.tgz", + "integrity": "sha512-tFLRAygk9NqrRPhJSnNGh7g7oaVWDwR0wKh/GM2LgmPa50Eg4UfyaCO4I8k6EqJHl1/uh2RAD6g06n5ygEnrjQ==", + "license": "ISC" + }, + "node_modules/mime": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/mime/-/mime-4.1.1.tgz", + "integrity": "sha512-YAApRsTpM2+gnUFHhRNGfkX8NK0V5xj1nyQLufGlwEI+eX4xRsTcel2IXDuMEGSGjBvzykNW4VuoEACgwYe7BQ==", + "funding": [ + "https://github.com/sponsors/broofa" + ], + "license": "MIT", + "bin": { + "mime": "bin/cli.js" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true, + "license": "MIT" + }, + "node_modules/picomatch": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz", + "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/quarto-ojs-runtime": { + "resolved": "quarto-ojs-runtime", + "link": true + }, + "node_modules/resolve": { + "version": "1.22.13", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.13.tgz", + "integrity": "sha512-Dj/cW9zBV2aRj6XzCxuGIs3ESZKv02jixne3q6jFZYZ3/Tg09gHHviSMDL4kObh9pqSahdRHEnDoaP2gn8YLhA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "is-core-module": "^2.17.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/rollup": { + "version": "4.64.6", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.64.6.tgz", + "integrity": "sha512-fX1Vy+UNKdXn+xKDnu/HBXbHVr1AY8cSdQj9BU4kLv5aFCMqGpvrVbyUMmjN3DdzWhSAuTbcX8PCNEVaumthYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "1.0.9" + }, + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=18.0.0", + "npm": ">=8.0.0" + }, + "optionalDependencies": { + "@napi-rs/lzma-linux-x64-gnu": "1.5.1", + "@rollup/rollup-android-arm-eabi": "4.64.6", + "@rollup/rollup-android-arm64": "4.64.6", + "@rollup/rollup-darwin-arm64": "4.64.6", + "@rollup/rollup-darwin-x64": "4.64.6", + "@rollup/rollup-freebsd-arm64": "4.64.6", + "@rollup/rollup-freebsd-x64": "4.64.6", + "@rollup/rollup-linux-arm-gnueabihf": "4.64.6", + "@rollup/rollup-linux-arm-musleabihf": "4.64.6", + "@rollup/rollup-linux-arm64-gnu": "4.64.6", + "@rollup/rollup-linux-arm64-musl": "4.64.6", + "@rollup/rollup-linux-loong64-gnu": "4.64.6", + "@rollup/rollup-linux-loong64-musl": "4.64.6", + "@rollup/rollup-linux-ppc64-gnu": "4.64.6", + "@rollup/rollup-linux-ppc64-musl": "4.64.6", + "@rollup/rollup-linux-riscv64-gnu": "4.64.6", + "@rollup/rollup-linux-riscv64-musl": "4.64.6", + "@rollup/rollup-linux-s390x-gnu": "4.64.6", + "@rollup/rollup-linux-x64-gnu": "4.64.6", + "@rollup/rollup-linux-x64-musl": "4.64.6", + "@rollup/rollup-openbsd-x64": "4.64.6", + "@rollup/rollup-openharmony-arm64": "4.64.6", + "@rollup/rollup-win32-arm64-msvc": "4.64.6", + "@rollup/rollup-win32-ia32-msvc": "4.64.6", + "@rollup/rollup-win32-x64-gnu": "4.64.6", + "@rollup/rollup-win32-x64-msvc": "4.64.6", + "fsevents": "~2.3.2" + } + }, + "node_modules/rw": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz", + "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==", + "license": "BSD-3-Clause" + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "license": "MIT" + }, + "node_modules/serialize-javascript": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-7.1.2.tgz", + "integrity": "sha512-GL2BWwVa6JydKO6l/ljVgjAZF4QJ3S7dWDWi53s5GZT8PJzD2fNxi67HANQGKAqPrwEpL5ba7gUBGi0Ls/sEoQ==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=20.0.0" + } + }, + "node_modules/smob": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/smob/-/smob-1.6.2.tgz", + "integrity": "sha512-RQsvleCbF8cVHEv+xuDGaA4pOizFqJ0GgjtMSRo6oP8pnN7WsigHgVGey6aILRBKv4W2YOMHLqbKdnB6hpB9fw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=20.0.0" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dev": true, + "license": "MIT", + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/terser": { + "version": "5.51.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.51.2.tgz", + "integrity": "sha512-bWnjSNscmuI+GJze6ZupnHP8G/cTcsJF+bXCeQknk2SHQsgbNJnLrqiH9jZ2W4STPVXH2mDKKRX3iwPhc9Cn/Q==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.15.0", + "commander": "^2.20.0", + "source-map-support": "~0.5.20" + }, + "bin": { + "terser": "bin/terser" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/terser/node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true, + "license": "MIT" + }, + "quarto-ojs-runtime": { + "version": "0.0.19", + "license": "ISC", + "dependencies": { + "@observablehq/inputs": "^0.10.4", + "acorn-walk": "8.3.5", + "external-alex-garcia-unofficial-observablehq-compiler": "*", + "external-observablehq-parser": "*", + "external-observablehq-runtime": "*", + "external-observablehq-stdlib": "*", + "mime": "^4.1.0" + }, + "devDependencies": { + "@rollup/plugin-node-resolve": "^16.0.3", + "@rollup/plugin-terser": "^1.0.0", + "rollup": "^4.63.5" + } + }, + "quarto-ojs-runtime/node_modules/acorn-walk": { + "version": "8.3.5", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.5.tgz", + "integrity": "sha512-HEHNfbars9v4pgpW6SO1KSPkfoS0xVOM/9UzkJltjlsHZmJasxg8aXkuZa7SMf8vKGIBhpUsPluQSqhJFCqebw==", + "license": "MIT", + "dependencies": { + "acorn": "^8.11.0" + }, + "engines": { + "node": ">=0.4.0" + } + } + } +} diff --git a/packages/ojs/package.json b/packages/ojs/package.json new file mode 100644 index 00000000000..330de1d42de --- /dev/null +++ b/packages/ojs/package.json @@ -0,0 +1,15 @@ +{ + "name": "quarto-ojs", + "private": true, + "scripts": { + "build": "npm run build --workspace quarto-ojs-runtime" + }, + "workspaces": [ + "quarto-ojs-runtime", + "external-asg017-unofficial-observablehq-compiler", + "external-d3-d3-require", + "external-observablehq-parser", + "external-observablehq-runtime", + "external-observablehq-stdlib" + ] +} diff --git a/packages/ojs/quarto-ojs-runtime/.editorconfig b/packages/ojs/quarto-ojs-runtime/.editorconfig new file mode 100644 index 00000000000..e9caa7f6a30 --- /dev/null +++ b/packages/ojs/quarto-ojs-runtime/.editorconfig @@ -0,0 +1,3 @@ +[*.js] +indent_size = 2 +indent_style = space \ No newline at end of file diff --git a/packages/ojs/quarto-ojs-runtime/.gitignore b/packages/ojs/quarto-ojs-runtime/.gitignore new file mode 100644 index 00000000000..26b76485ee4 --- /dev/null +++ b/packages/ojs/quarto-ojs-runtime/.gitignore @@ -0,0 +1,4 @@ +.DS_Store +dist/ +node_modules +npm-debug.log diff --git a/packages/ojs/quarto-ojs-runtime/LICENSE b/packages/ojs/quarto-ojs-runtime/LICENSE new file mode 100644 index 00000000000..aeb3a6619f3 --- /dev/null +++ b/packages/ojs/quarto-ojs-runtime/LICENSE @@ -0,0 +1,13 @@ +Copyright 2022 RStudio, PBC. + +Permission to use, copy, modify, and/or distribute this software for any purpose +with or without fee is hereby granted, provided that the above copyright notice +and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS +OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF +THIS SOFTWARE. diff --git a/packages/ojs/quarto-ojs-runtime/README.md b/packages/ojs/quarto-ojs-runtime/README.md new file mode 100644 index 00000000000..c2f9e414f17 --- /dev/null +++ b/packages/ojs/quarto-ojs-runtime/README.md @@ -0,0 +1,4 @@ +# @quarto/quarto-ojs-runtime + +A runtime for [Quarto](https://quarto.org)'s support of [ObservableHQ's reactive Javascript](https://observablehq.com). + diff --git a/packages/ojs/quarto-ojs-runtime/package.json b/packages/ojs/quarto-ojs-runtime/package.json new file mode 100644 index 00000000000..9be7fcd0839 --- /dev/null +++ b/packages/ojs/quarto-ojs-runtime/package.json @@ -0,0 +1,38 @@ +{ + "name": "quarto-ojs-runtime", + "version": "0.0.19", + "private": true, + "description": "A runtime for quarto's support of ObservableHQ's reactive Javascript.", + "main": "src/index.js", + "module": "src/index.js", + "type": "module", + "repository": { + "type": "git", + "url": "https://github.com/quarto-dev/quarto-cli.git", + "directory": "packages/ojs/quarto-ojs-runtime" + }, + "scripts": { + "build": "rollup -c" + }, + "keywords": [ + "quarto", + "observablehq", + "javascript" + ], + "author": "Posit Software, PBC", + "license": "ISC", + "dependencies": { + "@observablehq/inputs": "^0.10.4", + "acorn-walk": "8.3.5", + "external-alex-garcia-unofficial-observablehq-compiler": "*", + "external-observablehq-parser": "*", + "external-observablehq-runtime": "*", + "external-observablehq-stdlib": "*", + "mime": "^4.1.0" + }, + "devDependencies": { + "@rollup/plugin-node-resolve": "^16.0.3", + "@rollup/plugin-terser": "^1.0.0", + "rollup": "^4.63.5" + } +} diff --git a/packages/ojs/quarto-ojs-runtime/rollup.config.js b/packages/ojs/quarto-ojs-runtime/rollup.config.js new file mode 100644 index 00000000000..f3e80b522ea --- /dev/null +++ b/packages/ojs/quarto-ojs-runtime/rollup.config.js @@ -0,0 +1,42 @@ +import nodeResolve from '@rollup/plugin-node-resolve'; +import terser from "@rollup/plugin-terser"; +import meta from "./package.json" with { type: "json" }; + +// Write the bundles straight to where quarto-cli serves them from. +const outDir = "../../../src/resources/formats/html/ojs"; + +const config = { + input: "src/index.js", + output: { + file: `${outDir}/quarto-ojs-runtime.js`, + format: "esm", + indent: false, + // No build year here, so that rebuilding unchanged sources reproduces the + // committed bundles exactly. + banner: `// ${meta.name} v${meta.version} Copyright ${meta.author}`, + }, + plugins: [ + nodeResolve({ + mainFields: ["module", "main"], + }), + ] +}; + +export default [ + config, + { + ...config, + output: { + ...config.output, + file: `${outDir}/quarto-ojs-runtime.min.js`, + }, + plugins: [ + ...config.plugins, + terser({ + mangle: { + reserved: ["RequireError"] + } + }), + ] + } +]; diff --git a/packages/ojs/quarto-ojs-runtime/src/b64.js b/packages/ojs/quarto-ojs-runtime/src/b64.js new file mode 100644 index 00000000000..f93c673c8b2 --- /dev/null +++ b/packages/ojs/quarto-ojs-runtime/src/b64.js @@ -0,0 +1,19 @@ +// https://developer.mozilla.org/en-US/docs/Glossary/Base64 + +export function base64ToBytes(base64) { + const binString = atob(base64); + return Uint8Array.from(binString, (m) => m.codePointAt(0)); +} + +export function bytesToBase64(bytes) { + const binString = String.fromCodePoint(...bytes); + return btoa(binString); +} + +export function base64ToStr(base64) { + return new TextDecoder().decode(base64ToBytes(base64)); +} + +export function strToBase64(str) { + return bytesToBase64(new TextEncoder().encode(str)); +} diff --git a/packages/ojs/quarto-ojs-runtime/src/escape.js b/packages/ojs/quarto-ojs-runtime/src/escape.js new file mode 100644 index 00000000000..f7c57cebbe4 --- /dev/null +++ b/packages/ojs/quarto-ojs-runtime/src/escape.js @@ -0,0 +1,69 @@ +/*! + * escape-html + * Copyright(c) 2012-2013 TJ Holowaychuk + * Copyright(c) 2015 Andreas Lubbe + * Copyright(c) 2015 Tiancheng "Timothy" Gu + * Copyright(c) 2022 RStudio, PBC + * + * MIT Licensed + * + * Minimal changes to make ES6 + * + */ + +var matchHtmlRegExp = /["'&<>]/ + +/** + * Escape special characters in the given string of text. + * + * @param {string} string The string to escape for inserting into HTML + * @return {string} + * @public + */ + +export function escapeHtml (string) { + var str = '' + string + var match = matchHtmlRegExp.exec(str) + + if (!match) { + return str + } + + var escape + var html = '' + var index = 0 + var lastIndex = 0 + + for (index = match.index; index < str.length; index++) { + switch (str.charCodeAt(index)) { + case 34: // " + escape = '"' + break + case 38: // & + escape = '&' + break + case 39: // ' + escape = ''' + break + case 60: // < + escape = '<' + break + case 62: // > + escape = '>' + break + default: + continue + } + + if (lastIndex !== index) { + html += str.substring(lastIndex, index) + } + + lastIndex = index + 1 + html += escape + } + + return lastIndex !== index + ? html + str.substring(lastIndex, index) + : html +} \ No newline at end of file diff --git a/packages/ojs/quarto-ojs-runtime/src/escodegen.js b/packages/ojs/quarto-ojs-runtime/src/escodegen.js new file mode 100644 index 00000000000..3957c2059e2 --- /dev/null +++ b/packages/ojs/quarto-ojs-runtime/src/escodegen.js @@ -0,0 +1,2691 @@ +/* + Copyright (C) 2012-2014 Yusuke Suzuki + Copyright (C) 2015 Ingvar Stepanyan + Copyright (C) 2014 Ivan Nikulin + Copyright (C) 2012-2013 Michael Ficarra + Copyright (C) 2012-2013 Mathias Bynens + Copyright (C) 2013 Irakli Gozalishvili + Copyright (C) 2012 Robert Gust-Bardon + Copyright (C) 2012 John Freeman + Copyright (C) 2011-2012 Ariya Hidayat + Copyright (C) 2012 Joost-Wim Boekesteijn + Copyright (C) 2012 Kris Kowal + Copyright (C) 2012 Arpad Borsos + Copyright (C) 2020 Apple Inc. All rights reserved. + Copyright (C) 2023 Posit, PBC. + + This is a minimal modern single-file fork of escodegen, so that + + 1) we can use it in modern module-based JS environments + 2) we can extend the CodeGenerator prototype for the ability to + support custom code generation for new AST nodes. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +export let FORMAT_MINIFY, FORMAT_DEFAULTS, Precedence; + + var BinaryPrecedence, + esutils, + base, + indent, + json, + renumber, + hexadecimal, + quotes, + escapeless, + newline, + space, + parentheses, + semicolons, + safeConcatenation, + directive, + extra, + parse, + sourceMap, + sourceCode, + preserveBlankLines; + + esutils = { + code: { + ES5Regex: { + NonAsciiIdentifierStart: /[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B4\u08B6-\u08BD\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C80\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D54-\u0D56\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u1884\u1887-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1C80-\u1C88\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AE\uA7B0-\uA7B7\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]/, + NonAsciiIdentifierPart: /[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0-\u08B4\u08B6-\u08BD\u08D4-\u08E1\u08E3-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0AF9\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58-\u0C5A\u0C60-\u0C63\u0C66-\u0C6F\u0C80-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D01-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D54-\u0D57\u0D5F-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19D9\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1C80-\u1C88\u1CD0-\u1CD2\u1CD4-\u1CF6\u1CF8\u1CF9\u1D00-\u1DF5\u1DFB-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u2E2F\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099\u309A\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AE\uA7B0-\uA7B7\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C5\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA8FD\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2F\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]/ + }, + ES6Regex: { + NonAsciiIdentifierStart: /[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B4\u08B6-\u08BD\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C80\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D54-\u0D56\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1C80-\u1C88\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309B-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AE\uA7B0-\uA7B7\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDE80-\uDE9C\uDEA0-\uDED0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCB0-\uDCD3\uDCD8-\uDCFB\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE4\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC03-\uDC37\uDC83-\uDCAF\uDCD0-\uDCE8\uDD03-\uDD26\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE2B\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEDE\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF50\uDF5D-\uDF61]|\uD805[\uDC00-\uDC34\uDC47-\uDC4A\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDD80-\uDDAE\uDDD8-\uDDDB\uDE00-\uDE2F\uDE44\uDE80-\uDEAA\uDF00-\uDF19]|\uD806[\uDCA0-\uDCDF\uDCFF\uDEC0-\uDEF8]|\uD807[\uDC00-\uDC08\uDC0A-\uDC2E\uDC40\uDC72-\uDC8F]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD81C-\uD820\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50\uDF93-\uDF9F\uDFE0]|\uD821[\uDC00-\uDFEC]|\uD822[\uDC00-\uDEF2]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB]|\uD83A[\uDC00-\uDCC4\uDD00-\uDD43]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1]|\uD87E[\uDC00-\uDE1D]/, + NonAsciiIdentifierPart: /[\xAA\xB5\xB7\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0-\u08B4\u08B6-\u08BD\u08D4-\u08E1\u08E3-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0AF9\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58-\u0C5A\u0C60-\u0C63\u0C66-\u0C6F\u0C80-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D01-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D54-\u0D57\u0D5F-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1369-\u1371\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19DA\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1C80-\u1C88\u1CD0-\u1CD2\u1CD4-\u1CF6\u1CF8\u1CF9\u1D00-\u1DF5\u1DFB-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AE\uA7B0-\uA7B7\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C5\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA8FD\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2F\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDDFD\uDE80-\uDE9C\uDEA0-\uDED0\uDEE0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF7A\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDCB0-\uDCD3\uDCD8-\uDCFB\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00-\uDE03\uDE05\uDE06\uDE0C-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE38-\uDE3A\uDE3F\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE6\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC00-\uDC46\uDC66-\uDC6F\uDC7F-\uDCBA\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD00-\uDD34\uDD36-\uDD3F\uDD50-\uDD73\uDD76\uDD80-\uDDC4\uDDCA-\uDDCC\uDDD0-\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE37\uDE3E\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEEA\uDEF0-\uDEF9\uDF00-\uDF03\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3C-\uDF44\uDF47\uDF48\uDF4B-\uDF4D\uDF50\uDF57\uDF5D-\uDF63\uDF66-\uDF6C\uDF70-\uDF74]|\uD805[\uDC00-\uDC4A\uDC50-\uDC59\uDC80-\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDB5\uDDB8-\uDDC0\uDDD8-\uDDDD\uDE00-\uDE40\uDE44\uDE50-\uDE59\uDE80-\uDEB7\uDEC0-\uDEC9\uDF00-\uDF19\uDF1D-\uDF2B\uDF30-\uDF39]|\uD806[\uDCA0-\uDCE9\uDCFF\uDEC0-\uDEF8]|\uD807[\uDC00-\uDC08\uDC0A-\uDC36\uDC38-\uDC40\uDC50-\uDC59\uDC72-\uDC8F\uDC92-\uDCA7\uDCA9-\uDCB6]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD81C-\uD820\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDED0-\uDEED\uDEF0-\uDEF4\uDF00-\uDF36\uDF40-\uDF43\uDF50-\uDF59\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50-\uDF7E\uDF8F-\uDF9F\uDFE0]|\uD821[\uDC00-\uDFEC]|\uD822[\uDC00-\uDEF2]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99\uDC9D\uDC9E]|\uD834[\uDD65-\uDD69\uDD6D-\uDD72\uDD7B-\uDD82\uDD85-\uDD8B\uDDAA-\uDDAD\uDE42-\uDE44]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD836[\uDE00-\uDE36\uDE3B-\uDE6C\uDE75\uDE84\uDE9B-\uDE9F\uDEA1-\uDEAF]|\uD838[\uDC00-\uDC06\uDC08-\uDC18\uDC1B-\uDC21\uDC23\uDC24\uDC26-\uDC2A]|\uD83A[\uDC00-\uDCC4\uDCD0-\uDCD6\uDD00-\uDD4A\uDD50-\uDD59]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1]|\uD87E[\uDC00-\uDE1D]|\uDB40[\uDD00-\uDDEF]/ + }, + isDecimalDigit: function(ch) { + return 48 <= ch && ch <= 57; + }, + isHexDigit: function(ch) { + return 48 <= ch && ch <= 57 || 97 <= ch && ch <= 102 || 65 <= ch && ch <= 70; + }, + isOctalDigit: function(ch) { + return ch >= 48 && ch <= 55; + }, + NON_ASCII_WHITESPACES: [ + 5760, + 8192, + 8193, + 8194, + 8195, + 8196, + 8197, + 8198, + 8199, + 8200, + 8201, + 8202, + 8239, + 8287, + 12288, + 65279 + ], + isWhiteSpace: function(ch) { + return ch === 32 || ch === 9 || ch === 11 || ch === 12 || ch === 160 || ch >= 5760 && esutils.code.NON_ASCII_WHITESPACES.indexOf(ch) >= 0; + }, + isLineTerminator: function(ch) { + return ch === 10 || ch === 13 || ch === 8232 || ch === 8233; + }, + fromCodePoint: function(cp) { + if (cp <= 65535) { + return String.fromCharCode(cp); + } + var cu1 = String.fromCharCode(Math.floor((cp - 65536) / 1024) + 55296); + var cu2 = String.fromCharCode((cp - 65536) % 1024 + 56320); + return cu1 + cu2; + }, + IDENTIFIER_START: new Array(128), + IDENTIFIER_PART: new Array(128), + isIdentifierStartES5: function(ch) { + return ch < 128 ? esutils.code.IDENTIFIER_START[ch] : esutils.code.ES5Regex.NonAsciiIdentifierStart.test(esutils.code.fromCodePoint(ch)); + }, + isIdentifierPartES5: function(ch) { + return ch < 128 ? esutils.code.IDENTIFIER_PART[ch] : esutils.code.ES5Regex.NonAsciiIdentifierPart.test(esutils.code.fromCodePoint(ch)); + }, + isIdentifierStartES6: function(ch) { + return ch < 128 ? esutils.code.IDENTIFIER_START[ch] : esutils.code.ES6Regex.NonAsciiIdentifierStart.test(esutils.code.fromCodePoint(ch)); + }, + isIdentifierPartES6: function(ch) { + return ch < 128 ? esutils.code.IDENTIFIER_PART[ch] : esutils.code.ES6Regex.NonAsciiIdentifierPart.test(esutils.code.fromCodePoint(ch)); + } + } + } + for (var ch = 0; ch < 128; ++ch) { + esutils.code.IDENTIFIER_START[ch] = ch >= 97 && ch <= 122 || ch >= 65 && ch <= 90 || ch === 36 || ch === 95; + } + for (var ch = 0; ch < 128; ++ch) { + esutils.code.IDENTIFIER_PART[ch] = ch >= 97 && ch <= 122 || ch >= 65 && ch <= 90 || ch >= 48 && ch <= 57 || ch === 36 || ch === 95; + } + + // Generation is done by generateExpression. + function isExpression(node) { + return CodeGenerator.Expression.hasOwnProperty(node.type); + } + + // Generation is done by generateStatement. + function isStatement(node) { + return CodeGenerator.Statement.hasOwnProperty(node.type); + } + + Precedence = { + Sequence: 0, + Yield: 1, + Assignment: 1, + Conditional: 2, + ArrowFunction: 2, + Coalesce: 3, + LogicalOR: 4, + LogicalAND: 5, + BitwiseOR: 6, + BitwiseXOR: 7, + BitwiseAND: 8, + Equality: 9, + Relational: 10, + BitwiseSHIFT: 11, + Additive: 12, + Multiplicative: 13, + Exponentiation: 14, + Await: 15, + Unary: 15, + Postfix: 16, + OptionalChaining: 17, + Call: 18, + New: 19, + TaggedTemplate: 20, + Member: 21, + Primary: 22 + }; + + BinaryPrecedence = { + '??': Precedence.Coalesce, + '||': Precedence.LogicalOR, + '&&': Precedence.LogicalAND, + '|': Precedence.BitwiseOR, + '^': Precedence.BitwiseXOR, + '&': Precedence.BitwiseAND, + '==': Precedence.Equality, + '!=': Precedence.Equality, + '===': Precedence.Equality, + '!==': Precedence.Equality, + 'is': Precedence.Equality, + 'isnt': Precedence.Equality, + '<': Precedence.Relational, + '>': Precedence.Relational, + '<=': Precedence.Relational, + '>=': Precedence.Relational, + 'in': Precedence.Relational, + 'instanceof': Precedence.Relational, + '<<': Precedence.BitwiseSHIFT, + '>>': Precedence.BitwiseSHIFT, + '>>>': Precedence.BitwiseSHIFT, + '+': Precedence.Additive, + '-': Precedence.Additive, + '*': Precedence.Multiplicative, + '%': Precedence.Multiplicative, + '/': Precedence.Multiplicative, + '**': Precedence.Exponentiation + }; + + //Flags + var F_ALLOW_IN = 1, + F_ALLOW_CALL = 1 << 1, + F_ALLOW_UNPARATH_NEW = 1 << 2, + F_FUNC_BODY = 1 << 3, + F_DIRECTIVE_CTX = 1 << 4, + F_SEMICOLON_OPT = 1 << 5, + F_FOUND_COALESCE = 1 << 6; + + //Expression flag sets + //NOTE: Flag order: + // F_ALLOW_IN + // F_ALLOW_CALL + // F_ALLOW_UNPARATH_NEW + var E_FTT = F_ALLOW_CALL | F_ALLOW_UNPARATH_NEW, + E_TTF = F_ALLOW_IN | F_ALLOW_CALL, + E_TTT = F_ALLOW_IN | F_ALLOW_CALL | F_ALLOW_UNPARATH_NEW, + E_TFF = F_ALLOW_IN, + E_FFT = F_ALLOW_UNPARATH_NEW, + E_TFT = F_ALLOW_IN | F_ALLOW_UNPARATH_NEW; + + //Statement flag sets + //NOTE: Flag order: + // F_ALLOW_IN + // F_FUNC_BODY + // F_DIRECTIVE_CTX + // F_SEMICOLON_OPT + var S_TFFF = F_ALLOW_IN, + S_TFFT = F_ALLOW_IN | F_SEMICOLON_OPT, + S_FFFF = 0x00, + S_TFTF = F_ALLOW_IN | F_DIRECTIVE_CTX, + S_TTFF = F_ALLOW_IN | F_FUNC_BODY; + + function getDefaultOptions() { + // default options + return { + indent: null, + base: null, + parse: null, + comment: false, + format: { + indent: { + style: ' ', + base: 0, + adjustMultilineComment: false + }, + newline: '\n', + space: ' ', + json: false, + renumber: false, + hexadecimal: false, + quotes: 'single', + escapeless: false, + compact: false, + parentheses: true, + semicolons: true, + safeConcatenation: false, + preserveBlankLines: false + }, + moz: { + comprehensionExpressionStartsWithAssignment: false, + starlessGenerator: false + }, + sourceMap: null, + sourceMapRoot: null, + sourceMapWithCode: false, + directive: false, + raw: true, + verbatim: null, + sourceCode: null + }; + } + + function stringRepeat(str, num) { + var result = ''; + + for (num |= 0; num > 0; num >>>= 1, str += str) { + if (num & 1) { + result += str; + } + } + + return result; + } + + function hasLineTerminator(str) { + return (/[\r\n]/g).test(str); + } + + function endsWithLineTerminator(str) { + var len = str.length; + return len && esutils.code.isLineTerminator(str.charCodeAt(len - 1)); + } + + function merge(target, override) { + var key; + for (key in override) { + if (override.hasOwnProperty(key)) { + target[key] = override[key]; + } + } + return target; + } + + function updateDeeply(target, override) { + var key, val; + + function isHashObject(target) { + return typeof target === 'object' && target instanceof Object && !(target instanceof RegExp); + } + + for (key in override) { + if (override.hasOwnProperty(key)) { + val = override[key]; + if (isHashObject(val)) { + if (isHashObject(target[key])) { + updateDeeply(target[key], val); + } else { + target[key] = updateDeeply({}, val); + } + } else { + target[key] = val; + } + } + } + return target; + } + + function generateNumber(value) { + var result, point, temp, exponent, pos; + + if (value !== value) { + throw new Error('Numeric literal whose value is NaN'); + } + if (value < 0 || (value === 0 && 1 / value < 0)) { + throw new Error('Numeric literal whose value is negative'); + } + + if (value === 1 / 0) { + return json ? 'null' : renumber ? '1e400' : '1e+400'; + } + + result = '' + value; + if (!renumber || result.length < 3) { + return result; + } + + point = result.indexOf('.'); + if (!json && result.charCodeAt(0) === 0x30 /* 0 */ && point === 1) { + point = 0; + result = result.slice(1); + } + temp = result; + result = result.replace('e+', 'e'); + exponent = 0; + if ((pos = temp.indexOf('e')) > 0) { + exponent = +temp.slice(pos + 1); + temp = temp.slice(0, pos); + } + if (point >= 0) { + exponent -= temp.length - point - 1; + temp = +(temp.slice(0, point) + temp.slice(point + 1)) + ''; + } + pos = 0; + while (temp.charCodeAt(temp.length + pos - 1) === 0x30 /* 0 */) { + --pos; + } + if (pos !== 0) { + exponent -= pos; + temp = temp.slice(0, pos); + } + if (exponent !== 0) { + temp += 'e' + exponent; + } + if ((temp.length < result.length || + (hexadecimal && value > 1e12 && Math.floor(value) === value && (temp = '0x' + value.toString(16)).length < result.length)) && + +temp === value) { + result = temp; + } + + return result; + } + + // Generate valid RegExp expression. + // This function is based on https://github.com/Constellation/iv Engine + + function escapeRegExpCharacter(ch, previousIsBackslash) { + // not handling '\' and handling \u2028 or \u2029 to unicode escape sequence + if ((ch & ~1) === 0x2028) { + return (previousIsBackslash ? 'u' : '\\u') + ((ch === 0x2028) ? '2028' : '2029'); + } else if (ch === 10 || ch === 13) { // \n, \r + return (previousIsBackslash ? '' : '\\') + ((ch === 10) ? 'n' : 'r'); + } + return String.fromCharCode(ch); + } + + function generateRegExp(reg) { + var match, result, flags, i, iz, ch, characterInBrack, previousIsBackslash; + + result = reg.toString(); + + if (reg.source) { + // extract flag from toString result + match = result.match(/\/([^/]*)$/); + if (!match) { + return result; + } + + flags = match[1]; + result = ''; + + characterInBrack = false; + previousIsBackslash = false; + for (i = 0, iz = reg.source.length; i < iz; ++i) { + ch = reg.source.charCodeAt(i); + + if (!previousIsBackslash) { + if (characterInBrack) { + if (ch === 93) { // ] + characterInBrack = false; + } + } else { + if (ch === 47) { // / + result += '\\'; + } else if (ch === 91) { // [ + characterInBrack = true; + } + } + result += escapeRegExpCharacter(ch, previousIsBackslash); + previousIsBackslash = ch === 92; // \ + } else { + // if new RegExp("\\\n') is provided, create /\n/ + result += escapeRegExpCharacter(ch, previousIsBackslash); + // prevent like /\\[/]/ + previousIsBackslash = false; + } + } + + return '/' + result + '/' + flags; + } + + return result; + } + + function escapeAllowedCharacter(code, next) { + var hex; + + if (code === 0x08 /* \b */) { + return '\\b'; + } + + if (code === 0x0C /* \f */) { + return '\\f'; + } + + if (code === 0x09 /* \t */) { + return '\\t'; + } + + hex = code.toString(16).toUpperCase(); + if (json || code > 0xFF) { + return '\\u' + '0000'.slice(hex.length) + hex; + } else if (code === 0x0000 && !esutils.code.isDecimalDigit(next)) { + return '\\0'; + } else if (code === 0x000B /* \v */) { // '\v' + return '\\x0B'; + } else { + return '\\x' + '00'.slice(hex.length) + hex; + } + } + + function escapeDisallowedCharacter(code) { + if (code === 0x5C /* \ */) { + return '\\\\'; + } + + if (code === 0x0A /* \n */) { + return '\\n'; + } + + if (code === 0x0D /* \r */) { + return '\\r'; + } + + if (code === 0x2028) { + return '\\u2028'; + } + + if (code === 0x2029) { + return '\\u2029'; + } + + throw new Error('Incorrectly classified character'); + } + + function escapeDirective(str) { + var i, iz, code, quote; + + quote = quotes === 'double' ? '"' : '\''; + for (i = 0, iz = str.length; i < iz; ++i) { + code = str.charCodeAt(i); + if (code === 0x27 /* ' */) { + quote = '"'; + break; + } else if (code === 0x22 /* " */) { + quote = '\''; + break; + } else if (code === 0x5C /* \ */) { + ++i; + } + } + + return quote + str + quote; + } + + function escapeString(str) { + var result = '', i, len, code, singleQuotes = 0, doubleQuotes = 0, single, quote; + + for (i = 0, len = str.length; i < len; ++i) { + code = str.charCodeAt(i); + if (code === 0x27 /* ' */) { + ++singleQuotes; + } else if (code === 0x22 /* " */) { + ++doubleQuotes; + } else if (code === 0x2F /* / */ && json) { + result += '\\'; + } else if (esutils.code.isLineTerminator(code) || code === 0x5C /* \ */) { + result += escapeDisallowedCharacter(code); + continue; + } else if (!esutils.code.isIdentifierPartES5(code) && (json && code < 0x20 /* SP */ || !json && !escapeless && (code < 0x20 /* SP */ || code > 0x7E /* ~ */))) { + result += escapeAllowedCharacter(code, str.charCodeAt(i + 1)); + continue; + } + result += String.fromCharCode(code); + } + + single = !(quotes === 'double' || (quotes === 'auto' && doubleQuotes < singleQuotes)); + quote = single ? '\'' : '"'; + + if (!(single ? singleQuotes : doubleQuotes)) { + return quote + result + quote; + } + + str = result; + result = quote; + + for (i = 0, len = str.length; i < len; ++i) { + code = str.charCodeAt(i); + if ((code === 0x27 /* ' */ && single) || (code === 0x22 /* " */ && !single)) { + result += '\\'; + } + result += String.fromCharCode(code); + } + + return result + quote; + } + + /** + * flatten an array to a string, where the array can contain + * either strings or nested arrays + */ + function flattenToString(arr) { + var i, iz, elem, result = ''; + for (i = 0, iz = arr.length; i < iz; ++i) { + elem = arr[i]; + result += Array.isArray(elem) ? flattenToString(elem) : elem; + } + return result; + } + + function toSourceNodeWhenNeeded(generated) { + // with no source maps, generated is either an + // array or a string. if an array, flatten it. + // if a string, just return it + if (Array.isArray(generated)) { + return flattenToString(generated); + } else { + return generated; + } + } + + function noEmptySpace() { + return (space) ? space : ' '; + } + + function join(left, right) { + var leftSource, + rightSource, + leftCharCode, + rightCharCode; + + leftSource = toSourceNodeWhenNeeded(left).toString(); + if (leftSource.length === 0) { + return [right]; + } + + rightSource = toSourceNodeWhenNeeded(right).toString(); + if (rightSource.length === 0) { + return [left]; + } + + leftCharCode = leftSource.charCodeAt(leftSource.length - 1); + rightCharCode = rightSource.charCodeAt(0); + + if ((leftCharCode === 0x2B /* + */ || leftCharCode === 0x2D /* - */) && leftCharCode === rightCharCode || + esutils.code.isIdentifierPartES5(leftCharCode) && esutils.code.isIdentifierPartES5(rightCharCode) || + leftCharCode === 0x2F /* / */ && rightCharCode === 0x69 /* i */) { // infix word operators all start with `i` + return [left, noEmptySpace(), right]; + } else if (esutils.code.isWhiteSpace(leftCharCode) || esutils.code.isLineTerminator(leftCharCode) || + esutils.code.isWhiteSpace(rightCharCode) || esutils.code.isLineTerminator(rightCharCode)) { + return [left, right]; + } + return [left, space, right]; + } + + function addIndent(stmt) { + return [base, stmt]; + } + + function withIndent(fn) { + var previousBase; + previousBase = base; + base += indent; + fn(base); + base = previousBase; + } + + function calculateSpaces(str) { + var i; + for (i = str.length - 1; i >= 0; --i) { + if (esutils.code.isLineTerminator(str.charCodeAt(i))) { + break; + } + } + return (str.length - 1) - i; + } + + function adjustMultilineComment(value, specialBase) { + var array, i, len, line, j, spaces, previousBase, sn; + + array = value.split(/\r\n|[\r\n]/); + spaces = Number.MAX_VALUE; + + // first line doesn't have indentation + for (i = 1, len = array.length; i < len; ++i) { + line = array[i]; + j = 0; + while (j < line.length && esutils.code.isWhiteSpace(line.charCodeAt(j))) { + ++j; + } + if (spaces > j) { + spaces = j; + } + } + + if (typeof specialBase !== 'undefined') { + // pattern like + // { + // var t = 20; /* + // * this is comment + // */ + // } + previousBase = base; + if (array[1][spaces] === '*') { + specialBase += ' '; + } + base = specialBase; + } else { + if (spaces & 1) { + // /* + // * + // */ + // If spaces are odd number, above pattern is considered. + // We waste 1 space. + --spaces; + } + previousBase = base; + } + + for (i = 1, len = array.length; i < len; ++i) { + sn = toSourceNodeWhenNeeded(addIndent(array[i].slice(spaces))); + array[i] = sourceMap ? sn.join('') : sn; + } + + base = previousBase; + + return array.join('\n'); + } + + function generateComment(comment, specialBase) { + if (comment.type === 'Line') { + if (endsWithLineTerminator(comment.value)) { + return '//' + comment.value; + } else { + // Always use LineTerminator + var result = '//' + comment.value; + if (!preserveBlankLines) { + result += '\n'; + } + return result; + } + } + if (extra.format.indent.adjustMultilineComment && /[\n\r]/.test(comment.value)) { + return adjustMultilineComment('/*' + comment.value + '*/', specialBase); + } + return '/*' + comment.value + '*/'; + } + + function addComments(stmt, result) { + var i, len, comment, save, tailingToStatement, specialBase, fragment, + extRange, range, prevRange, prefix, infix, suffix, count; + + if (stmt.leadingComments && stmt.leadingComments.length > 0) { + save = result; + + if (preserveBlankLines) { + comment = stmt.leadingComments[0]; + result = []; + + extRange = comment.extendedRange; + range = comment.range; + + prefix = sourceCode.substring(extRange[0], range[0]); + count = (prefix.match(/\n/g) || []).length; + if (count > 0) { + result.push(stringRepeat('\n', count)); + result.push(addIndent(generateComment(comment))); + } else { + result.push(prefix); + result.push(generateComment(comment)); + } + + prevRange = range; + + for (i = 1, len = stmt.leadingComments.length; i < len; i++) { + comment = stmt.leadingComments[i]; + range = comment.range; + + infix = sourceCode.substring(prevRange[1], range[0]); + count = (infix.match(/\n/g) || []).length; + result.push(stringRepeat('\n', count)); + result.push(addIndent(generateComment(comment))); + + prevRange = range; + } + + suffix = sourceCode.substring(range[1], extRange[1]); + count = (suffix.match(/\n/g) || []).length; + result.push(stringRepeat('\n', count)); + } else { + comment = stmt.leadingComments[0]; + result = []; + if (safeConcatenation && stmt.type === "Program" && stmt.body.length === 0) { + result.push('\n'); + } + result.push(generateComment(comment)); + if (!endsWithLineTerminator(toSourceNodeWhenNeeded(result).toString())) { + result.push('\n'); + } + + for (i = 1, len = stmt.leadingComments.length; i < len; ++i) { + comment = stmt.leadingComments[i]; + fragment = [generateComment(comment)]; + if (!endsWithLineTerminator(toSourceNodeWhenNeeded(fragment).toString())) { + fragment.push('\n'); + } + result.push(addIndent(fragment)); + } + } + + result.push(addIndent(save)); + } + + if (stmt.trailingComments) { + + if (preserveBlankLines) { + comment = stmt.trailingComments[0]; + extRange = comment.extendedRange; + range = comment.range; + + prefix = sourceCode.substring(extRange[0], range[0]); + count = (prefix.match(/\n/g) || []).length; + + if (count > 0) { + result.push(stringRepeat('\n', count)); + result.push(addIndent(generateComment(comment))); + } else { + result.push(prefix); + result.push(generateComment(comment)); + } + } else { + tailingToStatement = !endsWithLineTerminator(toSourceNodeWhenNeeded(result).toString()); + specialBase = stringRepeat(' ', calculateSpaces(toSourceNodeWhenNeeded([base, result, indent]).toString())); + for (i = 0, len = stmt.trailingComments.length; i < len; ++i) { + comment = stmt.trailingComments[i]; + if (tailingToStatement) { + // We assume target like following script + // + // var t = 20; /** + // * This is comment of t + // */ + if (i === 0) { + // first case + result = [result, indent]; + } else { + result = [result, specialBase]; + } + result.push(generateComment(comment, specialBase)); + } else { + result = [result, addIndent(generateComment(comment))]; + } + if (i !== len - 1 && !endsWithLineTerminator(toSourceNodeWhenNeeded(result).toString())) { + result = [result, '\n']; + } + } + } + } + + return result; + } + + function generateBlankLines(start, end, result) { + var j, newlineCount = 0; + + for (j = start; j < end; j++) { + if (sourceCode[j] === '\n') { + newlineCount++; + } + } + + for (j = 1; j < newlineCount; j++) { + result.push(newline); + } + } + + function parenthesize(text, current, should) { + if (current < should) { + return ['(', text, ')']; + } + return text; + } + + function generateVerbatimString(string) { + var i, iz, result; + result = string.split(/\r\n|\n/); + for (i = 1, iz = result.length; i < iz; i++) { + result[i] = newline + base + result[i]; + } + return result; + } + + function generateVerbatim(expr, precedence) { + var verbatim, result, prec; + verbatim = expr[extra.verbatim]; + + if (typeof verbatim === 'string') { + result = parenthesize(generateVerbatimString(verbatim), Precedence.Sequence, precedence); + } else { + // verbatim is object + result = generateVerbatimString(verbatim.content); + prec = (verbatim.precedence != null) ? verbatim.precedence : Precedence.Sequence; + result = parenthesize(result, prec, precedence); + } + + return toSourceNodeWhenNeeded(result, expr); + } + + export function CodeGenerator() { + } + + // Helpers. + + CodeGenerator.prototype.maybeBlock = function(stmt, flags) { + var result, noLeadingComment, that = this; + + noLeadingComment = !extra.comment || !stmt.leadingComments; + + if (stmt.type === "BlockStatement" && noLeadingComment) { + return [space, this.generateStatement(stmt, flags)]; + } + + if (stmt.type === "EmptyStatement" && noLeadingComment) { + return ';'; + } + + withIndent(function () { + result = [ + newline, + addIndent(that.generateStatement(stmt, flags)) + ]; + }); + + return result; + }; + + CodeGenerator.prototype.maybeBlockSuffix = function (stmt, result) { + var ends = endsWithLineTerminator(toSourceNodeWhenNeeded(result).toString()); + if (stmt.type === "BlockStatement" && (!extra.comment || !stmt.leadingComments) && !ends) { + return [result, space]; + } + if (ends) { + return [result, base]; + } + return [result, newline, base]; + }; + + function generateIdentifier(node) { + return toSourceNodeWhenNeeded(node.name, node); + } + + function generateAsyncPrefix(node, spaceRequired) { + return node.async ? 'async' + (spaceRequired ? noEmptySpace() : space) : ''; + } + + function generateStarSuffix(node) { + var isGenerator = node.generator && !extra.moz.starlessGenerator; + return isGenerator ? '*' + space : ''; + } + + function generateMethodPrefix(prop) { + var func = prop.value, prefix = ''; + if (func.async) { + prefix += generateAsyncPrefix(func, !prop.computed); + } + if (func.generator) { + // avoid space before method name + prefix += generateStarSuffix(func) ? '*' : ''; + } + return prefix; + } + + CodeGenerator.prototype.generatePattern = function (node, precedence, flags) { + if (node.type === "Identifier") { + return generateIdentifier(node); + } + return this.generateExpression(node, precedence, flags); + }; + + CodeGenerator.prototype.generateFunctionParams = function (node) { + var i, iz, result, hasDefault; + + hasDefault = false; + + if (node.type === "ArrowFunctionExpression" && + !node.rest && (!node.defaults || node.defaults.length === 0) && + node.params.length === 1 && node.params[0].type === "Identifier") { + // arg => { } case + result = [generateAsyncPrefix(node, true), generateIdentifier(node.params[0])]; + } else { + result = node.type === "ArrowFunctionExpression"? [generateAsyncPrefix(node, false)] : []; + result.push('('); + if (node.defaults) { + hasDefault = true; + } + for (i = 0, iz = node.params.length; i < iz; ++i) { + if (hasDefault && node.defaults[i]) { + // Handle default values. + result.push(this.generateAssignment(node.params[i], node.defaults[i], '=', Precedence.Assignment, E_TTT)); + } else { + result.push(this.generatePattern(node.params[i], Precedence.Assignment, E_TTT)); + } + if (i + 1 < iz) { + result.push(',' + space); + } + } + + if (node.rest) { + if (node.params.length) { + result.push(',' + space); + } + result.push('...'); + result.push(generateIdentifier(node.rest)); + } + + result.push(')'); + } + + return result; + }; + + CodeGenerator.prototype.generateFunctionBody = function (node) { + var result, expr; + + result = this.generateFunctionParams(node); + + if (node.type === "ArrowFunctionExpression") { + result.push(space); + result.push('=>'); + } + + if (node.expression) { + result.push(space); + expr = this.generateExpression(node.body, Precedence.Assignment, E_TTT); + if (expr.toString().charAt(0) === '{') { + expr = ['(', expr, ')']; + } + result.push(expr); + } else { + result.push(this.maybeBlock(node.body, S_TTFF)); + } + + return result; + }; + + CodeGenerator.prototype.generateIterationForStatement = function (operator, stmt, flags) { + var result = ['for' + (stmt.await ? noEmptySpace() + 'await' : '') + space + '('], that = this; + withIndent(function () { + if (stmt.left.type === "VariableDeclaration") { + withIndent(function () { + result.push(stmt.left.kind + noEmptySpace()); + result.push(that.generateStatement(stmt.left.declarations[0], S_FFFF)); + }); + } else { + result.push(that.generateExpression(stmt.left, Precedence.Call, E_TTT)); + } + + result = join(result, operator); + result = [join( + result, + that.generateExpression(stmt.right, Precedence.Assignment, E_TTT) + ), ')']; + }); + result.push(this.maybeBlock(stmt.body, flags)); + return result; + }; + + CodeGenerator.prototype.generatePropertyKey = function (expr, computed) { + var result = []; + + if (computed) { + result.push('['); + } + + result.push(this.generateExpression(expr, Precedence.Assignment, E_TTT)); + + if (computed) { + result.push(']'); + } + + return result; + }; + + CodeGenerator.prototype.generateAssignment = function (left, right, operator, precedence, flags) { + if (Precedence.Assignment < precedence) { + flags |= F_ALLOW_IN; + } + + return parenthesize( + [ + this.generateExpression(left, Precedence.Call, flags), + space + operator + space, + this.generateExpression(right, Precedence.Assignment, flags) + ], + Precedence.Assignment, + precedence + ); + }; + + CodeGenerator.prototype.semicolon = function (flags) { + if (!semicolons && flags & F_SEMICOLON_OPT) { + return ''; + } + return ';'; + }; + + // Statements. + + CodeGenerator.Statement = { + + BlockStatement: function (stmt, flags) { + var range, content, result = ['{', newline], that = this; + + withIndent(function () { + // handle functions without any code + if (stmt.body.length === 0 && preserveBlankLines) { + range = stmt.range; + if (range[1] - range[0] > 2) { + content = sourceCode.substring(range[0] + 1, range[1] - 1); + if (content[0] === '\n') { + result = ['{']; + } + result.push(content); + } + } + + var i, iz, fragment, bodyFlags; + bodyFlags = S_TFFF; + if (flags & F_FUNC_BODY) { + bodyFlags |= F_DIRECTIVE_CTX; + } + + for (i = 0, iz = stmt.body.length; i < iz; ++i) { + if (preserveBlankLines) { + // handle spaces before the first line + if (i === 0) { + if (stmt.body[0].leadingComments) { + range = stmt.body[0].leadingComments[0].extendedRange; + content = sourceCode.substring(range[0], range[1]); + if (content[0] === '\n') { + result = ['{']; + } + } + if (!stmt.body[0].leadingComments) { + generateBlankLines(stmt.range[0], stmt.body[0].range[0], result); + } + } + + // handle spaces between lines + if (i > 0) { + if (!stmt.body[i - 1].trailingComments && !stmt.body[i].leadingComments) { + generateBlankLines(stmt.body[i - 1].range[1], stmt.body[i].range[0], result); + } + } + } + + if (i === iz - 1) { + bodyFlags |= F_SEMICOLON_OPT; + } + + if (stmt.body[i].leadingComments && preserveBlankLines) { + fragment = that.generateStatement(stmt.body[i], bodyFlags); + } else { + fragment = addIndent(that.generateStatement(stmt.body[i], bodyFlags)); + } + + result.push(fragment); + if (!endsWithLineTerminator(toSourceNodeWhenNeeded(fragment).toString())) { + if (preserveBlankLines && i < iz - 1) { + // don't add a new line if there are leading coments + // in the next statement + if (!stmt.body[i + 1].leadingComments) { + result.push(newline); + } + } else { + result.push(newline); + } + } + + if (preserveBlankLines) { + // handle spaces after the last line + if (i === iz - 1) { + if (!stmt.body[i].trailingComments) { + generateBlankLines(stmt.body[i].range[1], stmt.range[1], result); + } + } + } + } + }); + + result.push(addIndent('}')); + return result; + }, + + BreakStatement: function (stmt, flags) { + if (stmt.label) { + return 'break ' + stmt.label.name + this.semicolon(flags); + } + return 'break' + this.semicolon(flags); + }, + + ContinueStatement: function (stmt, flags) { + if (stmt.label) { + return 'continue ' + stmt.label.name + this.semicolon(flags); + } + return 'continue' + this.semicolon(flags); + }, + + ClassBody: function (stmt, flags) { + var result = [ '{', newline], that = this; + + withIndent(function (indent) { + var i, iz; + + for (i = 0, iz = stmt.body.length; i < iz; ++i) { + result.push(indent); + result.push(that.generateExpression(stmt.body[i], Precedence.Sequence, E_TTT)); + if (i + 1 < iz) { + result.push(newline); + } + } + }); + + if (!endsWithLineTerminator(toSourceNodeWhenNeeded(result).toString())) { + result.push(newline); + } + result.push(base); + result.push('}'); + return result; + }, + + ClassDeclaration: function (stmt, flags) { + var result, fragment; + result = ['class']; + if (stmt.id) { + result = join(result, this.generateExpression(stmt.id, Precedence.Sequence, E_TTT)); + } + if (stmt.superClass) { + fragment = join('extends', this.generateExpression(stmt.superClass, Precedence.Unary, E_TTT)); + result = join(result, fragment); + } + result.push(space); + result.push(this.generateStatement(stmt.body, S_TFFT)); + return result; + }, + + DirectiveStatement: function (stmt, flags) { + if (extra.raw && stmt.raw) { + return stmt.raw + this.semicolon(flags); + } + return escapeDirective(stmt.directive) + this.semicolon(flags); + }, + + DoWhileStatement: function (stmt, flags) { + // Because `do 42 while (cond)` is Syntax Error. We need semicolon. + var result = join('do', this.maybeBlock(stmt.body, S_TFFF)); + result = this.maybeBlockSuffix(stmt.body, result); + return join(result, [ + 'while' + space + '(', + this.generateExpression(stmt.test, Precedence.Sequence, E_TTT), + ')' + this.semicolon(flags) + ]); + }, + + CatchClause: function (stmt, flags) { + var result, that = this; + withIndent(function () { + var guard; + + if (stmt.param) { + result = [ + 'catch' + space + '(', + that.generateExpression(stmt.param, Precedence.Sequence, E_TTT), + ')' + ]; + + if (stmt.guard) { + guard = that.generateExpression(stmt.guard, Precedence.Sequence, E_TTT); + result.splice(2, 0, ' if ', guard); + } + } else { + result = ['catch']; + } + }); + result.push(this.maybeBlock(stmt.body, S_TFFF)); + return result; + }, + + DebuggerStatement: function (stmt, flags) { + return 'debugger' + this.semicolon(flags); + }, + + EmptyStatement: function (stmt, flags) { + return ';'; + }, + + ExportDefaultDeclaration: function (stmt, flags) { + var result = [ 'export' ], bodyFlags; + + bodyFlags = (flags & F_SEMICOLON_OPT) ? S_TFFT : S_TFFF; + + // export default HoistableDeclaration[Default] + // export default AssignmentExpression[In] ; + result = join(result, 'default'); + if (isStatement(stmt.declaration)) { + result = join(result, this.generateStatement(stmt.declaration, bodyFlags)); + } else { + result = join(result, this.generateExpression(stmt.declaration, Precedence.Assignment, E_TTT) + this.semicolon(flags)); + } + return result; + }, + + ExportNamedDeclaration: function (stmt, flags) { + var result = [ 'export' ], bodyFlags, that = this; + + bodyFlags = (flags & F_SEMICOLON_OPT) ? S_TFFT : S_TFFF; + + // export VariableStatement + // export Declaration[Default] + if (stmt.declaration) { + return join(result, this.generateStatement(stmt.declaration, bodyFlags)); + } + + // export ExportClause[NoReference] FromClause ; + // export ExportClause ; + if (stmt.specifiers) { + if (stmt.specifiers.length === 0) { + result = join(result, '{' + space + '}'); + } else if (stmt.specifiers[0].type === "ExportBatchSpecifier") { + result = join(result, this.generateExpression(stmt.specifiers[0], Precedence.Sequence, E_TTT)); + } else { + result = join(result, '{'); + withIndent(function (indent) { + var i, iz; + result.push(newline); + for (i = 0, iz = stmt.specifiers.length; i < iz; ++i) { + result.push(indent); + result.push(that.generateExpression(stmt.specifiers[i], Precedence.Sequence, E_TTT)); + if (i + 1 < iz) { + result.push(',' + newline); + } + } + }); + if (!endsWithLineTerminator(toSourceNodeWhenNeeded(result).toString())) { + result.push(newline); + } + result.push(base + '}'); + } + + if (stmt.source) { + result = join(result, [ + 'from' + space, + // ModuleSpecifier + this.generateExpression(stmt.source, Precedence.Sequence, E_TTT), + this.semicolon(flags) + ]); + } else { + result.push(this.semicolon(flags)); + } + } + return result; + }, + + ExportAllDeclaration: function (stmt, flags) { + // export * FromClause ; + return [ + 'export' + space, + '*' + space, + 'from' + space, + // ModuleSpecifier + this.generateExpression(stmt.source, Precedence.Sequence, E_TTT), + this.semicolon(flags) + ]; + }, + + ExpressionStatement: function (stmt, flags) { + var result, fragment; + + function isClassPrefixed(fragment) { + var code; + if (fragment.slice(0, 5) !== 'class') { + return false; + } + code = fragment.charCodeAt(5); + return code === 0x7B /* '{' */ || esutils.code.isWhiteSpace(code) || esutils.code.isLineTerminator(code); + } + + function isFunctionPrefixed(fragment) { + var code; + if (fragment.slice(0, 8) !== 'function') { + return false; + } + code = fragment.charCodeAt(8); + return code === 0x28 /* '(' */ || esutils.code.isWhiteSpace(code) || code === 0x2A /* '*' */ || esutils.code.isLineTerminator(code); + } + + function isAsyncPrefixed(fragment) { + var code, i, iz; + if (fragment.slice(0, 5) !== 'async') { + return false; + } + if (!esutils.code.isWhiteSpace(fragment.charCodeAt(5))) { + return false; + } + for (i = 6, iz = fragment.length; i < iz; ++i) { + if (!esutils.code.isWhiteSpace(fragment.charCodeAt(i))) { + break; + } + } + if (i === iz) { + return false; + } + if (fragment.slice(i, i + 8) !== 'function') { + return false; + } + code = fragment.charCodeAt(i + 8); + return code === 0x28 /* '(' */ || esutils.code.isWhiteSpace(code) || code === 0x2A /* '*' */ || esutils.code.isLineTerminator(code); + } + + result = [this.generateExpression(stmt.expression, Precedence.Sequence, E_TTT)]; + // 12.4 '{', 'function', 'class' is not allowed in this position. + // wrap expression with parentheses + fragment = toSourceNodeWhenNeeded(result).toString(); + if (fragment.charCodeAt(0) === 0x7B /* '{' */ || // ObjectExpression + isClassPrefixed(fragment) || + isFunctionPrefixed(fragment) || + isAsyncPrefixed(fragment) || + (directive && (flags & F_DIRECTIVE_CTX) && stmt.expression.type === "Literal" && typeof stmt.expression.value === 'string')) { + result = ['(', result, ')' + this.semicolon(flags)]; + } else { + result.push(this.semicolon(flags)); + } + return result; + }, + + ImportDeclaration: function (stmt, flags) { + // ES6: 15.2.1 valid import declarations: + // - import ImportClause FromClause ; + // - import ModuleSpecifier ; + var result, cursor, that = this; + + // If no ImportClause is present, + // this should be `import ModuleSpecifier` so skip `from` + // ModuleSpecifier is StringLiteral. + if (stmt.specifiers.length === 0) { + // import ModuleSpecifier ; + return [ + 'import', + space, + // ModuleSpecifier + this.generateExpression(stmt.source, Precedence.Sequence, E_TTT), + this.semicolon(flags) + ]; + } + + // import ImportClause FromClause ; + result = [ + 'import' + ]; + cursor = 0; + + // ImportedBinding + if (stmt.specifiers[cursor].type === "ImportDefaultSpecifier") { + result = join(result, [ + this.generateExpression(stmt.specifiers[cursor], Precedence.Sequence, E_TTT) + ]); + ++cursor; + } + + if (stmt.specifiers[cursor]) { + if (cursor !== 0) { + result.push(','); + } + + if (stmt.specifiers[cursor].type === "ImportNamespaceSpecifier") { + // NameSpaceImport + result = join(result, [ + space, + this.generateExpression(stmt.specifiers[cursor], Precedence.Sequence, E_TTT) + ]); + } else { + // NamedImports + result.push(space + '{'); + + if ((stmt.specifiers.length - cursor) === 1) { + // import { ... } from "..."; + result.push(space); + result.push(this.generateExpression(stmt.specifiers[cursor], Precedence.Sequence, E_TTT)); + result.push(space + '}' + space); + } else { + // import { + // ..., + // ..., + // } from "..."; + withIndent(function (indent) { + var i, iz; + result.push(newline); + for (i = cursor, iz = stmt.specifiers.length; i < iz; ++i) { + result.push(indent); + result.push(that.generateExpression(stmt.specifiers[i], Precedence.Sequence, E_TTT)); + if (i + 1 < iz) { + result.push(',' + newline); + } + } + }); + if (!endsWithLineTerminator(toSourceNodeWhenNeeded(result).toString())) { + result.push(newline); + } + result.push(base + '}' + space); + } + } + } + + result = join(result, [ + 'from' + space, + // ModuleSpecifier + this.generateExpression(stmt.source, Precedence.Sequence, E_TTT), + this.semicolon(flags) + ]); + return result; + }, + + VariableDeclarator: function (stmt, flags) { + var itemFlags = (flags & F_ALLOW_IN) ? E_TTT : E_FTT; + if (stmt.init) { + return [ + this.generateExpression(stmt.id, Precedence.Assignment, itemFlags), + space, + '=', + space, + this.generateExpression(stmt.init, Precedence.Assignment, itemFlags) + ]; + } + return this.generatePattern(stmt.id, Precedence.Assignment, itemFlags); + }, + + VariableDeclaration: function (stmt, flags) { + // VariableDeclarator is typed as Statement, + // but joined with comma (not LineTerminator). + // So if comment is attached to target node, we should specialize. + var result, i, iz, node, bodyFlags, that = this; + + result = [ stmt.kind ]; + + bodyFlags = (flags & F_ALLOW_IN) ? S_TFFF : S_FFFF; + + function block() { + node = stmt.declarations[0]; + if (extra.comment && node.leadingComments) { + result.push('\n'); + result.push(addIndent(that.generateStatement(node, bodyFlags))); + } else { + result.push(noEmptySpace()); + result.push(that.generateStatement(node, bodyFlags)); + } + + for (i = 1, iz = stmt.declarations.length; i < iz; ++i) { + node = stmt.declarations[i]; + if (extra.comment && node.leadingComments) { + result.push(',' + newline); + result.push(addIndent(that.generateStatement(node, bodyFlags))); + } else { + result.push(',' + space); + result.push(that.generateStatement(node, bodyFlags)); + } + } + } + + if (stmt.declarations.length > 1) { + withIndent(block); + } else { + block(); + } + + result.push(this.semicolon(flags)); + + return result; + }, + + ThrowStatement: function (stmt, flags) { + return [join( + 'throw', + this.generateExpression(stmt.argument, Precedence.Sequence, E_TTT) + ), this.semicolon(flags)]; + }, + + TryStatement: function (stmt, flags) { + var result, i, iz, guardedHandlers; + + result = ['try', this.maybeBlock(stmt.block, S_TFFF)]; + result = this.maybeBlockSuffix(stmt.block, result); + + if (stmt.handlers) { + // old interface + for (i = 0, iz = stmt.handlers.length; i < iz; ++i) { + result = join(result, this.generateStatement(stmt.handlers[i], S_TFFF)); + if (stmt.finalizer || i + 1 !== iz) { + result = this.maybeBlockSuffix(stmt.handlers[i].body, result); + } + } + } else { + guardedHandlers = stmt.guardedHandlers || []; + + for (i = 0, iz = guardedHandlers.length; i < iz; ++i) { + result = join(result, this.generateStatement(guardedHandlers[i], S_TFFF)); + if (stmt.finalizer || i + 1 !== iz) { + result = this.maybeBlockSuffix(guardedHandlers[i].body, result); + } + } + + // new interface + if (stmt.handler) { + if (Array.isArray(stmt.handler)) { + for (i = 0, iz = stmt.handler.length; i < iz; ++i) { + result = join(result, this.generateStatement(stmt.handler[i], S_TFFF)); + if (stmt.finalizer || i + 1 !== iz) { + result = this.maybeBlockSuffix(stmt.handler[i].body, result); + } + } + } else { + result = join(result, this.generateStatement(stmt.handler, S_TFFF)); + if (stmt.finalizer) { + result = this.maybeBlockSuffix(stmt.handler.body, result); + } + } + } + } + if (stmt.finalizer) { + result = join(result, ['finally', this.maybeBlock(stmt.finalizer, S_TFFF)]); + } + return result; + }, + + SwitchStatement: function (stmt, flags) { + var result, fragment, i, iz, bodyFlags, that = this; + withIndent(function () { + result = [ + 'switch' + space + '(', + that.generateExpression(stmt.discriminant, Precedence.Sequence, E_TTT), + ')' + space + '{' + newline + ]; + }); + if (stmt.cases) { + bodyFlags = S_TFFF; + for (i = 0, iz = stmt.cases.length; i < iz; ++i) { + if (i === iz - 1) { + bodyFlags |= F_SEMICOLON_OPT; + } + fragment = addIndent(this.generateStatement(stmt.cases[i], bodyFlags)); + result.push(fragment); + if (!endsWithLineTerminator(toSourceNodeWhenNeeded(fragment).toString())) { + result.push(newline); + } + } + } + result.push(addIndent('}')); + return result; + }, + + SwitchCase: function (stmt, flags) { + var result, fragment, i, iz, bodyFlags, that = this; + withIndent(function () { + if (stmt.test) { + result = [ + join('case', that.generateExpression(stmt.test, Precedence.Sequence, E_TTT)), + ':' + ]; + } else { + result = ['default:']; + } + + i = 0; + iz = stmt.consequent.length; + if (iz && stmt.consequent[0].type === "BlockStatement") { + fragment = that.maybeBlock(stmt.consequent[0], S_TFFF); + result.push(fragment); + i = 1; + } + + if (i !== iz && !endsWithLineTerminator(toSourceNodeWhenNeeded(result).toString())) { + result.push(newline); + } + + bodyFlags = S_TFFF; + for (; i < iz; ++i) { + if (i === iz - 1 && flags & F_SEMICOLON_OPT) { + bodyFlags |= F_SEMICOLON_OPT; + } + fragment = addIndent(that.generateStatement(stmt.consequent[i], bodyFlags)); + result.push(fragment); + if (i + 1 !== iz && !endsWithLineTerminator(toSourceNodeWhenNeeded(fragment).toString())) { + result.push(newline); + } + } + }); + return result; + }, + + IfStatement: function (stmt, flags) { + var result, bodyFlags, semicolonOptional, that = this; + withIndent(function () { + result = [ + 'if' + space + '(', + that.generateExpression(stmt.test, Precedence.Sequence, E_TTT), + ')' + ]; + }); + semicolonOptional = flags & F_SEMICOLON_OPT; + bodyFlags = S_TFFF; + if (semicolonOptional) { + bodyFlags |= F_SEMICOLON_OPT; + } + if (stmt.alternate) { + result.push(this.maybeBlock(stmt.consequent, S_TFFF)); + result = this.maybeBlockSuffix(stmt.consequent, result); + if (stmt.alternate.type === "IfStatement") { + result = join(result, ['else ', this.generateStatement(stmt.alternate, bodyFlags)]); + } else { + result = join(result, join('else', this.maybeBlock(stmt.alternate, bodyFlags))); + } + } else { + result.push(this.maybeBlock(stmt.consequent, bodyFlags)); + } + return result; + }, + + ForStatement: function (stmt, flags) { + var result, that = this; + withIndent(function () { + result = ['for' + space + '(']; + if (stmt.init) { + if (stmt.init.type === "VariableDeclaration") { + result.push(that.generateStatement(stmt.init, S_FFFF)); + } else { + // F_ALLOW_IN becomes false. + result.push(that.generateExpression(stmt.init, Precedence.Sequence, E_FTT)); + result.push(';'); + } + } else { + result.push(';'); + } + + if (stmt.test) { + result.push(space); + result.push(that.generateExpression(stmt.test, Precedence.Sequence, E_TTT)); + result.push(';'); + } else { + result.push(';'); + } + + if (stmt.update) { + result.push(space); + result.push(that.generateExpression(stmt.update, Precedence.Sequence, E_TTT)); + result.push(')'); + } else { + result.push(')'); + } + }); + + result.push(this.maybeBlock(stmt.body, flags & F_SEMICOLON_OPT ? S_TFFT : S_TFFF)); + return result; + }, + + ForInStatement: function (stmt, flags) { + return this.generateIterationForStatement('in', stmt, flags & F_SEMICOLON_OPT ? S_TFFT : S_TFFF); + }, + + ForOfStatement: function (stmt, flags) { + return this.generateIterationForStatement('of', stmt, flags & F_SEMICOLON_OPT ? S_TFFT : S_TFFF); + }, + + LabeledStatement: function (stmt, flags) { + return [stmt.label.name + ':', this.maybeBlock(stmt.body, flags & F_SEMICOLON_OPT ? S_TFFT : S_TFFF)]; + }, + + Program: function (stmt, flags) { + var result, fragment, i, iz, bodyFlags; + iz = stmt.body.length; + result = [safeConcatenation && iz > 0 ? '\n' : '']; + bodyFlags = S_TFTF; + for (i = 0; i < iz; ++i) { + if (!safeConcatenation && i === iz - 1) { + bodyFlags |= F_SEMICOLON_OPT; + } + + if (preserveBlankLines) { + // handle spaces before the first line + if (i === 0) { + if (!stmt.body[0].leadingComments) { + generateBlankLines(stmt.range[0], stmt.body[i].range[0], result); + } + } + + // handle spaces between lines + if (i > 0) { + if (!stmt.body[i - 1].trailingComments && !stmt.body[i].leadingComments) { + generateBlankLines(stmt.body[i - 1].range[1], stmt.body[i].range[0], result); + } + } + } + + fragment = addIndent(this.generateStatement(stmt.body[i], bodyFlags)); + result.push(fragment); + if (i + 1 < iz && !endsWithLineTerminator(toSourceNodeWhenNeeded(fragment).toString())) { + if (preserveBlankLines) { + if (!stmt.body[i + 1].leadingComments) { + result.push(newline); + } + } else { + result.push(newline); + } + } + + if (preserveBlankLines) { + // handle spaces after the last line + if (i === iz - 1) { + if (!stmt.body[i].trailingComments) { + generateBlankLines(stmt.body[i].range[1], stmt.range[1], result); + } + } + } + } + return result; + }, + + FunctionDeclaration: function (stmt, flags) { + return [ + generateAsyncPrefix(stmt, true), + 'function', + generateStarSuffix(stmt) || noEmptySpace(), + stmt.id ? generateIdentifier(stmt.id) : '', + this.generateFunctionBody(stmt) + ]; + }, + + ReturnStatement: function (stmt, flags) { + if (stmt.argument) { + return [join( + 'return', + this.generateExpression(stmt.argument, Precedence.Sequence, E_TTT) + ), this.semicolon(flags)]; + } + return ['return' + this.semicolon(flags)]; + }, + + WhileStatement: function (stmt, flags) { + var result, that = this; + withIndent(function () { + result = [ + 'while' + space + '(', + that.generateExpression(stmt.test, Precedence.Sequence, E_TTT), + ')' + ]; + }); + result.push(this.maybeBlock(stmt.body, flags & F_SEMICOLON_OPT ? S_TFFT : S_TFFF)); + return result; + }, + + WithStatement: function (stmt, flags) { + var result, that = this; + withIndent(function () { + result = [ + 'with' + space + '(', + that.generateExpression(stmt.object, Precedence.Sequence, E_TTT), + ')' + ]; + }); + result.push(this.maybeBlock(stmt.body, flags & F_SEMICOLON_OPT ? S_TFFT : S_TFFF)); + return result; + } + + }; + + merge(CodeGenerator.prototype, CodeGenerator.Statement); + + // Expressions. + + CodeGenerator.Expression = { + + /* OJS expressions begin */ + + MutableExpression: function(expr, precedence, flags) { + return `mutable ${expr.id.name}`; + }, + + ViewExpression: function(expr, precedence, flags) { + return `viewof ${expr.id.name}`; + }, + + /* OJS expressions end */ + + SequenceExpression: function (expr, precedence, flags) { + var result, i, iz; + if (Precedence.Sequence < precedence) { + flags |= F_ALLOW_IN; + } + result = []; + for (i = 0, iz = expr.expressions.length; i < iz; ++i) { + result.push(this.generateExpression(expr.expressions[i], Precedence.Assignment, flags)); + if (i + 1 < iz) { + result.push(',' + space); + } + } + return parenthesize(result, Precedence.Sequence, precedence); + }, + + AssignmentExpression: function (expr, precedence, flags) { + return this.generateAssignment(expr.left, expr.right, expr.operator, precedence, flags); + }, + + ArrowFunctionExpression: function (expr, precedence, flags) { + return parenthesize(this.generateFunctionBody(expr), Precedence.ArrowFunction, precedence); + }, + + ConditionalExpression: function (expr, precedence, flags) { + if (Precedence.Conditional < precedence) { + flags |= F_ALLOW_IN; + } + return parenthesize( + [ + this.generateExpression(expr.test, Precedence.Coalesce, flags), + space + '?' + space, + this.generateExpression(expr.consequent, Precedence.Assignment, flags), + space + ':' + space, + this.generateExpression(expr.alternate, Precedence.Assignment, flags) + ], + Precedence.Conditional, + precedence + ); + }, + + LogicalExpression: function (expr, precedence, flags) { + if (expr.operator === '??') { + flags |= F_FOUND_COALESCE; + } + return this.BinaryExpression(expr, precedence, flags); + }, + + BinaryExpression: function (expr, precedence, flags) { + var result, leftPrecedence, rightPrecedence, currentPrecedence, fragment, leftSource; + currentPrecedence = BinaryPrecedence[expr.operator]; + leftPrecedence = expr.operator === '**' ? Precedence.Postfix : currentPrecedence; + rightPrecedence = expr.operator === '**' ? currentPrecedence : currentPrecedence + 1; + + if (currentPrecedence < precedence) { + flags |= F_ALLOW_IN; + } + + fragment = this.generateExpression(expr.left, leftPrecedence, flags); + + leftSource = fragment.toString(); + + if (leftSource.charCodeAt(leftSource.length - 1) === 0x2F /* / */ && esutils.code.isIdentifierPartES5(expr.operator.charCodeAt(0))) { + result = [fragment, noEmptySpace(), expr.operator]; + } else { + result = join(fragment, expr.operator); + } + + fragment = this.generateExpression(expr.right, rightPrecedence, flags); + + if (expr.operator === '/' && fragment.toString().charAt(0) === '/' || + expr.operator.slice(-1) === '<' && fragment.toString().slice(0, 3) === '!--') { + // If '/' concats with '/' or `<` concats with `!--`, it is interpreted as comment start + result.push(noEmptySpace()); + result.push(fragment); + } else { + result = join(result, fragment); + } + + if (expr.operator === 'in' && !(flags & F_ALLOW_IN)) { + return ['(', result, ')']; + } + if ((expr.operator === '||' || expr.operator === '&&') && (flags & F_FOUND_COALESCE)) { + return ['(', result, ')']; + } + return parenthesize(result, currentPrecedence, precedence); + }, + + CallExpression: function (expr, precedence, flags) { + var result, i, iz; + + // F_ALLOW_UNPARATH_NEW becomes false. + result = [this.generateExpression(expr.callee, Precedence.Call, E_TTF)]; + + if (expr.optional) { + result.push('?.'); + } + + result.push('('); + for (i = 0, iz = expr['arguments'].length; i < iz; ++i) { + result.push(this.generateExpression(expr['arguments'][i], Precedence.Assignment, E_TTT)); + if (i + 1 < iz) { + result.push(',' + space); + } + } + result.push(')'); + + if (!(flags & F_ALLOW_CALL)) { + return ['(', result, ')']; + } + + return parenthesize(result, Precedence.Call, precedence); + }, + + ChainExpression: function (expr, precedence, flags) { + if (Precedence.OptionalChaining < precedence) { + flags |= F_ALLOW_CALL; + } + + var result = this.generateExpression(expr.expression, Precedence.OptionalChaining, flags); + + return parenthesize(result, Precedence.OptionalChaining, precedence); + }, + + NewExpression: function (expr, precedence, flags) { + var result, length, i, iz, itemFlags; + length = expr['arguments'].length; + + // F_ALLOW_CALL becomes false. + // F_ALLOW_UNPARATH_NEW may become false. + itemFlags = (flags & F_ALLOW_UNPARATH_NEW && !parentheses && length === 0) ? E_TFT : E_TFF; + + result = join( + 'new', + this.generateExpression(expr.callee, Precedence.New, itemFlags) + ); + + if (!(flags & F_ALLOW_UNPARATH_NEW) || parentheses || length > 0) { + result.push('('); + for (i = 0, iz = length; i < iz; ++i) { + result.push(this.generateExpression(expr['arguments'][i], Precedence.Assignment, E_TTT)); + if (i + 1 < iz) { + result.push(',' + space); + } + } + result.push(')'); + } + + return parenthesize(result, Precedence.New, precedence); + }, + + MemberExpression: function (expr, precedence, flags) { + var result, fragment; + + // F_ALLOW_UNPARATH_NEW becomes false. + result = [this.generateExpression(expr.object, Precedence.Call, (flags & F_ALLOW_CALL) ? E_TTF : E_TFF)]; + + if (expr.computed) { + if (expr.optional) { + result.push('?.'); + } + + result.push('['); + result.push(this.generateExpression(expr.property, Precedence.Sequence, flags & F_ALLOW_CALL ? E_TTT : E_TFT)); + result.push(']'); + } else { + if (!expr.optional && expr.object.type === "Literal" && typeof expr.object.value === 'number') { + fragment = toSourceNodeWhenNeeded(result).toString(); + // When the following conditions are all true, + // 1. No floating point + // 2. Don't have exponents + // 3. The last character is a decimal digit + // 4. Not hexadecimal OR octal number literal + // we should add a floating point. + if ( + fragment.indexOf('.') < 0 && + !/[eExX]/.test(fragment) && + esutils.code.isDecimalDigit(fragment.charCodeAt(fragment.length - 1)) && + !(fragment.length >= 2 && fragment.charCodeAt(0) === 48) // '0' + ) { + result.push(' '); + } + } + result.push(expr.optional ? '?.' : '.'); + result.push(generateIdentifier(expr.property)); + } + + return parenthesize(result, Precedence.Member, precedence); + }, + + MetaProperty: function (expr, precedence, flags) { + var result; + result = []; + result.push(typeof expr.meta === "string" ? expr.meta : generateIdentifier(expr.meta)); + result.push('.'); + result.push(typeof expr.property === "string" ? expr.property : generateIdentifier(expr.property)); + return parenthesize(result, Precedence.Member, precedence); + }, + + UnaryExpression: function (expr, precedence, flags) { + var result, fragment, rightCharCode, leftSource, leftCharCode; + fragment = this.generateExpression(expr.argument, Precedence.Unary, E_TTT); + + if (space === '') { + result = join(expr.operator, fragment); + } else { + result = [expr.operator]; + if (expr.operator.length > 2) { + // delete, void, typeof + // get `typeof []`, not `typeof[]` + result = join(result, fragment); + } else { + // Prevent inserting spaces between operator and argument if it is unnecessary + // like, `!cond` + leftSource = toSourceNodeWhenNeeded(result).toString(); + leftCharCode = leftSource.charCodeAt(leftSource.length - 1); + rightCharCode = fragment.toString().charCodeAt(0); + + if (((leftCharCode === 0x2B /* + */ || leftCharCode === 0x2D /* - */) && leftCharCode === rightCharCode) || + (esutils.code.isIdentifierPartES5(leftCharCode) && esutils.code.isIdentifierPartES5(rightCharCode))) { + result.push(noEmptySpace()); + result.push(fragment); + } else { + result.push(fragment); + } + } + } + return parenthesize(result, Precedence.Unary, precedence); + }, + + YieldExpression: function (expr, precedence, flags) { + var result; + if (expr.delegate) { + result = 'yield*'; + } else { + result = 'yield'; + } + if (expr.argument) { + result = join( + result, + this.generateExpression(expr.argument, Precedence.Yield, E_TTT) + ); + } + return parenthesize(result, Precedence.Yield, precedence); + }, + + AwaitExpression: function (expr, precedence, flags) { + var result = join( + expr.all ? 'await*' : 'await', + this.generateExpression(expr.argument, Precedence.Await, E_TTT) + ); + return parenthesize(result, Precedence.Await, precedence); + }, + + UpdateExpression: function (expr, precedence, flags) { + if (expr.prefix) { + return parenthesize( + [ + expr.operator, + this.generateExpression(expr.argument, Precedence.Unary, E_TTT) + ], + Precedence.Unary, + precedence + ); + } + return parenthesize( + [ + this.generateExpression(expr.argument, Precedence.Postfix, E_TTT), + expr.operator + ], + Precedence.Postfix, + precedence + ); + }, + + FunctionExpression: function (expr, precedence, flags) { + var result = [ + generateAsyncPrefix(expr, true), + 'function' + ]; + if (expr.id) { + result.push(generateStarSuffix(expr) || noEmptySpace()); + result.push(generateIdentifier(expr.id)); + } else { + result.push(generateStarSuffix(expr) || space); + } + result.push(this.generateFunctionBody(expr)); + return result; + }, + + ArrayPattern: function (expr, precedence, flags) { + return this.ArrayExpression(expr, precedence, flags, true); + }, + + ArrayExpression: function (expr, precedence, flags, isPattern) { + var result, multiline, that = this; + if (!expr.elements.length) { + return '[]'; + } + multiline = isPattern ? false : expr.elements.length > 1; + result = ['[', multiline ? newline : '']; + withIndent(function (indent) { + var i, iz; + for (i = 0, iz = expr.elements.length; i < iz; ++i) { + if (!expr.elements[i]) { + if (multiline) { + result.push(indent); + } + if (i + 1 === iz) { + result.push(','); + } + } else { + result.push(multiline ? indent : ''); + result.push(that.generateExpression(expr.elements[i], Precedence.Assignment, E_TTT)); + } + if (i + 1 < iz) { + result.push(',' + (multiline ? newline : space)); + } + } + }); + if (multiline && !endsWithLineTerminator(toSourceNodeWhenNeeded(result).toString())) { + result.push(newline); + } + result.push(multiline ? base : ''); + result.push(']'); + return result; + }, + + RestElement: function(expr, precedence, flags) { + return '...' + this.generatePattern(expr.argument); + }, + + ClassExpression: function (expr, precedence, flags) { + var result, fragment; + result = ['class']; + if (expr.id) { + result = join(result, this.generateExpression(expr.id, Precedence.Sequence, E_TTT)); + } + if (expr.superClass) { + fragment = join('extends', this.generateExpression(expr.superClass, Precedence.Unary, E_TTT)); + result = join(result, fragment); + } + result.push(space); + result.push(this.generateStatement(expr.body, S_TFFT)); + return result; + }, + + MethodDefinition: function (expr, precedence, flags) { + var result, fragment; + if (expr['static']) { + result = ['static' + space]; + } else { + result = []; + } + if (expr.kind === 'get' || expr.kind === 'set') { + fragment = [ + join(expr.kind, this.generatePropertyKey(expr.key, expr.computed)), + this.generateFunctionBody(expr.value) + ]; + } else { + fragment = [ + generateMethodPrefix(expr), + this.generatePropertyKey(expr.key, expr.computed), + this.generateFunctionBody(expr.value) + ]; + } + return join(result, fragment); + }, + + Property: function (expr, precedence, flags) { + if (expr.kind === 'get' || expr.kind === 'set') { + return [ + expr.kind, noEmptySpace(), + this.generatePropertyKey(expr.key, expr.computed), + this.generateFunctionBody(expr.value) + ]; + } + + if (expr.shorthand) { + if (expr.value.type === "AssignmentPattern") { + return this.AssignmentPattern(expr.value, Precedence.Sequence, E_TTT); + } + return this.generatePropertyKey(expr.key, expr.computed); + } + + if (expr.method) { + return [ + generateMethodPrefix(expr), + this.generatePropertyKey(expr.key, expr.computed), + this.generateFunctionBody(expr.value) + ]; + } + + return [ + this.generatePropertyKey(expr.key, expr.computed), + ':' + space, + this.generateExpression(expr.value, Precedence.Assignment, E_TTT) + ]; + }, + + ObjectExpression: function (expr, precedence, flags) { + var multiline, result, fragment, that = this; + + if (!expr.properties.length) { + return '{}'; + } + multiline = expr.properties.length > 1; + + withIndent(function () { + fragment = that.generateExpression(expr.properties[0], Precedence.Sequence, E_TTT); + }); + + if (!multiline) { + // issues 4 + // Do not transform from + // dejavu.Class.declare({ + // method2: function () {} + // }); + // to + // dejavu.Class.declare({method2: function () { + // }}); + if (!hasLineTerminator(toSourceNodeWhenNeeded(fragment).toString())) { + return [ '{', space, fragment, space, '}' ]; + } + } + + withIndent(function (indent) { + var i, iz; + result = [ '{', newline, indent, fragment ]; + + if (multiline) { + result.push(',' + newline); + for (i = 1, iz = expr.properties.length; i < iz; ++i) { + result.push(indent); + result.push(that.generateExpression(expr.properties[i], Precedence.Sequence, E_TTT)); + if (i + 1 < iz) { + result.push(',' + newline); + } + } + } + }); + + if (!endsWithLineTerminator(toSourceNodeWhenNeeded(result).toString())) { + result.push(newline); + } + result.push(base); + result.push('}'); + return result; + }, + + AssignmentPattern: function(expr, precedence, flags) { + return this.generateAssignment(expr.left, expr.right, '=', precedence, flags); + }, + + ObjectPattern: function (expr, precedence, flags) { + var result, i, iz, multiline, property, that = this; + if (!expr.properties.length) { + return '{}'; + } + + multiline = false; + if (expr.properties.length === 1) { + property = expr.properties[0]; + if ( + property.type === "Property" + && property.value.type !== "Identifier" + ) { + multiline = true; + } + } else { + for (i = 0, iz = expr.properties.length; i < iz; ++i) { + property = expr.properties[i]; + if ( + property.type === "Property" + && !property.shorthand + ) { + multiline = true; + break; + } + } + } + result = ['{', multiline ? newline : '' ]; + + withIndent(function (indent) { + var i, iz; + for (i = 0, iz = expr.properties.length; i < iz; ++i) { + result.push(multiline ? indent : ''); + result.push(that.generateExpression(expr.properties[i], Precedence.Sequence, E_TTT)); + if (i + 1 < iz) { + result.push(',' + (multiline ? newline : space)); + } + } + }); + + if (multiline && !endsWithLineTerminator(toSourceNodeWhenNeeded(result).toString())) { + result.push(newline); + } + result.push(multiline ? base : ''); + result.push('}'); + return result; + }, + + ThisExpression: function (expr, precedence, flags) { + return 'this'; + }, + + Super: function (expr, precedence, flags) { + return 'super'; + }, + + Identifier: function (expr, precedence, flags) { + return generateIdentifier(expr); + }, + + ImportDefaultSpecifier: function (expr, precedence, flags) { + return generateIdentifier(expr.id || expr.local); + }, + + ImportNamespaceSpecifier: function (expr, precedence, flags) { + var result = ['*']; + var id = expr.id || expr.local; + if (id) { + result.push(space + 'as' + noEmptySpace() + generateIdentifier(id)); + } + return result; + }, + + ImportSpecifier: function (expr, precedence, flags) { + var imported = expr.imported; + var result = [ imported.name ]; + var local = expr.local; + if (local && local.name !== imported.name) { + result.push(noEmptySpace() + 'as' + noEmptySpace() + generateIdentifier(local)); + } + return result; + }, + + ExportSpecifier: function (expr, precedence, flags) { + var local = expr.local; + var result = [ local.name ]; + var exported = expr.exported; + if (exported && exported.name !== local.name) { + result.push(noEmptySpace() + 'as' + noEmptySpace() + generateIdentifier(exported)); + } + return result; + }, + + Literal: function (expr, precedence, flags) { + var raw; + if (expr.hasOwnProperty('raw') && parse && extra.raw) { + try { + raw = parse(expr.raw).body[0].expression; + if (raw.type === "Literal") { + if (raw.value === expr.value) { + return expr.raw; + } + } + } catch (e) { + // not use raw property + } + } + + if (expr.regex) { + return '/' + expr.regex.pattern + '/' + expr.regex.flags; + } + + if (typeof expr.value === 'bigint') { + return expr.value.toString() + 'n'; + } + + // `expr.value` can be null if `expr.bigint` exists. We need to check + // `expr.bigint` first. + if (expr.bigint) { + return expr.bigint + 'n'; + } + + if (expr.value === null) { + return 'null'; + } + + if (typeof expr.value === 'string') { + return escapeString(expr.value); + } + + if (typeof expr.value === 'number') { + return generateNumber(expr.value); + } + + if (typeof expr.value === 'boolean') { + return expr.value ? 'true' : 'false'; + } + + return generateRegExp(expr.value); + }, + + GeneratorExpression: function (expr, precedence, flags) { + return this.ComprehensionExpression(expr, precedence, flags); + }, + + ComprehensionExpression: function (expr, precedence, flags) { + // GeneratorExpression should be parenthesized with (...), ComprehensionExpression with [...] + // Due to https://bugzilla.mozilla.org/show_bug.cgi?id=883468 position of expr.body can differ in Spidermonkey and ES6 + + var result, i, iz, fragment, that = this; + result = (expr.type === "GeneratorExpression") ? ['('] : ['[']; + + if (extra.moz.comprehensionExpressionStartsWithAssignment) { + fragment = this.generateExpression(expr.body, Precedence.Assignment, E_TTT); + result.push(fragment); + } + + if (expr.blocks) { + withIndent(function () { + for (i = 0, iz = expr.blocks.length; i < iz; ++i) { + fragment = that.generateExpression(expr.blocks[i], Precedence.Sequence, E_TTT); + if (i > 0 || extra.moz.comprehensionExpressionStartsWithAssignment) { + result = join(result, fragment); + } else { + result.push(fragment); + } + } + }); + } + + if (expr.filter) { + result = join(result, 'if' + space); + fragment = this.generateExpression(expr.filter, Precedence.Sequence, E_TTT); + result = join(result, [ '(', fragment, ')' ]); + } + + if (!extra.moz.comprehensionExpressionStartsWithAssignment) { + fragment = this.generateExpression(expr.body, Precedence.Assignment, E_TTT); + + result = join(result, fragment); + } + + result.push((expr.type === "GeneratorExpression") ? ')' : ']'); + return result; + }, + + ComprehensionBlock: function (expr, precedence, flags) { + var fragment; + if (expr.left.type === "VariableDeclaration") { + fragment = [ + expr.left.kind, noEmptySpace(), + this.generateStatement(expr.left.declarations[0], S_FFFF) + ]; + } else { + fragment = this.generateExpression(expr.left, Precedence.Call, E_TTT); + } + + fragment = join(fragment, expr.of ? 'of' : 'in'); + fragment = join(fragment, this.generateExpression(expr.right, Precedence.Sequence, E_TTT)); + + return [ 'for' + space + '(', fragment, ')' ]; + }, + + SpreadElement: function (expr, precedence, flags) { + return [ + '...', + this.generateExpression(expr.argument, Precedence.Assignment, E_TTT) + ]; + }, + + TaggedTemplateExpression: function (expr, precedence, flags) { + var itemFlags = E_TTF; + if (!(flags & F_ALLOW_CALL)) { + itemFlags = E_TFF; + } + var result = [ + this.generateExpression(expr.tag, Precedence.Call, itemFlags), + this.generateExpression(expr.quasi, Precedence.Primary, E_FFT) + ]; + return parenthesize(result, Precedence.TaggedTemplate, precedence); + }, + + TemplateElement: function (expr, precedence, flags) { + // Don't use "cooked". Since tagged template can use raw template + // representation. So if we do so, it breaks the script semantics. + return expr.value.raw; + }, + + TemplateLiteral: function (expr, precedence, flags) { + var result, i, iz; + result = [ '`' ]; + for (i = 0, iz = expr.quasis.length; i < iz; ++i) { + result.push(this.generateExpression(expr.quasis[i], Precedence.Primary, E_TTT)); + if (i + 1 < iz) { + result.push('${' + space); + result.push(this.generateExpression(expr.expressions[i], Precedence.Sequence, E_TTT)); + result.push(space + '}'); + } + } + result.push('`'); + return result; + }, + + ModuleSpecifier: function (expr, precedence, flags) { + return this.Literal(expr, precedence, flags); + }, + + ImportExpression: function(expr, precedence, flag) { + return parenthesize([ + 'import(', + this.generateExpression(expr.source, Precedence.Assignment, E_TTT), + ')' + ], Precedence.Call, precedence); + } + }; + + merge(CodeGenerator.prototype, CodeGenerator.Expression); + + CodeGenerator.prototype.generateExpression = function (expr, precedence, flags) { + var result, type; + + type = expr.type || "Property"; + + if (extra.verbatim && expr.hasOwnProperty(extra.verbatim)) { + return generateVerbatim(expr, precedence); + } + + result = this[type](expr, precedence, flags); + + + if (extra.comment) { + result = addComments(expr, result); + } + return toSourceNodeWhenNeeded(result, expr); + }; + + CodeGenerator.prototype.generateStatement = function (stmt, flags) { + var result, + fragment; + + result = this[stmt.type](stmt, flags); + + // Attach comments + + if (extra.comment) { + result = addComments(stmt, result); + } + + fragment = toSourceNodeWhenNeeded(result).toString(); + if (stmt.type === "Program" && !safeConcatenation && newline === '' && fragment.charAt(fragment.length - 1) === '\n') { + result = sourceMap ? toSourceNodeWhenNeeded(result).replaceRight(/\s+$/, '') : fragment.replace(/\s+$/, ''); + } + + return toSourceNodeWhenNeeded(result, stmt); + }; + + function generateInternal(node) { + var codegen; + + codegen = new CodeGenerator(); + if (isStatement(node)) { + return codegen.generateStatement(node, S_TFFF); + } + + if (isExpression(node)) { + return codegen.generateExpression(node, Precedence.Sequence, E_TTT); + } + + throw new Error('Unknown node type: ' + node.type); + } + + export function generate(node, options) { + var defaultOptions = getDefaultOptions(), result, pair; + + if (options != null) { + // Obsolete options + // + // `options.indent` + // `options.base` + // + // Instead of them, we can use `option.format.indent`. + if (typeof options.indent === 'string') { + defaultOptions.format.indent.style = options.indent; + } + if (typeof options.base === 'number') { + defaultOptions.format.indent.base = options.base; + } + options = updateDeeply(defaultOptions, options); + indent = options.format.indent.style; + if (typeof options.base === 'string') { + base = options.base; + } else { + base = stringRepeat(indent, options.format.indent.base); + } + } else { + options = defaultOptions; + indent = options.format.indent.style; + base = stringRepeat(indent, options.format.indent.base); + } + json = options.format.json; + renumber = options.format.renumber; + hexadecimal = json ? false : options.format.hexadecimal; + quotes = json ? 'double' : options.format.quotes; + escapeless = options.format.escapeless; + newline = options.format.newline; + space = options.format.space; + if (options.format.compact) { + newline = space = indent = base = ''; + } + parentheses = options.format.parentheses; + semicolons = options.format.semicolons; + safeConcatenation = options.format.safeConcatenation; + directive = options.directive; + parse = json ? null : options.parse; + sourceMap = false; + sourceCode = options.sourceCode; + preserveBlankLines = options.format.preserveBlankLines && sourceCode !== null; + extra = options; + + return generateInternal(node).toString(); + } + + FORMAT_MINIFY = { + indent: { + style: '', + base: 0 + }, + renumber: true, + hexadecimal: true, + quotes: 'auto', + escapeless: true, + compact: true, + parentheses: false, + semicolons: false + }; + + FORMAT_DEFAULTS = getDefaultOptions().format; + + Precedence = updateDeeply({}, Precedence); diff --git a/packages/ojs/quarto-ojs-runtime/src/index.js b/packages/ojs/quarto-ojs-runtime/src/index.js new file mode 100644 index 00000000000..0de9cc4a11c --- /dev/null +++ b/packages/ojs/quarto-ojs-runtime/src/index.js @@ -0,0 +1,3 @@ +import init from "./quarto-ojs.js"; +init(); +// export default init; \ No newline at end of file diff --git a/packages/ojs/quarto-ojs-runtime/src/ojs-code-transform.js b/packages/ojs/quarto-ojs-runtime/src/ojs-code-transform.js new file mode 100644 index 00000000000..46708baffcc --- /dev/null +++ b/packages/ojs/quarto-ojs-runtime/src/ojs-code-transform.js @@ -0,0 +1,218 @@ +/* + * ojs-code-transform.ts + * + * Copyright (C) 2021-2023 Posit Software, PBC + */ + +import { make, simple } from "acorn-walk"; +import { generate } from "./escodegen.js"; +import { parseModule } from "external-observablehq-parser"; + +// we need to patch the base walker ourselves because OJS sometimes +// emits Program nodes with "cells" rather than "body" +const walkerBase = make({ + Import() {}, + // deno-lint-ignore no-explicit-any + ViewExpression(node, st, c) { + c(node.id, st, "Identifier"); + }, + // deno-lint-ignore no-explicit-any + MutableExpression(node, st, c) { + c(node.id, st, "Identifier"); + }, + // deno-lint-ignore no-explicit-any + Cell(node, st, c) { + c(node.body, st); + }, + // deno-lint-ignore no-explicit-any + Program(node, st, c) { + if (node.body) { + for (let i = 0, list = node.body; i < list.length; i += 1) { + const stmt = list[i]; + c(stmt, st, "Statement"); + } + } else if (node.cells) { + for (let i = 0, list = node.cells; i < list.length; i += 1) { + const stmt = list[i]; + c(stmt, st); + } + } else { + throw new Error( + `OJS traversal: I don't know how to walk this node: ${node}`, + ); + } + }, +}); + +// deno-lint-ignore no-explicit-any +export function ojsSimpleWalker(parse, visitor) { + simple(parse, visitor, walkerBase); +} + +function isPlotPlotCall(node) { + if (node.type !== "CallExpression") { + return null; + } + const callee = node.callee; + if (callee.type !== "MemberExpression") { + return null; + } + if (callee.property.type !== "Identifier" || + callee.property.name !== "plot") { + return null; + } + + let result = node.arguments; + + node = callee.object; + while (true) { + if (node.type === "Identifier" && + node.name === "Plot") { + return result; + } + if (node.type !== "CallExpression" || + node.callee.type !== "MemberExpression") { + return null; + } + node = node.callee.object; + } +} + + +/* +Rewrites Plot.(method(...).method(...).)plot({ + ... +}) +to +Plot.(method(...).method(...).)plot({ + width: card[$CARD_IN_SCOPE].width, + height: card[$CARD_IN_SCOPE].height, + ... +}) */ +const multipleOutputCellMap = {}; +function rewritePlotPlotCall(exp, cellName) { + // First, check if cellName exists. If it doesn't, + // then that's likely because we're on a multiple-output cell. + // attempt to find a cell with the name cellName-1, cellName-2, etc. + const fixupCellName = () => { + if (document.getElementById(cellName) === null) { + let index = 1; + let subcellName; + do { + subcellName = `${cellName}-${index}`; + index += 1; + if (document.getElementById(subcellName) !== null && multipleOutputCellMap[subcellName] === undefined) { + multipleOutputCellMap[subcellName] = true; + return subcellName; + } + } while (document.getElementById(subcellName) !== null); + return undefined; + } else { + return cellName; + } + } + + const args = isPlotPlotCall(exp); + if (args === null) { + return false; + } + if (args.length > 1) { + return false; + } + if (args.length === 0) { + args.push({ + type: "ObjectExpression", + properties: [] + }); + } + if (args[0].type !== "ObjectExpression") { + return false; + } + + const props = args[0].properties; + // this will need to be more robust in the future. + // deno-lint-ignore no-explicit-any + if (!props.every((a) => a.type === "Property")) { + return false; + } + // insert + // width: cards[cardIndex].width property + // and height: cards[cardIndex].height property + + const cellNameToUse = fixupCellName(); + if (cellNameToUse === undefined) { + return false; + } + const value = (field) => ({ + type: "MemberExpression", + object: { + type: "MemberExpression", + computed: true, + object: { + type: "Identifier", + name: "cards", + }, + property: { + type: "Literal", + value: cellNameToUse, + }, + }, + property: { + type: "Identifier", + name: field, + }, + }); + const prop = (field) => ({ + type: "Property", + key: { + type: "Identifier", + name: field, + }, + value: value(field), + }); + + props.unshift(prop("width")); + props.unshift(prop("height")); + return true; +} + +export function autosizeOJSPlot( + src, + cellName, +) { + // deno-lint-ignore no-explicit-any + let ast; + try { + ast = parseModule(src); + } catch (e) { + // if we fail to parse, don't do anything + // FIXME warn? + if (!(e instanceof SyntaxError)) throw e; + return src; + } + ojsSimpleWalker(ast, { + // deno-lint-ignore no-explicit-any + CallExpression(exp) { + if (rewritePlotPlotCall(exp, cellName)) { + return; + } + } + }); + + const result = ast.cells.map((cell) => { + const bodySrc = generate(cell.body); + if (cell.id === null) { + return bodySrc; + } else if (cell.id.type === "Identifier") { + return `${cell.id.name} = ${bodySrc}`; + } else if (cell.id.type === "ViewExpression") { + return `viewof ${cell.id.id.name} = ${bodySrc}`; + } else if (cell.id.type === "MutableExpression") { + return `mutable ${cell.id.id.name} = ${bodySrc}`; + } else { + throw new Error(`OJS: I don't know how to handle this cell id: ${cell.id.type}`); + } + }).join("\n"); + return result; +} + diff --git a/packages/ojs/quarto-ojs-runtime/src/ojs-connector.js b/packages/ojs/quarto-ojs-runtime/src/ojs-connector.js new file mode 100644 index 00000000000..b0ea64583b5 --- /dev/null +++ b/packages/ojs/quarto-ojs-runtime/src/ojs-connector.js @@ -0,0 +1,522 @@ +/*global Shiny, $, DOMParser, MutationObserver, URL +* +* ojs-connector.js +* +* Copyright (C) 2022 RStudio, PBC +* +*/ + +import { Interpreter } from "external-alex-garcia-unofficial-observablehq-compiler"; + +import { + Inspector, + Runtime, + RuntimeError, +} from "external-observablehq-runtime"; + +import { parseModule } from "external-observablehq-parser"; +import { Library } from "external-observablehq-stdlib"; + +import { base64ToStr } from "./b64.js"; + +////////////////////////////////////////////////////////////////////////////// + +class EmptyInspector { + pending() { + } + fulfilled(_value, _name) { + } + rejected(_error, _name) { + // TODO we should probably communicate this upstream somehow. + } +} + +// here we need to convert from an ES6 module to an observable module +// in, well, a best-effort kind of way. +function es6ImportAsObservableModule(modulePromise, specs) { + const promiseMap = {}; + const resolveMap = {}; + specs.forEach(spec => { + promiseMap[spec] = new Promise((resolve, reject) => { resolveMap[spec] = { resolve, reject }; }); + }); + modulePromise.then(m => { + specs.forEach(spec => { + resolveMap[spec].resolve(m[spec]); + }); + }).catch(error => { + specs.forEach(spec => { + resolveMap[spec].reject(error); + }); + }); + return function (runtime, observer) { + const main = runtime.module(); + + specs.forEach(key => { + main.variable(observer(key)).define(key, [], () => promiseMap[key]) + }); +/* + Object.keys(m).forEach((key) => { + const v = m[key]; + + main.variable(observer(key)).define(key, [], () => promiseMap[key]v); + }); + */ + return main; + }; +} + + +// this is essentially the import resolution code from observable's +// runtime. we change it to add a license check for permissive +// open-source licenses before resolving the import +async function defaultResolveImportPath(path) { + const extractPath = (path) => { + let source = path; + let m; + if ((m = /\.js(\?|$)/i.exec(source))) { + source = source.slice(0, m.index); + } + if ((m = /^[0-9a-f]{16}$/i.test(source))) { + source = `d/${source}`; + } + if ((m = /^https:\/\/(api\.|beta\.|)observablehq\.com\//i.exec(source))) { + source = source.slice(m[0].length); + } + return source; + }; + const source = extractPath(path); + const metadataURL = `https://api.observablehq.com/document/${source}`; + const moduleURL = `https://api.observablehq.com/${source}.js?v=3`; + + /* TODO This should be the implementation we use, once/if observable + starts reporting notebook license on their metadata. + + const metadata = await fetch(metadataURL, { mode: 'no-cors' }); + const nbJson = metadata.json(); + if (["isc", "mit", "bsd-3-clause", "apache-2.0"].indexOf(nbJson.license) === -1) { + throw new Error(`Notebook doesn't have a permissive open-source license`); + } */ + + const m = await import(moduleURL); + return m.default; +} + +/* + importPathResolver encodes the rules for ojsconnector to resolve + import statements. + + This code doesn't depend have any dependencies on quarto, but some + of the decisions here are influence by the needs of the quarto + system. + + We use the same name from observable's runtime so the intended + functionality is clear. However, note that their name is slightly + misleading. importPathResolver not only resolves import paths but + performs module imports as well. This is useful for us because it + allows us to extend the meaning of ojs's import statement, but it + makes the name confusing. + + Here are the rules for our version of the import statement. + + The function returned by importPathResolver expects a "module specifier", and + produces a module as defined by observable's runtime. + + ## Local vs remote vs observable imports + + A module specifier is a string, interpreted differently depending on + the following properties: + + - it starts with "." or "/", in which case we call it a "local module" + + - it is a well-defined absolute URL which does _not_ match the regexp: + /^https:\/\/(api\.|beta\.|)observablehq\.com\//i + in which case we call it a "remote import" + + - otherwise, it is an "observable import" + + If the string is an observable import, it behaves exactly like the import + statement inside observable notebooks (we actually defer to their function + call.) Otherwise, the import statement first retrieves the text content + of the resource referenced by the path, and then interprets it. + + ## where resources come from + + When operating in non-self-contained mode, local and remote import + paths are then interpreted as relative URLs (RFC 1808) with base URL + window.location (specifically as "relative path" and "absolute path" + relative URLs). + + In self-contained mode, these paths are interpreted as paths in the + quarto project, either as root-relative or relative paths. The + contents of these files are converted to data URLs and stored in a + local resolution map. + + ## how are contents interpreted + + The contents of the resource are then interpreted differently + depending on the file type of the requested resource. + + For non-self-contained imports, the file type is determined by the + extension of the URL pathname. If the extension is "js", we take the + specifier to mean an ES module; If the extension is "ojs", we take + the specifier to mean an "ojs" module (a collection of observable + statements packaged into a module, suitable for reuse). If the + extension is "ts" or "tsx", then this is an import that was actually transpiled + into js during quarto render, and we change the extension to .js and + resolve that. Finally, if the extension is "qmd", we take the specifier + to mean an "implicit ojs module", equivalent to extracting all + the ojs statements from the .qmd file and producing an OJS module. + + For self-contained imports, the file type is determined by the MIME + type of the data URL. "application/javascript" is interpreted to + mean an ES module, and "application/ojs-javascript" is interpreted + to mean an "ojs" module. (.qmd imports will have been + translated to ojs modules by the compilation step.) + + The resources are finally retrieved, compiled into modules + compatible with the observable runtime, and returned as + the result of the import statement. + +*/ + +function importPathResolver(paths, localResolverMap) { + // NB: only resolve the field values in paths when calling rootPath + // and relativePath. If we prematurely optimize this by moving the + // const declarations outside, then we will capture the + // uninitialized values. + + // fetch() and import() have different relative path semantics, so + // we need different paths for each use case + + function importRootPath(path) { + const { runtimeToRoot } = paths; + if (!runtimeToRoot) { + return path; + } else { + return `${runtimeToRoot}/${path}`; + } + } + + function importRelativePath(path) { + const { runtimeToDoc } = paths; + if (!runtimeToDoc) { + return path; + } else { + return `${runtimeToDoc}/${path}`; + } + } + + // a fetch path of a root-relative path is resolved wrt to + // the document root + function fetchRootPath(path) { + const { docToRoot } = paths; + if (!docToRoot) { + return path; + } else { + return `${docToRoot}/${path}`; + } + } + + // a fetch path of a relative path is resolved the naive way + function fetchRelativePath(path) { + return path; + } + + return async (path, specs) => { + const isLocalModule = path.startsWith("/") || path.startsWith("."); + const isImportFromObservableWebsite = path.match( + /^https:\/\/(api\.|beta\.|)observablehq\.com\//i, + ); + + if (!isLocalModule || isImportFromObservableWebsite) { + return defaultResolveImportPath(path); + } + + let importPath, fetchPath; + let moduleType; + if (window._ojs.selfContained) { + if (path.endsWith(".ts")) { + path = path.replace(/\.ts$/, ".js"); + } else if (path.endsWith(".tsx")) { + path = path.replace(/\.tsx$/, ".js"); + } + const resolved = localResolverMap.get(path); + if (resolved === undefined) { + throw new Error(`missing local file ${path} in self-contained mode`); + } + // self-contained resolves to data URLs, so they behave the same. + importPath = resolved; + fetchPath = resolved; + + // we have a data URL here. + const mimeType = resolved.match(/data:(.*);base64/)[1]; + switch (mimeType) { + case "application/javascript": + moduleType = "js"; + break; + case "application/ojs-javascript": + moduleType = "ojs"; + break; + default: + throw new Error(`unrecognized MIME type ${mimeType}`); + } + } else { + // we have a relative URL here + const resourceURL = new URL(path, window.location); + moduleType = resourceURL.pathname.match(/\.(ojs|js|ts|tsx|qmd)$/)[1]; + + // resolve path according to quarto path resolution rules. + if (path.startsWith("/")) { + importPath = importRootPath(path); + fetchPath = fetchRootPath(path); + } else { + importPath = importRelativePath(path); + fetchPath = fetchRelativePath(path); + } + } + + if (moduleType === "ts" || moduleType === "tsx") { + try { + const modulePromise = import(window._ojs.selfContained ? + importPath : + importPath.replace(/\.ts$/, ".js").replace(/\.tsx$/, ".js")); + return es6ImportAsObservableModule(modulePromise, specs); + } catch (e) { + // record the error on the browser console to make debugging + // slightly more convenient. + console.error(e); + throw e; + } + } else if (moduleType === "js") { + try { + const modulePromise = import(importPath); + return es6ImportAsObservableModule(modulePromise, specs); + } catch (e) { + // record the error on the browser console to make debugging + // slightly more convenient. + console.error(e); + throw e; + } + } else if (moduleType === "ojs") { + return importOjsFromURL(fetchPath); + } else if (moduleType === "qmd") { + const htmlPath = `${fetchPath.slice(0, -4)}.html`; + const response = await fetch(htmlPath); + const text = await response.text(); + return createOjsModuleFromHTMLSrc(text); + } else { + throw new Error(`internal error, unrecognized module type ${moduleType}`); + } + }; +} + + +function createOjsModuleFromHTMLSrc(text) { + const parser = new DOMParser(); + const doc = parser.parseFromString(text, "text/html"); + const staticDefns = []; + for (const el of doc.querySelectorAll('script[type="ojs-define"]')) { + staticDefns.push(el.text); + } + const ojsSource = []; + for ( + const content of doc.querySelectorAll('script[type="ojs-module-contents"]') + ) { + for (const cell of JSON.parse(base64ToStr(content.text)).contents) { + ojsSource.push(cell.source); + } + } + return createOjsModuleFromSrc(ojsSource.join("\n"), staticDefns); +} + +function createOjsModuleFromSrc(src, staticDefns = []) { + return (runtime, _observer) => { + const newModule = runtime.module(); + const interpreter = window._ojs.ojsConnector.interpreter; + const _cells = interpreter.module( + src, + newModule, + (_name) => new EmptyInspector(), + ); + for (const defn of staticDefns) { + for (const { name, value } of JSON.parse(defn).contents) { + window._ojs.ojsConnector.define(name, newModule)(value); + } + } + return newModule; + }; +} + +/* + * Given a URL, fetches the text content and creates a new observable module + * exporting all of the names as variables + */ +async function importOjsFromURL(path) { + const r = await fetch(path); + const src = await r.text(); + return createOjsModuleFromSrc(src); +} + +export class OJSConnector { + constructor({ paths, inspectorClass, library, allowPendingGlobals = false }) { + this.library = library || new Library(); + + // this map contains a mapping from resource names to data URLs + // that governs fileAttachment and import() resolutions in the + // case of self-contained files. + this.localResolverMap = new Map(); + // Keeps track of variables that have been requested by ojs code, but do + // not exist (not in the module, not in the library, not on window). + // The keys are variable names, the values are {promise, resolve, reject}. + // This is intended to allow for a (hopefully brief) phase during startup + // in which, if an ojs code chunk references a variable that is not defined, + // instead of treating it as an "x is not defined" error we instead + // take a wait-and-see approach, in case the variable dynamically becomes + // defined later. When the phase ends, killPendingGlobals() must be called + // so any variables that are still missing do cause "x is not defined" + // errors. + this.pendingGlobals = {}; + // When true, the mechanism described in the `this.pendingGlobals` comment + // is used. When false, the result of accessing undefined variables is just + // "x is not defined". This should be considered private, only settable via + // constructor or `killPendingGlobals`. + this.allowPendingGlobals = allowPendingGlobals; + // NB it looks like Runtime makes a local copy of the library object, + // such that mutating library after this is initializaed doesn't actually + // work. + this.runtime = new Runtime(this.library, (name) => this.global(name)); + this.mainModule = this.runtime.module(); + this.interpreter = new Interpreter({ + module: this.mainModule, + resolveImportPath: importPathResolver(paths, this.localResolverMap), + }); + this.inspectorClass = inspectorClass || Inspector; + + // state to handle flash of unevaluated js because of async module imports + this.mainModuleHasImports = false; + this.mainModuleOutstandingImportCount = 0; + this.chunkPromises = []; + } + + // Customizes the Runtime's behavior when an undefined variable is accessed. + // This is needed for cases where the ojs graph is not all present at the + // time of initialization; in particular, the case where a dependent cell + // starts executing before one or more of its dependencies have been defined. + // Without this customization, the user would see a flash of errors while the + // graph is constructed; with this customization, the dependents stay blank + // while they wait. + global(name) { + if (typeof window[name] !== "undefined") { + return window[name]; + } + if (!this.allowPendingGlobals) { + return undefined; + } + + // deno-lint-ignore no-prototype-builtins + if (!this.pendingGlobals.hasOwnProperty(name)) { + // This is a pending global we haven't seen before. Stash a new promise, + // along with its resolve/reject callbacks, in an object and remember it + // for later. + const info = {}; + info.promise = new Promise((resolve, reject) => { + info.resolve = resolve; + info.reject = reject; + }); + this.pendingGlobals[name] = info; + } + return this.pendingGlobals[name].promise; + } + + // Signals the end of the "pending globals" phase. Any promises we've handed + // out from the global() method now are rejected. (We never resolve these + // promises to values; if these variables made an appearance, it would've + // been as variables on modules.) + killPendingGlobals() { + this.allowPendingGlobals = false; + for (const [name, { reject }] of Object.entries(this.pendingGlobals)) { + reject(new RuntimeError(`${name} is not defined`)); + } + } + + setLocalResolver(map) { + for (const [key, value] of Object.entries(map)) { + this.localResolverMap.set(key, value); + } + } + + define(name, module = undefined) { + if (!module) { + module = this.mainModule; + } + let change; + const obs = this.library.Generators.observe((change_) => { + change = change_; + // TODO do something about destruction + }); + module.variable().define(name, obs); + return change; + } + + watch(name, k, module = undefined) { + if (!module) { + module = this.mainModule; + } + module.variable({ + fulfilled: (x) => k(x, name), + }).define([name], (val) => val); + } + + async value(val, module = undefined) { + if (!module) { + module = this.mainModule; + } + const result = await module.value(val); + return result; + } + + finishInterpreting() { + return Promise.all(this.chunkPromises); + } + + interpretWithRunner(src, runner) { + try { + const parse = parseModule(src); + const chunkPromise = Promise.all(parse.cells.map(runner)); + this.chunkPromises.push(chunkPromise); + return chunkPromise; + } catch (error) { + return Promise.reject(error); + } + } + + waitOnImports(cell, promise) { + if (cell.body.type !== "ImportDeclaration") { + return promise; + } else { + this.mainModuleHasImports = true; + this.mainModuleOutstandingImportCount++; + return promise.then((result) => { + this.mainModuleOutstandingImportCount--; + if (this.mainModuleOutstandingImportCount === 0) { + this.clearImportModuleWait(); + } + return result; + }); + } + } + + interpretQuiet(src) { + const runCell = (cell) => { + const cellSrc = src.slice(cell.start, cell.end); + const promise = this.interpreter.module( + cellSrc, + undefined, + (_name) => new EmptyInspector(), + ); + return this.waitOnImports(cell, promise); + }; + return this.interpretWithRunner(src, runCell); + } +}; + \ No newline at end of file diff --git a/packages/ojs/quarto-ojs-runtime/src/pandoc-code-decorator.js b/packages/ojs/quarto-ojs-runtime/src/pandoc-code-decorator.js new file mode 100644 index 00000000000..8ccf41467a2 --- /dev/null +++ b/packages/ojs/quarto-ojs-runtime/src/pandoc-code-decorator.js @@ -0,0 +1,145 @@ +// src/main.js +export class PandocCodeDecorator { + constructor(node) { + this._node = node; + this._spans = []; + this.normalizeCodeRange(); + this.initializeEntryPoints(); + } + normalizeCodeRange() { + const n = this._node; + const lines = n.querySelectorAll("code > span"); + for (const line of lines) { + Array.from(line.childNodes).filter((n2) => n2.nodeType === n2.TEXT_NODE).forEach((n2) => { + const newSpan = document.createElement("span"); + newSpan.textContent = n2.wholeText; + n2.replaceWith(newSpan); + }); + } + } + initializeEntryPoints() { + const lines = this._node.querySelectorAll("code > span"); + let result = []; + let offset = this._node.parentElement.dataset.sourceOffset && -Number(this._node.parentElement.dataset.sourceOffset) || 0; + for (const line of lines) { + let lineNumber = Number(line.id.split("-").pop()); + let column = 1; + Array.from(line.childNodes).filter((n) => n.nodeType === n.ELEMENT_NODE && n.nodeName === "SPAN").forEach((n) => { + result.push({ + offset, + line: lineNumber, + column, + node: n + }); + offset += n.textContent.length; + column += n.textContent.length; + }); + offset += 1; + } + this._elementEntryPoints = result; + } + locateEntry(offset) { + let candidate; + if (offset === Infinity) + return void 0; + for (let i = 0; i < this._elementEntryPoints.length; ++i) { + const entry = this._elementEntryPoints[i]; + if (entry.offset > offset) { + return { entry: candidate, index: i - 1 }; + } + candidate = entry; + } + if (offset < candidate.offset + candidate.node.textContent.length) { + return { entry: candidate, index: this._elementEntryPoints.length - 1 }; + } else { + return void 0; + } + } + offsetToLineColumn(offset) { + let entry = this.locateEntry(offset); + if (entry === void 0) { + const entries = this._elementEntryPoints; + const last = entries[entries.length - 1]; + return { + line: last.line, + column: last.column + Math.min(last.node.textContent.length, offset - last.offset) + }; + } + return { + line: entry.entry.line, + column: entry.entry.column + offset - entry.entry.offset + }; + } + *spanSelection(start, end) { + this.ensureExactSpan(start, end); + const startEntry = this.locateEntry(start); + const endEntry = this.locateEntry(end); + if (startEntry === void 0) { + return; + } + const startIndex = startEntry.index; + const endIndex = endEntry && endEntry.index || this._elementEntryPoints.length; + for (let i = startIndex; i < endIndex; ++i) { + if (this._elementEntryPoints[i] !== void 0) { + yield this._elementEntryPoints[i]; + } + } + } + decorateSpan(start, end, classes) { + for (const entryPoint of this.spanSelection(start, end)) { + for (const cssClass of classes) { + entryPoint.node.classList.add(cssClass); + } + } + } + clearSpan(start, end, classes) { + for (const entryPoint of this.spanSelection(start, end)) { + for (const cssClass of classes) { + entryPoint.node.classList.remove(cssClass); + } + } + } + ensureExactSpan(start, end) { + const splitEntry = (entry, offset) => { + const newSpan = document.createElement("span"); + for (const cssClass of entry.node.classList) { + newSpan.classList.add(cssClass); + } + const beforeText = entry.node.textContent.slice(0, offset - entry.offset); + const afterText = entry.node.textContent.slice(offset - entry.offset); + entry.node.textContent = beforeText; + newSpan.textContent = afterText; + entry.node.after(newSpan); + this._elementEntryPoints.push({ + column: entry.column + offset - entry.offset, + line: entry.line, + node: newSpan, + offset + }); + this._elementEntryPoints.sort((a, b) => a.offset - b.offset); + }; + const startEntry = this.locateEntry(start); + if (startEntry !== void 0 && startEntry.entry !== void 0 && startEntry.entry.offset != start) { + splitEntry(startEntry.entry, start); + } + const endEntry = this.locateEntry(end); + if (endEntry !== void 0 && startEntry.entry !== void 0 && endEntry.entry.offset !== end) { + splitEntry(endEntry.entry, end); + } + } + clearSpan(start, end, classes) { + this.ensureExactSpan(start, end); + const startEntry = this.locateEntry(start); + const endEntry = this.locateEntry(end); + if (startEntry === void 0) { + return; + } + const startIndex = startEntry.index; + const endIndex = endEntry && endEntry.index || this._elementEntryPoints.length; + for (let i = startIndex; i < endIndex; ++i) { + for (const cssClass of classes) { + this._elementEntryPoints[i].node.classList.remove(cssClass); + } + } + } +}; diff --git a/packages/ojs/quarto-ojs-runtime/src/quarto-inspector.js b/packages/ojs/quarto-ojs-runtime/src/quarto-inspector.js new file mode 100644 index 00000000000..a1ce4883989 --- /dev/null +++ b/packages/ojs/quarto-ojs-runtime/src/quarto-inspector.js @@ -0,0 +1,19 @@ +/* +* quarto-inspector.js +* +* Copyright (C) 2022 RStudio, PBC +* +*/ + +import { Inspector } from "external-observablehq-runtime"; + +export class QuartoInspector extends Inspector { + constructor(node, cellAst) { + super(node); + this._cellAst = cellAst; + } + rejected(error) { + console.error(`Error evaluating OJS cell\n${this._cellAst.input}\n${String(error)}`); + return super.rejected(error); + } +} diff --git a/packages/ojs/quarto-ojs-runtime/src/quarto-jsx.js b/packages/ojs/quarto-ojs-runtime/src/quarto-jsx.js new file mode 100644 index 00000000000..39c1a2eb5ef --- /dev/null +++ b/packages/ojs/quarto-ojs-runtime/src/quarto-jsx.js @@ -0,0 +1,133 @@ +import { escapeHtml } from "./escape.js"; + +function createHtmlElement(tag, attrs, ...children) { + const el = document.createElement(tag); + for (const [key, val] of Object.entries(attrs || {})) { + el.setAttribute(key, val); + } + while (children.length) { + const child = children.shift(); + if (Array.isArray(child)) { + children.unshift(...child); + } else if (child instanceof HTMLElement) { + el.appendChild(child); + } else { + el.appendChild(document.createTextNode(escapeHtml(child))); + } + } + return el; +} + +function createNamespacedElement(ns, tag, attrs, ...children) { + const el = document.createElementNS(ns.namespace, tag); + for (const [key, val] of Object.entries(attrs || {})) { + el.setAttribute(key, val); + } + while (children.length) { + const child = children.shift(); + if (Array.isArray(child)) { + children.unshift(...child); + } else if (child instanceof HTMLElement || child instanceof ns.class) { + el.appendChild(child); + } else { + el.appendChild(document.createTextNode(escapeHtml(child))); + } + } + return el; +} + +const resolver = { + a: "svg", + animate: "svg", + animateMotion: "svg", + animateTransform: "svg", + circle: "svg", + clipPath: "svg", + defs: "svg", + desc: "svg", + discard: "svg", + ellipse: "svg", + feBlend: "svg", + feColorMatrix: "svg", + feComponentTransfer: "svg", + feComposite: "svg", + feConvolveMatrix: "svg", + feDiffuseLighting: "svg", + feDisplacementMap: "svg", + feDistantLight: "svg", + feDropShadow: "svg", + feFlood: "svg", + feFuncA: "svg", + feFuncB: "svg", + feFuncG: "svg", + feFuncR: "svg", + feGaussianBlur: "svg", + feImage: "svg", + feMerge: "svg", + feMergeNode: "svg", + feMorphology: "svg", + feOffset: "svg", + fePointLight: "svg", + feSpecularLighting: "svg", + feSpotLight: "svg", + feTile: "svg", + feTurbulence: "svg", + filter: "svg", + foreignObject: "svg", + g: "svg", + image: "svg", + line: "svg", + linearGradient: "svg", + marker: "svg", + mask: "svg", + metadata: "svg", + mpath: "svg", + path: "svg", + pattern: "svg", + polygon: "svg", + polyline: "svg", + radialGradient: "svg", + rect: "svg", + script: "svg", + set: "svg", + stop: "svg", + style: "svg", + svg: "svg", + switch: "svg", + symbol: "svg", + text: "svg", + textPath: "svg", + title: "svg", + tspan: "svg", + use: "svg", + view: "svg", +}; + +const nss = { + "svg": { namespace: "http://www.w3.org/2000/svg", class: SVGElement } +}; + +function resolveCreator(tag) { + const nsKey = resolver[tag]; + if (nsKey === undefined) { + return createHtmlElement; + } + const namespace = nss[nsKey]; + + return function(tag, attrs, ...children) { + return createNamespacedElement(namespace, tag, attrs, ...children); + } +} + +export function createQuartoJsxShim() +{ + return { + createElement(tag, attrs, ...children) { + if (typeof tag === "function") { + return tag({...attrs, children }); + } + + return resolveCreator(tag)(tag, attrs, ...children); + } + }; +} \ No newline at end of file diff --git a/packages/ojs/quarto-ojs-runtime/src/quarto-observable-shiny.js b/packages/ojs/quarto-ojs-runtime/src/quarto-observable-shiny.js new file mode 100644 index 00000000000..ef3d72d29ea --- /dev/null +++ b/packages/ojs/quarto-ojs-runtime/src/quarto-observable-shiny.js @@ -0,0 +1,205 @@ +/*global Shiny, $ +* +* quarto-observable-shiny.js +* +* Copyright (C) 2022 RStudio, PBC +*/ + +import { Inspector } from "external-observablehq-runtime"; +import { button } from "@observablehq/inputs"; +import { Library } from "external-observablehq-stdlib"; +import { QuartoInspector } from "./quarto-inspector.js"; + +const shinyInputVars = new Set(); +let shinyInitialValue = {}; + +export function extendObservableStdlib(lib) { + class NamedVariableOutputBinding extends Shiny.OutputBinding { + constructor(name, change) { + super(); + this._name = name; + this._change = change; + } + find(scope) { + return $(scope).find("#" + this._name); + } + getId(el) { + return el.id; + } + renderValue(_el, data) { + this._change(data); + } + onValueError(el, err) { + const group = `Shiny error in ${el.id}`; + console.groupCollapsed(`%c${group}`, "color:red"); + console.log(`${err.message}`); + console.log(`call: ${err.call}`); + console.groupEnd(group); + } + } + + $(document).on("shiny:connected", function (_event) { + Object.entries(shinyInitialValue).map(([k, v]) => { + window.Shiny.setInputValue(k, v); + }); + shinyInitialValue = {}; + }); + + lib.shinyInput = function () { + return (name) => { + shinyInputVars.add(name); + window._ojs.ojsConnector.mainModule.value(name) + .then((val) => { + if (window.Shiny && window.Shiny.setInputValue) { + window.Shiny.setInputValue(name, val); + } else { + shinyInitialValue[name] = val; + } + }); + }; + }; + + lib.shinyOutput = function () { + return function (name) { + const dummySpan = document.createElement("div"); + dummySpan.id = name; + dummySpan.classList.add("ojs-variable-writer"); + window._ojs.shinyElementRoot.appendChild(dummySpan); + return lib.Generators.observe((change) => { + Shiny.outputBindings.register( + new NamedVariableOutputBinding(name, change), + ); + }); + }; + }; +} + +export class ShinyInspector extends QuartoInspector { + constructor(node, cellAst) { + super(node, cellAst); + } + fulfilled(value, name) { + if (shinyInputVars.has(name) && window.Shiny) { + if (window.Shiny.setInputValue === undefined) { + shinyInitialValue[name] = value; + } else { + window.Shiny.setInputValue(name, value); + } + } + return super.fulfilled(value, name); + } +} + +const { Generators } = new Library(); + +class OjsButtonInput /*extends ShinyInput*/ { + find(_scope) { + return document.querySelectorAll(".ojs-inputs-button"); + } + + init(el, change) { + const btn = button(el.textContent); + el.innerHTML = ""; + el.appendChild(btn); + + const obs = Generators.input(el.firstChild); + (async function () { + // throw away the first value, it doesn't count for buttons + await obs.next().value; + for (const x of obs) { + change(await x); + } + })(); + // TODO: error handling + + return { + onSetValue: (_value) => { + }, + dispose: () => { + obs.return(); + }, + }; + } +} + +export function initOjsShinyRuntime() { + const valueSym = Symbol("value"); + const callbackSym = Symbol("callback"); + const instanceSym = Symbol("instance"); + // const values = new WeakMap(); // unused? + + class BindingAdapter extends Shiny.InputBinding { + constructor(x) { + super(); + this.x = x; + } + + find(scope) { + const matches = this.x.find(scope); + return $(matches); + } + getId(el) { + if (this.x.getId) { + return this.x.getId(el); + } else { + return super.getId(el); + } + } + initialize(el) { + const changeHandler = (value) => { + el[valueSym] = value; + el[callbackSym](); + }; + const instance = this.x.init(el, changeHandler); + el[instanceSym] = instance; + } + getValue(el) { + return el[valueSym]; + } + setValue(el, value) { + el[valueSym] = value; + el[instanceSym].onSetValue(value); + } + subscribe(el, callback) { + el[callbackSym] = callback; + } + unsubscribe(el) { + el[instanceSym].dispose(); + } + } + + class InspectorOutputBinding extends Shiny.OutputBinding { + find(scope) { + return $(scope).find(".observablehq-inspector"); + } + getId(el) { + return el.id; + } + renderValue(el, data) { + (new Inspector(el)).fulfilled(data); + } + } + + if (window.Shiny === undefined) { + console.warn("Shiny runtime not found; Shiny features won't work."); + return false; + } + + Shiny.inputBindings.register(new BindingAdapter(new OjsButtonInput())); + Shiny.outputBindings.register(new InspectorOutputBinding()); + + // Handle requests from the server to export Shiny outputs to ojs. + Shiny.addCustomMessageHandler("ojs-export", ({ name }) => { + window._ojs.ojsConnector.mainModule.redefine( + name, + window._ojs.ojsConnector.library.shinyOutput()(name), + ); + // shinyOutput() creates an output DOM element, but we have to cause it to + // be actually bound. I don't love this code being here, I'd prefer if we + // could receive Shiny outputs without using output bindings at all (for + // this case, not for things that truly are DOM-oriented outputs). + Shiny.bindAll(document.body); + }); + + return true; +} diff --git a/packages/ojs/quarto-ojs-runtime/src/quarto-ojs.js b/packages/ojs/quarto-ojs-runtime/src/quarto-ojs.js new file mode 100644 index 00000000000..d2d03ab2aa9 --- /dev/null +++ b/packages/ojs/quarto-ojs-runtime/src/quarto-ojs.js @@ -0,0 +1,1139 @@ +/*global Shiny, $, DOMParser, MutationObserver, URL + * + * quarto-ojs.js + * + * Copyright (C) 2021 RStudio, PBC + * + */ + +// FIXME Our integration of observable's stdlib and d3-require is less than ideal. +// +// While https://github.com/d3/d3-require/pull/40 isn't merged into d3-require, +// +// we need to run our own version of d3-require. That means we also +// need to run our own version of observable's stdlib (specifically to +// grab FileAttachments and Library) + +import { FileAttachments, Library } from "external-observablehq-stdlib"; + +import { PandocCodeDecorator } from "./pandoc-code-decorator.js"; + +import { + extendObservableStdlib, + ShinyInspector, + initOjsShinyRuntime, +} from "./quarto-observable-shiny.js"; + +import { QuartoInspector } from "./quarto-inspector.js"; + +import { OJSConnector } from "./ojs-connector.js"; + +import { createQuartoJsxShim } from "./quarto-jsx.js"; + +import { autosizeOJSPlot } from "./ojs-code-transform.js"; + +import { base64ToStr } from "./b64.js"; + +import mime from "mime"; + +////////////////////////////////////////////////////////////////////////////// + +function displayOJSWarning(warning) { + const cells = []; + for (const content of document.querySelectorAll( + 'script[type="ojs-module-contents"]' + )) { + for (const cellJson of JSON.parse(base64ToStr(content.text)).contents) { + let cell = + document.getElementById(cellJson.cellName) || + document.getElementById(`${cellJson.cellName}-1`); + if (!cell) { + // give up + continue; + } + cells.push(cell); + } + } + + cells.forEach((cell) => { + cell.innerHTML = ""; + + const message = warning(); + + cell.appendChild( + calloutBlock({ + heading: "Error", + type: "error", + message, + }) + ); + }); +} + +function displayQtWebEngineError() { + displayOJSWarning(() => { + const message = document.createElement("div"); + message.appendChild( + document.createTextNode( + "This document uses OJS, which requires JavaScript features not present in this version of QtWebEngine. If you're using RStudio IDE, please upgrade to a " + ) + ); + const link = document.createElement("a"); + link.appendChild(document.createTextNode("2022.12 build")); + link.href = "https://dailies.rstudio.com/rstudio/elsbeth-geranium/"; + message.appendChild(link); + message.appendChild(document.createTextNode(".")); + return message; + }); +} + +function displayFileProtocolError() { + displayOJSWarning(() => { + const message = document.createElement("div"); + message.appendChild( + document.createTextNode( + "This document uses OJS, which requires JavaScript features disabled when running in file://... URLs. In order for these features to work, run this document in a web server." + ) + ); + return message; + }); +} + +////////////////////////////////////////////////////////////////////////////// +// Quarto-specific code starts here. + +// For RStudio IDE integration +/** creates a click handler to point the IDE to a given line and column */ +const makeDevhostErrorClickHandler = (line, column) => { + return function () { + if (!window.quartoDevhost) { + return false; + } + window.quartoDevhost.openInputFile(line, column, true); + return false; + }; +}; + +// we cannot depend on Object.fromEntries because the IDE +// doesn't support it. We minimally polyfill it +if (Object.fromEntries === undefined) { + Object.fromEntries = function (obj) { + const result = {}; + for (const [key, value] of obj) { + result[key] = value; + } + return result; + }; +} + +/** create a callout block with the given opts, currently to be used + to signal a runtime error in the observable runtime. +*/ +function calloutBlock(opts) { + const { type, heading, message, onclick } = opts; + + const outerBlock = document.createElement("div"); + outerBlock.classList.add( + `callout-${type}`, + "callout", + "callout-style-default", + "callout-captioned" + ); + const header = document.createElement("div"); + header.classList.add("callout-header", "d-flex", "align-content-center"); + const iconContainer = document.createElement("div"); + iconContainer.classList.add("callout-icon-container"); + const icon = document.createElement("i"); + icon.classList.add("callout-icon"); + iconContainer.appendChild(icon); + header.appendChild(iconContainer); + + const headingDiv = document.createElement("div"); + headingDiv.classList.add("callout-caption-container", "flex-fill"); + // we assume heading is either a string or a span + if (typeof heading === "string") { + headingDiv.innerText = heading; + } else { + headingDiv.appendChild(heading); + } + header.appendChild(headingDiv); + outerBlock.appendChild(header); + + const container = document.createElement("div"); + container.classList.add("callout-body-container", "callout-body"); + if (typeof message === "string") { + const p = document.createElement("p"); + p.innerText = message; + container.appendChild(p); + } else { + container.append(message); + } + outerBlock.appendChild(container); + + if (onclick) { + outerBlock.onclick = onclick; + outerBlock.style.cursor = "pointer"; + } + + return outerBlock; +} + +const kQuartoModuleWaitClass = "ojs-in-a-box-waiting-for-module-import"; + +class QuartoOJSConnector extends OJSConnector { + constructor(opts) { + super(opts); + } + + //////////////////////////////////////////////////////////////////////////// + // handle import module waits + + clearImportModuleWait() { + const array = Array.from( + document.querySelectorAll(`.${kQuartoModuleWaitClass}`) + ); + for (const node of array) { + node.classList.remove(kQuartoModuleWaitClass); + } + } + + finishInterpreting() { + return super.finishInterpreting().then(() => { + if (this.mainModuleHasImports) { + this.clearImportModuleWait(); + } + }); + } + + //////////////////////////////////////////////////////////////////////////// + // Error tracking/reporting + + locatePreDiv(cellDiv, ojsDiv) { + // locate the correct pre div with the pandocDecorator + // of all potential divs, we need to find the one that most + // immediately precedes `ojsDiv` in the DOM. + let preDiv; + for (const candidate of cellDiv.querySelectorAll("pre.sourceCode")) { + if ( + candidate.compareDocumentPosition(ojsDiv) & + ojsDiv.DOCUMENT_POSITION_FOLLOWING + ) { + preDiv = candidate; + } else { + break; + } + } + return preDiv; + } + + findCellOutputDisplay(ojsDiv) { + while (ojsDiv && !ojsDiv.classList.contains("cell-output-display")) { + ojsDiv = ojsDiv.parentElement; + } + if (!ojsDiv) { + return null; + } + return ojsDiv; + } + + setPreDivClasses(preDiv, hasErrors) { + if (!hasErrors) { + preDiv.classList.remove("numberSource"); + if (preDiv._hidden === true) { + const parent = preDiv.parentElement; + parent.classList.add("hidden"); + // when code-tools is active (that is, when pre is inside a details tag), we also need to hide the details tag. + if (parent.parentElement.tagName === "DETAILS") { + parent.parentElement.classList.add("hidden"); + } + } + } else { + preDiv.classList.add("numberSource"); + const parent = preDiv.parentElement; + if (parent.classList.contains("hidden")) { + preDiv._hidden = true; // signal that we used to be hidden so that when errors go away, we're hidden again. + parent.classList.remove("hidden"); + + // when code-tools is active (that is, when pre is inside a details tag), we also need to unhide the details tag. + if (parent.parentElement.tagName === "DETAILS") { + parent.parentElement.classList.remove("hidden"); + // open the code-tools by default when error happens. + parent.parentElement.setAttribute("open", "open"); + } + } + } + } + + clearErrorPinpoints(cellDiv, ojsDiv) { + const preDiv = this.locatePreDiv(cellDiv, ojsDiv); + if (preDiv === undefined) { + return; + } + this.setPreDivClasses(preDiv, false); + let startingOffset = 0; + if (preDiv.parentElement.dataset.sourceOffset) { + startingOffset = -Number(preDiv.parentElement.dataset.sourceOffset); + } + for (const entryPoint of preDiv._decorator.spanSelection( + startingOffset, + Infinity + )) { + const { node } = entryPoint; + node.classList.remove("quarto-ojs-error-pinpoint"); + node.onclick = null; + } + } + + decorateOjsDivWithErrorPinpoint(ojsDiv, start, end, line, column) { + const cellOutputDisplay = this.findCellOutputDisplay(ojsDiv); + // if ojs element is inline, there's no div. + if (!cellOutputDisplay) { + return; + } + if (cellOutputDisplay._errorSpans === undefined) { + cellOutputDisplay._errorSpans = []; + } + cellOutputDisplay._errorSpans.push({ + start, + end, + line, + column, + }); + } + + decorateSource(cellDiv, ojsDiv) { + if (!cellDiv) { + // no div in inline spans + return; + } + this.clearErrorPinpoints(cellDiv, ojsDiv); + const preDiv = this.locatePreDiv(cellDiv, ojsDiv); + // sometimes the source code is not echoed. + // FIXME: should ojs source always be "hidden" so we can show it + // in case of runtime errors? + if (preDiv === undefined) { + return; + } + // now find all ojsDivs that contain errors that need to be decorated + // on preDiv + let parent = preDiv.parentElement; + if (parent.parentElement.tagName === "DETAILS") { + // we're in a code-tools setting, need to go one further up + parent = parent.parentElement; + } + let div = parent.nextElementSibling; + let foundErrors = false; + while (div !== null && div.classList.contains("cell-output-display")) { + for (const errorSpan of div._errorSpans || []) { + for (const entryPoint of preDiv._decorator.spanSelection( + errorSpan.start, + errorSpan.end + )) { + const { node } = entryPoint; + node.classList.add("quarto-ojs-error-pinpoint"); + node.onclick = makeDevhostErrorClickHandler( + errorSpan.line, + errorSpan.column + ); + } + foundErrors = true; + } + div = div.nextElementSibling; + } + this.setPreDivClasses(preDiv, foundErrors); + } + + clearError(ojsDiv) { + const cellOutputDisplay = this.findCellOutputDisplay(ojsDiv); + // if ojs element is inline, there's no div. + if (cellOutputDisplay) cellOutputDisplay._errorSpans = []; + } + + signalError(cellDiv, ojsDiv, ojsAst) { + const buildCallout = (ojsDiv) => { + let onclick; + const inspectChild = ojsDiv.querySelector(".observablehq--inspect"); + let [heading, message] = inspectChild.textContent.split(": "); + if (heading === "RuntimeError") { + heading = "OJS Runtime Error"; + if (message.match(/^(.+) is not defined$/)) { + const [varName, ...rest] = message.split(" "); + const p = document.createElement("p"); + const tt = document.createElement("tt"); + tt.innerText = varName; + p.appendChild(tt); + p.appendChild(document.createTextNode(" " + rest.join(" "))); + message = p; + + const preDiv = this.locatePreDiv(cellDiv, ojsDiv); + // preDiv might not be exist in case source isn't echoed to HTML + if (preDiv !== undefined) { + // force line numbers to show + preDiv.classList.add("numberSource"); + const missingRef = ojsAst.references.find( + (n) => n.name === varName + ); + // TODO when missingRef === undefined, it likely means an unresolved + // import reference. For now we will leave things as is, but + // this needs better handling. + if (missingRef !== undefined) { + const { line, column } = preDiv._decorator.offsetToLineColumn( + missingRef.start + ); + const headingSpan = document.createElement("span"); + const headingTextEl = document.createTextNode( + `${heading} (line ${line}, column ${column}) ` + ); + headingSpan.appendChild(headingTextEl); + if (window.quartoDevhost) { + const clicker = document.createElement("a"); + clicker.href = "#"; // this forces the right CSS to apply + clicker.innerText = "(source)"; + onclick = makeDevhostErrorClickHandler(line, column); + headingSpan.appendChild(clicker); + } + heading = headingSpan; + this.decorateOjsDivWithErrorPinpoint( + ojsDiv, + missingRef.start, + missingRef.end, + line, + column + ); + } + } + } else if ( + message.match(/^(.+) could not be resolved$/) || + message.match(/^(.+) is defined more than once$/) + ) { + const [varName, ...rest] = message.split(" "); + const p = document.createElement("p"); + const tt = document.createElement("tt"); + tt.innerText = varName; + p.appendChild(tt); + p.appendChild(document.createTextNode(" " + rest.join(" "))); + message = p; + } else { + const p = document.createElement("p"); + p.appendChild(document.createTextNode(message)); + message = p; + } + } else { + heading = "OJS Error"; + const p = document.createElement("p"); + p.appendChild(document.createTextNode(inspectChild.textContent)); + message = p; + } + const callout = calloutBlock({ + type: "important", + heading, + message, + onclick, + }); + ojsDiv.appendChild(callout); + }; + + buildCallout(ojsDiv); + } + + interpret(src, elementGetter, elementCreator) { + // deno-lint-ignore no-this-alias + const that = this; + const observer = (targetElement, ojsAst) => { + return (name) => { + const element = + typeof elementCreator === "function" + ? elementCreator() + : elementCreator; + targetElement.appendChild(element); + + // TODO the unofficial interpreter always calls viewexpression observers + // twice, one with the name, and the next with 'viewof $name'. + // we check for 'viewof ' here and hide the element we're creating. + // this behavior appears inconsistent with OHQ's interpreter, so we + // shouldn't be surprised to see this fail in the future. + if ( + ojsAst.id && + ojsAst.id.type === "ViewExpression" && + !name.startsWith("viewof ") + ) { + element.classList.add("quarto-ojs-hide"); + } + + // handle output:all hiding + // + // if every output from a cell is is not displayed, then we + // must also not display the cell output display element + // itself. + + // collect the cell element as well as the cell output display + // element + let cellDiv = targetElement; + let cellOutputDisplay; + while (cellDiv !== null && !cellDiv.classList.contains("cell")) { + cellDiv = cellDiv.parentElement; + if (cellDiv && cellDiv.classList.contains("cell-output-display")) { + cellOutputDisplay = cellDiv; + } + } + const forceShowDeclarations = + !cellDiv || cellDiv.dataset.output === "all"; + + const config = { childList: true }; + const callback = function (mutationsList) { + // we may fail to find a cell in inline settings; but + // inline cells won't have inspectors, so in that case + // we never hide + for (const mutation of mutationsList) { + const ojsDiv = mutation.target; + + if (!forceShowDeclarations) { + const childNodes = Array.from(mutation.target.childNodes); + for (const n of childNodes) { + // hide the inner inspect outputs that aren't errors or + // declarations + if ( + n.classList.contains("observablehq--inspect") && + !n.parentNode.classList.contains("observablehq--error") && + n.parentNode.parentNode.dataset.nodetype !== "expression" + ) { + n.classList.add("quarto-ojs-hide"); + } + // show the inspect outputs that aren't errors and are + // expressions (they might have been hidden in the past, + // since errors can clear) + if ( + n.classList.contains("observablehq--inspect") && + !n.parentNode.classList.contains("observablehq--error") && + n.parentNode.parentNode.dataset.nodetype === "expression" + ) { + n.classList.remove("quarto-ojs-hide"); + } + } + } + + // if the ojsDiv shows an error, display a callout block instead of it. + if (ojsDiv.classList.contains("observablehq--error")) { + // we don't use quarto-ojs-hide here because that would confuse + // the code which depends on that class for its logic. + ojsDiv.querySelector(".observablehq--inspect").style.display = + "none"; + + if (ojsDiv.querySelectorAll(".callout-important").length === 0) { + that.signalError(cellDiv, ojsDiv, ojsAst); + } + } else { + that.clearError(ojsDiv); + if ( + ojsDiv.parentNode.dataset.nodetype !== "expression" && + !forceShowDeclarations && + Array.from(ojsDiv.childNodes).every((n) => + n.classList.contains("observablehq--inspect") + ) + ) { + // if every child is an inspect output, hide the ojsDiv + ojsDiv.classList.add("quarto-ojs-hide"); + } + } + + that.decorateSource(cellDiv, ojsDiv); + + for (const added of mutation.addedNodes) { + // https://github.com/quarto-dev/quarto-cli/issues/7426 + // ObservableHQ.Plot fixup: + // remove "background: white" from style declaration + if ( + added.tagName === "svg" && + Array.from(added.classList).some((x) => + x.match(/plot-[0-9a-f]+/) + ) + ) { + // this overrides the style CSS inside. + added.style.background = "none"; + } + + if ( + added.tagName === "FORM" && + Array.from(added.classList).some( + (x) => x.endsWith("table") && x.startsWith("oi-") + ) + ) { + // add quarto-specific classes to OJS-generated tables + added.classList.add("quarto-ojs-table-fixup"); + + // in dashboard, change styles so that autosizing works + if (window._ojs.isDashboard) { + const table = added.querySelector("table"); + if (table) { + table.style.width = "100%"; + } + added.style.maxHeight = null; + added.style.margin = "0 0 0 0"; + added.style.padding = "0 0 0 0"; + + // find parentElement with class cell-output-display or cell + let parent = added.parentElement; + while ( + parent && + !parent.classList.contains("cell-output-display") && + !parent.classList.contains("cell") + ) { + parent = parent.parentElement; + } + if ( + parent !== null && + added.clientHeight > parent.clientHeight + ) { + added.style.maxHeight = `${parent.clientHeight}px`; + } + } + } + + // add quarto-specific classes to OJS-generated buttons + const addedButtons = added.querySelectorAll("button"); + for (const button of Array.from(addedButtons)) { + button.classList.add("btn"); + button.classList.add("btn-quarto"); + } + + // hide import statements even if output === "all" + //// Hide imports that aren't javascript code + // + // We search here for code.javascript and node span.hljs-... because + // at this point in the DOM, observable's runtime hasn't called + // HLJS yet. if you inspect the DOM yourself, you're likely to see + // HLJS, so this comment is here to prevent future confusion. + const result = added.querySelectorAll("code.javascript"); + if (result.length !== 1) { + continue; + } + if (result[0].textContent.trim().startsWith("import")) { + ojsDiv.classList.add("quarto-ojs-hide"); + } + } + } + + // cellOutputDisplay doesn't exist in inline spans, so we must check it explicitly + if (cellOutputDisplay) { + const children = Array.from( + cellOutputDisplay.querySelectorAll("div.observablehq") + ); + // after all mutations are handled, we check the full cell for hiding + if ( + children.every((n) => { + return n.classList.contains("quarto-ojs-hide"); + }) + ) { + cellOutputDisplay.classList.add("quarto-ojs-hide"); + } else { + cellOutputDisplay.classList.remove("quarto-ojs-hide"); + } + } + }; + new MutationObserver(callback).observe(element, config); + // 'element' is the outer div given to observable's runtime to insert their output + // every quarto cell will have either one or two such divs. + // The parent of these divs should always be a div corresponding to an ojs "cell" + // (with ids "ojs-cell-*") + + element.classList.add(kQuartoModuleWaitClass); + + return new this.inspectorClass(element, ojsAst); + }; + }; + const runCell = (cell) => { + const targetElement = + typeof elementGetter === "function" ? elementGetter() : elementGetter; + const cellSrc = src.slice(cell.start, cell.end); + const promise = this.interpreter.module( + cellSrc, + undefined, + observer(targetElement, cell) + ); + return this.waitOnImports(cell, promise); + }; + return this.interpretWithRunner(src, runCell); + } +} + +////////////////////////////////////////////////////////////////////////////// +// previously quarto-observable-shiny.js + +export function createRuntime() { + const quartoOjsGlobal = window._ojs; + const isShiny = window.Shiny !== undefined; + + // Are we QtWebEngine? bail + if (window.navigator.userAgent.includes("QtWebEngine")) { + displayQtWebEngineError(); + return; + } + + // Are we file://? bail + if (window.location.protocol === "file:") { + displayFileProtocolError(); + return; + } + + // Are we shiny? + if (isShiny) { + quartoOjsGlobal.hasShiny = true; + initOjsShinyRuntime(); + + const span = document.createElement("span"); + window._ojs.shinyElementRoot = span; + document.body.appendChild(span); + } + + // we use the trick described here to extend observable runtime's standard library + // https://talk.observablehq.com/t/embedded-width/1063 + + // stdlib from our fork, which uses the safe d3-require + const lib = new Library(); + if (isShiny) { + extendObservableStdlib(lib); + } + + function transpose(df) { + const keys = Object.keys(df); + return df[keys[0]] + .map((v, i) => + Object.fromEntries( + keys.map((key) => { + const v = df[key][i]; + const result = v === null ? undefined : v; + return [key, result]; + }) + ) + ) + .filter((v) => !Object.values(v).every((e) => e === undefined)); + } + lib.transpose = () => transpose; + + // TODO this should be user-configurable, so that we can actually + // make it work in arbitrary layouts. + // There's probably a slick reactive trick to make the element + // user settable. + // + // Right now we support quarto's standard HTML formats + + const mainEl = + document.querySelector("main") || // html + document.querySelector("div.reveal") || // reveal + document.querySelector("body"); // fall-through + + function cards() { + if (mainEl === null) { + return lib.Generators.observe((change) => { + change(undefined); + }); + } + return lib.Generators.observe(function (change) { + let previous = undefined; + function resized() { + let changed = false; + const result = {}; + let cellIndex = 0; + const handle = (card) => { + const cardInfo = { + card, + width: card.clientWidth, + height: card.clientHeight, + }; + result[cellIndex] = cardInfo; + if ( + previous === undefined || + previous[cellIndex].width !== cardInfo.width || + previous[cellIndex].height !== cardInfo.height + ) { + changed = true; + } + cellIndex++; + + // there can be an id in the card itself, allow that as a key + if (card.id) { + result[card.id] = cardInfo; + } + }; + for (const card of document.querySelectorAll("div.card")) { + for (const cell of card.querySelectorAll("div.cell-output-display")) { + handle(cell); + } + for (const cell of card.querySelectorAll("div.quarto-layout-cell")) { + handle(cell); + } + } + for (const card of document.querySelectorAll("div")) { + if (!card.id.startsWith("ojs-cell-")) { + continue; + } + let cardInfoCard; + // many possible cases: + + if (card.parentElement.classList.contains("cell-output-display")) { + // single cell: card parent is cell-output-display + cardInfoCard = card.parentElement; + } else if ( + card.parentElement.classList.contains("quarto-layout-cell") + ) { + // subcell of layout + cardInfoCard = card.parentElement; + } else if ( + card.parentElement.parentElement.classList.contains( + "cell-output-display" + ) + ) { + // subcell of cell-output-display + cardInfoCard = card.parentElement.parentElement; + } else { + continue; + } + const cardInfo = { + card: cardInfoCard, + width: card.clientWidth, + height: card.clientHeight, + }; + result[card.id] = cardInfo; + if ( + previous === undefined || + previous[card.id].width !== cardInfo.width || + previous[card.id].height !== cardInfo.height + ) { + changed = true; + } + if (card.parentElement.id !== "") { + result[card.parentElement.id] = cardInfo; + } + } + + if (changed) { + previous = result; + change(result); + } + } + resized(); + window.addEventListener("resize", resized); + return function () { + window.removeEventListener("resize", resized); + }; + }); + } + + function width() { + if (mainEl === null) { + return lib.Generators.observe((change) => { + change(undefined); + }); + } + return lib.Generators.observe(function (change) { + var width = change(mainEl.clientWidth); + function resized() { + var w = mainEl.clientWidth; + if (w !== width) change((width = w)); + } + window.addEventListener("resize", resized); + return function () { + window.removeEventListener("resize", resized); + }; + }); + } + lib.width = width; + lib.cards = cards; + + // hack for "echo: fenced": remove all "//| echo: fenced" lines the hard way, but keep + // the right line numbers around. + Array.from(document.querySelectorAll("span.co")) + .filter((n) => n.textContent === "//| echo: fenced") + .forEach((n) => { + const lineSpan = n.parentElement; + const lineBreak = lineSpan.nextSibling; + if (lineBreak) { + const nextLineSpan = lineBreak.nextSibling; + if (nextLineSpan) { + const lineNumber = Number(nextLineSpan.id.split("-")[1]); + nextLineSpan.style = `counter-reset: source-line ${lineNumber - 1}`; + } + } + + // update the source offset variable with the new right amount + const sourceDiv = lineSpan.parentElement.parentElement.parentElement; + const oldOffset = Number(sourceDiv.dataset.sourceOffset); + sourceDiv.dataset.sourceOffset = oldOffset - "//| echo: fenced\n".length; + + lineSpan.remove(); + lineBreak.remove(); + }); + + // select all elements to track: + // panel elements with ids, and divs with ids and .ojs-track-layout + + const layoutDivs = [ + ...Array.from(document.querySelectorAll("div.quarto-layout-panel div[id]")), + ...Array.from(document.querySelectorAll("div.ojs-track-layout[id]")), + ]; + + function layoutWidth() { + return lib.Generators.observe(function (change) { + const ourWidths = Object.fromEntries( + layoutDivs.map((div) => [div.id, div.clientWidth]) + ); + change(ourWidths); + function resized() { + let changed = false; + for (const div of layoutDivs) { + const w = div.clientWidth; + if (w !== ourWidths[div.id]) { + ourWidths[div.id] = w; + changed = true; + } + } + if (changed) { + change(ourWidths); + } + } + window.addEventListener("resize", resized); + return function () { + window.removeEventListener("resize", resized); + }; + }); + } + lib.layoutWidth = layoutWidth; + let localResolver = {}; + + function fileAttachmentPathResolver(n) { + if (localResolver[n]) { + return localResolver[n]; + } + + let name; + + // we need to remove the hash from the current path + // for this to work in revealjs + const currentPath = window.location.href + .split("#")[0] + .replace(/[^/]*$/, ""); + + if (n.startsWith("/")) { + // docToRoot can be empty, in which case naive concatenation creates + // an absolute path. + if (quartoOjsGlobal.paths.docToRoot === "") { + name = `${currentPath}.${n}`; + } else { + name = `${currentPath}${quartoOjsGlobal.paths.docToRoot}${n}`; + } + } else if (n.startsWith("http")) { + name = n; + } else { + name = `${currentPath}${n}`; + } + + const mimeType = mime.getType(name); + + return { + url: name, + mimeType: mimeType, + }; + } + lib.FileAttachment = () => FileAttachments(fileAttachmentPathResolver); + + const ojsConnector = new QuartoOJSConnector({ + paths: quartoOjsGlobal.paths, + inspectorClass: isShiny ? ShinyInspector : QuartoInspector, + library: lib, + allowPendingGlobals: isShiny, + }); + quartoOjsGlobal.ojsConnector = ojsConnector; + if (isShiny) { + // When isShiny, OJSConnector is constructed with allowPendingGlobals:true. + // Our guess is that most shiny-to-ojs exports will have been defined + // by the time the server function finishes executing (i.e. session init + // completion); so we call `killPendingGlobals()` to show errors for + // variables that are still undefined. + $(document).one("shiny:idle", () => { + // "shiny:idle" is not late enough; it is raised before the resulting + // outputs are received from the server. + $(document).one("shiny:message", () => { + // "shiny:message" is not late enough; it is raised after the message + // is received, but before it is processed (i.e. variables are still + // not actually defined). + setTimeout(() => { + ojsConnector.killPendingGlobals(); + }, 0); + }); + }); + } + + const subfigIdMap = new Map(); + function getSubfigId(elementId) { + if (!subfigIdMap.has(elementId)) { + subfigIdMap.set(elementId, 0); + } + let nextIx = subfigIdMap.get(elementId); + nextIx++; + subfigIdMap.set(elementId, nextIx); + return `${elementId}-${nextIx}`; + } + + const sourceNodes = document.querySelectorAll( + "pre.sourceCode code.sourceCode" + ); + const decorators = Array.from(sourceNodes).map((n) => { + n = n.parentElement; + const decorator = new PandocCodeDecorator(n); + n._decorator = decorator; + return decorator; + }); + // handle build-time syntax error + decorators.forEach((n) => { + if (n._node.parentElement.dataset.syntaxErrorPosition === undefined) { + return; + } + const offset = Number(n._node.parentElement.dataset.syntaxErrorPosition); + n.decorateSpan(offset, offset + 1, ["quarto-ojs-error-pinpoint"]); + }); + + const result = { + setLocalResolver(obj) { + localResolver = obj; + ojsConnector.setLocalResolver(obj); + }, + finishInterpreting() { + return ojsConnector.finishInterpreting(); + }, + + // return the latest value of the named reactive variable in the main module + async value(name) { + await this.finishInterpreting(); + const result = await ojsConnector.value(name); + return result; + }, + + // fixme clarify what's the expected behavior of the 'error' option + // when evaluation is at client-time + interpretLenient(src, targetElementId, inline) { + return result.interpret(src, targetElementId, inline).catch(() => {}); + }, + interpret(src, targetElementId, inline) { + // we capture the result here so that the error handler doesn't + // grab a new id accidentally. + let targetElement; + const getElement = () => { + targetElement = document.getElementById(targetElementId); + let subFigId; + if (!targetElement) { + // this is a subfigure + subFigId = getSubfigId(targetElementId); + targetElement = document.getElementById(subFigId); + if (!targetElement) { + // console.error("Ran out of subfigures for element", targetElementId); + // console.error("This will fail."); + throw new Error("Ran out of quarto subfigures."); + } + } + return targetElement; + }; + + const makeElement = () => { + return document.createElement(inline ? "span" : "div"); + }; + + return ojsConnector.interpret(src, getElement, makeElement).catch((e) => { + // to the best of our knowledge, we only get here + // on import statement failures. So we report those + // in a callout + + let cellDiv = targetElement; + while (cellDiv !== null && !cellDiv.classList.contains("cell")) { + cellDiv = cellDiv.parentElement; + } + + const ojsDiv = targetElement.querySelector(".observablehq"); + if (!ojsDiv) { + // we failed to find an observablehq div inside the targetElement. + // This is an internal error and we have no way to report it + // except throwing the original exception. + throw e; + } + // because this is in an exception handler, we might need + // to clear some of the garbage that other pieces of code + // won't have the chance to + // + for (const div of ojsDiv.querySelectorAll(".callout")) { + div.remove(); + } + + const messagePre = document.createElement("pre"); + messagePre.innerText = e.stack; + + const callout = calloutBlock({ + type: "important", + heading: `${e.name}: ${e.message}`, + message: messagePre, + }); + ojsDiv.appendChild(callout); + ojsConnector.clearError(ojsDiv); + ojsConnector.clearErrorPinpoints(cellDiv, ojsDiv); + + return e; + }); + }, + interpretQuiet(src) { + return ojsConnector.interpretQuiet(src); + }, + interpretFromScriptTags() { + // source definitions + for (const el of document.querySelectorAll( + "script[type='ojs-module-contents']" + )) { + for (const call of JSON.parse(base64ToStr(el.text)).contents) { + let source = window._ojs.isDashboard + ? autosizeOJSPlot(call.source, call.cellName) + : call.source; + switch (call.methodName) { + case "interpret": + this.interpret(source, call.cellName, call.inline); + break; + case "interpretLenient": + this.interpretLenient(source, call.cellName, call.inline); + break; + case "interpretQuiet": + this.interpretQuiet(source); + break; + default: + throw new Error( + `Don't know how to call method ${call.methodName}` + ); + } + } + } + + // static data definitions + for (const el of document.querySelectorAll("script[type='ojs-define']")) { + for (const { name, value } of JSON.parse(el.text).contents) { + ojsConnector.define(name)(value); + } + } + }, + }; + + return result; +} + +export default function initializeRuntime() { + // TODO "obs" or "ojs"? Inconsistent naming. + window._ojs = { + ojsConnector: undefined, + + paths: {}, // placeholder for per-quarto-file paths + // necessary for module resolution + + hasShiny: false, // true if we have the quarto-ojs-shiny runtime + + isDashboard: document.body.classList.contains("quarto-dashboard"), // true if we are a dashboard format + + shinyElementRoot: undefined, // root element for the communication with shiny + // via DOM + }; + window._ojs.runtime = createRuntime(); + window._ojs.jsx = createQuartoJsxShim(); +} diff --git a/src/resources/formats/html/ojs/quarto-ojs-runtime.js b/src/resources/formats/html/ojs/quarto-ojs-runtime.js index 7d21a9f6cb3..57680cdf071 100644 --- a/src/resources/formats/html/ojs/quarto-ojs-runtime.js +++ b/src/resources/formats/html/ojs/quarto-ojs-runtime.js @@ -1,4 +1,4 @@ -// quarto-ojs-runtime v0.0.18 Copyright 2024 undefined +// quarto-ojs-runtime v0.0.19 Copyright Posit Software, PBC var EOL = {}, EOF = {}, QUOTE = 34, @@ -231,7 +231,7 @@ const metas = new Map; const queue$1 = []; const map$2 = queue$1.map; const some = queue$1.some; -const hasOwnProperty$2 = queue$1.hasOwnProperty; +const hasOwnProperty$3 = queue$1.hasOwnProperty; const identifierRe = /^((?:@[^/@]+\/)?[^/@]+)(?:@([^/]+))?(?:\/(.*))?$/; const versionRe = /^\d+\.\d+\.\d+(-[\w-.+]+)?$/; const extensionRe = /(?:\.[^/]*|\/)$/; @@ -295,7 +295,7 @@ function resolveFrom(origin = "https://cdn.jsdelivr.net/npm/", mains = ["unpkg", }; } -var require = requireFrom(resolveFrom()); +var require$1 = requireFrom(resolveFrom()); let requestsInFlight = 0; let prevDefine = undefined; @@ -368,7 +368,7 @@ function merge$1(modules) { const o = {}; for (const m of modules) { for (const k in m) { - if (hasOwnProperty$2.call(m, k)) { + if (hasOwnProperty$3.call(m, k)) { if (m[k] == null) Object.defineProperty(o, k, {get: getter(m, k)}); else o[k] = m[k]; } @@ -412,7 +412,7 @@ define.amd = {}; // TODO Allow this to be overridden using the Library’s resolver. const cdn = "https://cdn.observableusercontent.com/npm/"; -let requireDefault = require; +let requireDefault = require$1; function setDefaultRequire(require) { requireDefault = require; @@ -557,75 +557,6 @@ function ascending(a, b) { return a == null || b == null ? NaN : a < b ? -1 : a > b ? 1 : a >= b ? 0 : NaN; } -function descending(a, b) { - return a == null || b == null ? NaN - : b < a ? -1 - : b > a ? 1 - : b >= a ? 0 - : NaN; -} - -function bisector(f) { - let compare1, compare2, delta; - - // If an accessor is specified, promote it to a comparator. In this case we - // can test whether the search value is (self-) comparable. We can’t do this - // for a comparator (except for specific, known comparators) because we can’t - // tell if the comparator is symmetric, and an asymmetric comparator can’t be - // used to test whether a single value is comparable. - if (f.length !== 2) { - compare1 = ascending; - compare2 = (d, x) => ascending(f(d), x); - delta = (d, x) => f(d) - x; - } else { - compare1 = f === ascending || f === descending ? f : zero; - compare2 = f; - delta = f; - } - - function left(a, x, lo = 0, hi = a.length) { - if (lo < hi) { - if (compare1(x, x) !== 0) return hi; - do { - const mid = (lo + hi) >>> 1; - if (compare2(a[mid], x) < 0) lo = mid + 1; - else hi = mid; - } while (lo < hi); - } - return lo; - } - - function right(a, x, lo = 0, hi = a.length) { - if (lo < hi) { - if (compare1(x, x) !== 0) return hi; - do { - const mid = (lo + hi) >>> 1; - if (compare2(a[mid], x) <= 0) lo = mid + 1; - else hi = mid; - } while (lo < hi); - } - return lo; - } - - function center(a, x, lo = 0, hi = a.length) { - const i = left(a, x, lo, hi - 1); - return i > lo && delta(a[i - 1], x) > -delta(a[i], x) ? i - 1 : i; - } - - return {left, center, right}; -} - -function zero() { - return 0; -} - -function number(x) { - return x === null ? NaN : +x; -} - -bisector(ascending); -bisector(number).center; - function greatest(values, compare = ascending) { let max; let defined = false; @@ -1053,7 +984,7 @@ function isDatabaseClient(value, mode) { (typeof value.queryTag === "function" && (typeof value.query === "function" || typeof value.queryStream === "function"))) && - (mode !== "table" || typeof value.describeColumns === "function") && + (mode !== "table") && value !== __query // don’t match our internal helper ); } @@ -1882,7 +1813,7 @@ function createTypeCount() { // Caution: the order below matters! 🌶️ The first one that passes the ≥90% test // should be the one that we chose, and therefore these types should be listed // from most specific to least specific. -const types$2 = [ +const types$4 = [ "boolean", "integer", "number", @@ -1952,7 +1883,7 @@ function inferSchema(source, columns = getAllKeys(source)) { // ≥90%; and lastly fallback to other. const minCount = Math.max(1, colCount.defined * 0.9); const type = - greatest(types$2, (type) => + greatest(types$4, (type) => colCount[type] >= minCount ? colCount[type] : NaN ) ?? (colCount.string >= minCount ? "string" : "other"); schema.push({ @@ -3113,7 +3044,7 @@ function formatSymbol(symbol) { return symbolToString.call(symbol); } -const {getOwnPropertySymbols, prototype: {hasOwnProperty: hasOwnProperty$1}} = Object; +const {getOwnPropertySymbols, prototype: {hasOwnProperty: hasOwnProperty$2}} = Object; const {toStringTag} = Symbol; const FORBIDDEN = {}; @@ -3121,7 +3052,7 @@ const FORBIDDEN = {}; const symbolsof = getOwnPropertySymbols; function isown(object, key) { - return hasOwnProperty$1.call(object, key); + return hasOwnProperty$2.call(object, key); } function tagof(object) { @@ -3403,8 +3334,8 @@ function hasSelection(elem) { return ( sel.type === "Range" && (sel.containsNode(elem, true) || - sel.anchorNode.isSelfOrDescendant(elem) || - sel.focusNode.isSelfOrDescendant(elem)) + elem.contains(sel.anchorNode) || + elem.contains(sel.focusNode)) ); } @@ -3688,7 +3619,7 @@ function count(string, re) { return n; } -var toString$2 = Function.prototype.toString, +var toString$3 = Function.prototype.toString, TYPE_ASYNC = {prefix: "async ƒ"}, TYPE_ASYNC_GENERATOR = {prefix: "async ƒ*"}, TYPE_CLASS = {prefix: "class"}, @@ -3696,7 +3627,7 @@ var toString$2 = Function.prototype.toString, TYPE_GENERATOR = {prefix: "ƒ*"}; function inspectFunction(f, name) { - var type, m, t = toString$2.call(f); + var type, m, t = toString$3.call(f); switch (f.constructor && f.constructor.name) { case "AsyncFunction": type = TYPE_ASYNC; break; @@ -3751,7 +3682,7 @@ function formatFunction(type, args, cellname) { return span; } -const {prototype: {toString: toString$1}} = Object; +const {prototype: {toString: toString$2}} = Object; function inspect(value, shallow, expand, name, proto) { let type = typeof value; @@ -3767,7 +3698,7 @@ function inspect(value, shallow, expand, name, proto) { if (value === null) { type = null, value = "null"; break; } if (value instanceof Date) { type = "date", value = formatDate$1(value); break; } if (value === FORBIDDEN) { type = "forbidden", value = "[forbidden]"; break; } - switch (toString$1.call(value)) { + switch (toString$2.call(value)) { case "[object RegExp]": { type = "regexp", value = formatRegExp(value); break; } case "[object Error]": // https://github.com/lodash/lodash/blob/master/isError.js#L26 case "[object DOMException]": { type = "error", value = formatError(value); break; } @@ -5374,7 +5305,8 @@ function button(content = "≡", { if (!required && value === undefined) value = null; disabled = new Set(disabled === true ? Array.from(content, ([content]) => content) : disabled || undefined); } - const form = html`
`; + const form = html``; + form.addEventListener("submit", preventDefault); const style = {width: length(width)}; const buttons = Array.from(content, ([content, reduce = identity]) => { if (typeof reduce !== "function") throw new TypeError("reduce is not a function"); @@ -5422,6 +5354,7 @@ function localize(f) { * */ + class QuartoInspector extends Inspector { constructor(node, cellAst) { super(node); @@ -5440,6 +5373,7 @@ class QuartoInspector extends Inspector { * Copyright (C) 2022 RStudio, PBC */ + const shinyInputVars = new Set(); let shinyInitialValue = {}; @@ -5634,7060 +5568,9 @@ function initOjsShinyRuntime() { return true; } -var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {}; - -var dist = {exports: {}}; - -(function (module, exports) { - (function(g,f){f(exports);}(commonjsGlobal,(function(exports){ - var reservedWords = { - 3: "abstract boolean byte char class double enum export extends final float goto implements import int interface long native package private protected public short static super synchronized throws transient volatile", - 5: "class enum extends super const export import", - 6: "enum", - strict: "implements interface let package private protected public static yield", - strictBind: "eval arguments" - }; - - // And the keywords - - var ecma5AndLessKeywords = "break case catch continue debugger default do else finally for function if return switch throw try var while with null true false instanceof typeof void delete new in this"; - - var keywords = { - 5: ecma5AndLessKeywords, - "5module": ecma5AndLessKeywords + " export import", - 6: ecma5AndLessKeywords + " const class extends export import super" - }; - - var keywordRelationalOperator = /^in(stanceof)?$/; - - // ## Character categories - - // Big ugly regular expressions that match characters in the - // whitespace, identifier, and identifier-start categories. These - // are only applied when a character is found to actually have a - // code point above 128. - // Generated by `bin/generate-identifier-regex.js`. - var nonASCIIidentifierStartChars = "\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u037f\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u052f\u0531-\u0556\u0559\u0560-\u0588\u05d0-\u05ea\u05ef-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u0860-\u086a\u08a0-\u08b4\u08b6-\u08c7\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u09fc\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0af9\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c39\u0c3d\u0c58-\u0c5a\u0c60\u0c61\u0c80\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d04-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d54-\u0d56\u0d5f-\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e86-\u0e8a\u0e8c-\u0ea3\u0ea5\u0ea7-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f5\u13f8-\u13fd\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f8\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1878\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191e\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19b0-\u19c9\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1c80-\u1c88\u1c90-\u1cba\u1cbd-\u1cbf\u1ce9-\u1cec\u1cee-\u1cf3\u1cf5\u1cf6\u1cfa\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2118-\u211d\u2124\u2126\u2128\u212a-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309b-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312f\u3131-\u318e\u31a0-\u31bf\u31f0-\u31ff\u3400-\u4dbf\u4e00-\u9ffc\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua69d\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua7bf\ua7c2-\ua7ca\ua7f5-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua8fd\ua8fe\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\ua9e0-\ua9e4\ua9e6-\ua9ef\ua9fa-\ua9fe\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa7e-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uab30-\uab5a\uab5c-\uab69\uab70-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc"; - var nonASCIIidentifierChars = "\u200c\u200d\xb7\u0300-\u036f\u0387\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u0669\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u06f0-\u06f9\u0711\u0730-\u074a\u07a6-\u07b0\u07c0-\u07c9\u07eb-\u07f3\u07fd\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u08d3-\u08e1\u08e3-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u09e6-\u09ef\u09fe\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0ae6-\u0aef\u0afa-\u0aff\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b55-\u0b57\u0b62\u0b63\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c00-\u0c04\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c66-\u0c6f\u0c81-\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0ce6-\u0cef\u0d00-\u0d03\u0d3b\u0d3c\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d66-\u0d6f\u0d81-\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0de6-\u0def\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0e50-\u0e59\u0eb1\u0eb4-\u0ebc\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1040-\u1049\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u1369-\u1371\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b4-\u17d3\u17dd\u17e0-\u17e9\u180b-\u180d\u1810-\u1819\u18a9\u1920-\u192b\u1930-\u193b\u1946-\u194f\u19d0-\u19da\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1ab0-\u1abd\u1abf\u1ac0\u1b00-\u1b04\u1b34-\u1b44\u1b50-\u1b59\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1bad\u1bb0-\u1bb9\u1be6-\u1bf3\u1c24-\u1c37\u1c40-\u1c49\u1c50-\u1c59\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf4\u1cf7-\u1cf9\u1dc0-\u1df9\u1dfb-\u1dff\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua620-\ua629\ua66f\ua674-\ua67d\ua69e\ua69f\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua82c\ua880\ua881\ua8b4-\ua8c5\ua8d0-\ua8d9\ua8e0-\ua8f1\ua8ff-\ua909\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\ua9d0-\ua9d9\ua9e5\ua9f0-\ua9f9\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa50-\uaa59\uaa7b-\uaa7d\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uaaeb-\uaaef\uaaf5\uaaf6\uabe3-\uabea\uabec\uabed\uabf0-\uabf9\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f"; - - var nonASCIIidentifierStart = new RegExp("[" + nonASCIIidentifierStartChars + "]"); - var nonASCIIidentifier = new RegExp("[" + nonASCIIidentifierStartChars + nonASCIIidentifierChars + "]"); - - nonASCIIidentifierStartChars = nonASCIIidentifierChars = null; - - // These are a run-length and offset encoded representation of the - // >0xffff code points that are a valid part of identifiers. The - // offset starts at 0x10000, and each pair of numbers represents an - // offset to the next range, and then a size of the range. They were - // generated by bin/generate-identifier-regex.js - - // eslint-disable-next-line comma-spacing - var astralIdentifierStartCodes = [0,11,2,25,2,18,2,1,2,14,3,13,35,122,70,52,268,28,4,48,48,31,14,29,6,37,11,29,3,35,5,7,2,4,43,157,19,35,5,35,5,39,9,51,157,310,10,21,11,7,153,5,3,0,2,43,2,1,4,0,3,22,11,22,10,30,66,18,2,1,11,21,11,25,71,55,7,1,65,0,16,3,2,2,2,28,43,28,4,28,36,7,2,27,28,53,11,21,11,18,14,17,111,72,56,50,14,50,14,35,349,41,7,1,79,28,11,0,9,21,107,20,28,22,13,52,76,44,33,24,27,35,30,0,3,0,9,34,4,0,13,47,15,3,22,0,2,0,36,17,2,24,85,6,2,0,2,3,2,14,2,9,8,46,39,7,3,1,3,21,2,6,2,1,2,4,4,0,19,0,13,4,159,52,19,3,21,2,31,47,21,1,2,0,185,46,42,3,37,47,21,0,60,42,14,0,72,26,230,43,117,63,32,7,3,0,3,7,2,1,2,23,16,0,2,0,95,7,3,38,17,0,2,0,29,0,11,39,8,0,22,0,12,45,20,0,35,56,264,8,2,36,18,0,50,29,113,6,2,1,2,37,22,0,26,5,2,1,2,31,15,0,328,18,190,0,80,921,103,110,18,195,2749,1070,4050,582,8634,568,8,30,114,29,19,47,17,3,32,20,6,18,689,63,129,74,6,0,67,12,65,1,2,0,29,6135,9,1237,43,8,8952,286,50,2,18,3,9,395,2309,106,6,12,4,8,8,9,5991,84,2,70,2,1,3,0,3,1,3,3,2,11,2,0,2,6,2,64,2,3,3,7,2,6,2,27,2,3,2,4,2,0,4,6,2,339,3,24,2,24,2,30,2,24,2,30,2,24,2,30,2,24,2,30,2,24,2,7,2357,44,11,6,17,0,370,43,1301,196,60,67,8,0,1205,3,2,26,2,1,2,0,3,0,2,9,2,3,2,0,2,0,7,0,5,0,2,0,2,0,2,2,2,1,2,0,3,0,2,0,2,0,2,0,2,0,2,1,2,0,3,3,2,6,2,3,2,3,2,0,2,9,2,16,6,2,2,4,2,16,4421,42717,35,4148,12,221,3,5761,15,7472,3104,541,1507,4938]; - - // eslint-disable-next-line comma-spacing - var astralIdentifierCodes = [509,0,227,0,150,4,294,9,1368,2,2,1,6,3,41,2,5,0,166,1,574,3,9,9,370,1,154,10,176,2,54,14,32,9,16,3,46,10,54,9,7,2,37,13,2,9,6,1,45,0,13,2,49,13,9,3,2,11,83,11,7,0,161,11,6,9,7,3,56,1,2,6,3,1,3,2,10,0,11,1,3,6,4,4,193,17,10,9,5,0,82,19,13,9,214,6,3,8,28,1,83,16,16,9,82,12,9,9,84,14,5,9,243,14,166,9,71,5,2,1,3,3,2,0,2,1,13,9,120,6,3,6,4,0,29,9,41,6,2,3,9,0,10,10,47,15,406,7,2,7,17,9,57,21,2,13,123,5,4,0,2,1,2,6,2,0,9,9,49,4,2,1,2,4,9,9,330,3,19306,9,135,4,60,6,26,9,1014,0,2,54,8,3,82,0,12,1,19628,1,5319,4,4,5,9,7,3,6,31,3,149,2,1418,49,513,54,5,49,9,0,15,0,23,4,2,14,1361,6,2,16,3,6,2,1,2,4,262,6,10,9,419,13,1495,6,110,6,6,9,4759,9,787719,239]; - - // This has a complexity linear to the value of the code. The - // assumption is that looking up astral identifier characters is - // rare. - function isInAstralSet(code, set) { - var pos = 0x10000; - for (var i = 0; i < set.length; i += 2) { - pos += set[i]; - if (pos > code) { return false } - pos += set[i + 1]; - if (pos >= code) { return true } - } - } - - // Test whether a given character code starts an identifier. - - function isIdentifierStart(code, astral) { - if (code < 65) { return code === 36 } - if (code < 91) { return true } - if (code < 97) { return code === 95 } - if (code < 123) { return true } - if (code <= 0xffff) { return code >= 0xaa && nonASCIIidentifierStart.test(String.fromCharCode(code)) } - if (astral === false) { return false } - return isInAstralSet(code, astralIdentifierStartCodes) - } - - // Test whether a given character is part of an identifier. - - function isIdentifierChar(code, astral) { - if (code < 48) { return code === 36 } - if (code < 58) { return true } - if (code < 65) { return false } - if (code < 91) { return true } - if (code < 97) { return code === 95 } - if (code < 123) { return true } - if (code <= 0xffff) { return code >= 0xaa && nonASCIIidentifier.test(String.fromCharCode(code)) } - if (astral === false) { return false } - return isInAstralSet(code, astralIdentifierStartCodes) || isInAstralSet(code, astralIdentifierCodes) - } - - // ## Token types - - // The assignment of fine-grained, information-carrying type objects - // allows the tokenizer to store the information it has about a - // token in a way that is very cheap for the parser to look up. - - // All token type variables start with an underscore, to make them - // easy to recognize. - - // The `beforeExpr` property is used to disambiguate between regular - // expressions and divisions. It is set on all token types that can - // be followed by an expression (thus, a slash after them would be a - // regular expression). - // - // The `startsExpr` property is used to check if the token ends a - // `yield` expression. It is set on all token types that either can - // directly start an expression (like a quotation mark) or can - // continue an expression (like the body of a string). - // - // `isLoop` marks a keyword as starting a loop, which is important - // to know when parsing a label, in order to allow or disallow - // continue jumps to that label. - - var TokenType = function TokenType(label, conf) { - if ( conf === void 0 ) conf = {}; - - this.label = label; - this.keyword = conf.keyword; - this.beforeExpr = !!conf.beforeExpr; - this.startsExpr = !!conf.startsExpr; - this.isLoop = !!conf.isLoop; - this.isAssign = !!conf.isAssign; - this.prefix = !!conf.prefix; - this.postfix = !!conf.postfix; - this.binop = conf.binop || null; - this.updateContext = null; - }; - - function binop(name, prec) { - return new TokenType(name, {beforeExpr: true, binop: prec}) - } - var beforeExpr = {beforeExpr: true}, startsExpr = {startsExpr: true}; - - // Map keyword names to token types. - - var keywords$1 = {}; - - // Succinct definitions of keyword token types - function kw(name, options) { - if ( options === void 0 ) options = {}; - - options.keyword = name; - return keywords$1[name] = new TokenType(name, options) - } - - var types = { - num: new TokenType("num", startsExpr), - regexp: new TokenType("regexp", startsExpr), - string: new TokenType("string", startsExpr), - name: new TokenType("name", startsExpr), - eof: new TokenType("eof"), - - // Punctuation token types. - bracketL: new TokenType("[", {beforeExpr: true, startsExpr: true}), - bracketR: new TokenType("]"), - braceL: new TokenType("{", {beforeExpr: true, startsExpr: true}), - braceR: new TokenType("}"), - parenL: new TokenType("(", {beforeExpr: true, startsExpr: true}), - parenR: new TokenType(")"), - comma: new TokenType(",", beforeExpr), - semi: new TokenType(";", beforeExpr), - colon: new TokenType(":", beforeExpr), - dot: new TokenType("."), - question: new TokenType("?", beforeExpr), - questionDot: new TokenType("?."), - arrow: new TokenType("=>", beforeExpr), - template: new TokenType("template"), - invalidTemplate: new TokenType("invalidTemplate"), - ellipsis: new TokenType("...", beforeExpr), - backQuote: new TokenType("`", startsExpr), - dollarBraceL: new TokenType("${", {beforeExpr: true, startsExpr: true}), - - // Operators. These carry several kinds of properties to help the - // parser use them properly (the presence of these properties is - // what categorizes them as operators). - // - // `binop`, when present, specifies that this operator is a binary - // operator, and will refer to its precedence. - // - // `prefix` and `postfix` mark the operator as a prefix or postfix - // unary operator. - // - // `isAssign` marks all of `=`, `+=`, `-=` etcetera, which act as - // binary operators with a very low precedence, that should result - // in AssignmentExpression nodes. - - eq: new TokenType("=", {beforeExpr: true, isAssign: true}), - assign: new TokenType("_=", {beforeExpr: true, isAssign: true}), - incDec: new TokenType("++/--", {prefix: true, postfix: true, startsExpr: true}), - prefix: new TokenType("!/~", {beforeExpr: true, prefix: true, startsExpr: true}), - logicalOR: binop("||", 1), - logicalAND: binop("&&", 2), - bitwiseOR: binop("|", 3), - bitwiseXOR: binop("^", 4), - bitwiseAND: binop("&", 5), - equality: binop("==/!=/===/!==", 6), - relational: binop("/<=/>=", 7), - bitShift: binop("<>/>>>", 8), - plusMin: new TokenType("+/-", {beforeExpr: true, binop: 9, prefix: true, startsExpr: true}), - modulo: binop("%", 10), - star: binop("*", 10), - slash: binop("/", 10), - starstar: new TokenType("**", {beforeExpr: true}), - coalesce: binop("??", 1), - - // Keyword token types. - _break: kw("break"), - _case: kw("case", beforeExpr), - _catch: kw("catch"), - _continue: kw("continue"), - _debugger: kw("debugger"), - _default: kw("default", beforeExpr), - _do: kw("do", {isLoop: true, beforeExpr: true}), - _else: kw("else", beforeExpr), - _finally: kw("finally"), - _for: kw("for", {isLoop: true}), - _function: kw("function", startsExpr), - _if: kw("if"), - _return: kw("return", beforeExpr), - _switch: kw("switch"), - _throw: kw("throw", beforeExpr), - _try: kw("try"), - _var: kw("var"), - _const: kw("const"), - _while: kw("while", {isLoop: true}), - _with: kw("with"), - _new: kw("new", {beforeExpr: true, startsExpr: true}), - _this: kw("this", startsExpr), - _super: kw("super", startsExpr), - _class: kw("class", startsExpr), - _extends: kw("extends", beforeExpr), - _export: kw("export"), - _import: kw("import", startsExpr), - _null: kw("null", startsExpr), - _true: kw("true", startsExpr), - _false: kw("false", startsExpr), - _in: kw("in", {beforeExpr: true, binop: 7}), - _instanceof: kw("instanceof", {beforeExpr: true, binop: 7}), - _typeof: kw("typeof", {beforeExpr: true, prefix: true, startsExpr: true}), - _void: kw("void", {beforeExpr: true, prefix: true, startsExpr: true}), - _delete: kw("delete", {beforeExpr: true, prefix: true, startsExpr: true}) - }; - - // Matches a whole line break (where CRLF is considered a single - // line break). Used to count lines. - - var lineBreak = /\r\n?|\n|\u2028|\u2029/; - var lineBreakG = new RegExp(lineBreak.source, "g"); - - function isNewLine(code, ecma2019String) { - return code === 10 || code === 13 || (!ecma2019String && (code === 0x2028 || code === 0x2029)) - } - - var nonASCIIwhitespace = /[\u1680\u2000-\u200a\u202f\u205f\u3000\ufeff]/; - - var skipWhiteSpace = /(?:\s|\/\/.*|\/\*[^]*?\*\/)*/g; - - var ref = Object.prototype; - var hasOwnProperty = ref.hasOwnProperty; - var toString = ref.toString; - - // Checks if an object has a property. - - function has(obj, propName) { - return hasOwnProperty.call(obj, propName) - } - - var isArray = Array.isArray || (function (obj) { return ( - toString.call(obj) === "[object Array]" - ); }); - - function wordsRegexp(words) { - return new RegExp("^(?:" + words.replace(/ /g, "|") + ")$") - } - - // These are used when `options.locations` is on, for the - // `startLoc` and `endLoc` properties. - - var Position = function Position(line, col) { - this.line = line; - this.column = col; - }; - - Position.prototype.offset = function offset (n) { - return new Position(this.line, this.column + n) - }; - - var SourceLocation = function SourceLocation(p, start, end) { - this.start = start; - this.end = end; - if (p.sourceFile !== null) { this.source = p.sourceFile; } - }; - - // The `getLineInfo` function is mostly useful when the - // `locations` option is off (for performance reasons) and you - // want to find the line/column position for a given character - // offset. `input` should be the code string that the offset refers - // into. - - function getLineInfo(input, offset) { - for (var line = 1, cur = 0;;) { - lineBreakG.lastIndex = cur; - var match = lineBreakG.exec(input); - if (match && match.index < offset) { - ++line; - cur = match.index + match[0].length; - } else { - return new Position(line, offset - cur) - } - } - } - - // A second optional argument can be given to further configure - // the parser process. These options are recognized: - - var defaultOptions = { - // `ecmaVersion` indicates the ECMAScript version to parse. Must be - // either 3, 5, 6 (2015), 7 (2016), 8 (2017), 9 (2018), or 10 - // (2019). This influences support for strict mode, the set of - // reserved words, and support for new syntax features. The default - // is 10. - ecmaVersion: 10, - // `sourceType` indicates the mode the code should be parsed in. - // Can be either `"script"` or `"module"`. This influences global - // strict mode and parsing of `import` and `export` declarations. - sourceType: "script", - // `onInsertedSemicolon` can be a callback that will be called - // when a semicolon is automatically inserted. It will be passed - // the position of the comma as an offset, and if `locations` is - // enabled, it is given the location as a `{line, column}` object - // as second argument. - onInsertedSemicolon: null, - // `onTrailingComma` is similar to `onInsertedSemicolon`, but for - // trailing commas. - onTrailingComma: null, - // By default, reserved words are only enforced if ecmaVersion >= 5. - // Set `allowReserved` to a boolean value to explicitly turn this on - // an off. When this option has the value "never", reserved words - // and keywords can also not be used as property names. - allowReserved: null, - // When enabled, a return at the top level is not considered an - // error. - allowReturnOutsideFunction: false, - // When enabled, import/export statements are not constrained to - // appearing at the top of the program. - allowImportExportEverywhere: false, - // When enabled, await identifiers are allowed to appear at the top-level scope, - // but they are still not allowed in non-async functions. - allowAwaitOutsideFunction: false, - // When enabled, hashbang directive in the beginning of file - // is allowed and treated as a line comment. - allowHashBang: false, - // When `locations` is on, `loc` properties holding objects with - // `start` and `end` properties in `{line, column}` form (with - // line being 1-based and column 0-based) will be attached to the - // nodes. - locations: false, - // A function can be passed as `onToken` option, which will - // cause Acorn to call that function with object in the same - // format as tokens returned from `tokenizer().getToken()`. Note - // that you are not allowed to call the parser from the - // callback—that will corrupt its internal state. - onToken: null, - // A function can be passed as `onComment` option, which will - // cause Acorn to call that function with `(block, text, start, - // end)` parameters whenever a comment is skipped. `block` is a - // boolean indicating whether this is a block (`/* */`) comment, - // `text` is the content of the comment, and `start` and `end` are - // character offsets that denote the start and end of the comment. - // When the `locations` option is on, two more parameters are - // passed, the full `{line, column}` locations of the start and - // end of the comments. Note that you are not allowed to call the - // parser from the callback—that will corrupt its internal state. - onComment: null, - // Nodes have their start and end characters offsets recorded in - // `start` and `end` properties (directly on the node, rather than - // the `loc` object, which holds line/column data. To also add a - // [semi-standardized][range] `range` property holding a `[start, - // end]` array with the same numbers, set the `ranges` option to - // `true`. - // - // [range]: https://bugzilla.mozilla.org/show_bug.cgi?id=745678 - ranges: false, - // It is possible to parse multiple files into a single AST by - // passing the tree produced by parsing the first file as - // `program` option in subsequent parses. This will add the - // toplevel forms of the parsed file to the `Program` (top) node - // of an existing parse tree. - program: null, - // When `locations` is on, you can pass this to record the source - // file in every node's `loc` object. - sourceFile: null, - // This value, if given, is stored in every node, whether - // `locations` is on or off. - directSourceFile: null, - // When enabled, parenthesized expressions are represented by - // (non-standard) ParenthesizedExpression nodes - preserveParens: false - }; - - // Interpret and default an options object - - function getOptions(opts) { - var options = {}; - - for (var opt in defaultOptions) - { options[opt] = opts && has(opts, opt) ? opts[opt] : defaultOptions[opt]; } - - if (options.ecmaVersion >= 2015) - { options.ecmaVersion -= 2009; } - - if (options.allowReserved == null) - { options.allowReserved = options.ecmaVersion < 5; } - - if (isArray(options.onToken)) { - var tokens = options.onToken; - options.onToken = function (token) { return tokens.push(token); }; - } - if (isArray(options.onComment)) - { options.onComment = pushComment(options, options.onComment); } - - return options - } - - function pushComment(options, array) { - return function(block, text, start, end, startLoc, endLoc) { - var comment = { - type: block ? "Block" : "Line", - value: text, - start: start, - end: end - }; - if (options.locations) - { comment.loc = new SourceLocation(this, startLoc, endLoc); } - if (options.ranges) - { comment.range = [start, end]; } - array.push(comment); - } - } - - // Each scope gets a bitset that may contain these flags - var - SCOPE_TOP = 1, - SCOPE_FUNCTION = 2, - SCOPE_VAR = SCOPE_TOP | SCOPE_FUNCTION, - SCOPE_ASYNC = 4, - SCOPE_GENERATOR = 8, - SCOPE_ARROW = 16, - SCOPE_SIMPLE_CATCH = 32, - SCOPE_SUPER = 64, - SCOPE_DIRECT_SUPER = 128; - - function functionFlags(async, generator) { - return SCOPE_FUNCTION | (async ? SCOPE_ASYNC : 0) | (generator ? SCOPE_GENERATOR : 0) - } - - // Used in checkLVal and declareName to determine the type of a binding - var - BIND_NONE = 0, // Not a binding - BIND_VAR = 1, // Var-style binding - BIND_LEXICAL = 2, // Let- or const-style binding - BIND_FUNCTION = 3, // Function declaration - BIND_SIMPLE_CATCH = 4, // Simple (identifier pattern) catch binding - BIND_OUTSIDE = 5; // Special case for function names as bound inside the function - - var Parser = function Parser(options, input, startPos) { - this.options = options = getOptions(options); - this.sourceFile = options.sourceFile; - this.keywords = wordsRegexp(keywords[options.ecmaVersion >= 6 ? 6 : options.sourceType === "module" ? "5module" : 5]); - var reserved = ""; - if (options.allowReserved !== true) { - for (var v = options.ecmaVersion;; v--) - { if (reserved = reservedWords[v]) { break } } - if (options.sourceType === "module") { reserved += " await"; } - } - this.reservedWords = wordsRegexp(reserved); - var reservedStrict = (reserved ? reserved + " " : "") + reservedWords.strict; - this.reservedWordsStrict = wordsRegexp(reservedStrict); - this.reservedWordsStrictBind = wordsRegexp(reservedStrict + " " + reservedWords.strictBind); - this.input = String(input); - - // Used to signal to callers of `readWord1` whether the word - // contained any escape sequences. This is needed because words with - // escape sequences must not be interpreted as keywords. - this.containsEsc = false; - - // Set up token state - - // The current position of the tokenizer in the input. - if (startPos) { - this.pos = startPos; - this.lineStart = this.input.lastIndexOf("\n", startPos - 1) + 1; - this.curLine = this.input.slice(0, this.lineStart).split(lineBreak).length; - } else { - this.pos = this.lineStart = 0; - this.curLine = 1; - } - - // Properties of the current token: - // Its type - this.type = types.eof; - // For tokens that include more information than their type, the value - this.value = null; - // Its start and end offset - this.start = this.end = this.pos; - // And, if locations are used, the {line, column} object - // corresponding to those offsets - this.startLoc = this.endLoc = this.curPosition(); - - // Position information for the previous token - this.lastTokEndLoc = this.lastTokStartLoc = null; - this.lastTokStart = this.lastTokEnd = this.pos; - - // The context stack is used to superficially track syntactic - // context to predict whether a regular expression is allowed in a - // given position. - this.context = this.initialContext(); - this.exprAllowed = true; - - // Figure out if it's a module code. - this.inModule = options.sourceType === "module"; - this.strict = this.inModule || this.strictDirective(this.pos); - - // Used to signify the start of a potential arrow function - this.potentialArrowAt = -1; - - // Positions to delayed-check that yield/await does not exist in default parameters. - this.yieldPos = this.awaitPos = this.awaitIdentPos = 0; - // Labels in scope. - this.labels = []; - // Thus-far undefined exports. - this.undefinedExports = {}; - - // If enabled, skip leading hashbang line. - if (this.pos === 0 && options.allowHashBang && this.input.slice(0, 2) === "#!") - { this.skipLineComment(2); } - - // Scope tracking for duplicate variable names (see scope.js) - this.scopeStack = []; - this.enterScope(SCOPE_TOP); - - // For RegExp validation - this.regexpState = null; - }; - - var prototypeAccessors = { inFunction: { configurable: true },inGenerator: { configurable: true },inAsync: { configurable: true },allowSuper: { configurable: true },allowDirectSuper: { configurable: true },treatFunctionsAsVar: { configurable: true } }; - - Parser.prototype.parse = function parse () { - var node = this.options.program || this.startNode(); - this.nextToken(); - return this.parseTopLevel(node) - }; - - prototypeAccessors.inFunction.get = function () { return (this.currentVarScope().flags & SCOPE_FUNCTION) > 0 }; - prototypeAccessors.inGenerator.get = function () { return (this.currentVarScope().flags & SCOPE_GENERATOR) > 0 }; - prototypeAccessors.inAsync.get = function () { return (this.currentVarScope().flags & SCOPE_ASYNC) > 0 }; - prototypeAccessors.allowSuper.get = function () { return (this.currentThisScope().flags & SCOPE_SUPER) > 0 }; - prototypeAccessors.allowDirectSuper.get = function () { return (this.currentThisScope().flags & SCOPE_DIRECT_SUPER) > 0 }; - prototypeAccessors.treatFunctionsAsVar.get = function () { return this.treatFunctionsAsVarInScope(this.currentScope()) }; - - // Switch to a getter for 7.0.0. - Parser.prototype.inNonArrowFunction = function inNonArrowFunction () { return (this.currentThisScope().flags & SCOPE_FUNCTION) > 0 }; - - Parser.extend = function extend () { - var plugins = [], len = arguments.length; - while ( len-- ) plugins[ len ] = arguments[ len ]; - - var cls = this; - for (var i = 0; i < plugins.length; i++) { cls = plugins[i](cls); } - return cls - }; - - Parser.parse = function parse (input, options) { - return new this(options, input).parse() - }; - - Parser.parseExpressionAt = function parseExpressionAt (input, pos, options) { - var parser = new this(options, input, pos); - parser.nextToken(); - return parser.parseExpression() - }; - - Parser.tokenizer = function tokenizer (input, options) { - return new this(options, input) - }; - - Object.defineProperties( Parser.prototype, prototypeAccessors ); - - var pp = Parser.prototype; - - // ## Parser utilities - - var literal = /^(?:'((?:\\.|[^'\\])*?)'|"((?:\\.|[^"\\])*?)")/; - pp.strictDirective = function(start) { - for (;;) { - // Try to find string literal. - skipWhiteSpace.lastIndex = start; - start += skipWhiteSpace.exec(this.input)[0].length; - var match = literal.exec(this.input.slice(start)); - if (!match) { return false } - if ((match[1] || match[2]) === "use strict") { - skipWhiteSpace.lastIndex = start + match[0].length; - var spaceAfter = skipWhiteSpace.exec(this.input), end = spaceAfter.index + spaceAfter[0].length; - var next = this.input.charAt(end); - return next === ";" || next === "}" || - (lineBreak.test(spaceAfter[0]) && - !(/[(`.[+\-/*%<>=,?^&]/.test(next) || next === "!" && this.input.charAt(end + 1) === "=")) - } - start += match[0].length; - - // Skip semicolon, if any. - skipWhiteSpace.lastIndex = start; - start += skipWhiteSpace.exec(this.input)[0].length; - if (this.input[start] === ";") - { start++; } - } - }; - - // Predicate that tests whether the next token is of the given - // type, and if yes, consumes it as a side effect. - - pp.eat = function(type) { - if (this.type === type) { - this.next(); - return true - } else { - return false - } - }; - - // Tests whether parsed token is a contextual keyword. - - pp.isContextual = function(name) { - return this.type === types.name && this.value === name && !this.containsEsc - }; - - // Consumes contextual keyword if possible. - - pp.eatContextual = function(name) { - if (!this.isContextual(name)) { return false } - this.next(); - return true - }; - - // Asserts that following token is given contextual keyword. - - pp.expectContextual = function(name) { - if (!this.eatContextual(name)) { this.unexpected(); } - }; - - // Test whether a semicolon can be inserted at the current position. - - pp.canInsertSemicolon = function() { - return this.type === types.eof || - this.type === types.braceR || - lineBreak.test(this.input.slice(this.lastTokEnd, this.start)) - }; - - pp.insertSemicolon = function() { - if (this.canInsertSemicolon()) { - if (this.options.onInsertedSemicolon) - { this.options.onInsertedSemicolon(this.lastTokEnd, this.lastTokEndLoc); } - return true - } - }; - - // Consume a semicolon, or, failing that, see if we are allowed to - // pretend that there is a semicolon at this position. - - pp.semicolon = function() { - if (!this.eat(types.semi) && !this.insertSemicolon()) { this.unexpected(); } - }; - - pp.afterTrailingComma = function(tokType, notNext) { - if (this.type === tokType) { - if (this.options.onTrailingComma) - { this.options.onTrailingComma(this.lastTokStart, this.lastTokStartLoc); } - if (!notNext) - { this.next(); } - return true - } - }; - - // Expect a token of a given type. If found, consume it, otherwise, - // raise an unexpected token error. - - pp.expect = function(type) { - this.eat(type) || this.unexpected(); - }; - - // Raise an unexpected token error. - - pp.unexpected = function(pos) { - this.raise(pos != null ? pos : this.start, "Unexpected token"); - }; - - function DestructuringErrors() { - this.shorthandAssign = - this.trailingComma = - this.parenthesizedAssign = - this.parenthesizedBind = - this.doubleProto = - -1; - } - - pp.checkPatternErrors = function(refDestructuringErrors, isAssign) { - if (!refDestructuringErrors) { return } - if (refDestructuringErrors.trailingComma > -1) - { this.raiseRecoverable(refDestructuringErrors.trailingComma, "Comma is not permitted after the rest element"); } - var parens = isAssign ? refDestructuringErrors.parenthesizedAssign : refDestructuringErrors.parenthesizedBind; - if (parens > -1) { this.raiseRecoverable(parens, "Parenthesized pattern"); } - }; - - pp.checkExpressionErrors = function(refDestructuringErrors, andThrow) { - if (!refDestructuringErrors) { return false } - var shorthandAssign = refDestructuringErrors.shorthandAssign; - var doubleProto = refDestructuringErrors.doubleProto; - if (!andThrow) { return shorthandAssign >= 0 || doubleProto >= 0 } - if (shorthandAssign >= 0) - { this.raise(shorthandAssign, "Shorthand property assignments are valid only in destructuring patterns"); } - if (doubleProto >= 0) - { this.raiseRecoverable(doubleProto, "Redefinition of __proto__ property"); } - }; - - pp.checkYieldAwaitInDefaultParams = function() { - if (this.yieldPos && (!this.awaitPos || this.yieldPos < this.awaitPos)) - { this.raise(this.yieldPos, "Yield expression cannot be a default value"); } - if (this.awaitPos) - { this.raise(this.awaitPos, "Await expression cannot be a default value"); } - }; - - pp.isSimpleAssignTarget = function(expr) { - if (expr.type === "ParenthesizedExpression") - { return this.isSimpleAssignTarget(expr.expression) } - return expr.type === "Identifier" || expr.type === "MemberExpression" - }; - - var pp$1 = Parser.prototype; - - // ### Statement parsing - - // Parse a program. Initializes the parser, reads any number of - // statements, and wraps them in a Program node. Optionally takes a - // `program` argument. If present, the statements will be appended - // to its body instead of creating a new node. - - pp$1.parseTopLevel = function(node) { - var exports = {}; - if (!node.body) { node.body = []; } - while (this.type !== types.eof) { - var stmt = this.parseStatement(null, true, exports); - node.body.push(stmt); - } - if (this.inModule) - { for (var i = 0, list = Object.keys(this.undefinedExports); i < list.length; i += 1) - { - var name = list[i]; - - this.raiseRecoverable(this.undefinedExports[name].start, ("Export '" + name + "' is not defined")); - } } - this.adaptDirectivePrologue(node.body); - this.next(); - node.sourceType = this.options.sourceType; - return this.finishNode(node, "Program") - }; - - var loopLabel = {kind: "loop"}, switchLabel = {kind: "switch"}; - - pp$1.isLet = function(context) { - if (this.options.ecmaVersion < 6 || !this.isContextual("let")) { return false } - skipWhiteSpace.lastIndex = this.pos; - var skip = skipWhiteSpace.exec(this.input); - var next = this.pos + skip[0].length, nextCh = this.input.charCodeAt(next); - // For ambiguous cases, determine if a LexicalDeclaration (or only a - // Statement) is allowed here. If context is not empty then only a Statement - // is allowed. However, `let [` is an explicit negative lookahead for - // ExpressionStatement, so special-case it first. - if (nextCh === 91) { return true } // '[' - if (context) { return false } - - if (nextCh === 123) { return true } // '{' - if (isIdentifierStart(nextCh, true)) { - var pos = next + 1; - while (isIdentifierChar(this.input.charCodeAt(pos), true)) { ++pos; } - var ident = this.input.slice(next, pos); - if (!keywordRelationalOperator.test(ident)) { return true } - } - return false - }; - - // check 'async [no LineTerminator here] function' - // - 'async /*foo*/ function' is OK. - // - 'async /*\n*/ function' is invalid. - pp$1.isAsyncFunction = function() { - if (this.options.ecmaVersion < 8 || !this.isContextual("async")) - { return false } - - skipWhiteSpace.lastIndex = this.pos; - var skip = skipWhiteSpace.exec(this.input); - var next = this.pos + skip[0].length; - return !lineBreak.test(this.input.slice(this.pos, next)) && - this.input.slice(next, next + 8) === "function" && - (next + 8 === this.input.length || !isIdentifierChar(this.input.charAt(next + 8))) - }; - - // Parse a single statement. - // - // If expecting a statement and finding a slash operator, parse a - // regular expression literal. This is to handle cases like - // `if (foo) /blah/.exec(foo)`, where looking at the previous token - // does not help. - - pp$1.parseStatement = function(context, topLevel, exports) { - var starttype = this.type, node = this.startNode(), kind; - - if (this.isLet(context)) { - starttype = types._var; - kind = "let"; - } - - // Most types of statements are recognized by the keyword they - // start with. Many are trivial to parse, some require a bit of - // complexity. - - switch (starttype) { - case types._break: case types._continue: return this.parseBreakContinueStatement(node, starttype.keyword) - case types._debugger: return this.parseDebuggerStatement(node) - case types._do: return this.parseDoStatement(node) - case types._for: return this.parseForStatement(node) - case types._function: - // Function as sole body of either an if statement or a labeled statement - // works, but not when it is part of a labeled statement that is the sole - // body of an if statement. - if ((context && (this.strict || context !== "if" && context !== "label")) && this.options.ecmaVersion >= 6) { this.unexpected(); } - return this.parseFunctionStatement(node, false, !context) - case types._class: - if (context) { this.unexpected(); } - return this.parseClass(node, true) - case types._if: return this.parseIfStatement(node) - case types._return: return this.parseReturnStatement(node) - case types._switch: return this.parseSwitchStatement(node) - case types._throw: return this.parseThrowStatement(node) - case types._try: return this.parseTryStatement(node) - case types._const: case types._var: - kind = kind || this.value; - if (context && kind !== "var") { this.unexpected(); } - return this.parseVarStatement(node, kind) - case types._while: return this.parseWhileStatement(node) - case types._with: return this.parseWithStatement(node) - case types.braceL: return this.parseBlock(true, node) - case types.semi: return this.parseEmptyStatement(node) - case types._export: - case types._import: - if (this.options.ecmaVersion > 10 && starttype === types._import) { - skipWhiteSpace.lastIndex = this.pos; - var skip = skipWhiteSpace.exec(this.input); - var next = this.pos + skip[0].length, nextCh = this.input.charCodeAt(next); - if (nextCh === 40 || nextCh === 46) // '(' or '.' - { return this.parseExpressionStatement(node, this.parseExpression()) } - } - - if (!this.options.allowImportExportEverywhere) { - if (!topLevel) - { this.raise(this.start, "'import' and 'export' may only appear at the top level"); } - if (!this.inModule) - { this.raise(this.start, "'import' and 'export' may appear only with 'sourceType: module'"); } - } - return starttype === types._import ? this.parseImport(node) : this.parseExport(node, exports) - - // If the statement does not start with a statement keyword or a - // brace, it's an ExpressionStatement or LabeledStatement. We - // simply start parsing an expression, and afterwards, if the - // next token is a colon and the expression was a simple - // Identifier node, we switch to interpreting it as a label. - default: - if (this.isAsyncFunction()) { - if (context) { this.unexpected(); } - this.next(); - return this.parseFunctionStatement(node, true, !context) - } - - var maybeName = this.value, expr = this.parseExpression(); - if (starttype === types.name && expr.type === "Identifier" && this.eat(types.colon)) - { return this.parseLabeledStatement(node, maybeName, expr, context) } - else { return this.parseExpressionStatement(node, expr) } - } - }; - - pp$1.parseBreakContinueStatement = function(node, keyword) { - var isBreak = keyword === "break"; - this.next(); - if (this.eat(types.semi) || this.insertSemicolon()) { node.label = null; } - else if (this.type !== types.name) { this.unexpected(); } - else { - node.label = this.parseIdent(); - this.semicolon(); - } - - // Verify that there is an actual destination to break or - // continue to. - var i = 0; - for (; i < this.labels.length; ++i) { - var lab = this.labels[i]; - if (node.label == null || lab.name === node.label.name) { - if (lab.kind != null && (isBreak || lab.kind === "loop")) { break } - if (node.label && isBreak) { break } - } - } - if (i === this.labels.length) { this.raise(node.start, "Unsyntactic " + keyword); } - return this.finishNode(node, isBreak ? "BreakStatement" : "ContinueStatement") - }; - - pp$1.parseDebuggerStatement = function(node) { - this.next(); - this.semicolon(); - return this.finishNode(node, "DebuggerStatement") - }; - - pp$1.parseDoStatement = function(node) { - this.next(); - this.labels.push(loopLabel); - node.body = this.parseStatement("do"); - this.labels.pop(); - this.expect(types._while); - node.test = this.parseParenExpression(); - if (this.options.ecmaVersion >= 6) - { this.eat(types.semi); } - else - { this.semicolon(); } - return this.finishNode(node, "DoWhileStatement") - }; - - // Disambiguating between a `for` and a `for`/`in` or `for`/`of` - // loop is non-trivial. Basically, we have to parse the init `var` - // statement or expression, disallowing the `in` operator (see - // the second parameter to `parseExpression`), and then check - // whether the next token is `in` or `of`. When there is no init - // part (semicolon immediately after the opening parenthesis), it - // is a regular `for` loop. - - pp$1.parseForStatement = function(node) { - this.next(); - var awaitAt = (this.options.ecmaVersion >= 9 && (this.inAsync || (!this.inFunction && this.options.allowAwaitOutsideFunction)) && this.eatContextual("await")) ? this.lastTokStart : -1; - this.labels.push(loopLabel); - this.enterScope(0); - this.expect(types.parenL); - if (this.type === types.semi) { - if (awaitAt > -1) { this.unexpected(awaitAt); } - return this.parseFor(node, null) - } - var isLet = this.isLet(); - if (this.type === types._var || this.type === types._const || isLet) { - var init$1 = this.startNode(), kind = isLet ? "let" : this.value; - this.next(); - this.parseVar(init$1, true, kind); - this.finishNode(init$1, "VariableDeclaration"); - if ((this.type === types._in || (this.options.ecmaVersion >= 6 && this.isContextual("of"))) && init$1.declarations.length === 1) { - if (this.options.ecmaVersion >= 9) { - if (this.type === types._in) { - if (awaitAt > -1) { this.unexpected(awaitAt); } - } else { node.await = awaitAt > -1; } - } - return this.parseForIn(node, init$1) - } - if (awaitAt > -1) { this.unexpected(awaitAt); } - return this.parseFor(node, init$1) - } - var refDestructuringErrors = new DestructuringErrors; - var init = this.parseExpression(true, refDestructuringErrors); - if (this.type === types._in || (this.options.ecmaVersion >= 6 && this.isContextual("of"))) { - if (this.options.ecmaVersion >= 9) { - if (this.type === types._in) { - if (awaitAt > -1) { this.unexpected(awaitAt); } - } else { node.await = awaitAt > -1; } - } - this.toAssignable(init, false, refDestructuringErrors); - this.checkLVal(init); - return this.parseForIn(node, init) - } else { - this.checkExpressionErrors(refDestructuringErrors, true); - } - if (awaitAt > -1) { this.unexpected(awaitAt); } - return this.parseFor(node, init) - }; - - pp$1.parseFunctionStatement = function(node, isAsync, declarationPosition) { - this.next(); - return this.parseFunction(node, FUNC_STATEMENT | (declarationPosition ? 0 : FUNC_HANGING_STATEMENT), false, isAsync) - }; - - pp$1.parseIfStatement = function(node) { - this.next(); - node.test = this.parseParenExpression(); - // allow function declarations in branches, but only in non-strict mode - node.consequent = this.parseStatement("if"); - node.alternate = this.eat(types._else) ? this.parseStatement("if") : null; - return this.finishNode(node, "IfStatement") - }; - - pp$1.parseReturnStatement = function(node) { - if (!this.inFunction && !this.options.allowReturnOutsideFunction) - { this.raise(this.start, "'return' outside of function"); } - this.next(); - - // In `return` (and `break`/`continue`), the keywords with - // optional arguments, we eagerly look for a semicolon or the - // possibility to insert one. - - if (this.eat(types.semi) || this.insertSemicolon()) { node.argument = null; } - else { node.argument = this.parseExpression(); this.semicolon(); } - return this.finishNode(node, "ReturnStatement") - }; - - pp$1.parseSwitchStatement = function(node) { - this.next(); - node.discriminant = this.parseParenExpression(); - node.cases = []; - this.expect(types.braceL); - this.labels.push(switchLabel); - this.enterScope(0); - - // Statements under must be grouped (by label) in SwitchCase - // nodes. `cur` is used to keep the node that we are currently - // adding statements to. - - var cur; - for (var sawDefault = false; this.type !== types.braceR;) { - if (this.type === types._case || this.type === types._default) { - var isCase = this.type === types._case; - if (cur) { this.finishNode(cur, "SwitchCase"); } - node.cases.push(cur = this.startNode()); - cur.consequent = []; - this.next(); - if (isCase) { - cur.test = this.parseExpression(); - } else { - if (sawDefault) { this.raiseRecoverable(this.lastTokStart, "Multiple default clauses"); } - sawDefault = true; - cur.test = null; - } - this.expect(types.colon); - } else { - if (!cur) { this.unexpected(); } - cur.consequent.push(this.parseStatement(null)); - } - } - this.exitScope(); - if (cur) { this.finishNode(cur, "SwitchCase"); } - this.next(); // Closing brace - this.labels.pop(); - return this.finishNode(node, "SwitchStatement") - }; - - pp$1.parseThrowStatement = function(node) { - this.next(); - if (lineBreak.test(this.input.slice(this.lastTokEnd, this.start))) - { this.raise(this.lastTokEnd, "Illegal newline after throw"); } - node.argument = this.parseExpression(); - this.semicolon(); - return this.finishNode(node, "ThrowStatement") - }; - - // Reused empty array added for node fields that are always empty. - - var empty = []; - - pp$1.parseTryStatement = function(node) { - this.next(); - node.block = this.parseBlock(); - node.handler = null; - if (this.type === types._catch) { - var clause = this.startNode(); - this.next(); - if (this.eat(types.parenL)) { - clause.param = this.parseBindingAtom(); - var simple = clause.param.type === "Identifier"; - this.enterScope(simple ? SCOPE_SIMPLE_CATCH : 0); - this.checkLVal(clause.param, simple ? BIND_SIMPLE_CATCH : BIND_LEXICAL); - this.expect(types.parenR); - } else { - if (this.options.ecmaVersion < 10) { this.unexpected(); } - clause.param = null; - this.enterScope(0); - } - clause.body = this.parseBlock(false); - this.exitScope(); - node.handler = this.finishNode(clause, "CatchClause"); - } - node.finalizer = this.eat(types._finally) ? this.parseBlock() : null; - if (!node.handler && !node.finalizer) - { this.raise(node.start, "Missing catch or finally clause"); } - return this.finishNode(node, "TryStatement") - }; - - pp$1.parseVarStatement = function(node, kind) { - this.next(); - this.parseVar(node, false, kind); - this.semicolon(); - return this.finishNode(node, "VariableDeclaration") - }; - - pp$1.parseWhileStatement = function(node) { - this.next(); - node.test = this.parseParenExpression(); - this.labels.push(loopLabel); - node.body = this.parseStatement("while"); - this.labels.pop(); - return this.finishNode(node, "WhileStatement") - }; - - pp$1.parseWithStatement = function(node) { - if (this.strict) { this.raise(this.start, "'with' in strict mode"); } - this.next(); - node.object = this.parseParenExpression(); - node.body = this.parseStatement("with"); - return this.finishNode(node, "WithStatement") - }; - - pp$1.parseEmptyStatement = function(node) { - this.next(); - return this.finishNode(node, "EmptyStatement") - }; - - pp$1.parseLabeledStatement = function(node, maybeName, expr, context) { - for (var i$1 = 0, list = this.labels; i$1 < list.length; i$1 += 1) - { - var label = list[i$1]; - - if (label.name === maybeName) - { this.raise(expr.start, "Label '" + maybeName + "' is already declared"); - } } - var kind = this.type.isLoop ? "loop" : this.type === types._switch ? "switch" : null; - for (var i = this.labels.length - 1; i >= 0; i--) { - var label$1 = this.labels[i]; - if (label$1.statementStart === node.start) { - // Update information about previous labels on this node - label$1.statementStart = this.start; - label$1.kind = kind; - } else { break } - } - this.labels.push({name: maybeName, kind: kind, statementStart: this.start}); - node.body = this.parseStatement(context ? context.indexOf("label") === -1 ? context + "label" : context : "label"); - this.labels.pop(); - node.label = expr; - return this.finishNode(node, "LabeledStatement") - }; - - pp$1.parseExpressionStatement = function(node, expr) { - node.expression = expr; - this.semicolon(); - return this.finishNode(node, "ExpressionStatement") - }; - - // Parse a semicolon-enclosed block of statements, handling `"use - // strict"` declarations when `allowStrict` is true (used for - // function bodies). - - pp$1.parseBlock = function(createNewLexicalScope, node, exitStrict) { - if ( createNewLexicalScope === void 0 ) createNewLexicalScope = true; - if ( node === void 0 ) node = this.startNode(); - - node.body = []; - this.expect(types.braceL); - if (createNewLexicalScope) { this.enterScope(0); } - while (this.type !== types.braceR) { - var stmt = this.parseStatement(null); - node.body.push(stmt); - } - if (exitStrict) { this.strict = false; } - this.next(); - if (createNewLexicalScope) { this.exitScope(); } - return this.finishNode(node, "BlockStatement") - }; - - // Parse a regular `for` loop. The disambiguation code in - // `parseStatement` will already have parsed the init statement or - // expression. - - pp$1.parseFor = function(node, init) { - node.init = init; - this.expect(types.semi); - node.test = this.type === types.semi ? null : this.parseExpression(); - this.expect(types.semi); - node.update = this.type === types.parenR ? null : this.parseExpression(); - this.expect(types.parenR); - node.body = this.parseStatement("for"); - this.exitScope(); - this.labels.pop(); - return this.finishNode(node, "ForStatement") - }; - - // Parse a `for`/`in` and `for`/`of` loop, which are almost - // same from parser's perspective. - - pp$1.parseForIn = function(node, init) { - var isForIn = this.type === types._in; - this.next(); - - if ( - init.type === "VariableDeclaration" && - init.declarations[0].init != null && - ( - !isForIn || - this.options.ecmaVersion < 8 || - this.strict || - init.kind !== "var" || - init.declarations[0].id.type !== "Identifier" - ) - ) { - this.raise( - init.start, - ((isForIn ? "for-in" : "for-of") + " loop variable declaration may not have an initializer") - ); - } else if (init.type === "AssignmentPattern") { - this.raise(init.start, "Invalid left-hand side in for-loop"); - } - node.left = init; - node.right = isForIn ? this.parseExpression() : this.parseMaybeAssign(); - this.expect(types.parenR); - node.body = this.parseStatement("for"); - this.exitScope(); - this.labels.pop(); - return this.finishNode(node, isForIn ? "ForInStatement" : "ForOfStatement") - }; - - // Parse a list of variable declarations. - - pp$1.parseVar = function(node, isFor, kind) { - node.declarations = []; - node.kind = kind; - for (;;) { - var decl = this.startNode(); - this.parseVarId(decl, kind); - if (this.eat(types.eq)) { - decl.init = this.parseMaybeAssign(isFor); - } else if (kind === "const" && !(this.type === types._in || (this.options.ecmaVersion >= 6 && this.isContextual("of")))) { - this.unexpected(); - } else if (decl.id.type !== "Identifier" && !(isFor && (this.type === types._in || this.isContextual("of")))) { - this.raise(this.lastTokEnd, "Complex binding patterns require an initialization value"); - } else { - decl.init = null; - } - node.declarations.push(this.finishNode(decl, "VariableDeclarator")); - if (!this.eat(types.comma)) { break } - } - return node - }; - - pp$1.parseVarId = function(decl, kind) { - decl.id = this.parseBindingAtom(); - this.checkLVal(decl.id, kind === "var" ? BIND_VAR : BIND_LEXICAL, false); - }; - - var FUNC_STATEMENT = 1, FUNC_HANGING_STATEMENT = 2, FUNC_NULLABLE_ID = 4; - - // Parse a function declaration or literal (depending on the - // `statement & FUNC_STATEMENT`). - - // Remove `allowExpressionBody` for 7.0.0, as it is only called with false - pp$1.parseFunction = function(node, statement, allowExpressionBody, isAsync) { - this.initFunction(node); - if (this.options.ecmaVersion >= 9 || this.options.ecmaVersion >= 6 && !isAsync) { - if (this.type === types.star && (statement & FUNC_HANGING_STATEMENT)) - { this.unexpected(); } - node.generator = this.eat(types.star); - } - if (this.options.ecmaVersion >= 8) - { node.async = !!isAsync; } - - if (statement & FUNC_STATEMENT) { - node.id = (statement & FUNC_NULLABLE_ID) && this.type !== types.name ? null : this.parseIdent(); - if (node.id && !(statement & FUNC_HANGING_STATEMENT)) - // If it is a regular function declaration in sloppy mode, then it is - // subject to Annex B semantics (BIND_FUNCTION). Otherwise, the binding - // mode depends on properties of the current scope (see - // treatFunctionsAsVar). - { this.checkLVal(node.id, (this.strict || node.generator || node.async) ? this.treatFunctionsAsVar ? BIND_VAR : BIND_LEXICAL : BIND_FUNCTION); } - } - - var oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos, oldAwaitIdentPos = this.awaitIdentPos; - this.yieldPos = 0; - this.awaitPos = 0; - this.awaitIdentPos = 0; - this.enterScope(functionFlags(node.async, node.generator)); - - if (!(statement & FUNC_STATEMENT)) - { node.id = this.type === types.name ? this.parseIdent() : null; } - - this.parseFunctionParams(node); - this.parseFunctionBody(node, allowExpressionBody, false); - - this.yieldPos = oldYieldPos; - this.awaitPos = oldAwaitPos; - this.awaitIdentPos = oldAwaitIdentPos; - return this.finishNode(node, (statement & FUNC_STATEMENT) ? "FunctionDeclaration" : "FunctionExpression") - }; - - pp$1.parseFunctionParams = function(node) { - this.expect(types.parenL); - node.params = this.parseBindingList(types.parenR, false, this.options.ecmaVersion >= 8); - this.checkYieldAwaitInDefaultParams(); - }; - - // Parse a class declaration or literal (depending on the - // `isStatement` parameter). - - pp$1.parseClass = function(node, isStatement) { - this.next(); - - // ecma-262 14.6 Class Definitions - // A class definition is always strict mode code. - var oldStrict = this.strict; - this.strict = true; - - this.parseClassId(node, isStatement); - this.parseClassSuper(node); - var classBody = this.startNode(); - var hadConstructor = false; - classBody.body = []; - this.expect(types.braceL); - while (this.type !== types.braceR) { - var element = this.parseClassElement(node.superClass !== null); - if (element) { - classBody.body.push(element); - if (element.type === "MethodDefinition" && element.kind === "constructor") { - if (hadConstructor) { this.raise(element.start, "Duplicate constructor in the same class"); } - hadConstructor = true; - } - } - } - this.strict = oldStrict; - this.next(); - node.body = this.finishNode(classBody, "ClassBody"); - return this.finishNode(node, isStatement ? "ClassDeclaration" : "ClassExpression") - }; - - pp$1.parseClassElement = function(constructorAllowsSuper) { - var this$1$1 = this; - - if (this.eat(types.semi)) { return null } - - var method = this.startNode(); - var tryContextual = function (k, noLineBreak) { - if ( noLineBreak === void 0 ) noLineBreak = false; - - var start = this$1$1.start, startLoc = this$1$1.startLoc; - if (!this$1$1.eatContextual(k)) { return false } - if (this$1$1.type !== types.parenL && (!noLineBreak || !this$1$1.canInsertSemicolon())) { return true } - if (method.key) { this$1$1.unexpected(); } - method.computed = false; - method.key = this$1$1.startNodeAt(start, startLoc); - method.key.name = k; - this$1$1.finishNode(method.key, "Identifier"); - return false - }; - - method.kind = "method"; - method.static = tryContextual("static"); - var isGenerator = this.eat(types.star); - var isAsync = false; - if (!isGenerator) { - if (this.options.ecmaVersion >= 8 && tryContextual("async", true)) { - isAsync = true; - isGenerator = this.options.ecmaVersion >= 9 && this.eat(types.star); - } else if (tryContextual("get")) { - method.kind = "get"; - } else if (tryContextual("set")) { - method.kind = "set"; - } - } - if (!method.key) { this.parsePropertyName(method); } - var key = method.key; - var allowsDirectSuper = false; - if (!method.computed && !method.static && (key.type === "Identifier" && key.name === "constructor" || - key.type === "Literal" && key.value === "constructor")) { - if (method.kind !== "method") { this.raise(key.start, "Constructor can't have get/set modifier"); } - if (isGenerator) { this.raise(key.start, "Constructor can't be a generator"); } - if (isAsync) { this.raise(key.start, "Constructor can't be an async method"); } - method.kind = "constructor"; - allowsDirectSuper = constructorAllowsSuper; - } else if (method.static && key.type === "Identifier" && key.name === "prototype") { - this.raise(key.start, "Classes may not have a static property named prototype"); - } - this.parseClassMethod(method, isGenerator, isAsync, allowsDirectSuper); - if (method.kind === "get" && method.value.params.length !== 0) - { this.raiseRecoverable(method.value.start, "getter should have no params"); } - if (method.kind === "set" && method.value.params.length !== 1) - { this.raiseRecoverable(method.value.start, "setter should have exactly one param"); } - if (method.kind === "set" && method.value.params[0].type === "RestElement") - { this.raiseRecoverable(method.value.params[0].start, "Setter cannot use rest params"); } - return method - }; - - pp$1.parseClassMethod = function(method, isGenerator, isAsync, allowsDirectSuper) { - method.value = this.parseMethod(isGenerator, isAsync, allowsDirectSuper); - return this.finishNode(method, "MethodDefinition") - }; - - pp$1.parseClassId = function(node, isStatement) { - if (this.type === types.name) { - node.id = this.parseIdent(); - if (isStatement) - { this.checkLVal(node.id, BIND_LEXICAL, false); } - } else { - if (isStatement === true) - { this.unexpected(); } - node.id = null; - } - }; - - pp$1.parseClassSuper = function(node) { - node.superClass = this.eat(types._extends) ? this.parseExprSubscripts() : null; - }; - - // Parses module export declaration. - - pp$1.parseExport = function(node, exports) { - this.next(); - // export * from '...' - if (this.eat(types.star)) { - if (this.options.ecmaVersion >= 11) { - if (this.eatContextual("as")) { - node.exported = this.parseIdent(true); - this.checkExport(exports, node.exported.name, this.lastTokStart); - } else { - node.exported = null; - } - } - this.expectContextual("from"); - if (this.type !== types.string) { this.unexpected(); } - node.source = this.parseExprAtom(); - this.semicolon(); - return this.finishNode(node, "ExportAllDeclaration") - } - if (this.eat(types._default)) { // export default ... - this.checkExport(exports, "default", this.lastTokStart); - var isAsync; - if (this.type === types._function || (isAsync = this.isAsyncFunction())) { - var fNode = this.startNode(); - this.next(); - if (isAsync) { this.next(); } - node.declaration = this.parseFunction(fNode, FUNC_STATEMENT | FUNC_NULLABLE_ID, false, isAsync); - } else if (this.type === types._class) { - var cNode = this.startNode(); - node.declaration = this.parseClass(cNode, "nullableID"); - } else { - node.declaration = this.parseMaybeAssign(); - this.semicolon(); - } - return this.finishNode(node, "ExportDefaultDeclaration") - } - // export var|const|let|function|class ... - if (this.shouldParseExportStatement()) { - node.declaration = this.parseStatement(null); - if (node.declaration.type === "VariableDeclaration") - { this.checkVariableExport(exports, node.declaration.declarations); } - else - { this.checkExport(exports, node.declaration.id.name, node.declaration.id.start); } - node.specifiers = []; - node.source = null; - } else { // export { x, y as z } [from '...'] - node.declaration = null; - node.specifiers = this.parseExportSpecifiers(exports); - if (this.eatContextual("from")) { - if (this.type !== types.string) { this.unexpected(); } - node.source = this.parseExprAtom(); - } else { - for (var i = 0, list = node.specifiers; i < list.length; i += 1) { - // check for keywords used as local names - var spec = list[i]; - - this.checkUnreserved(spec.local); - // check if export is defined - this.checkLocalExport(spec.local); - } - - node.source = null; - } - this.semicolon(); - } - return this.finishNode(node, "ExportNamedDeclaration") - }; - - pp$1.checkExport = function(exports, name, pos) { - if (!exports) { return } - if (has(exports, name)) - { this.raiseRecoverable(pos, "Duplicate export '" + name + "'"); } - exports[name] = true; - }; - - pp$1.checkPatternExport = function(exports, pat) { - var type = pat.type; - if (type === "Identifier") - { this.checkExport(exports, pat.name, pat.start); } - else if (type === "ObjectPattern") - { for (var i = 0, list = pat.properties; i < list.length; i += 1) - { - var prop = list[i]; - - this.checkPatternExport(exports, prop); - } } - else if (type === "ArrayPattern") - { for (var i$1 = 0, list$1 = pat.elements; i$1 < list$1.length; i$1 += 1) { - var elt = list$1[i$1]; - - if (elt) { this.checkPatternExport(exports, elt); } - } } - else if (type === "Property") - { this.checkPatternExport(exports, pat.value); } - else if (type === "AssignmentPattern") - { this.checkPatternExport(exports, pat.left); } - else if (type === "RestElement") - { this.checkPatternExport(exports, pat.argument); } - else if (type === "ParenthesizedExpression") - { this.checkPatternExport(exports, pat.expression); } - }; - - pp$1.checkVariableExport = function(exports, decls) { - if (!exports) { return } - for (var i = 0, list = decls; i < list.length; i += 1) - { - var decl = list[i]; - - this.checkPatternExport(exports, decl.id); - } - }; - - pp$1.shouldParseExportStatement = function() { - return this.type.keyword === "var" || - this.type.keyword === "const" || - this.type.keyword === "class" || - this.type.keyword === "function" || - this.isLet() || - this.isAsyncFunction() - }; - - // Parses a comma-separated list of module exports. - - pp$1.parseExportSpecifiers = function(exports) { - var nodes = [], first = true; - // export { x, y as z } [from '...'] - this.expect(types.braceL); - while (!this.eat(types.braceR)) { - if (!first) { - this.expect(types.comma); - if (this.afterTrailingComma(types.braceR)) { break } - } else { first = false; } - - var node = this.startNode(); - node.local = this.parseIdent(true); - node.exported = this.eatContextual("as") ? this.parseIdent(true) : node.local; - this.checkExport(exports, node.exported.name, node.exported.start); - nodes.push(this.finishNode(node, "ExportSpecifier")); - } - return nodes - }; - - // Parses import declaration. - - pp$1.parseImport = function(node) { - this.next(); - // import '...' - if (this.type === types.string) { - node.specifiers = empty; - node.source = this.parseExprAtom(); - } else { - node.specifiers = this.parseImportSpecifiers(); - this.expectContextual("from"); - node.source = this.type === types.string ? this.parseExprAtom() : this.unexpected(); - } - this.semicolon(); - return this.finishNode(node, "ImportDeclaration") - }; - - // Parses a comma-separated list of module imports. - - pp$1.parseImportSpecifiers = function() { - var nodes = [], first = true; - if (this.type === types.name) { - // import defaultObj, { x, y as z } from '...' - var node = this.startNode(); - node.local = this.parseIdent(); - this.checkLVal(node.local, BIND_LEXICAL); - nodes.push(this.finishNode(node, "ImportDefaultSpecifier")); - if (!this.eat(types.comma)) { return nodes } - } - if (this.type === types.star) { - var node$1 = this.startNode(); - this.next(); - this.expectContextual("as"); - node$1.local = this.parseIdent(); - this.checkLVal(node$1.local, BIND_LEXICAL); - nodes.push(this.finishNode(node$1, "ImportNamespaceSpecifier")); - return nodes - } - this.expect(types.braceL); - while (!this.eat(types.braceR)) { - if (!first) { - this.expect(types.comma); - if (this.afterTrailingComma(types.braceR)) { break } - } else { first = false; } - - var node$2 = this.startNode(); - node$2.imported = this.parseIdent(true); - if (this.eatContextual("as")) { - node$2.local = this.parseIdent(); - } else { - this.checkUnreserved(node$2.imported); - node$2.local = node$2.imported; - } - this.checkLVal(node$2.local, BIND_LEXICAL); - nodes.push(this.finishNode(node$2, "ImportSpecifier")); - } - return nodes - }; - - // Set `ExpressionStatement#directive` property for directive prologues. - pp$1.adaptDirectivePrologue = function(statements) { - for (var i = 0; i < statements.length && this.isDirectiveCandidate(statements[i]); ++i) { - statements[i].directive = statements[i].expression.raw.slice(1, -1); - } - }; - pp$1.isDirectiveCandidate = function(statement) { - return ( - statement.type === "ExpressionStatement" && - statement.expression.type === "Literal" && - typeof statement.expression.value === "string" && - // Reject parenthesized strings. - (this.input[statement.start] === "\"" || this.input[statement.start] === "'") - ) - }; - - var pp$2 = Parser.prototype; - - // Convert existing expression atom to assignable pattern - // if possible. - - pp$2.toAssignable = function(node, isBinding, refDestructuringErrors) { - if (this.options.ecmaVersion >= 6 && node) { - switch (node.type) { - case "Identifier": - if (this.inAsync && node.name === "await") - { this.raise(node.start, "Cannot use 'await' as identifier inside an async function"); } - break - - case "ObjectPattern": - case "ArrayPattern": - case "RestElement": - break - - case "ObjectExpression": - node.type = "ObjectPattern"; - if (refDestructuringErrors) { this.checkPatternErrors(refDestructuringErrors, true); } - for (var i = 0, list = node.properties; i < list.length; i += 1) { - var prop = list[i]; - - this.toAssignable(prop, isBinding); - // Early error: - // AssignmentRestProperty[Yield, Await] : - // `...` DestructuringAssignmentTarget[Yield, Await] - // - // It is a Syntax Error if |DestructuringAssignmentTarget| is an |ArrayLiteral| or an |ObjectLiteral|. - if ( - prop.type === "RestElement" && - (prop.argument.type === "ArrayPattern" || prop.argument.type === "ObjectPattern") - ) { - this.raise(prop.argument.start, "Unexpected token"); - } - } - break - - case "Property": - // AssignmentProperty has type === "Property" - if (node.kind !== "init") { this.raise(node.key.start, "Object pattern can't contain getter or setter"); } - this.toAssignable(node.value, isBinding); - break - - case "ArrayExpression": - node.type = "ArrayPattern"; - if (refDestructuringErrors) { this.checkPatternErrors(refDestructuringErrors, true); } - this.toAssignableList(node.elements, isBinding); - break - - case "SpreadElement": - node.type = "RestElement"; - this.toAssignable(node.argument, isBinding); - if (node.argument.type === "AssignmentPattern") - { this.raise(node.argument.start, "Rest elements cannot have a default value"); } - break - - case "AssignmentExpression": - if (node.operator !== "=") { this.raise(node.left.end, "Only '=' operator can be used for specifying default value."); } - node.type = "AssignmentPattern"; - delete node.operator; - this.toAssignable(node.left, isBinding); - // falls through to AssignmentPattern - - case "AssignmentPattern": - break - - case "ParenthesizedExpression": - this.toAssignable(node.expression, isBinding, refDestructuringErrors); - break - - case "ChainExpression": - this.raiseRecoverable(node.start, "Optional chaining cannot appear in left-hand side"); - break - - case "MemberExpression": - if (!isBinding) { break } - - default: - this.raise(node.start, "Assigning to rvalue"); - } - } else if (refDestructuringErrors) { this.checkPatternErrors(refDestructuringErrors, true); } - return node - }; - - // Convert list of expression atoms to binding list. - - pp$2.toAssignableList = function(exprList, isBinding) { - var end = exprList.length; - for (var i = 0; i < end; i++) { - var elt = exprList[i]; - if (elt) { this.toAssignable(elt, isBinding); } - } - if (end) { - var last = exprList[end - 1]; - if (this.options.ecmaVersion === 6 && isBinding && last && last.type === "RestElement" && last.argument.type !== "Identifier") - { this.unexpected(last.argument.start); } - } - return exprList - }; - - // Parses spread element. - - pp$2.parseSpread = function(refDestructuringErrors) { - var node = this.startNode(); - this.next(); - node.argument = this.parseMaybeAssign(false, refDestructuringErrors); - return this.finishNode(node, "SpreadElement") - }; - - pp$2.parseRestBinding = function() { - var node = this.startNode(); - this.next(); - - // RestElement inside of a function parameter must be an identifier - if (this.options.ecmaVersion === 6 && this.type !== types.name) - { this.unexpected(); } - - node.argument = this.parseBindingAtom(); - - return this.finishNode(node, "RestElement") - }; - - // Parses lvalue (assignable) atom. - - pp$2.parseBindingAtom = function() { - if (this.options.ecmaVersion >= 6) { - switch (this.type) { - case types.bracketL: - var node = this.startNode(); - this.next(); - node.elements = this.parseBindingList(types.bracketR, true, true); - return this.finishNode(node, "ArrayPattern") - - case types.braceL: - return this.parseObj(true) - } - } - return this.parseIdent() - }; - - pp$2.parseBindingList = function(close, allowEmpty, allowTrailingComma) { - var elts = [], first = true; - while (!this.eat(close)) { - if (first) { first = false; } - else { this.expect(types.comma); } - if (allowEmpty && this.type === types.comma) { - elts.push(null); - } else if (allowTrailingComma && this.afterTrailingComma(close)) { - break - } else if (this.type === types.ellipsis) { - var rest = this.parseRestBinding(); - this.parseBindingListItem(rest); - elts.push(rest); - if (this.type === types.comma) { this.raise(this.start, "Comma is not permitted after the rest element"); } - this.expect(close); - break - } else { - var elem = this.parseMaybeDefault(this.start, this.startLoc); - this.parseBindingListItem(elem); - elts.push(elem); - } - } - return elts - }; - - pp$2.parseBindingListItem = function(param) { - return param - }; - - // Parses assignment pattern around given atom if possible. - - pp$2.parseMaybeDefault = function(startPos, startLoc, left) { - left = left || this.parseBindingAtom(); - if (this.options.ecmaVersion < 6 || !this.eat(types.eq)) { return left } - var node = this.startNodeAt(startPos, startLoc); - node.left = left; - node.right = this.parseMaybeAssign(); - return this.finishNode(node, "AssignmentPattern") - }; - - // Verify that a node is an lval — something that can be assigned - // to. - // bindingType can be either: - // 'var' indicating that the lval creates a 'var' binding - // 'let' indicating that the lval creates a lexical ('let' or 'const') binding - // 'none' indicating that the binding should be checked for illegal identifiers, but not for duplicate references - - pp$2.checkLVal = function(expr, bindingType, checkClashes) { - if ( bindingType === void 0 ) bindingType = BIND_NONE; - - switch (expr.type) { - case "Identifier": - if (bindingType === BIND_LEXICAL && expr.name === "let") - { this.raiseRecoverable(expr.start, "let is disallowed as a lexically bound name"); } - if (this.strict && this.reservedWordsStrictBind.test(expr.name)) - { this.raiseRecoverable(expr.start, (bindingType ? "Binding " : "Assigning to ") + expr.name + " in strict mode"); } - if (checkClashes) { - if (has(checkClashes, expr.name)) - { this.raiseRecoverable(expr.start, "Argument name clash"); } - checkClashes[expr.name] = true; - } - if (bindingType !== BIND_NONE && bindingType !== BIND_OUTSIDE) { this.declareName(expr.name, bindingType, expr.start); } - break - - case "ChainExpression": - this.raiseRecoverable(expr.start, "Optional chaining cannot appear in left-hand side"); - break - - case "MemberExpression": - if (bindingType) { this.raiseRecoverable(expr.start, "Binding member expression"); } - break - - case "ObjectPattern": - for (var i = 0, list = expr.properties; i < list.length; i += 1) - { - var prop = list[i]; - - this.checkLVal(prop, bindingType, checkClashes); - } - break - - case "Property": - // AssignmentProperty has type === "Property" - this.checkLVal(expr.value, bindingType, checkClashes); - break - - case "ArrayPattern": - for (var i$1 = 0, list$1 = expr.elements; i$1 < list$1.length; i$1 += 1) { - var elem = list$1[i$1]; - - if (elem) { this.checkLVal(elem, bindingType, checkClashes); } - } - break - - case "AssignmentPattern": - this.checkLVal(expr.left, bindingType, checkClashes); - break - - case "RestElement": - this.checkLVal(expr.argument, bindingType, checkClashes); - break - - case "ParenthesizedExpression": - this.checkLVal(expr.expression, bindingType, checkClashes); - break - - default: - this.raise(expr.start, (bindingType ? "Binding" : "Assigning to") + " rvalue"); - } - }; - - // A recursive descent parser operates by defining functions for all - - var pp$3 = Parser.prototype; - - // Check if property name clashes with already added. - // Object/class getters and setters are not allowed to clash — - // either with each other or with an init property — and in - // strict mode, init properties are also not allowed to be repeated. - - pp$3.checkPropClash = function(prop, propHash, refDestructuringErrors) { - if (this.options.ecmaVersion >= 9 && prop.type === "SpreadElement") - { return } - if (this.options.ecmaVersion >= 6 && (prop.computed || prop.method || prop.shorthand)) - { return } - var key = prop.key; - var name; - switch (key.type) { - case "Identifier": name = key.name; break - case "Literal": name = String(key.value); break - default: return - } - var kind = prop.kind; - if (this.options.ecmaVersion >= 6) { - if (name === "__proto__" && kind === "init") { - if (propHash.proto) { - if (refDestructuringErrors) { - if (refDestructuringErrors.doubleProto < 0) - { refDestructuringErrors.doubleProto = key.start; } - // Backwards-compat kludge. Can be removed in version 6.0 - } else { this.raiseRecoverable(key.start, "Redefinition of __proto__ property"); } - } - propHash.proto = true; - } - return - } - name = "$" + name; - var other = propHash[name]; - if (other) { - var redefinition; - if (kind === "init") { - redefinition = this.strict && other.init || other.get || other.set; - } else { - redefinition = other.init || other[kind]; - } - if (redefinition) - { this.raiseRecoverable(key.start, "Redefinition of property"); } - } else { - other = propHash[name] = { - init: false, - get: false, - set: false - }; - } - other[kind] = true; - }; - - // ### Expression parsing - - // These nest, from the most general expression type at the top to - // 'atomic', nondivisible expression types at the bottom. Most of - // the functions will simply let the function(s) below them parse, - // and, *if* the syntactic construct they handle is present, wrap - // the AST node that the inner parser gave them in another node. - - // Parse a full expression. The optional arguments are used to - // forbid the `in` operator (in for loops initalization expressions) - // and provide reference for storing '=' operator inside shorthand - // property assignment in contexts where both object expression - // and object pattern might appear (so it's possible to raise - // delayed syntax error at correct position). - - pp$3.parseExpression = function(noIn, refDestructuringErrors) { - var startPos = this.start, startLoc = this.startLoc; - var expr = this.parseMaybeAssign(noIn, refDestructuringErrors); - if (this.type === types.comma) { - var node = this.startNodeAt(startPos, startLoc); - node.expressions = [expr]; - while (this.eat(types.comma)) { node.expressions.push(this.parseMaybeAssign(noIn, refDestructuringErrors)); } - return this.finishNode(node, "SequenceExpression") - } - return expr - }; - - // Parse an assignment expression. This includes applications of - // operators like `+=`. - - pp$3.parseMaybeAssign = function(noIn, refDestructuringErrors, afterLeftParse) { - if (this.isContextual("yield")) { - if (this.inGenerator) { return this.parseYield(noIn) } - // The tokenizer will assume an expression is allowed after - // `yield`, but this isn't that kind of yield - else { this.exprAllowed = false; } - } - - var ownDestructuringErrors = false, oldParenAssign = -1, oldTrailingComma = -1; - if (refDestructuringErrors) { - oldParenAssign = refDestructuringErrors.parenthesizedAssign; - oldTrailingComma = refDestructuringErrors.trailingComma; - refDestructuringErrors.parenthesizedAssign = refDestructuringErrors.trailingComma = -1; - } else { - refDestructuringErrors = new DestructuringErrors; - ownDestructuringErrors = true; - } - - var startPos = this.start, startLoc = this.startLoc; - if (this.type === types.parenL || this.type === types.name) - { this.potentialArrowAt = this.start; } - var left = this.parseMaybeConditional(noIn, refDestructuringErrors); - if (afterLeftParse) { left = afterLeftParse.call(this, left, startPos, startLoc); } - if (this.type.isAssign) { - var node = this.startNodeAt(startPos, startLoc); - node.operator = this.value; - node.left = this.type === types.eq ? this.toAssignable(left, false, refDestructuringErrors) : left; - if (!ownDestructuringErrors) { - refDestructuringErrors.parenthesizedAssign = refDestructuringErrors.trailingComma = refDestructuringErrors.doubleProto = -1; - } - if (refDestructuringErrors.shorthandAssign >= node.left.start) - { refDestructuringErrors.shorthandAssign = -1; } // reset because shorthand default was used correctly - this.checkLVal(left); - this.next(); - node.right = this.parseMaybeAssign(noIn); - return this.finishNode(node, "AssignmentExpression") - } else { - if (ownDestructuringErrors) { this.checkExpressionErrors(refDestructuringErrors, true); } - } - if (oldParenAssign > -1) { refDestructuringErrors.parenthesizedAssign = oldParenAssign; } - if (oldTrailingComma > -1) { refDestructuringErrors.trailingComma = oldTrailingComma; } - return left - }; - - // Parse a ternary conditional (`?:`) operator. - - pp$3.parseMaybeConditional = function(noIn, refDestructuringErrors) { - var startPos = this.start, startLoc = this.startLoc; - var expr = this.parseExprOps(noIn, refDestructuringErrors); - if (this.checkExpressionErrors(refDestructuringErrors)) { return expr } - if (this.eat(types.question)) { - var node = this.startNodeAt(startPos, startLoc); - node.test = expr; - node.consequent = this.parseMaybeAssign(); - this.expect(types.colon); - node.alternate = this.parseMaybeAssign(noIn); - return this.finishNode(node, "ConditionalExpression") - } - return expr - }; - - // Start the precedence parser. - - pp$3.parseExprOps = function(noIn, refDestructuringErrors) { - var startPos = this.start, startLoc = this.startLoc; - var expr = this.parseMaybeUnary(refDestructuringErrors, false); - if (this.checkExpressionErrors(refDestructuringErrors)) { return expr } - return expr.start === startPos && expr.type === "ArrowFunctionExpression" ? expr : this.parseExprOp(expr, startPos, startLoc, -1, noIn) - }; - - // Parse binary operators with the operator precedence parsing - // algorithm. `left` is the left-hand side of the operator. - // `minPrec` provides context that allows the function to stop and - // defer further parser to one of its callers when it encounters an - // operator that has a lower precedence than the set it is parsing. - - pp$3.parseExprOp = function(left, leftStartPos, leftStartLoc, minPrec, noIn) { - var prec = this.type.binop; - if (prec != null && (!noIn || this.type !== types._in)) { - if (prec > minPrec) { - var logical = this.type === types.logicalOR || this.type === types.logicalAND; - var coalesce = this.type === types.coalesce; - if (coalesce) { - // Handle the precedence of `tt.coalesce` as equal to the range of logical expressions. - // In other words, `node.right` shouldn't contain logical expressions in order to check the mixed error. - prec = types.logicalAND.binop; - } - var op = this.value; - this.next(); - var startPos = this.start, startLoc = this.startLoc; - var right = this.parseExprOp(this.parseMaybeUnary(null, false), startPos, startLoc, prec, noIn); - var node = this.buildBinary(leftStartPos, leftStartLoc, left, right, op, logical || coalesce); - if ((logical && this.type === types.coalesce) || (coalesce && (this.type === types.logicalOR || this.type === types.logicalAND))) { - this.raiseRecoverable(this.start, "Logical expressions and coalesce expressions cannot be mixed. Wrap either by parentheses"); - } - return this.parseExprOp(node, leftStartPos, leftStartLoc, minPrec, noIn) - } - } - return left - }; - - pp$3.buildBinary = function(startPos, startLoc, left, right, op, logical) { - var node = this.startNodeAt(startPos, startLoc); - node.left = left; - node.operator = op; - node.right = right; - return this.finishNode(node, logical ? "LogicalExpression" : "BinaryExpression") - }; - - // Parse unary operators, both prefix and postfix. - - pp$3.parseMaybeUnary = function(refDestructuringErrors, sawUnary) { - var startPos = this.start, startLoc = this.startLoc, expr; - if (this.isContextual("await") && (this.inAsync || (!this.inFunction && this.options.allowAwaitOutsideFunction))) { - expr = this.parseAwait(); - sawUnary = true; - } else if (this.type.prefix) { - var node = this.startNode(), update = this.type === types.incDec; - node.operator = this.value; - node.prefix = true; - this.next(); - node.argument = this.parseMaybeUnary(null, true); - this.checkExpressionErrors(refDestructuringErrors, true); - if (update) { this.checkLVal(node.argument); } - else if (this.strict && node.operator === "delete" && - node.argument.type === "Identifier") - { this.raiseRecoverable(node.start, "Deleting local variable in strict mode"); } - else { sawUnary = true; } - expr = this.finishNode(node, update ? "UpdateExpression" : "UnaryExpression"); - } else { - expr = this.parseExprSubscripts(refDestructuringErrors); - if (this.checkExpressionErrors(refDestructuringErrors)) { return expr } - while (this.type.postfix && !this.canInsertSemicolon()) { - var node$1 = this.startNodeAt(startPos, startLoc); - node$1.operator = this.value; - node$1.prefix = false; - node$1.argument = expr; - this.checkLVal(expr); - this.next(); - expr = this.finishNode(node$1, "UpdateExpression"); - } - } - - if (!sawUnary && this.eat(types.starstar)) - { return this.buildBinary(startPos, startLoc, expr, this.parseMaybeUnary(null, false), "**", false) } - else - { return expr } - }; - - // Parse call, dot, and `[]`-subscript expressions. - - pp$3.parseExprSubscripts = function(refDestructuringErrors) { - var startPos = this.start, startLoc = this.startLoc; - var expr = this.parseExprAtom(refDestructuringErrors); - if (expr.type === "ArrowFunctionExpression" && this.input.slice(this.lastTokStart, this.lastTokEnd) !== ")") - { return expr } - var result = this.parseSubscripts(expr, startPos, startLoc); - if (refDestructuringErrors && result.type === "MemberExpression") { - if (refDestructuringErrors.parenthesizedAssign >= result.start) { refDestructuringErrors.parenthesizedAssign = -1; } - if (refDestructuringErrors.parenthesizedBind >= result.start) { refDestructuringErrors.parenthesizedBind = -1; } - } - return result - }; - - pp$3.parseSubscripts = function(base, startPos, startLoc, noCalls) { - var maybeAsyncArrow = this.options.ecmaVersion >= 8 && base.type === "Identifier" && base.name === "async" && - this.lastTokEnd === base.end && !this.canInsertSemicolon() && base.end - base.start === 5 && - this.potentialArrowAt === base.start; - var optionalChained = false; - - while (true) { - var element = this.parseSubscript(base, startPos, startLoc, noCalls, maybeAsyncArrow, optionalChained); - - if (element.optional) { optionalChained = true; } - if (element === base || element.type === "ArrowFunctionExpression") { - if (optionalChained) { - var chainNode = this.startNodeAt(startPos, startLoc); - chainNode.expression = element; - element = this.finishNode(chainNode, "ChainExpression"); - } - return element - } - - base = element; - } - }; - - pp$3.parseSubscript = function(base, startPos, startLoc, noCalls, maybeAsyncArrow, optionalChained) { - var optionalSupported = this.options.ecmaVersion >= 11; - var optional = optionalSupported && this.eat(types.questionDot); - if (noCalls && optional) { this.raise(this.lastTokStart, "Optional chaining cannot appear in the callee of new expressions"); } - - var computed = this.eat(types.bracketL); - if (computed || (optional && this.type !== types.parenL && this.type !== types.backQuote) || this.eat(types.dot)) { - var node = this.startNodeAt(startPos, startLoc); - node.object = base; - node.property = computed ? this.parseExpression() : this.parseIdent(this.options.allowReserved !== "never"); - node.computed = !!computed; - if (computed) { this.expect(types.bracketR); } - if (optionalSupported) { - node.optional = optional; - } - base = this.finishNode(node, "MemberExpression"); - } else if (!noCalls && this.eat(types.parenL)) { - var refDestructuringErrors = new DestructuringErrors, oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos, oldAwaitIdentPos = this.awaitIdentPos; - this.yieldPos = 0; - this.awaitPos = 0; - this.awaitIdentPos = 0; - var exprList = this.parseExprList(types.parenR, this.options.ecmaVersion >= 8, false, refDestructuringErrors); - if (maybeAsyncArrow && !optional && !this.canInsertSemicolon() && this.eat(types.arrow)) { - this.checkPatternErrors(refDestructuringErrors, false); - this.checkYieldAwaitInDefaultParams(); - if (this.awaitIdentPos > 0) - { this.raise(this.awaitIdentPos, "Cannot use 'await' as identifier inside an async function"); } - this.yieldPos = oldYieldPos; - this.awaitPos = oldAwaitPos; - this.awaitIdentPos = oldAwaitIdentPos; - return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), exprList, true) - } - this.checkExpressionErrors(refDestructuringErrors, true); - this.yieldPos = oldYieldPos || this.yieldPos; - this.awaitPos = oldAwaitPos || this.awaitPos; - this.awaitIdentPos = oldAwaitIdentPos || this.awaitIdentPos; - var node$1 = this.startNodeAt(startPos, startLoc); - node$1.callee = base; - node$1.arguments = exprList; - if (optionalSupported) { - node$1.optional = optional; - } - base = this.finishNode(node$1, "CallExpression"); - } else if (this.type === types.backQuote) { - if (optional || optionalChained) { - this.raise(this.start, "Optional chaining cannot appear in the tag of tagged template expressions"); - } - var node$2 = this.startNodeAt(startPos, startLoc); - node$2.tag = base; - node$2.quasi = this.parseTemplate({isTagged: true}); - base = this.finishNode(node$2, "TaggedTemplateExpression"); - } - return base - }; - - // Parse an atomic expression — either a single token that is an - // expression, an expression started by a keyword like `function` or - // `new`, or an expression wrapped in punctuation like `()`, `[]`, - // or `{}`. - - pp$3.parseExprAtom = function(refDestructuringErrors) { - // If a division operator appears in an expression position, the - // tokenizer got confused, and we force it to read a regexp instead. - if (this.type === types.slash) { this.readRegexp(); } - - var node, canBeArrow = this.potentialArrowAt === this.start; - switch (this.type) { - case types._super: - if (!this.allowSuper) - { this.raise(this.start, "'super' keyword outside a method"); } - node = this.startNode(); - this.next(); - if (this.type === types.parenL && !this.allowDirectSuper) - { this.raise(node.start, "super() call outside constructor of a subclass"); } - // The `super` keyword can appear at below: - // SuperProperty: - // super [ Expression ] - // super . IdentifierName - // SuperCall: - // super ( Arguments ) - if (this.type !== types.dot && this.type !== types.bracketL && this.type !== types.parenL) - { this.unexpected(); } - return this.finishNode(node, "Super") - - case types._this: - node = this.startNode(); - this.next(); - return this.finishNode(node, "ThisExpression") - - case types.name: - var startPos = this.start, startLoc = this.startLoc, containsEsc = this.containsEsc; - var id = this.parseIdent(false); - if (this.options.ecmaVersion >= 8 && !containsEsc && id.name === "async" && !this.canInsertSemicolon() && this.eat(types._function)) - { return this.parseFunction(this.startNodeAt(startPos, startLoc), 0, false, true) } - if (canBeArrow && !this.canInsertSemicolon()) { - if (this.eat(types.arrow)) - { return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), [id], false) } - if (this.options.ecmaVersion >= 8 && id.name === "async" && this.type === types.name && !containsEsc) { - id = this.parseIdent(false); - if (this.canInsertSemicolon() || !this.eat(types.arrow)) - { this.unexpected(); } - return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), [id], true) - } - } - return id - - case types.regexp: - var value = this.value; - node = this.parseLiteral(value.value); - node.regex = {pattern: value.pattern, flags: value.flags}; - return node - - case types.num: case types.string: - return this.parseLiteral(this.value) - - case types._null: case types._true: case types._false: - node = this.startNode(); - node.value = this.type === types._null ? null : this.type === types._true; - node.raw = this.type.keyword; - this.next(); - return this.finishNode(node, "Literal") - - case types.parenL: - var start = this.start, expr = this.parseParenAndDistinguishExpression(canBeArrow); - if (refDestructuringErrors) { - if (refDestructuringErrors.parenthesizedAssign < 0 && !this.isSimpleAssignTarget(expr)) - { refDestructuringErrors.parenthesizedAssign = start; } - if (refDestructuringErrors.parenthesizedBind < 0) - { refDestructuringErrors.parenthesizedBind = start; } - } - return expr - - case types.bracketL: - node = this.startNode(); - this.next(); - node.elements = this.parseExprList(types.bracketR, true, true, refDestructuringErrors); - return this.finishNode(node, "ArrayExpression") - - case types.braceL: - return this.parseObj(false, refDestructuringErrors) - - case types._function: - node = this.startNode(); - this.next(); - return this.parseFunction(node, 0) - - case types._class: - return this.parseClass(this.startNode(), false) - - case types._new: - return this.parseNew() - - case types.backQuote: - return this.parseTemplate() - - case types._import: - if (this.options.ecmaVersion >= 11) { - return this.parseExprImport() - } else { - return this.unexpected() - } - - default: - this.unexpected(); - } - }; - - pp$3.parseExprImport = function() { - var node = this.startNode(); - - // Consume `import` as an identifier for `import.meta`. - // Because `this.parseIdent(true)` doesn't check escape sequences, it needs the check of `this.containsEsc`. - if (this.containsEsc) { this.raiseRecoverable(this.start, "Escape sequence in keyword import"); } - var meta = this.parseIdent(true); - - switch (this.type) { - case types.parenL: - return this.parseDynamicImport(node) - case types.dot: - node.meta = meta; - return this.parseImportMeta(node) - default: - this.unexpected(); - } - }; - - pp$3.parseDynamicImport = function(node) { - this.next(); // skip `(` - - // Parse node.source. - node.source = this.parseMaybeAssign(); - - // Verify ending. - if (!this.eat(types.parenR)) { - var errorPos = this.start; - if (this.eat(types.comma) && this.eat(types.parenR)) { - this.raiseRecoverable(errorPos, "Trailing comma is not allowed in import()"); - } else { - this.unexpected(errorPos); - } - } - - return this.finishNode(node, "ImportExpression") - }; - - pp$3.parseImportMeta = function(node) { - this.next(); // skip `.` - - var containsEsc = this.containsEsc; - node.property = this.parseIdent(true); - - if (node.property.name !== "meta") - { this.raiseRecoverable(node.property.start, "The only valid meta property for import is 'import.meta'"); } - if (containsEsc) - { this.raiseRecoverable(node.start, "'import.meta' must not contain escaped characters"); } - if (this.options.sourceType !== "module") - { this.raiseRecoverable(node.start, "Cannot use 'import.meta' outside a module"); } - - return this.finishNode(node, "MetaProperty") - }; - - pp$3.parseLiteral = function(value) { - var node = this.startNode(); - node.value = value; - node.raw = this.input.slice(this.start, this.end); - if (node.raw.charCodeAt(node.raw.length - 1) === 110) { node.bigint = node.raw.slice(0, -1).replace(/_/g, ""); } - this.next(); - return this.finishNode(node, "Literal") - }; - - pp$3.parseParenExpression = function() { - this.expect(types.parenL); - var val = this.parseExpression(); - this.expect(types.parenR); - return val - }; - - pp$3.parseParenAndDistinguishExpression = function(canBeArrow) { - var startPos = this.start, startLoc = this.startLoc, val, allowTrailingComma = this.options.ecmaVersion >= 8; - if (this.options.ecmaVersion >= 6) { - this.next(); - - var innerStartPos = this.start, innerStartLoc = this.startLoc; - var exprList = [], first = true, lastIsComma = false; - var refDestructuringErrors = new DestructuringErrors, oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos, spreadStart; - this.yieldPos = 0; - this.awaitPos = 0; - // Do not save awaitIdentPos to allow checking awaits nested in parameters - while (this.type !== types.parenR) { - first ? first = false : this.expect(types.comma); - if (allowTrailingComma && this.afterTrailingComma(types.parenR, true)) { - lastIsComma = true; - break - } else if (this.type === types.ellipsis) { - spreadStart = this.start; - exprList.push(this.parseParenItem(this.parseRestBinding())); - if (this.type === types.comma) { this.raise(this.start, "Comma is not permitted after the rest element"); } - break - } else { - exprList.push(this.parseMaybeAssign(false, refDestructuringErrors, this.parseParenItem)); - } - } - var innerEndPos = this.start, innerEndLoc = this.startLoc; - this.expect(types.parenR); - - if (canBeArrow && !this.canInsertSemicolon() && this.eat(types.arrow)) { - this.checkPatternErrors(refDestructuringErrors, false); - this.checkYieldAwaitInDefaultParams(); - this.yieldPos = oldYieldPos; - this.awaitPos = oldAwaitPos; - return this.parseParenArrowList(startPos, startLoc, exprList) - } - - if (!exprList.length || lastIsComma) { this.unexpected(this.lastTokStart); } - if (spreadStart) { this.unexpected(spreadStart); } - this.checkExpressionErrors(refDestructuringErrors, true); - this.yieldPos = oldYieldPos || this.yieldPos; - this.awaitPos = oldAwaitPos || this.awaitPos; - - if (exprList.length > 1) { - val = this.startNodeAt(innerStartPos, innerStartLoc); - val.expressions = exprList; - this.finishNodeAt(val, "SequenceExpression", innerEndPos, innerEndLoc); - } else { - val = exprList[0]; - } - } else { - val = this.parseParenExpression(); - } - - if (this.options.preserveParens) { - var par = this.startNodeAt(startPos, startLoc); - par.expression = val; - return this.finishNode(par, "ParenthesizedExpression") - } else { - return val - } - }; - - pp$3.parseParenItem = function(item) { - return item - }; - - pp$3.parseParenArrowList = function(startPos, startLoc, exprList) { - return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), exprList) - }; - - // New's precedence is slightly tricky. It must allow its argument to - // be a `[]` or dot subscript expression, but not a call — at least, - // not without wrapping it in parentheses. Thus, it uses the noCalls - // argument to parseSubscripts to prevent it from consuming the - // argument list. - - var empty$1 = []; - - pp$3.parseNew = function() { - if (this.containsEsc) { this.raiseRecoverable(this.start, "Escape sequence in keyword new"); } - var node = this.startNode(); - var meta = this.parseIdent(true); - if (this.options.ecmaVersion >= 6 && this.eat(types.dot)) { - node.meta = meta; - var containsEsc = this.containsEsc; - node.property = this.parseIdent(true); - if (node.property.name !== "target") - { this.raiseRecoverable(node.property.start, "The only valid meta property for new is 'new.target'"); } - if (containsEsc) - { this.raiseRecoverable(node.start, "'new.target' must not contain escaped characters"); } - if (!this.inNonArrowFunction()) - { this.raiseRecoverable(node.start, "'new.target' can only be used in functions"); } - return this.finishNode(node, "MetaProperty") - } - var startPos = this.start, startLoc = this.startLoc, isImport = this.type === types._import; - node.callee = this.parseSubscripts(this.parseExprAtom(), startPos, startLoc, true); - if (isImport && node.callee.type === "ImportExpression") { - this.raise(startPos, "Cannot use new with import()"); - } - if (this.eat(types.parenL)) { node.arguments = this.parseExprList(types.parenR, this.options.ecmaVersion >= 8, false); } - else { node.arguments = empty$1; } - return this.finishNode(node, "NewExpression") - }; - - // Parse template expression. - - pp$3.parseTemplateElement = function(ref) { - var isTagged = ref.isTagged; - - var elem = this.startNode(); - if (this.type === types.invalidTemplate) { - if (!isTagged) { - this.raiseRecoverable(this.start, "Bad escape sequence in untagged template literal"); - } - elem.value = { - raw: this.value, - cooked: null - }; - } else { - elem.value = { - raw: this.input.slice(this.start, this.end).replace(/\r\n?/g, "\n"), - cooked: this.value - }; - } - this.next(); - elem.tail = this.type === types.backQuote; - return this.finishNode(elem, "TemplateElement") - }; - - pp$3.parseTemplate = function(ref) { - if ( ref === void 0 ) ref = {}; - var isTagged = ref.isTagged; if ( isTagged === void 0 ) isTagged = false; - - var node = this.startNode(); - this.next(); - node.expressions = []; - var curElt = this.parseTemplateElement({isTagged: isTagged}); - node.quasis = [curElt]; - while (!curElt.tail) { - if (this.type === types.eof) { this.raise(this.pos, "Unterminated template literal"); } - this.expect(types.dollarBraceL); - node.expressions.push(this.parseExpression()); - this.expect(types.braceR); - node.quasis.push(curElt = this.parseTemplateElement({isTagged: isTagged})); - } - this.next(); - return this.finishNode(node, "TemplateLiteral") - }; - - pp$3.isAsyncProp = function(prop) { - return !prop.computed && prop.key.type === "Identifier" && prop.key.name === "async" && - (this.type === types.name || this.type === types.num || this.type === types.string || this.type === types.bracketL || this.type.keyword || (this.options.ecmaVersion >= 9 && this.type === types.star)) && - !lineBreak.test(this.input.slice(this.lastTokEnd, this.start)) - }; - - // Parse an object literal or binding pattern. - - pp$3.parseObj = function(isPattern, refDestructuringErrors) { - var node = this.startNode(), first = true, propHash = {}; - node.properties = []; - this.next(); - while (!this.eat(types.braceR)) { - if (!first) { - this.expect(types.comma); - if (this.options.ecmaVersion >= 5 && this.afterTrailingComma(types.braceR)) { break } - } else { first = false; } - - var prop = this.parseProperty(isPattern, refDestructuringErrors); - if (!isPattern) { this.checkPropClash(prop, propHash, refDestructuringErrors); } - node.properties.push(prop); - } - return this.finishNode(node, isPattern ? "ObjectPattern" : "ObjectExpression") - }; - - pp$3.parseProperty = function(isPattern, refDestructuringErrors) { - var prop = this.startNode(), isGenerator, isAsync, startPos, startLoc; - if (this.options.ecmaVersion >= 9 && this.eat(types.ellipsis)) { - if (isPattern) { - prop.argument = this.parseIdent(false); - if (this.type === types.comma) { - this.raise(this.start, "Comma is not permitted after the rest element"); - } - return this.finishNode(prop, "RestElement") - } - // To disallow parenthesized identifier via `this.toAssignable()`. - if (this.type === types.parenL && refDestructuringErrors) { - if (refDestructuringErrors.parenthesizedAssign < 0) { - refDestructuringErrors.parenthesizedAssign = this.start; - } - if (refDestructuringErrors.parenthesizedBind < 0) { - refDestructuringErrors.parenthesizedBind = this.start; - } - } - // Parse argument. - prop.argument = this.parseMaybeAssign(false, refDestructuringErrors); - // To disallow trailing comma via `this.toAssignable()`. - if (this.type === types.comma && refDestructuringErrors && refDestructuringErrors.trailingComma < 0) { - refDestructuringErrors.trailingComma = this.start; - } - // Finish - return this.finishNode(prop, "SpreadElement") - } - if (this.options.ecmaVersion >= 6) { - prop.method = false; - prop.shorthand = false; - if (isPattern || refDestructuringErrors) { - startPos = this.start; - startLoc = this.startLoc; - } - if (!isPattern) - { isGenerator = this.eat(types.star); } - } - var containsEsc = this.containsEsc; - this.parsePropertyName(prop); - if (!isPattern && !containsEsc && this.options.ecmaVersion >= 8 && !isGenerator && this.isAsyncProp(prop)) { - isAsync = true; - isGenerator = this.options.ecmaVersion >= 9 && this.eat(types.star); - this.parsePropertyName(prop, refDestructuringErrors); - } else { - isAsync = false; - } - this.parsePropertyValue(prop, isPattern, isGenerator, isAsync, startPos, startLoc, refDestructuringErrors, containsEsc); - return this.finishNode(prop, "Property") - }; - - pp$3.parsePropertyValue = function(prop, isPattern, isGenerator, isAsync, startPos, startLoc, refDestructuringErrors, containsEsc) { - if ((isGenerator || isAsync) && this.type === types.colon) - { this.unexpected(); } - - if (this.eat(types.colon)) { - prop.value = isPattern ? this.parseMaybeDefault(this.start, this.startLoc) : this.parseMaybeAssign(false, refDestructuringErrors); - prop.kind = "init"; - } else if (this.options.ecmaVersion >= 6 && this.type === types.parenL) { - if (isPattern) { this.unexpected(); } - prop.kind = "init"; - prop.method = true; - prop.value = this.parseMethod(isGenerator, isAsync); - } else if (!isPattern && !containsEsc && - this.options.ecmaVersion >= 5 && !prop.computed && prop.key.type === "Identifier" && - (prop.key.name === "get" || prop.key.name === "set") && - (this.type !== types.comma && this.type !== types.braceR && this.type !== types.eq)) { - if (isGenerator || isAsync) { this.unexpected(); } - prop.kind = prop.key.name; - this.parsePropertyName(prop); - prop.value = this.parseMethod(false); - var paramCount = prop.kind === "get" ? 0 : 1; - if (prop.value.params.length !== paramCount) { - var start = prop.value.start; - if (prop.kind === "get") - { this.raiseRecoverable(start, "getter should have no params"); } - else - { this.raiseRecoverable(start, "setter should have exactly one param"); } - } else { - if (prop.kind === "set" && prop.value.params[0].type === "RestElement") - { this.raiseRecoverable(prop.value.params[0].start, "Setter cannot use rest params"); } - } - } else if (this.options.ecmaVersion >= 6 && !prop.computed && prop.key.type === "Identifier") { - if (isGenerator || isAsync) { this.unexpected(); } - this.checkUnreserved(prop.key); - if (prop.key.name === "await" && !this.awaitIdentPos) - { this.awaitIdentPos = startPos; } - prop.kind = "init"; - if (isPattern) { - prop.value = this.parseMaybeDefault(startPos, startLoc, prop.key); - } else if (this.type === types.eq && refDestructuringErrors) { - if (refDestructuringErrors.shorthandAssign < 0) - { refDestructuringErrors.shorthandAssign = this.start; } - prop.value = this.parseMaybeDefault(startPos, startLoc, prop.key); - } else { - prop.value = prop.key; - } - prop.shorthand = true; - } else { this.unexpected(); } - }; - - pp$3.parsePropertyName = function(prop) { - if (this.options.ecmaVersion >= 6) { - if (this.eat(types.bracketL)) { - prop.computed = true; - prop.key = this.parseMaybeAssign(); - this.expect(types.bracketR); - return prop.key - } else { - prop.computed = false; - } - } - return prop.key = this.type === types.num || this.type === types.string ? this.parseExprAtom() : this.parseIdent(this.options.allowReserved !== "never") - }; - - // Initialize empty function node. - - pp$3.initFunction = function(node) { - node.id = null; - if (this.options.ecmaVersion >= 6) { node.generator = node.expression = false; } - if (this.options.ecmaVersion >= 8) { node.async = false; } - }; - - // Parse object or class method. - - pp$3.parseMethod = function(isGenerator, isAsync, allowDirectSuper) { - var node = this.startNode(), oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos, oldAwaitIdentPos = this.awaitIdentPos; - - this.initFunction(node); - if (this.options.ecmaVersion >= 6) - { node.generator = isGenerator; } - if (this.options.ecmaVersion >= 8) - { node.async = !!isAsync; } - - this.yieldPos = 0; - this.awaitPos = 0; - this.awaitIdentPos = 0; - this.enterScope(functionFlags(isAsync, node.generator) | SCOPE_SUPER | (allowDirectSuper ? SCOPE_DIRECT_SUPER : 0)); - - this.expect(types.parenL); - node.params = this.parseBindingList(types.parenR, false, this.options.ecmaVersion >= 8); - this.checkYieldAwaitInDefaultParams(); - this.parseFunctionBody(node, false, true); - - this.yieldPos = oldYieldPos; - this.awaitPos = oldAwaitPos; - this.awaitIdentPos = oldAwaitIdentPos; - return this.finishNode(node, "FunctionExpression") - }; - - // Parse arrow function expression with given parameters. - - pp$3.parseArrowExpression = function(node, params, isAsync) { - var oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos, oldAwaitIdentPos = this.awaitIdentPos; - - this.enterScope(functionFlags(isAsync, false) | SCOPE_ARROW); - this.initFunction(node); - if (this.options.ecmaVersion >= 8) { node.async = !!isAsync; } - - this.yieldPos = 0; - this.awaitPos = 0; - this.awaitIdentPos = 0; - - node.params = this.toAssignableList(params, true); - this.parseFunctionBody(node, true, false); - - this.yieldPos = oldYieldPos; - this.awaitPos = oldAwaitPos; - this.awaitIdentPos = oldAwaitIdentPos; - return this.finishNode(node, "ArrowFunctionExpression") - }; - - // Parse function body and check parameters. - - pp$3.parseFunctionBody = function(node, isArrowFunction, isMethod) { - var isExpression = isArrowFunction && this.type !== types.braceL; - var oldStrict = this.strict, useStrict = false; - - if (isExpression) { - node.body = this.parseMaybeAssign(); - node.expression = true; - this.checkParams(node, false); - } else { - var nonSimple = this.options.ecmaVersion >= 7 && !this.isSimpleParamList(node.params); - if (!oldStrict || nonSimple) { - useStrict = this.strictDirective(this.end); - // If this is a strict mode function, verify that argument names - // are not repeated, and it does not try to bind the words `eval` - // or `arguments`. - if (useStrict && nonSimple) - { this.raiseRecoverable(node.start, "Illegal 'use strict' directive in function with non-simple parameter list"); } - } - // Start a new scope with regard to labels and the `inFunction` - // flag (restore them to their old value afterwards). - var oldLabels = this.labels; - this.labels = []; - if (useStrict) { this.strict = true; } - - // Add the params to varDeclaredNames to ensure that an error is thrown - // if a let/const declaration in the function clashes with one of the params. - this.checkParams(node, !oldStrict && !useStrict && !isArrowFunction && !isMethod && this.isSimpleParamList(node.params)); - // Ensure the function name isn't a forbidden identifier in strict mode, e.g. 'eval' - if (this.strict && node.id) { this.checkLVal(node.id, BIND_OUTSIDE); } - node.body = this.parseBlock(false, undefined, useStrict && !oldStrict); - node.expression = false; - this.adaptDirectivePrologue(node.body.body); - this.labels = oldLabels; - } - this.exitScope(); - }; - - pp$3.isSimpleParamList = function(params) { - for (var i = 0, list = params; i < list.length; i += 1) - { - var param = list[i]; - - if (param.type !== "Identifier") { return false - } } - return true - }; - - // Checks function params for various disallowed patterns such as using "eval" - // or "arguments" and duplicate parameters. - - pp$3.checkParams = function(node, allowDuplicates) { - var nameHash = {}; - for (var i = 0, list = node.params; i < list.length; i += 1) - { - var param = list[i]; - - this.checkLVal(param, BIND_VAR, allowDuplicates ? null : nameHash); - } - }; - - // Parses a comma-separated list of expressions, and returns them as - // an array. `close` is the token type that ends the list, and - // `allowEmpty` can be turned on to allow subsequent commas with - // nothing in between them to be parsed as `null` (which is needed - // for array literals). - - pp$3.parseExprList = function(close, allowTrailingComma, allowEmpty, refDestructuringErrors) { - var elts = [], first = true; - while (!this.eat(close)) { - if (!first) { - this.expect(types.comma); - if (allowTrailingComma && this.afterTrailingComma(close)) { break } - } else { first = false; } - - var elt = (void 0); - if (allowEmpty && this.type === types.comma) - { elt = null; } - else if (this.type === types.ellipsis) { - elt = this.parseSpread(refDestructuringErrors); - if (refDestructuringErrors && this.type === types.comma && refDestructuringErrors.trailingComma < 0) - { refDestructuringErrors.trailingComma = this.start; } - } else { - elt = this.parseMaybeAssign(false, refDestructuringErrors); - } - elts.push(elt); - } - return elts - }; - - pp$3.checkUnreserved = function(ref) { - var start = ref.start; - var end = ref.end; - var name = ref.name; - - if (this.inGenerator && name === "yield") - { this.raiseRecoverable(start, "Cannot use 'yield' as identifier inside a generator"); } - if (this.inAsync && name === "await") - { this.raiseRecoverable(start, "Cannot use 'await' as identifier inside an async function"); } - if (this.keywords.test(name)) - { this.raise(start, ("Unexpected keyword '" + name + "'")); } - if (this.options.ecmaVersion < 6 && - this.input.slice(start, end).indexOf("\\") !== -1) { return } - var re = this.strict ? this.reservedWordsStrict : this.reservedWords; - if (re.test(name)) { - if (!this.inAsync && name === "await") - { this.raiseRecoverable(start, "Cannot use keyword 'await' outside an async function"); } - this.raiseRecoverable(start, ("The keyword '" + name + "' is reserved")); - } - }; - - // Parse the next token as an identifier. If `liberal` is true (used - // when parsing properties), it will also convert keywords into - // identifiers. - - pp$3.parseIdent = function(liberal, isBinding) { - var node = this.startNode(); - if (this.type === types.name) { - node.name = this.value; - } else if (this.type.keyword) { - node.name = this.type.keyword; - - // To fix https://github.com/acornjs/acorn/issues/575 - // `class` and `function` keywords push new context into this.context. - // But there is no chance to pop the context if the keyword is consumed as an identifier such as a property name. - // If the previous token is a dot, this does not apply because the context-managing code already ignored the keyword - if ((node.name === "class" || node.name === "function") && - (this.lastTokEnd !== this.lastTokStart + 1 || this.input.charCodeAt(this.lastTokStart) !== 46)) { - this.context.pop(); - } - } else { - this.unexpected(); - } - this.next(!!liberal); - this.finishNode(node, "Identifier"); - if (!liberal) { - this.checkUnreserved(node); - if (node.name === "await" && !this.awaitIdentPos) - { this.awaitIdentPos = node.start; } - } - return node - }; - - // Parses yield expression inside generator. - - pp$3.parseYield = function(noIn) { - if (!this.yieldPos) { this.yieldPos = this.start; } - - var node = this.startNode(); - this.next(); - if (this.type === types.semi || this.canInsertSemicolon() || (this.type !== types.star && !this.type.startsExpr)) { - node.delegate = false; - node.argument = null; - } else { - node.delegate = this.eat(types.star); - node.argument = this.parseMaybeAssign(noIn); - } - return this.finishNode(node, "YieldExpression") - }; - - pp$3.parseAwait = function() { - if (!this.awaitPos) { this.awaitPos = this.start; } - - var node = this.startNode(); - this.next(); - node.argument = this.parseMaybeUnary(null, false); - return this.finishNode(node, "AwaitExpression") - }; - - var pp$4 = Parser.prototype; - - // This function is used to raise exceptions on parse errors. It - // takes an offset integer (into the current `input`) to indicate - // the location of the error, attaches the position to the end - // of the error message, and then raises a `SyntaxError` with that - // message. - - pp$4.raise = function(pos, message) { - var loc = getLineInfo(this.input, pos); - message += " (" + loc.line + ":" + loc.column + ")"; - var err = new SyntaxError(message); - err.pos = pos; err.loc = loc; err.raisedAt = this.pos; - throw err - }; - - pp$4.raiseRecoverable = pp$4.raise; - - pp$4.curPosition = function() { - if (this.options.locations) { - return new Position(this.curLine, this.pos - this.lineStart) - } - }; - - var pp$5 = Parser.prototype; - - var Scope = function Scope(flags) { - this.flags = flags; - // A list of var-declared names in the current lexical scope - this.var = []; - // A list of lexically-declared names in the current lexical scope - this.lexical = []; - // A list of lexically-declared FunctionDeclaration names in the current lexical scope - this.functions = []; - }; - - // The functions in this module keep track of declared variables in the current scope in order to detect duplicate variable names. - - pp$5.enterScope = function(flags) { - this.scopeStack.push(new Scope(flags)); - }; - - pp$5.exitScope = function() { - this.scopeStack.pop(); - }; - - // The spec says: - // > At the top level of a function, or script, function declarations are - // > treated like var declarations rather than like lexical declarations. - pp$5.treatFunctionsAsVarInScope = function(scope) { - return (scope.flags & SCOPE_FUNCTION) || !this.inModule && (scope.flags & SCOPE_TOP) - }; - - pp$5.declareName = function(name, bindingType, pos) { - var redeclared = false; - if (bindingType === BIND_LEXICAL) { - var scope = this.currentScope(); - redeclared = scope.lexical.indexOf(name) > -1 || scope.functions.indexOf(name) > -1 || scope.var.indexOf(name) > -1; - scope.lexical.push(name); - if (this.inModule && (scope.flags & SCOPE_TOP)) - { delete this.undefinedExports[name]; } - } else if (bindingType === BIND_SIMPLE_CATCH) { - var scope$1 = this.currentScope(); - scope$1.lexical.push(name); - } else if (bindingType === BIND_FUNCTION) { - var scope$2 = this.currentScope(); - if (this.treatFunctionsAsVar) - { redeclared = scope$2.lexical.indexOf(name) > -1; } - else - { redeclared = scope$2.lexical.indexOf(name) > -1 || scope$2.var.indexOf(name) > -1; } - scope$2.functions.push(name); - } else { - for (var i = this.scopeStack.length - 1; i >= 0; --i) { - var scope$3 = this.scopeStack[i]; - if (scope$3.lexical.indexOf(name) > -1 && !((scope$3.flags & SCOPE_SIMPLE_CATCH) && scope$3.lexical[0] === name) || - !this.treatFunctionsAsVarInScope(scope$3) && scope$3.functions.indexOf(name) > -1) { - redeclared = true; - break - } - scope$3.var.push(name); - if (this.inModule && (scope$3.flags & SCOPE_TOP)) - { delete this.undefinedExports[name]; } - if (scope$3.flags & SCOPE_VAR) { break } - } - } - if (redeclared) { this.raiseRecoverable(pos, ("Identifier '" + name + "' has already been declared")); } - }; - - pp$5.checkLocalExport = function(id) { - // scope.functions must be empty as Module code is always strict. - if (this.scopeStack[0].lexical.indexOf(id.name) === -1 && - this.scopeStack[0].var.indexOf(id.name) === -1) { - this.undefinedExports[id.name] = id; - } - }; - - pp$5.currentScope = function() { - return this.scopeStack[this.scopeStack.length - 1] - }; - - pp$5.currentVarScope = function() { - for (var i = this.scopeStack.length - 1;; i--) { - var scope = this.scopeStack[i]; - if (scope.flags & SCOPE_VAR) { return scope } - } - }; - - // Could be useful for `this`, `new.target`, `super()`, `super.property`, and `super[property]`. - pp$5.currentThisScope = function() { - for (var i = this.scopeStack.length - 1;; i--) { - var scope = this.scopeStack[i]; - if (scope.flags & SCOPE_VAR && !(scope.flags & SCOPE_ARROW)) { return scope } - } - }; - - var Node = function Node(parser, pos, loc) { - this.type = ""; - this.start = pos; - this.end = 0; - if (parser.options.locations) - { this.loc = new SourceLocation(parser, loc); } - if (parser.options.directSourceFile) - { this.sourceFile = parser.options.directSourceFile; } - if (parser.options.ranges) - { this.range = [pos, 0]; } - }; - - // Start an AST node, attaching a start offset. - - var pp$6 = Parser.prototype; - - pp$6.startNode = function() { - return new Node(this, this.start, this.startLoc) - }; - - pp$6.startNodeAt = function(pos, loc) { - return new Node(this, pos, loc) - }; - - // Finish an AST node, adding `type` and `end` properties. - - function finishNodeAt(node, type, pos, loc) { - node.type = type; - node.end = pos; - if (this.options.locations) - { node.loc.end = loc; } - if (this.options.ranges) - { node.range[1] = pos; } - return node - } - - pp$6.finishNode = function(node, type) { - return finishNodeAt.call(this, node, type, this.lastTokEnd, this.lastTokEndLoc) - }; - - // Finish node at given position - - pp$6.finishNodeAt = function(node, type, pos, loc) { - return finishNodeAt.call(this, node, type, pos, loc) - }; - - // The algorithm used to determine whether a regexp can appear at a - - var TokContext = function TokContext(token, isExpr, preserveSpace, override, generator) { - this.token = token; - this.isExpr = !!isExpr; - this.preserveSpace = !!preserveSpace; - this.override = override; - this.generator = !!generator; - }; - - var types$1 = { - b_stat: new TokContext("{", false), - b_expr: new TokContext("{", true), - b_tmpl: new TokContext("${", false), - p_stat: new TokContext("(", false), - p_expr: new TokContext("(", true), - q_tmpl: new TokContext("`", true, true, function (p) { return p.tryReadTemplateToken(); }), - f_stat: new TokContext("function", false), - f_expr: new TokContext("function", true), - f_expr_gen: new TokContext("function", true, false, null, true), - f_gen: new TokContext("function", false, false, null, true) - }; - - var pp$7 = Parser.prototype; - - pp$7.initialContext = function() { - return [types$1.b_stat] - }; - - pp$7.braceIsBlock = function(prevType) { - var parent = this.curContext(); - if (parent === types$1.f_expr || parent === types$1.f_stat) - { return true } - if (prevType === types.colon && (parent === types$1.b_stat || parent === types$1.b_expr)) - { return !parent.isExpr } - - // The check for `tt.name && exprAllowed` detects whether we are - // after a `yield` or `of` construct. See the `updateContext` for - // `tt.name`. - if (prevType === types._return || prevType === types.name && this.exprAllowed) - { return lineBreak.test(this.input.slice(this.lastTokEnd, this.start)) } - if (prevType === types._else || prevType === types.semi || prevType === types.eof || prevType === types.parenR || prevType === types.arrow) - { return true } - if (prevType === types.braceL) - { return parent === types$1.b_stat } - if (prevType === types._var || prevType === types._const || prevType === types.name) - { return false } - return !this.exprAllowed - }; - - pp$7.inGeneratorContext = function() { - for (var i = this.context.length - 1; i >= 1; i--) { - var context = this.context[i]; - if (context.token === "function") - { return context.generator } - } - return false - }; - - pp$7.updateContext = function(prevType) { - var update, type = this.type; - if (type.keyword && prevType === types.dot) - { this.exprAllowed = false; } - else if (update = type.updateContext) - { update.call(this, prevType); } - else - { this.exprAllowed = type.beforeExpr; } - }; - - // Token-specific context update code - - types.parenR.updateContext = types.braceR.updateContext = function() { - if (this.context.length === 1) { - this.exprAllowed = true; - return - } - var out = this.context.pop(); - if (out === types$1.b_stat && this.curContext().token === "function") { - out = this.context.pop(); - } - this.exprAllowed = !out.isExpr; - }; - - types.braceL.updateContext = function(prevType) { - this.context.push(this.braceIsBlock(prevType) ? types$1.b_stat : types$1.b_expr); - this.exprAllowed = true; - }; - - types.dollarBraceL.updateContext = function() { - this.context.push(types$1.b_tmpl); - this.exprAllowed = true; - }; - - types.parenL.updateContext = function(prevType) { - var statementParens = prevType === types._if || prevType === types._for || prevType === types._with || prevType === types._while; - this.context.push(statementParens ? types$1.p_stat : types$1.p_expr); - this.exprAllowed = true; - }; - - types.incDec.updateContext = function() { - // tokExprAllowed stays unchanged - }; - - types._function.updateContext = types._class.updateContext = function(prevType) { - if (prevType.beforeExpr && prevType !== types.semi && prevType !== types._else && - !(prevType === types._return && lineBreak.test(this.input.slice(this.lastTokEnd, this.start))) && - !((prevType === types.colon || prevType === types.braceL) && this.curContext() === types$1.b_stat)) - { this.context.push(types$1.f_expr); } - else - { this.context.push(types$1.f_stat); } - this.exprAllowed = false; - }; - - types.backQuote.updateContext = function() { - if (this.curContext() === types$1.q_tmpl) - { this.context.pop(); } - else - { this.context.push(types$1.q_tmpl); } - this.exprAllowed = false; - }; - - types.star.updateContext = function(prevType) { - if (prevType === types._function) { - var index = this.context.length - 1; - if (this.context[index] === types$1.f_expr) - { this.context[index] = types$1.f_expr_gen; } - else - { this.context[index] = types$1.f_gen; } - } - this.exprAllowed = true; - }; - - types.name.updateContext = function(prevType) { - var allowed = false; - if (this.options.ecmaVersion >= 6 && prevType !== types.dot) { - if (this.value === "of" && !this.exprAllowed || - this.value === "yield" && this.inGeneratorContext()) - { allowed = true; } - } - this.exprAllowed = allowed; - }; - - // This file contains Unicode properties extracted from the ECMAScript - // specification. The lists are extracted like so: - // $$('#table-binary-unicode-properties > figure > table > tbody > tr > td:nth-child(1) code').map(el => el.innerText) - - // #table-binary-unicode-properties - var ecma9BinaryProperties = "ASCII ASCII_Hex_Digit AHex Alphabetic Alpha Any Assigned Bidi_Control Bidi_C Bidi_Mirrored Bidi_M Case_Ignorable CI Cased Changes_When_Casefolded CWCF Changes_When_Casemapped CWCM Changes_When_Lowercased CWL Changes_When_NFKC_Casefolded CWKCF Changes_When_Titlecased CWT Changes_When_Uppercased CWU Dash Default_Ignorable_Code_Point DI Deprecated Dep Diacritic Dia Emoji Emoji_Component Emoji_Modifier Emoji_Modifier_Base Emoji_Presentation Extender Ext Grapheme_Base Gr_Base Grapheme_Extend Gr_Ext Hex_Digit Hex IDS_Binary_Operator IDSB IDS_Trinary_Operator IDST ID_Continue IDC ID_Start IDS Ideographic Ideo Join_Control Join_C Logical_Order_Exception LOE Lowercase Lower Math Noncharacter_Code_Point NChar Pattern_Syntax Pat_Syn Pattern_White_Space Pat_WS Quotation_Mark QMark Radical Regional_Indicator RI Sentence_Terminal STerm Soft_Dotted SD Terminal_Punctuation Term Unified_Ideograph UIdeo Uppercase Upper Variation_Selector VS White_Space space XID_Continue XIDC XID_Start XIDS"; - var ecma10BinaryProperties = ecma9BinaryProperties + " Extended_Pictographic"; - var ecma11BinaryProperties = ecma10BinaryProperties; - var unicodeBinaryProperties = { - 9: ecma9BinaryProperties, - 10: ecma10BinaryProperties, - 11: ecma11BinaryProperties - }; - - // #table-unicode-general-category-values - var unicodeGeneralCategoryValues = "Cased_Letter LC Close_Punctuation Pe Connector_Punctuation Pc Control Cc cntrl Currency_Symbol Sc Dash_Punctuation Pd Decimal_Number Nd digit Enclosing_Mark Me Final_Punctuation Pf Format Cf Initial_Punctuation Pi Letter L Letter_Number Nl Line_Separator Zl Lowercase_Letter Ll Mark M Combining_Mark Math_Symbol Sm Modifier_Letter Lm Modifier_Symbol Sk Nonspacing_Mark Mn Number N Open_Punctuation Ps Other C Other_Letter Lo Other_Number No Other_Punctuation Po Other_Symbol So Paragraph_Separator Zp Private_Use Co Punctuation P punct Separator Z Space_Separator Zs Spacing_Mark Mc Surrogate Cs Symbol S Titlecase_Letter Lt Unassigned Cn Uppercase_Letter Lu"; - - // #table-unicode-script-values - var ecma9ScriptValues = "Adlam Adlm Ahom Ahom Anatolian_Hieroglyphs Hluw Arabic Arab Armenian Armn Avestan Avst Balinese Bali Bamum Bamu Bassa_Vah Bass Batak Batk Bengali Beng Bhaiksuki Bhks Bopomofo Bopo Brahmi Brah Braille Brai Buginese Bugi Buhid Buhd Canadian_Aboriginal Cans Carian Cari Caucasian_Albanian Aghb Chakma Cakm Cham Cham Cherokee Cher Common Zyyy Coptic Copt Qaac Cuneiform Xsux Cypriot Cprt Cyrillic Cyrl Deseret Dsrt Devanagari Deva Duployan Dupl Egyptian_Hieroglyphs Egyp Elbasan Elba Ethiopic Ethi Georgian Geor Glagolitic Glag Gothic Goth Grantha Gran Greek Grek Gujarati Gujr Gurmukhi Guru Han Hani Hangul Hang Hanunoo Hano Hatran Hatr Hebrew Hebr Hiragana Hira Imperial_Aramaic Armi Inherited Zinh Qaai Inscriptional_Pahlavi Phli Inscriptional_Parthian Prti Javanese Java Kaithi Kthi Kannada Knda Katakana Kana Kayah_Li Kali Kharoshthi Khar Khmer Khmr Khojki Khoj Khudawadi Sind Lao Laoo Latin Latn Lepcha Lepc Limbu Limb Linear_A Lina Linear_B Linb Lisu Lisu Lycian Lyci Lydian Lydi Mahajani Mahj Malayalam Mlym Mandaic Mand Manichaean Mani Marchen Marc Masaram_Gondi Gonm Meetei_Mayek Mtei Mende_Kikakui Mend Meroitic_Cursive Merc Meroitic_Hieroglyphs Mero Miao Plrd Modi Modi Mongolian Mong Mro Mroo Multani Mult Myanmar Mymr Nabataean Nbat New_Tai_Lue Talu Newa Newa Nko Nkoo Nushu Nshu Ogham Ogam Ol_Chiki Olck Old_Hungarian Hung Old_Italic Ital Old_North_Arabian Narb Old_Permic Perm Old_Persian Xpeo Old_South_Arabian Sarb Old_Turkic Orkh Oriya Orya Osage Osge Osmanya Osma Pahawh_Hmong Hmng Palmyrene Palm Pau_Cin_Hau Pauc Phags_Pa Phag Phoenician Phnx Psalter_Pahlavi Phlp Rejang Rjng Runic Runr Samaritan Samr Saurashtra Saur Sharada Shrd Shavian Shaw Siddham Sidd SignWriting Sgnw Sinhala Sinh Sora_Sompeng Sora Soyombo Soyo Sundanese Sund Syloti_Nagri Sylo Syriac Syrc Tagalog Tglg Tagbanwa Tagb Tai_Le Tale Tai_Tham Lana Tai_Viet Tavt Takri Takr Tamil Taml Tangut Tang Telugu Telu Thaana Thaa Thai Thai Tibetan Tibt Tifinagh Tfng Tirhuta Tirh Ugaritic Ugar Vai Vaii Warang_Citi Wara Yi Yiii Zanabazar_Square Zanb"; - var ecma10ScriptValues = ecma9ScriptValues + " Dogra Dogr Gunjala_Gondi Gong Hanifi_Rohingya Rohg Makasar Maka Medefaidrin Medf Old_Sogdian Sogo Sogdian Sogd"; - var ecma11ScriptValues = ecma10ScriptValues + " Elymaic Elym Nandinagari Nand Nyiakeng_Puachue_Hmong Hmnp Wancho Wcho"; - var unicodeScriptValues = { - 9: ecma9ScriptValues, - 10: ecma10ScriptValues, - 11: ecma11ScriptValues - }; - - var data = {}; - function buildUnicodeData(ecmaVersion) { - var d = data[ecmaVersion] = { - binary: wordsRegexp(unicodeBinaryProperties[ecmaVersion] + " " + unicodeGeneralCategoryValues), - nonBinary: { - General_Category: wordsRegexp(unicodeGeneralCategoryValues), - Script: wordsRegexp(unicodeScriptValues[ecmaVersion]) - } - }; - d.nonBinary.Script_Extensions = d.nonBinary.Script; - - d.nonBinary.gc = d.nonBinary.General_Category; - d.nonBinary.sc = d.nonBinary.Script; - d.nonBinary.scx = d.nonBinary.Script_Extensions; - } - buildUnicodeData(9); - buildUnicodeData(10); - buildUnicodeData(11); - - var pp$8 = Parser.prototype; - - var RegExpValidationState = function RegExpValidationState(parser) { - this.parser = parser; - this.validFlags = "gim" + (parser.options.ecmaVersion >= 6 ? "uy" : "") + (parser.options.ecmaVersion >= 9 ? "s" : ""); - this.unicodeProperties = data[parser.options.ecmaVersion >= 11 ? 11 : parser.options.ecmaVersion]; - this.source = ""; - this.flags = ""; - this.start = 0; - this.switchU = false; - this.switchN = false; - this.pos = 0; - this.lastIntValue = 0; - this.lastStringValue = ""; - this.lastAssertionIsQuantifiable = false; - this.numCapturingParens = 0; - this.maxBackReference = 0; - this.groupNames = []; - this.backReferenceNames = []; - }; - - RegExpValidationState.prototype.reset = function reset (start, pattern, flags) { - var unicode = flags.indexOf("u") !== -1; - this.start = start | 0; - this.source = pattern + ""; - this.flags = flags; - this.switchU = unicode && this.parser.options.ecmaVersion >= 6; - this.switchN = unicode && this.parser.options.ecmaVersion >= 9; - }; - - RegExpValidationState.prototype.raise = function raise (message) { - this.parser.raiseRecoverable(this.start, ("Invalid regular expression: /" + (this.source) + "/: " + message)); - }; - - // If u flag is given, this returns the code point at the index (it combines a surrogate pair). - // Otherwise, this returns the code unit of the index (can be a part of a surrogate pair). - RegExpValidationState.prototype.at = function at (i, forceU) { - if ( forceU === void 0 ) forceU = false; - - var s = this.source; - var l = s.length; - if (i >= l) { - return -1 - } - var c = s.charCodeAt(i); - if (!(forceU || this.switchU) || c <= 0xD7FF || c >= 0xE000 || i + 1 >= l) { - return c - } - var next = s.charCodeAt(i + 1); - return next >= 0xDC00 && next <= 0xDFFF ? (c << 10) + next - 0x35FDC00 : c - }; - - RegExpValidationState.prototype.nextIndex = function nextIndex (i, forceU) { - if ( forceU === void 0 ) forceU = false; - - var s = this.source; - var l = s.length; - if (i >= l) { - return l - } - var c = s.charCodeAt(i), next; - if (!(forceU || this.switchU) || c <= 0xD7FF || c >= 0xE000 || i + 1 >= l || - (next = s.charCodeAt(i + 1)) < 0xDC00 || next > 0xDFFF) { - return i + 1 - } - return i + 2 - }; - - RegExpValidationState.prototype.current = function current (forceU) { - if ( forceU === void 0 ) forceU = false; - - return this.at(this.pos, forceU) - }; - - RegExpValidationState.prototype.lookahead = function lookahead (forceU) { - if ( forceU === void 0 ) forceU = false; - - return this.at(this.nextIndex(this.pos, forceU), forceU) - }; - - RegExpValidationState.prototype.advance = function advance (forceU) { - if ( forceU === void 0 ) forceU = false; - - this.pos = this.nextIndex(this.pos, forceU); - }; - - RegExpValidationState.prototype.eat = function eat (ch, forceU) { - if ( forceU === void 0 ) forceU = false; - - if (this.current(forceU) === ch) { - this.advance(forceU); - return true - } - return false - }; - - function codePointToString(ch) { - if (ch <= 0xFFFF) { return String.fromCharCode(ch) } - ch -= 0x10000; - return String.fromCharCode((ch >> 10) + 0xD800, (ch & 0x03FF) + 0xDC00) - } - - /** - * Validate the flags part of a given RegExpLiteral. - * - * @param {RegExpValidationState} state The state to validate RegExp. - * @returns {void} - */ - pp$8.validateRegExpFlags = function(state) { - var validFlags = state.validFlags; - var flags = state.flags; - - for (var i = 0; i < flags.length; i++) { - var flag = flags.charAt(i); - if (validFlags.indexOf(flag) === -1) { - this.raise(state.start, "Invalid regular expression flag"); - } - if (flags.indexOf(flag, i + 1) > -1) { - this.raise(state.start, "Duplicate regular expression flag"); - } - } - }; - - /** - * Validate the pattern part of a given RegExpLiteral. - * - * @param {RegExpValidationState} state The state to validate RegExp. - * @returns {void} - */ - pp$8.validateRegExpPattern = function(state) { - this.regexp_pattern(state); - - // The goal symbol for the parse is |Pattern[~U, ~N]|. If the result of - // parsing contains a |GroupName|, reparse with the goal symbol - // |Pattern[~U, +N]| and use this result instead. Throw a *SyntaxError* - // exception if _P_ did not conform to the grammar, if any elements of _P_ - // were not matched by the parse, or if any Early Error conditions exist. - if (!state.switchN && this.options.ecmaVersion >= 9 && state.groupNames.length > 0) { - state.switchN = true; - this.regexp_pattern(state); - } - }; - - // https://www.ecma-international.org/ecma-262/8.0/#prod-Pattern - pp$8.regexp_pattern = function(state) { - state.pos = 0; - state.lastIntValue = 0; - state.lastStringValue = ""; - state.lastAssertionIsQuantifiable = false; - state.numCapturingParens = 0; - state.maxBackReference = 0; - state.groupNames.length = 0; - state.backReferenceNames.length = 0; - - this.regexp_disjunction(state); - - if (state.pos !== state.source.length) { - // Make the same messages as V8. - if (state.eat(0x29 /* ) */)) { - state.raise("Unmatched ')'"); - } - if (state.eat(0x5D /* ] */) || state.eat(0x7D /* } */)) { - state.raise("Lone quantifier brackets"); - } - } - if (state.maxBackReference > state.numCapturingParens) { - state.raise("Invalid escape"); - } - for (var i = 0, list = state.backReferenceNames; i < list.length; i += 1) { - var name = list[i]; - - if (state.groupNames.indexOf(name) === -1) { - state.raise("Invalid named capture referenced"); - } - } - }; - - // https://www.ecma-international.org/ecma-262/8.0/#prod-Disjunction - pp$8.regexp_disjunction = function(state) { - this.regexp_alternative(state); - while (state.eat(0x7C /* | */)) { - this.regexp_alternative(state); - } - - // Make the same message as V8. - if (this.regexp_eatQuantifier(state, true)) { - state.raise("Nothing to repeat"); - } - if (state.eat(0x7B /* { */)) { - state.raise("Lone quantifier brackets"); - } - }; - - // https://www.ecma-international.org/ecma-262/8.0/#prod-Alternative - pp$8.regexp_alternative = function(state) { - while (state.pos < state.source.length && this.regexp_eatTerm(state)) - { } - }; - - // https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-Term - pp$8.regexp_eatTerm = function(state) { - if (this.regexp_eatAssertion(state)) { - // Handle `QuantifiableAssertion Quantifier` alternative. - // `state.lastAssertionIsQuantifiable` is true if the last eaten Assertion - // is a QuantifiableAssertion. - if (state.lastAssertionIsQuantifiable && this.regexp_eatQuantifier(state)) { - // Make the same message as V8. - if (state.switchU) { - state.raise("Invalid quantifier"); - } - } - return true - } - - if (state.switchU ? this.regexp_eatAtom(state) : this.regexp_eatExtendedAtom(state)) { - this.regexp_eatQuantifier(state); - return true - } - - return false - }; - - // https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-Assertion - pp$8.regexp_eatAssertion = function(state) { - var start = state.pos; - state.lastAssertionIsQuantifiable = false; - - // ^, $ - if (state.eat(0x5E /* ^ */) || state.eat(0x24 /* $ */)) { - return true - } - - // \b \B - if (state.eat(0x5C /* \ */)) { - if (state.eat(0x42 /* B */) || state.eat(0x62 /* b */)) { - return true - } - state.pos = start; - } - - // Lookahead / Lookbehind - if (state.eat(0x28 /* ( */) && state.eat(0x3F /* ? */)) { - var lookbehind = false; - if (this.options.ecmaVersion >= 9) { - lookbehind = state.eat(0x3C /* < */); - } - if (state.eat(0x3D /* = */) || state.eat(0x21 /* ! */)) { - this.regexp_disjunction(state); - if (!state.eat(0x29 /* ) */)) { - state.raise("Unterminated group"); - } - state.lastAssertionIsQuantifiable = !lookbehind; - return true - } - } - - state.pos = start; - return false - }; - - // https://www.ecma-international.org/ecma-262/8.0/#prod-Quantifier - pp$8.regexp_eatQuantifier = function(state, noError) { - if ( noError === void 0 ) noError = false; - - if (this.regexp_eatQuantifierPrefix(state, noError)) { - state.eat(0x3F /* ? */); - return true - } - return false - }; - - // https://www.ecma-international.org/ecma-262/8.0/#prod-QuantifierPrefix - pp$8.regexp_eatQuantifierPrefix = function(state, noError) { - return ( - state.eat(0x2A /* * */) || - state.eat(0x2B /* + */) || - state.eat(0x3F /* ? */) || - this.regexp_eatBracedQuantifier(state, noError) - ) - }; - pp$8.regexp_eatBracedQuantifier = function(state, noError) { - var start = state.pos; - if (state.eat(0x7B /* { */)) { - var min = 0, max = -1; - if (this.regexp_eatDecimalDigits(state)) { - min = state.lastIntValue; - if (state.eat(0x2C /* , */) && this.regexp_eatDecimalDigits(state)) { - max = state.lastIntValue; - } - if (state.eat(0x7D /* } */)) { - // SyntaxError in https://www.ecma-international.org/ecma-262/8.0/#sec-term - if (max !== -1 && max < min && !noError) { - state.raise("numbers out of order in {} quantifier"); - } - return true - } - } - if (state.switchU && !noError) { - state.raise("Incomplete quantifier"); - } - state.pos = start; - } - return false - }; - - // https://www.ecma-international.org/ecma-262/8.0/#prod-Atom - pp$8.regexp_eatAtom = function(state) { - return ( - this.regexp_eatPatternCharacters(state) || - state.eat(0x2E /* . */) || - this.regexp_eatReverseSolidusAtomEscape(state) || - this.regexp_eatCharacterClass(state) || - this.regexp_eatUncapturingGroup(state) || - this.regexp_eatCapturingGroup(state) - ) - }; - pp$8.regexp_eatReverseSolidusAtomEscape = function(state) { - var start = state.pos; - if (state.eat(0x5C /* \ */)) { - if (this.regexp_eatAtomEscape(state)) { - return true - } - state.pos = start; - } - return false - }; - pp$8.regexp_eatUncapturingGroup = function(state) { - var start = state.pos; - if (state.eat(0x28 /* ( */)) { - if (state.eat(0x3F /* ? */) && state.eat(0x3A /* : */)) { - this.regexp_disjunction(state); - if (state.eat(0x29 /* ) */)) { - return true - } - state.raise("Unterminated group"); - } - state.pos = start; - } - return false - }; - pp$8.regexp_eatCapturingGroup = function(state) { - if (state.eat(0x28 /* ( */)) { - if (this.options.ecmaVersion >= 9) { - this.regexp_groupSpecifier(state); - } else if (state.current() === 0x3F /* ? */) { - state.raise("Invalid group"); - } - this.regexp_disjunction(state); - if (state.eat(0x29 /* ) */)) { - state.numCapturingParens += 1; - return true - } - state.raise("Unterminated group"); - } - return false - }; - - // https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-ExtendedAtom - pp$8.regexp_eatExtendedAtom = function(state) { - return ( - state.eat(0x2E /* . */) || - this.regexp_eatReverseSolidusAtomEscape(state) || - this.regexp_eatCharacterClass(state) || - this.regexp_eatUncapturingGroup(state) || - this.regexp_eatCapturingGroup(state) || - this.regexp_eatInvalidBracedQuantifier(state) || - this.regexp_eatExtendedPatternCharacter(state) - ) - }; - - // https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-InvalidBracedQuantifier - pp$8.regexp_eatInvalidBracedQuantifier = function(state) { - if (this.regexp_eatBracedQuantifier(state, true)) { - state.raise("Nothing to repeat"); - } - return false - }; - - // https://www.ecma-international.org/ecma-262/8.0/#prod-SyntaxCharacter - pp$8.regexp_eatSyntaxCharacter = function(state) { - var ch = state.current(); - if (isSyntaxCharacter(ch)) { - state.lastIntValue = ch; - state.advance(); - return true - } - return false - }; - function isSyntaxCharacter(ch) { - return ( - ch === 0x24 /* $ */ || - ch >= 0x28 /* ( */ && ch <= 0x2B /* + */ || - ch === 0x2E /* . */ || - ch === 0x3F /* ? */ || - ch >= 0x5B /* [ */ && ch <= 0x5E /* ^ */ || - ch >= 0x7B /* { */ && ch <= 0x7D /* } */ - ) - } - - // https://www.ecma-international.org/ecma-262/8.0/#prod-PatternCharacter - // But eat eager. - pp$8.regexp_eatPatternCharacters = function(state) { - var start = state.pos; - var ch = 0; - while ((ch = state.current()) !== -1 && !isSyntaxCharacter(ch)) { - state.advance(); - } - return state.pos !== start - }; - - // https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-ExtendedPatternCharacter - pp$8.regexp_eatExtendedPatternCharacter = function(state) { - var ch = state.current(); - if ( - ch !== -1 && - ch !== 0x24 /* $ */ && - !(ch >= 0x28 /* ( */ && ch <= 0x2B /* + */) && - ch !== 0x2E /* . */ && - ch !== 0x3F /* ? */ && - ch !== 0x5B /* [ */ && - ch !== 0x5E /* ^ */ && - ch !== 0x7C /* | */ - ) { - state.advance(); - return true - } - return false - }; - - // GroupSpecifier :: - // [empty] - // `?` GroupName - pp$8.regexp_groupSpecifier = function(state) { - if (state.eat(0x3F /* ? */)) { - if (this.regexp_eatGroupName(state)) { - if (state.groupNames.indexOf(state.lastStringValue) !== -1) { - state.raise("Duplicate capture group name"); - } - state.groupNames.push(state.lastStringValue); - return - } - state.raise("Invalid group"); - } - }; - - // GroupName :: - // `<` RegExpIdentifierName `>` - // Note: this updates `state.lastStringValue` property with the eaten name. - pp$8.regexp_eatGroupName = function(state) { - state.lastStringValue = ""; - if (state.eat(0x3C /* < */)) { - if (this.regexp_eatRegExpIdentifierName(state) && state.eat(0x3E /* > */)) { - return true - } - state.raise("Invalid capture group name"); - } - return false - }; - - // RegExpIdentifierName :: - // RegExpIdentifierStart - // RegExpIdentifierName RegExpIdentifierPart - // Note: this updates `state.lastStringValue` property with the eaten name. - pp$8.regexp_eatRegExpIdentifierName = function(state) { - state.lastStringValue = ""; - if (this.regexp_eatRegExpIdentifierStart(state)) { - state.lastStringValue += codePointToString(state.lastIntValue); - while (this.regexp_eatRegExpIdentifierPart(state)) { - state.lastStringValue += codePointToString(state.lastIntValue); - } - return true - } - return false - }; - - // RegExpIdentifierStart :: - // UnicodeIDStart - // `$` - // `_` - // `\` RegExpUnicodeEscapeSequence[+U] - pp$8.regexp_eatRegExpIdentifierStart = function(state) { - var start = state.pos; - var forceU = this.options.ecmaVersion >= 11; - var ch = state.current(forceU); - state.advance(forceU); - - if (ch === 0x5C /* \ */ && this.regexp_eatRegExpUnicodeEscapeSequence(state, forceU)) { - ch = state.lastIntValue; - } - if (isRegExpIdentifierStart(ch)) { - state.lastIntValue = ch; - return true - } - - state.pos = start; - return false - }; - function isRegExpIdentifierStart(ch) { - return isIdentifierStart(ch, true) || ch === 0x24 /* $ */ || ch === 0x5F /* _ */ - } - - // RegExpIdentifierPart :: - // UnicodeIDContinue - // `$` - // `_` - // `\` RegExpUnicodeEscapeSequence[+U] - // - // - pp$8.regexp_eatRegExpIdentifierPart = function(state) { - var start = state.pos; - var forceU = this.options.ecmaVersion >= 11; - var ch = state.current(forceU); - state.advance(forceU); - - if (ch === 0x5C /* \ */ && this.regexp_eatRegExpUnicodeEscapeSequence(state, forceU)) { - ch = state.lastIntValue; - } - if (isRegExpIdentifierPart(ch)) { - state.lastIntValue = ch; - return true - } - - state.pos = start; - return false - }; - function isRegExpIdentifierPart(ch) { - return isIdentifierChar(ch, true) || ch === 0x24 /* $ */ || ch === 0x5F /* _ */ || ch === 0x200C /* */ || ch === 0x200D /* */ - } - - // https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-AtomEscape - pp$8.regexp_eatAtomEscape = function(state) { - if ( - this.regexp_eatBackReference(state) || - this.regexp_eatCharacterClassEscape(state) || - this.regexp_eatCharacterEscape(state) || - (state.switchN && this.regexp_eatKGroupName(state)) - ) { - return true - } - if (state.switchU) { - // Make the same message as V8. - if (state.current() === 0x63 /* c */) { - state.raise("Invalid unicode escape"); - } - state.raise("Invalid escape"); - } - return false - }; - pp$8.regexp_eatBackReference = function(state) { - var start = state.pos; - if (this.regexp_eatDecimalEscape(state)) { - var n = state.lastIntValue; - if (state.switchU) { - // For SyntaxError in https://www.ecma-international.org/ecma-262/8.0/#sec-atomescape - if (n > state.maxBackReference) { - state.maxBackReference = n; - } - return true - } - if (n <= state.numCapturingParens) { - return true - } - state.pos = start; - } - return false - }; - pp$8.regexp_eatKGroupName = function(state) { - if (state.eat(0x6B /* k */)) { - if (this.regexp_eatGroupName(state)) { - state.backReferenceNames.push(state.lastStringValue); - return true - } - state.raise("Invalid named reference"); - } - return false - }; - - // https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-CharacterEscape - pp$8.regexp_eatCharacterEscape = function(state) { - return ( - this.regexp_eatControlEscape(state) || - this.regexp_eatCControlLetter(state) || - this.regexp_eatZero(state) || - this.regexp_eatHexEscapeSequence(state) || - this.regexp_eatRegExpUnicodeEscapeSequence(state, false) || - (!state.switchU && this.regexp_eatLegacyOctalEscapeSequence(state)) || - this.regexp_eatIdentityEscape(state) - ) - }; - pp$8.regexp_eatCControlLetter = function(state) { - var start = state.pos; - if (state.eat(0x63 /* c */)) { - if (this.regexp_eatControlLetter(state)) { - return true - } - state.pos = start; - } - return false - }; - pp$8.regexp_eatZero = function(state) { - if (state.current() === 0x30 /* 0 */ && !isDecimalDigit(state.lookahead())) { - state.lastIntValue = 0; - state.advance(); - return true - } - return false - }; - - // https://www.ecma-international.org/ecma-262/8.0/#prod-ControlEscape - pp$8.regexp_eatControlEscape = function(state) { - var ch = state.current(); - if (ch === 0x74 /* t */) { - state.lastIntValue = 0x09; /* \t */ - state.advance(); - return true - } - if (ch === 0x6E /* n */) { - state.lastIntValue = 0x0A; /* \n */ - state.advance(); - return true - } - if (ch === 0x76 /* v */) { - state.lastIntValue = 0x0B; /* \v */ - state.advance(); - return true - } - if (ch === 0x66 /* f */) { - state.lastIntValue = 0x0C; /* \f */ - state.advance(); - return true - } - if (ch === 0x72 /* r */) { - state.lastIntValue = 0x0D; /* \r */ - state.advance(); - return true - } - return false - }; - - // https://www.ecma-international.org/ecma-262/8.0/#prod-ControlLetter - pp$8.regexp_eatControlLetter = function(state) { - var ch = state.current(); - if (isControlLetter(ch)) { - state.lastIntValue = ch % 0x20; - state.advance(); - return true - } - return false - }; - function isControlLetter(ch) { - return ( - (ch >= 0x41 /* A */ && ch <= 0x5A /* Z */) || - (ch >= 0x61 /* a */ && ch <= 0x7A /* z */) - ) - } - - // https://www.ecma-international.org/ecma-262/8.0/#prod-RegExpUnicodeEscapeSequence - pp$8.regexp_eatRegExpUnicodeEscapeSequence = function(state, forceU) { - if ( forceU === void 0 ) forceU = false; - - var start = state.pos; - var switchU = forceU || state.switchU; - - if (state.eat(0x75 /* u */)) { - if (this.regexp_eatFixedHexDigits(state, 4)) { - var lead = state.lastIntValue; - if (switchU && lead >= 0xD800 && lead <= 0xDBFF) { - var leadSurrogateEnd = state.pos; - if (state.eat(0x5C /* \ */) && state.eat(0x75 /* u */) && this.regexp_eatFixedHexDigits(state, 4)) { - var trail = state.lastIntValue; - if (trail >= 0xDC00 && trail <= 0xDFFF) { - state.lastIntValue = (lead - 0xD800) * 0x400 + (trail - 0xDC00) + 0x10000; - return true - } - } - state.pos = leadSurrogateEnd; - state.lastIntValue = lead; - } - return true - } - if ( - switchU && - state.eat(0x7B /* { */) && - this.regexp_eatHexDigits(state) && - state.eat(0x7D /* } */) && - isValidUnicode(state.lastIntValue) - ) { - return true - } - if (switchU) { - state.raise("Invalid unicode escape"); - } - state.pos = start; - } - - return false - }; - function isValidUnicode(ch) { - return ch >= 0 && ch <= 0x10FFFF - } - - // https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-IdentityEscape - pp$8.regexp_eatIdentityEscape = function(state) { - if (state.switchU) { - if (this.regexp_eatSyntaxCharacter(state)) { - return true - } - if (state.eat(0x2F /* / */)) { - state.lastIntValue = 0x2F; /* / */ - return true - } - return false - } - - var ch = state.current(); - if (ch !== 0x63 /* c */ && (!state.switchN || ch !== 0x6B /* k */)) { - state.lastIntValue = ch; - state.advance(); - return true - } - - return false - }; - - // https://www.ecma-international.org/ecma-262/8.0/#prod-DecimalEscape - pp$8.regexp_eatDecimalEscape = function(state) { - state.lastIntValue = 0; - var ch = state.current(); - if (ch >= 0x31 /* 1 */ && ch <= 0x39 /* 9 */) { - do { - state.lastIntValue = 10 * state.lastIntValue + (ch - 0x30 /* 0 */); - state.advance(); - } while ((ch = state.current()) >= 0x30 /* 0 */ && ch <= 0x39 /* 9 */) - return true - } - return false - }; - - // https://www.ecma-international.org/ecma-262/8.0/#prod-CharacterClassEscape - pp$8.regexp_eatCharacterClassEscape = function(state) { - var ch = state.current(); - - if (isCharacterClassEscape(ch)) { - state.lastIntValue = -1; - state.advance(); - return true - } - - if ( - state.switchU && - this.options.ecmaVersion >= 9 && - (ch === 0x50 /* P */ || ch === 0x70 /* p */) - ) { - state.lastIntValue = -1; - state.advance(); - if ( - state.eat(0x7B /* { */) && - this.regexp_eatUnicodePropertyValueExpression(state) && - state.eat(0x7D /* } */) - ) { - return true - } - state.raise("Invalid property name"); - } - - return false - }; - function isCharacterClassEscape(ch) { - return ( - ch === 0x64 /* d */ || - ch === 0x44 /* D */ || - ch === 0x73 /* s */ || - ch === 0x53 /* S */ || - ch === 0x77 /* w */ || - ch === 0x57 /* W */ - ) - } - - // UnicodePropertyValueExpression :: - // UnicodePropertyName `=` UnicodePropertyValue - // LoneUnicodePropertyNameOrValue - pp$8.regexp_eatUnicodePropertyValueExpression = function(state) { - var start = state.pos; - - // UnicodePropertyName `=` UnicodePropertyValue - if (this.regexp_eatUnicodePropertyName(state) && state.eat(0x3D /* = */)) { - var name = state.lastStringValue; - if (this.regexp_eatUnicodePropertyValue(state)) { - var value = state.lastStringValue; - this.regexp_validateUnicodePropertyNameAndValue(state, name, value); - return true - } - } - state.pos = start; - - // LoneUnicodePropertyNameOrValue - if (this.regexp_eatLoneUnicodePropertyNameOrValue(state)) { - var nameOrValue = state.lastStringValue; - this.regexp_validateUnicodePropertyNameOrValue(state, nameOrValue); - return true - } - return false - }; - pp$8.regexp_validateUnicodePropertyNameAndValue = function(state, name, value) { - if (!has(state.unicodeProperties.nonBinary, name)) - { state.raise("Invalid property name"); } - if (!state.unicodeProperties.nonBinary[name].test(value)) - { state.raise("Invalid property value"); } - }; - pp$8.regexp_validateUnicodePropertyNameOrValue = function(state, nameOrValue) { - if (!state.unicodeProperties.binary.test(nameOrValue)) - { state.raise("Invalid property name"); } - }; - - // UnicodePropertyName :: - // UnicodePropertyNameCharacters - pp$8.regexp_eatUnicodePropertyName = function(state) { - var ch = 0; - state.lastStringValue = ""; - while (isUnicodePropertyNameCharacter(ch = state.current())) { - state.lastStringValue += codePointToString(ch); - state.advance(); - } - return state.lastStringValue !== "" - }; - function isUnicodePropertyNameCharacter(ch) { - return isControlLetter(ch) || ch === 0x5F /* _ */ - } - - // UnicodePropertyValue :: - // UnicodePropertyValueCharacters - pp$8.regexp_eatUnicodePropertyValue = function(state) { - var ch = 0; - state.lastStringValue = ""; - while (isUnicodePropertyValueCharacter(ch = state.current())) { - state.lastStringValue += codePointToString(ch); - state.advance(); - } - return state.lastStringValue !== "" - }; - function isUnicodePropertyValueCharacter(ch) { - return isUnicodePropertyNameCharacter(ch) || isDecimalDigit(ch) - } - - // LoneUnicodePropertyNameOrValue :: - // UnicodePropertyValueCharacters - pp$8.regexp_eatLoneUnicodePropertyNameOrValue = function(state) { - return this.regexp_eatUnicodePropertyValue(state) - }; - - // https://www.ecma-international.org/ecma-262/8.0/#prod-CharacterClass - pp$8.regexp_eatCharacterClass = function(state) { - if (state.eat(0x5B /* [ */)) { - state.eat(0x5E /* ^ */); - this.regexp_classRanges(state); - if (state.eat(0x5D /* ] */)) { - return true - } - // Unreachable since it threw "unterminated regular expression" error before. - state.raise("Unterminated character class"); - } - return false - }; - - // https://www.ecma-international.org/ecma-262/8.0/#prod-ClassRanges - // https://www.ecma-international.org/ecma-262/8.0/#prod-NonemptyClassRanges - // https://www.ecma-international.org/ecma-262/8.0/#prod-NonemptyClassRangesNoDash - pp$8.regexp_classRanges = function(state) { - while (this.regexp_eatClassAtom(state)) { - var left = state.lastIntValue; - if (state.eat(0x2D /* - */) && this.regexp_eatClassAtom(state)) { - var right = state.lastIntValue; - if (state.switchU && (left === -1 || right === -1)) { - state.raise("Invalid character class"); - } - if (left !== -1 && right !== -1 && left > right) { - state.raise("Range out of order in character class"); - } - } - } - }; - - // https://www.ecma-international.org/ecma-262/8.0/#prod-ClassAtom - // https://www.ecma-international.org/ecma-262/8.0/#prod-ClassAtomNoDash - pp$8.regexp_eatClassAtom = function(state) { - var start = state.pos; - - if (state.eat(0x5C /* \ */)) { - if (this.regexp_eatClassEscape(state)) { - return true - } - if (state.switchU) { - // Make the same message as V8. - var ch$1 = state.current(); - if (ch$1 === 0x63 /* c */ || isOctalDigit(ch$1)) { - state.raise("Invalid class escape"); - } - state.raise("Invalid escape"); - } - state.pos = start; - } - - var ch = state.current(); - if (ch !== 0x5D /* ] */) { - state.lastIntValue = ch; - state.advance(); - return true - } - - return false - }; - - // https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-ClassEscape - pp$8.regexp_eatClassEscape = function(state) { - var start = state.pos; - - if (state.eat(0x62 /* b */)) { - state.lastIntValue = 0x08; /* */ - return true - } - - if (state.switchU && state.eat(0x2D /* - */)) { - state.lastIntValue = 0x2D; /* - */ - return true - } - - if (!state.switchU && state.eat(0x63 /* c */)) { - if (this.regexp_eatClassControlLetter(state)) { - return true - } - state.pos = start; - } - - return ( - this.regexp_eatCharacterClassEscape(state) || - this.regexp_eatCharacterEscape(state) - ) - }; - - // https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-ClassControlLetter - pp$8.regexp_eatClassControlLetter = function(state) { - var ch = state.current(); - if (isDecimalDigit(ch) || ch === 0x5F /* _ */) { - state.lastIntValue = ch % 0x20; - state.advance(); - return true - } - return false - }; - - // https://www.ecma-international.org/ecma-262/8.0/#prod-HexEscapeSequence - pp$8.regexp_eatHexEscapeSequence = function(state) { - var start = state.pos; - if (state.eat(0x78 /* x */)) { - if (this.regexp_eatFixedHexDigits(state, 2)) { - return true - } - if (state.switchU) { - state.raise("Invalid escape"); - } - state.pos = start; - } - return false - }; - - // https://www.ecma-international.org/ecma-262/8.0/#prod-DecimalDigits - pp$8.regexp_eatDecimalDigits = function(state) { - var start = state.pos; - var ch = 0; - state.lastIntValue = 0; - while (isDecimalDigit(ch = state.current())) { - state.lastIntValue = 10 * state.lastIntValue + (ch - 0x30 /* 0 */); - state.advance(); - } - return state.pos !== start - }; - function isDecimalDigit(ch) { - return ch >= 0x30 /* 0 */ && ch <= 0x39 /* 9 */ - } - - // https://www.ecma-international.org/ecma-262/8.0/#prod-HexDigits - pp$8.regexp_eatHexDigits = function(state) { - var start = state.pos; - var ch = 0; - state.lastIntValue = 0; - while (isHexDigit(ch = state.current())) { - state.lastIntValue = 16 * state.lastIntValue + hexToInt(ch); - state.advance(); - } - return state.pos !== start - }; - function isHexDigit(ch) { - return ( - (ch >= 0x30 /* 0 */ && ch <= 0x39 /* 9 */) || - (ch >= 0x41 /* A */ && ch <= 0x46 /* F */) || - (ch >= 0x61 /* a */ && ch <= 0x66 /* f */) - ) - } - function hexToInt(ch) { - if (ch >= 0x41 /* A */ && ch <= 0x46 /* F */) { - return 10 + (ch - 0x41 /* A */) - } - if (ch >= 0x61 /* a */ && ch <= 0x66 /* f */) { - return 10 + (ch - 0x61 /* a */) - } - return ch - 0x30 /* 0 */ - } - - // https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-LegacyOctalEscapeSequence - // Allows only 0-377(octal) i.e. 0-255(decimal). - pp$8.regexp_eatLegacyOctalEscapeSequence = function(state) { - if (this.regexp_eatOctalDigit(state)) { - var n1 = state.lastIntValue; - if (this.regexp_eatOctalDigit(state)) { - var n2 = state.lastIntValue; - if (n1 <= 3 && this.regexp_eatOctalDigit(state)) { - state.lastIntValue = n1 * 64 + n2 * 8 + state.lastIntValue; - } else { - state.lastIntValue = n1 * 8 + n2; - } - } else { - state.lastIntValue = n1; - } - return true - } - return false - }; - - // https://www.ecma-international.org/ecma-262/8.0/#prod-OctalDigit - pp$8.regexp_eatOctalDigit = function(state) { - var ch = state.current(); - if (isOctalDigit(ch)) { - state.lastIntValue = ch - 0x30; /* 0 */ - state.advance(); - return true - } - state.lastIntValue = 0; - return false - }; - function isOctalDigit(ch) { - return ch >= 0x30 /* 0 */ && ch <= 0x37 /* 7 */ - } - - // https://www.ecma-international.org/ecma-262/8.0/#prod-Hex4Digits - // https://www.ecma-international.org/ecma-262/8.0/#prod-HexDigit - // And HexDigit HexDigit in https://www.ecma-international.org/ecma-262/8.0/#prod-HexEscapeSequence - pp$8.regexp_eatFixedHexDigits = function(state, length) { - var start = state.pos; - state.lastIntValue = 0; - for (var i = 0; i < length; ++i) { - var ch = state.current(); - if (!isHexDigit(ch)) { - state.pos = start; - return false - } - state.lastIntValue = 16 * state.lastIntValue + hexToInt(ch); - state.advance(); - } - return true - }; - - // Object type used to represent tokens. Note that normally, tokens - // simply exist as properties on the parser object. This is only - // used for the onToken callback and the external tokenizer. - - var Token = function Token(p) { - this.type = p.type; - this.value = p.value; - this.start = p.start; - this.end = p.end; - if (p.options.locations) - { this.loc = new SourceLocation(p, p.startLoc, p.endLoc); } - if (p.options.ranges) - { this.range = [p.start, p.end]; } - }; - - // ## Tokenizer - - var pp$9 = Parser.prototype; - - // Move to the next token - - pp$9.next = function(ignoreEscapeSequenceInKeyword) { - if (!ignoreEscapeSequenceInKeyword && this.type.keyword && this.containsEsc) - { this.raiseRecoverable(this.start, "Escape sequence in keyword " + this.type.keyword); } - if (this.options.onToken) - { this.options.onToken(new Token(this)); } - - this.lastTokEnd = this.end; - this.lastTokStart = this.start; - this.lastTokEndLoc = this.endLoc; - this.lastTokStartLoc = this.startLoc; - this.nextToken(); - }; - - pp$9.getToken = function() { - this.next(); - return new Token(this) - }; - - // If we're in an ES6 environment, make parsers iterable - if (typeof Symbol !== "undefined") - { pp$9[Symbol.iterator] = function() { - var this$1$1 = this; - - return { - next: function () { - var token = this$1$1.getToken(); - return { - done: token.type === types.eof, - value: token - } - } - } - }; } - - // Toggle strict mode. Re-reads the next number or string to please - // pedantic tests (`"use strict"; 010;` should fail). - - pp$9.curContext = function() { - return this.context[this.context.length - 1] - }; - - // Read a single token, updating the parser object's token-related - // properties. - - pp$9.nextToken = function() { - var curContext = this.curContext(); - if (!curContext || !curContext.preserveSpace) { this.skipSpace(); } - - this.start = this.pos; - if (this.options.locations) { this.startLoc = this.curPosition(); } - if (this.pos >= this.input.length) { return this.finishToken(types.eof) } - - if (curContext.override) { return curContext.override(this) } - else { this.readToken(this.fullCharCodeAtPos()); } - }; - - pp$9.readToken = function(code) { - // Identifier or keyword. '\uXXXX' sequences are allowed in - // identifiers, so '\' also dispatches to that. - if (isIdentifierStart(code, this.options.ecmaVersion >= 6) || code === 92 /* '\' */) - { return this.readWord() } - - return this.getTokenFromCode(code) - }; - - pp$9.fullCharCodeAtPos = function() { - var code = this.input.charCodeAt(this.pos); - if (code <= 0xd7ff || code >= 0xe000) { return code } - var next = this.input.charCodeAt(this.pos + 1); - return (code << 10) + next - 0x35fdc00 - }; - - pp$9.skipBlockComment = function() { - var startLoc = this.options.onComment && this.curPosition(); - var start = this.pos, end = this.input.indexOf("*/", this.pos += 2); - if (end === -1) { this.raise(this.pos - 2, "Unterminated comment"); } - this.pos = end + 2; - if (this.options.locations) { - lineBreakG.lastIndex = start; - var match; - while ((match = lineBreakG.exec(this.input)) && match.index < this.pos) { - ++this.curLine; - this.lineStart = match.index + match[0].length; - } - } - if (this.options.onComment) - { this.options.onComment(true, this.input.slice(start + 2, end), start, this.pos, - startLoc, this.curPosition()); } - }; - - pp$9.skipLineComment = function(startSkip) { - var start = this.pos; - var startLoc = this.options.onComment && this.curPosition(); - var ch = this.input.charCodeAt(this.pos += startSkip); - while (this.pos < this.input.length && !isNewLine(ch)) { - ch = this.input.charCodeAt(++this.pos); - } - if (this.options.onComment) - { this.options.onComment(false, this.input.slice(start + startSkip, this.pos), start, this.pos, - startLoc, this.curPosition()); } - }; - - // Called at the start of the parse and after every token. Skips - // whitespace and comments, and. - - pp$9.skipSpace = function() { - loop: while (this.pos < this.input.length) { - var ch = this.input.charCodeAt(this.pos); - switch (ch) { - case 32: case 160: // ' ' - ++this.pos; - break - case 13: - if (this.input.charCodeAt(this.pos + 1) === 10) { - ++this.pos; - } - case 10: case 8232: case 8233: - ++this.pos; - if (this.options.locations) { - ++this.curLine; - this.lineStart = this.pos; - } - break - case 47: // '/' - switch (this.input.charCodeAt(this.pos + 1)) { - case 42: // '*' - this.skipBlockComment(); - break - case 47: - this.skipLineComment(2); - break - default: - break loop - } - break - default: - if (ch > 8 && ch < 14 || ch >= 5760 && nonASCIIwhitespace.test(String.fromCharCode(ch))) { - ++this.pos; - } else { - break loop - } - } - } - }; - - // Called at the end of every token. Sets `end`, `val`, and - // maintains `context` and `exprAllowed`, and skips the space after - // the token, so that the next one's `start` will point at the - // right position. - - pp$9.finishToken = function(type, val) { - this.end = this.pos; - if (this.options.locations) { this.endLoc = this.curPosition(); } - var prevType = this.type; - this.type = type; - this.value = val; - - this.updateContext(prevType); - }; - - // ### Token reading - - // This is the function that is called to fetch the next token. It - // is somewhat obscure, because it works in character codes rather - // than characters, and because operator parsing has been inlined - // into it. - // - // All in the name of speed. - // - pp$9.readToken_dot = function() { - var next = this.input.charCodeAt(this.pos + 1); - if (next >= 48 && next <= 57) { return this.readNumber(true) } - var next2 = this.input.charCodeAt(this.pos + 2); - if (this.options.ecmaVersion >= 6 && next === 46 && next2 === 46) { // 46 = dot '.' - this.pos += 3; - return this.finishToken(types.ellipsis) - } else { - ++this.pos; - return this.finishToken(types.dot) - } - }; - - pp$9.readToken_slash = function() { // '/' - var next = this.input.charCodeAt(this.pos + 1); - if (this.exprAllowed) { ++this.pos; return this.readRegexp() } - if (next === 61) { return this.finishOp(types.assign, 2) } - return this.finishOp(types.slash, 1) - }; - - pp$9.readToken_mult_modulo_exp = function(code) { // '%*' - var next = this.input.charCodeAt(this.pos + 1); - var size = 1; - var tokentype = code === 42 ? types.star : types.modulo; - - // exponentiation operator ** and **= - if (this.options.ecmaVersion >= 7 && code === 42 && next === 42) { - ++size; - tokentype = types.starstar; - next = this.input.charCodeAt(this.pos + 2); - } - - if (next === 61) { return this.finishOp(types.assign, size + 1) } - return this.finishOp(tokentype, size) - }; - - pp$9.readToken_pipe_amp = function(code) { // '|&' - var next = this.input.charCodeAt(this.pos + 1); - if (next === code) { - if (this.options.ecmaVersion >= 12) { - var next2 = this.input.charCodeAt(this.pos + 2); - if (next2 === 61) { return this.finishOp(types.assign, 3) } - } - return this.finishOp(code === 124 ? types.logicalOR : types.logicalAND, 2) - } - if (next === 61) { return this.finishOp(types.assign, 2) } - return this.finishOp(code === 124 ? types.bitwiseOR : types.bitwiseAND, 1) - }; - - pp$9.readToken_caret = function() { // '^' - var next = this.input.charCodeAt(this.pos + 1); - if (next === 61) { return this.finishOp(types.assign, 2) } - return this.finishOp(types.bitwiseXOR, 1) - }; - - pp$9.readToken_plus_min = function(code) { // '+-' - var next = this.input.charCodeAt(this.pos + 1); - if (next === code) { - if (next === 45 && !this.inModule && this.input.charCodeAt(this.pos + 2) === 62 && - (this.lastTokEnd === 0 || lineBreak.test(this.input.slice(this.lastTokEnd, this.pos)))) { - // A `-->` line comment - this.skipLineComment(3); - this.skipSpace(); - return this.nextToken() - } - return this.finishOp(types.incDec, 2) - } - if (next === 61) { return this.finishOp(types.assign, 2) } - return this.finishOp(types.plusMin, 1) - }; - - pp$9.readToken_lt_gt = function(code) { // '<>' - var next = this.input.charCodeAt(this.pos + 1); - var size = 1; - if (next === code) { - size = code === 62 && this.input.charCodeAt(this.pos + 2) === 62 ? 3 : 2; - if (this.input.charCodeAt(this.pos + size) === 61) { return this.finishOp(types.assign, size + 1) } - return this.finishOp(types.bitShift, size) - } - if (next === 33 && code === 60 && !this.inModule && this.input.charCodeAt(this.pos + 2) === 45 && - this.input.charCodeAt(this.pos + 3) === 45) { - // `` line comment this.skipLineComment(3); this.skipSpace(); return this.nextToken() } - return this.finishOp(types$1.incDec, 2) + return this.finishOp(types$3.incDec, 2) } - if (next === 61) { return this.finishOp(types$1.assign, 2) } - return this.finishOp(types$1.plusMin, 1) + if (next === 61) { return this.finishOp(types$3.assign, 2) } + return this.finishOp(types$3.plusMin, 1) }; -pp.readToken_lt_gt = function(code) { // '<>' +pp$9$1.readToken_lt_gt = function(code) { // '<>' var next = this.input.charCodeAt(this.pos + 1); var size = 1; if (next === code) { size = code === 62 && this.input.charCodeAt(this.pos + 2) === 62 ? 3 : 2; - if (this.input.charCodeAt(this.pos + size) === 61) { return this.finishOp(types$1.assign, size + 1) } - return this.finishOp(types$1.bitShift, size) + if (this.input.charCodeAt(this.pos + size) === 61) { return this.finishOp(types$3.assign, size + 1) } + return this.finishOp(types$3.bitShift, size) } if (next === 33 && code === 60 && !this.inModule && this.input.charCodeAt(this.pos + 2) === 45 && this.input.charCodeAt(this.pos + 3) === 45) { @@ -17664,53 +10164,39 @@ pp.readToken_lt_gt = function(code) { // '<>' return this.nextToken() } if (next === 61) { size = 2; } - return this.finishOp(types$1.relational, size) + return this.finishOp(types$3.relational, size) }; -pp.readToken_eq_excl = function(code) { // '=!' +pp$9$1.readToken_eq_excl = function(code) { // '=!' var next = this.input.charCodeAt(this.pos + 1); - if (next === 61) { return this.finishOp(types$1.equality, this.input.charCodeAt(this.pos + 2) === 61 ? 3 : 2) } + if (next === 61) { return this.finishOp(types$3.equality, this.input.charCodeAt(this.pos + 2) === 61 ? 3 : 2) } if (code === 61 && next === 62 && this.options.ecmaVersion >= 6) { // '=>' this.pos += 2; - return this.finishToken(types$1.arrow) + return this.finishToken(types$3.arrow) } - return this.finishOp(code === 61 ? types$1.eq : types$1.prefix, 1) + return this.finishOp(code === 61 ? types$3.eq : types$3.prefix, 1) }; -pp.readToken_question = function() { // '?' +pp$9$1.readToken_question = function() { // '?' var ecmaVersion = this.options.ecmaVersion; if (ecmaVersion >= 11) { var next = this.input.charCodeAt(this.pos + 1); if (next === 46) { var next2 = this.input.charCodeAt(this.pos + 2); - if (next2 < 48 || next2 > 57) { return this.finishOp(types$1.questionDot, 2) } + if (next2 < 48 || next2 > 57) { return this.finishOp(types$3.questionDot, 2) } } if (next === 63) { if (ecmaVersion >= 12) { var next2$1 = this.input.charCodeAt(this.pos + 2); - if (next2$1 === 61) { return this.finishOp(types$1.assign, 3) } + if (next2$1 === 61) { return this.finishOp(types$3.assign, 3) } } - return this.finishOp(types$1.coalesce, 2) - } - } - return this.finishOp(types$1.question, 1) -}; - -pp.readToken_numberSign = function() { // '#' - var ecmaVersion = this.options.ecmaVersion; - var code = 35; // '#' - if (ecmaVersion >= 13) { - ++this.pos; - code = this.fullCharCodeAtPos(); - if (isIdentifierStart(code, true) || code === 92 /* '\' */) { - return this.finishToken(types$1.privateId, this.readWord1()) + return this.finishOp(types$3.coalesce, 2) } } - - this.raise(this.pos, "Unexpected character '" + codePointToString(code) + "'"); + return this.finishOp(types$3.question, 1) }; -pp.getTokenFromCode = function(code) { +pp$9$1.getTokenFromCode = function(code) { switch (code) { // The interpretation of a dot depends on whether it is followed // by a digit or another two dots. @@ -17718,20 +10204,20 @@ pp.getTokenFromCode = function(code) { return this.readToken_dot() // Punctuation tokens. - case 40: ++this.pos; return this.finishToken(types$1.parenL) - case 41: ++this.pos; return this.finishToken(types$1.parenR) - case 59: ++this.pos; return this.finishToken(types$1.semi) - case 44: ++this.pos; return this.finishToken(types$1.comma) - case 91: ++this.pos; return this.finishToken(types$1.bracketL) - case 93: ++this.pos; return this.finishToken(types$1.bracketR) - case 123: ++this.pos; return this.finishToken(types$1.braceL) - case 125: ++this.pos; return this.finishToken(types$1.braceR) - case 58: ++this.pos; return this.finishToken(types$1.colon) + case 40: ++this.pos; return this.finishToken(types$3.parenL) + case 41: ++this.pos; return this.finishToken(types$3.parenR) + case 59: ++this.pos; return this.finishToken(types$3.semi) + case 44: ++this.pos; return this.finishToken(types$3.comma) + case 91: ++this.pos; return this.finishToken(types$3.bracketL) + case 93: ++this.pos; return this.finishToken(types$3.bracketR) + case 123: ++this.pos; return this.finishToken(types$3.braceL) + case 125: ++this.pos; return this.finishToken(types$3.braceR) + case 58: ++this.pos; return this.finishToken(types$3.colon) case 96: // '`' if (this.options.ecmaVersion < 6) { break } ++this.pos; - return this.finishToken(types$1.backQuote) + return this.finishToken(types$3.backQuote) case 48: // '0' var next = this.input.charCodeAt(this.pos + 1); @@ -17754,6 +10240,7 @@ pp.getTokenFromCode = function(code) { // often referred to. `finishOp` simply skips the amount of // characters it is given as second argument, and returns a token // of the type given by its first argument. + case 47: // '/' return this.readToken_slash() @@ -17779,27 +10266,24 @@ pp.getTokenFromCode = function(code) { return this.readToken_question() case 126: // '~' - return this.finishOp(types$1.prefix, 1) - - case 35: // '#' - return this.readToken_numberSign() + return this.finishOp(types$3.prefix, 1) } - this.raise(this.pos, "Unexpected character '" + codePointToString(code) + "'"); + this.raise(this.pos, "Unexpected character '" + codePointToString$1$1(code) + "'"); }; -pp.finishOp = function(type, size) { +pp$9$1.finishOp = function(type, size) { var str = this.input.slice(this.pos, this.pos + size); this.pos += size; return this.finishToken(type, str) }; -pp.readRegexp = function() { +pp$9$1.readRegexp = function() { var escaped, inClass, start = this.pos; for (;;) { if (this.pos >= this.input.length) { this.raise(start, "Unterminated regular expression"); } var ch = this.input.charAt(this.pos); - if (lineBreak.test(ch)) { this.raise(start, "Unterminated regular expression"); } + if (lineBreak$1.test(ch)) { this.raise(start, "Unterminated regular expression"); } if (!escaped) { if (ch === "[") { inClass = true; } else if (ch === "]" && inClass) { inClass = false; } @@ -17815,7 +10299,7 @@ pp.readRegexp = function() { if (this.containsEsc) { this.unexpected(flagsStart); } // Validate pattern - var state = this.regexpState || (this.regexpState = new RegExpValidationState(this)); + var state = this.regexpState || (this.regexpState = new RegExpValidationState$1(this)); state.reset(start, pattern, flags); this.validateRegExpFlags(state); this.validateRegExpPattern(state); @@ -17829,14 +10313,14 @@ pp.readRegexp = function() { // https://github.com/estree/estree/blob/a27003adf4fd7bfad44de9cef372a2eacd527b1c/es5.md#regexpliteral } - return this.finishToken(types$1.regexp, {pattern: pattern, flags: flags, value: value}) + return this.finishToken(types$3.regexp, {pattern: pattern, flags: flags, value: value}) }; // Read an integer in the given radix. Return null if zero digits // were read, the integer value otherwise. When `len` is given, this // will return `null` unless the integer has exactly `len` digits. -pp.readInt = function(radix, len, maybeLegacyOctalNumericLiteral) { +pp$9$1.readInt = function(radix, len, maybeLegacyOctalNumericLiteral) { // `len` is used for character escape sequences. In that case, disallow separators. var allowSeparators = this.options.ecmaVersion >= 12 && len === undefined; @@ -17872,7 +10356,7 @@ pp.readInt = function(radix, len, maybeLegacyOctalNumericLiteral) { return total }; -function stringToNumber(str, isLegacyOctalNumericLiteral) { +function stringToNumber$1(str, isLegacyOctalNumericLiteral) { if (isLegacyOctalNumericLiteral) { return parseInt(str, 8) } @@ -17881,7 +10365,7 @@ function stringToNumber(str, isLegacyOctalNumericLiteral) { return parseFloat(str.replace(/_/g, "")) } -function stringToBigInt(str) { +function stringToBigInt$1(str) { if (typeof BigInt !== "function") { return null } @@ -17890,31 +10374,31 @@ function stringToBigInt(str) { return BigInt(str.replace(/_/g, "")) } -pp.readRadixNumber = function(radix) { +pp$9$1.readRadixNumber = function(radix) { var start = this.pos; this.pos += 2; // 0x var val = this.readInt(radix); if (val == null) { this.raise(this.start + 2, "Expected number in radix " + radix); } if (this.options.ecmaVersion >= 11 && this.input.charCodeAt(this.pos) === 110) { - val = stringToBigInt(this.input.slice(start, this.pos)); + val = stringToBigInt$1(this.input.slice(start, this.pos)); ++this.pos; - } else if (isIdentifierStart(this.fullCharCodeAtPos())) { this.raise(this.pos, "Identifier directly after number"); } - return this.finishToken(types$1.num, val) + } else if (isIdentifierStart$1(this.fullCharCodeAtPos())) { this.raise(this.pos, "Identifier directly after number"); } + return this.finishToken(types$3.num, val) }; // Read an integer, octal integer, or floating-point number. -pp.readNumber = function(startsWithDot) { +pp$9$1.readNumber = function(startsWithDot) { var start = this.pos; if (!startsWithDot && this.readInt(10, undefined, true) === null) { this.raise(start, "Invalid number"); } var octal = this.pos - start >= 2 && this.input.charCodeAt(start) === 48; if (octal && this.strict) { this.raise(start, "Invalid number"); } var next = this.input.charCodeAt(this.pos); if (!octal && !startsWithDot && this.options.ecmaVersion >= 11 && next === 110) { - var val$1 = stringToBigInt(this.input.slice(start, this.pos)); + var val$1 = stringToBigInt$1(this.input.slice(start, this.pos)); ++this.pos; - if (isIdentifierStart(this.fullCharCodeAtPos())) { this.raise(this.pos, "Identifier directly after number"); } - return this.finishToken(types$1.num, val$1) + if (isIdentifierStart$1(this.fullCharCodeAtPos())) { this.raise(this.pos, "Identifier directly after number"); } + return this.finishToken(types$3.num, val$1) } if (octal && /[89]/.test(this.input.slice(start, this.pos))) { octal = false; } if (next === 46 && !octal) { // '.' @@ -17927,15 +10411,15 @@ pp.readNumber = function(startsWithDot) { if (next === 43 || next === 45) { ++this.pos; } // '+-' if (this.readInt(10) === null) { this.raise(start, "Invalid number"); } } - if (isIdentifierStart(this.fullCharCodeAtPos())) { this.raise(this.pos, "Identifier directly after number"); } + if (isIdentifierStart$1(this.fullCharCodeAtPos())) { this.raise(this.pos, "Identifier directly after number"); } - var val = stringToNumber(this.input.slice(start, this.pos), octal); - return this.finishToken(types$1.num, val) + var val = stringToNumber$1(this.input.slice(start, this.pos), octal); + return this.finishToken(types$3.num, val) }; // Read a string value, interpreting backslash-escapes. -pp.readCodePoint = function() { +pp$9$1.readCodePoint = function() { var ch = this.input.charCodeAt(this.pos), code; if (ch === 123) { // '{' @@ -17950,7 +10434,14 @@ pp.readCodePoint = function() { return code }; -pp.readString = function(quote) { +function codePointToString$1$1(code) { + // UTF-16 Decoding + if (code <= 0xFFFF) { return String.fromCharCode(code) } + code -= 0x10000; + return String.fromCharCode((code >> 10) + 0xD800, (code & 1023) + 0xDC00) +} + +pp$9$1.readString = function(quote) { var out = "", chunkStart = ++this.pos; for (;;) { if (this.pos >= this.input.length) { this.raise(this.start, "Unterminated string constant"); } @@ -17960,32 +10451,25 @@ pp.readString = function(quote) { out += this.input.slice(chunkStart, this.pos); out += this.readEscapedChar(false); chunkStart = this.pos; - } else if (ch === 0x2028 || ch === 0x2029) { - if (this.options.ecmaVersion < 10) { this.raise(this.start, "Unterminated string constant"); } - ++this.pos; - if (this.options.locations) { - this.curLine++; - this.lineStart = this.pos; - } } else { - if (isNewLine(ch)) { this.raise(this.start, "Unterminated string constant"); } + if (isNewLine$1(ch, this.options.ecmaVersion >= 10)) { this.raise(this.start, "Unterminated string constant"); } ++this.pos; } } out += this.input.slice(chunkStart, this.pos++); - return this.finishToken(types$1.string, out) + return this.finishToken(types$3.string, out) }; // Reads template string tokens. -var INVALID_TEMPLATE_ESCAPE_ERROR = {}; +var INVALID_TEMPLATE_ESCAPE_ERROR$1 = {}; -pp.tryReadTemplateToken = function() { +pp$9$1.tryReadTemplateToken = function() { this.inTemplateElement = true; try { this.readTmplToken(); } catch (err) { - if (err === INVALID_TEMPLATE_ESCAPE_ERROR) { + if (err === INVALID_TEMPLATE_ESCAPE_ERROR$1) { this.readInvalidTemplateToken(); } else { throw err @@ -17995,37 +10479,37 @@ pp.tryReadTemplateToken = function() { this.inTemplateElement = false; }; -pp.invalidStringToken = function(position, message) { +pp$9$1.invalidStringToken = function(position, message) { if (this.inTemplateElement && this.options.ecmaVersion >= 9) { - throw INVALID_TEMPLATE_ESCAPE_ERROR + throw INVALID_TEMPLATE_ESCAPE_ERROR$1 } else { this.raise(position, message); } }; -pp.readTmplToken = function() { +pp$9$1.readTmplToken = function() { var out = "", chunkStart = this.pos; for (;;) { if (this.pos >= this.input.length) { this.raise(this.start, "Unterminated template"); } var ch = this.input.charCodeAt(this.pos); if (ch === 96 || ch === 36 && this.input.charCodeAt(this.pos + 1) === 123) { // '`', '${' - if (this.pos === this.start && (this.type === types$1.template || this.type === types$1.invalidTemplate)) { + if (this.pos === this.start && (this.type === types$3.template || this.type === types$3.invalidTemplate)) { if (ch === 36) { this.pos += 2; - return this.finishToken(types$1.dollarBraceL) + return this.finishToken(types$3.dollarBraceL) } else { ++this.pos; - return this.finishToken(types$1.backQuote) + return this.finishToken(types$3.backQuote) } } out += this.input.slice(chunkStart, this.pos); - return this.finishToken(types$1.template, out) + return this.finishToken(types$3.template, out) } if (ch === 92) { // '\' out += this.input.slice(chunkStart, this.pos); out += this.readEscapedChar(true); chunkStart = this.pos; - } else if (isNewLine(ch)) { + } else if (isNewLine$1(ch)) { out += this.input.slice(chunkStart, this.pos); ++this.pos; switch (ch) { @@ -18050,7 +10534,7 @@ pp.readTmplToken = function() { }; // Reads a template token to search for the end, without validating any escape sequences -pp.readInvalidTemplateToken = function() { +pp$9$1.readInvalidTemplateToken = function() { for (; this.pos < this.input.length; this.pos++) { switch (this.input[this.pos]) { case "\\": @@ -18061,10 +10545,10 @@ pp.readInvalidTemplateToken = function() { if (this.input[this.pos + 1] !== "{") { break } - // falls through + case "`": - return this.finishToken(types$1.invalidTemplate, this.input.slice(this.start, this.pos)) + return this.finishToken(types$3.invalidTemplate, this.input.slice(this.start, this.pos)) // no default } @@ -18074,14 +10558,14 @@ pp.readInvalidTemplateToken = function() { // Used to read escaped characters -pp.readEscapedChar = function(inTemplate) { +pp$9$1.readEscapedChar = function(inTemplate) { var ch = this.input.charCodeAt(++this.pos); ++this.pos; switch (ch) { case 110: return "\n" // 'n' -> '\n' case 114: return "\r" // 'r' -> '\r' case 120: return String.fromCharCode(this.readHexChar(2)) // 'x' - case 117: return codePointToString(this.readCodePoint()) // 'u' + case 117: return codePointToString$1$1(this.readCodePoint()) // 'u' case 116: return "\t" // 't' -> '\t' case 98: return "\b" // 'b' -> '\b' case 118: return "\u000b" // 'v' -> '\u000b' @@ -18092,12 +10576,6 @@ pp.readEscapedChar = function(inTemplate) { return "" case 56: case 57: - if (this.strict) { - this.invalidStringToken( - this.pos - 1, - "Invalid escape sequence" - ); - } if (inTemplate) { var codePos = this.pos - 1; @@ -18128,7 +10606,7 @@ pp.readEscapedChar = function(inTemplate) { } return String.fromCharCode(octal) } - if (isNewLine(ch)) { + if (isNewLine$1(ch)) { // Unicode new line characters after \ get removed from output in both // template literals and strings return "" @@ -18139,7 +10617,7 @@ pp.readEscapedChar = function(inTemplate) { // Used to read character escape sequences ('\x', '\u', '\U'). -pp.readHexChar = function(len) { +pp$9$1.readHexChar = function(len) { var codePos = this.pos; var n = this.readInt(16, len); if (n === null) { this.invalidStringToken(codePos, "Bad character escape sequence"); } @@ -18152,13 +10630,13 @@ pp.readHexChar = function(len) { // Incrementally adds only escaped chars, adding other chunks as-is // as a micro-optimization. -pp.readWord1 = function() { +pp$9$1.readWord1 = function() { this.containsEsc = false; var word = "", first = true, chunkStart = this.pos; var astral = this.options.ecmaVersion >= 6; while (this.pos < this.input.length) { var ch = this.fullCharCodeAtPos(); - if (isIdentifierChar(ch, astral)) { + if (isIdentifierChar$1(ch, astral)) { this.pos += ch <= 0xffff ? 1 : 2; } else if (ch === 92) { // "\" this.containsEsc = true; @@ -18168,9 +10646,9 @@ pp.readWord1 = function() { { this.invalidStringToken(this.pos, "Expecting Unicode escape sequence \\uXXXX"); } ++this.pos; var esc = this.readCodePoint(); - if (!(first ? isIdentifierStart : isIdentifierChar)(esc, astral)) + if (!(first ? isIdentifierStart$1 : isIdentifierChar$1)(esc, astral)) { this.invalidStringToken(escStart, "Invalid Unicode escape"); } - word += codePointToString(esc); + word += codePointToString$1$1(esc); chunkStart = this.pos; } else { break @@ -18183,42 +10661,42 @@ pp.readWord1 = function() { // Read an identifier or keyword token. Will check for reserved // words when necessary. -pp.readWord = function() { +pp$9$1.readWord = function() { var word = this.readWord1(); - var type = types$1.name; + var type = types$3.name; if (this.keywords.test(word)) { - type = keywords[word]; + type = keywords$1$1[word]; } return this.finishToken(type, word) }; // Acorn is a tiny, fast JavaScript parser written in JavaScript. -var version = "8.8.1"; - -Parser.acorn = { - Parser: Parser, - version: version, - defaultOptions: defaultOptions, - Position: Position, - SourceLocation: SourceLocation, - getLineInfo: getLineInfo, - Node: Node$1, - TokenType: TokenType, - tokTypes: types$1, - keywordTypes: keywords, - TokContext: TokContext, - tokContexts: types, - isIdentifierChar: isIdentifierChar, - isIdentifierStart: isIdentifierStart, - Token: Token, - isNewLine: isNewLine, - lineBreak: lineBreak, - lineBreakG: lineBreakG, - nonASCIIwhitespace: nonASCIIwhitespace -}; - -var defaultGlobals = new Set([ +var version$1 = "7.4.1"; + +Parser$1.acorn = { + Parser: Parser$1, + version: version$1, + defaultOptions: defaultOptions$1, + Position: Position$1, + SourceLocation: SourceLocation$1, + getLineInfo: getLineInfo$1, + Node: Node$2, + TokenType: TokenType$1, + tokTypes: types$3, + keywordTypes: keywords$1$1, + TokContext: TokContext$1, + tokContexts: types$1$2, + isIdentifierChar: isIdentifierChar$1, + isIdentifierStart: isIdentifierStart$1, + Token: Token$1, + isNewLine: isNewLine$1, + lineBreak: lineBreak$1, + lineBreakG: lineBreakG$1, + nonASCIIwhitespace: nonASCIIwhitespace$1 +}; + +var defaultGlobals$1 = new Set([ "Array", "ArrayBuffer", "atob", @@ -18322,8 +10800,8 @@ var defaultGlobals = new Set([ // walker, and state can be used to give this walked an initial // state. -function simple(node, visitors, baseVisitor, state, override) { - if (!baseVisitor) { baseVisitor = base$1 +function simple$2(node, visitors, baseVisitor, state, override) { + if (!baseVisitor) { baseVisitor = base$3 ; }(function c(node, st, override) { var type = override || node.type, found = visitors[type]; baseVisitor[type](node, st, c); @@ -18334,9 +10812,9 @@ function simple(node, visitors, baseVisitor, state, override) { // An ancestor walk keeps an array of ancestor nodes (including the // current node) and passes them to the callback as third parameter // (and also as state parameter when no other state is present). -function ancestor(node, visitors, baseVisitor, state, override) { +function ancestor$1(node, visitors, baseVisitor, state, override) { var ancestors = []; - if (!baseVisitor) { baseVisitor = base$1 + if (!baseVisitor) { baseVisitor = base$3 ; }(function c(node, st, override) { var type = override || node.type, found = visitors[type]; var isNew = node !== ancestors[ancestors.length - 1]; @@ -18347,22 +10825,39 @@ function ancestor(node, visitors, baseVisitor, state, override) { })(node, state, override); } +// A full walk triggers the callback on each node +function full(node, callback, baseVisitor, state, override) { + if (!baseVisitor) { baseVisitor = base$3 + ; }(function c(node, st, override) { + var type = override || node.type; + baseVisitor[type](node, st, c); + if (!override) { callback(node, st, type); } + })(node, state, override); +} + +// Fallback to an Object.create polyfill for older environments. +var create = Object.create || function(proto) { + function Ctor() {} + Ctor.prototype = proto; + return new Ctor +}; + // Used to create a custom walker. Will fill in all missing node // type properties with the defaults. -function make(funcs, baseVisitor) { - var visitor = Object.create(baseVisitor || base$1); +function make$2(funcs, baseVisitor) { + var visitor = create(base$3); for (var type in funcs) { visitor[type] = funcs[type]; } return visitor } -function skipThrough(node, st, c) { c(node, st); } -function ignore(_node, _st, _c) {} +function skipThrough$2(node, st, c) { c(node, st); } +function ignore$2(_node, _st, _c) {} // Node walkers. -var base$1 = {}; +var base$3 = {}; -base$1.Program = base$1.BlockStatement = base$1.StaticBlock = function (node, st, c) { +base$3.Program = base$3.BlockStatement = function (node, st, c) { for (var i = 0, list = node.body; i < list.length; i += 1) { var stmt = list[i]; @@ -18370,22 +10865,22 @@ base$1.Program = base$1.BlockStatement = base$1.StaticBlock = function (node, st c(stmt, st, "Statement"); } }; -base$1.Statement = skipThrough; -base$1.EmptyStatement = ignore; -base$1.ExpressionStatement = base$1.ParenthesizedExpression = base$1.ChainExpression = +base$3.Statement = skipThrough$2; +base$3.EmptyStatement = ignore$2; +base$3.ExpressionStatement = base$3.ParenthesizedExpression = base$3.ChainExpression = function (node, st, c) { return c(node.expression, st, "Expression"); }; -base$1.IfStatement = function (node, st, c) { +base$3.IfStatement = function (node, st, c) { c(node.test, st, "Expression"); c(node.consequent, st, "Statement"); if (node.alternate) { c(node.alternate, st, "Statement"); } }; -base$1.LabeledStatement = function (node, st, c) { return c(node.body, st, "Statement"); }; -base$1.BreakStatement = base$1.ContinueStatement = ignore; -base$1.WithStatement = function (node, st, c) { +base$3.LabeledStatement = function (node, st, c) { return c(node.body, st, "Statement"); }; +base$3.BreakStatement = base$3.ContinueStatement = ignore$2; +base$3.WithStatement = function (node, st, c) { c(node.object, st, "Expression"); c(node.body, st, "Statement"); }; -base$1.SwitchStatement = function (node, st, c) { +base$3.SwitchStatement = function (node, st, c) { c(node.discriminant, st, "Expression"); for (var i$1 = 0, list$1 = node.cases; i$1 < list$1.length; i$1 += 1) { var cs = list$1[i$1]; @@ -18399,7 +10894,7 @@ base$1.SwitchStatement = function (node, st, c) { } } }; -base$1.SwitchCase = function (node, st, c) { +base$3.SwitchCase = function (node, st, c) { if (node.test) { c(node.test, st, "Expression"); } for (var i = 0, list = node.consequent; i < list.length; i += 1) { @@ -18408,43 +10903,43 @@ base$1.SwitchCase = function (node, st, c) { c(cons, st, "Statement"); } }; -base$1.ReturnStatement = base$1.YieldExpression = base$1.AwaitExpression = function (node, st, c) { +base$3.ReturnStatement = base$3.YieldExpression = base$3.AwaitExpression = function (node, st, c) { if (node.argument) { c(node.argument, st, "Expression"); } }; -base$1.ThrowStatement = base$1.SpreadElement = +base$3.ThrowStatement = base$3.SpreadElement = function (node, st, c) { return c(node.argument, st, "Expression"); }; -base$1.TryStatement = function (node, st, c) { +base$3.TryStatement = function (node, st, c) { c(node.block, st, "Statement"); if (node.handler) { c(node.handler, st); } if (node.finalizer) { c(node.finalizer, st, "Statement"); } }; -base$1.CatchClause = function (node, st, c) { +base$3.CatchClause = function (node, st, c) { if (node.param) { c(node.param, st, "Pattern"); } c(node.body, st, "Statement"); }; -base$1.WhileStatement = base$1.DoWhileStatement = function (node, st, c) { +base$3.WhileStatement = base$3.DoWhileStatement = function (node, st, c) { c(node.test, st, "Expression"); c(node.body, st, "Statement"); }; -base$1.ForStatement = function (node, st, c) { +base$3.ForStatement = function (node, st, c) { if (node.init) { c(node.init, st, "ForInit"); } if (node.test) { c(node.test, st, "Expression"); } if (node.update) { c(node.update, st, "Expression"); } c(node.body, st, "Statement"); }; -base$1.ForInStatement = base$1.ForOfStatement = function (node, st, c) { +base$3.ForInStatement = base$3.ForOfStatement = function (node, st, c) { c(node.left, st, "ForInit"); c(node.right, st, "Expression"); c(node.body, st, "Statement"); }; -base$1.ForInit = function (node, st, c) { +base$3.ForInit = function (node, st, c) { if (node.type === "VariableDeclaration") { c(node, st); } else { c(node, st, "Expression"); } }; -base$1.DebuggerStatement = ignore; +base$3.DebuggerStatement = ignore$2; -base$1.FunctionDeclaration = function (node, st, c) { return c(node, st, "Function"); }; -base$1.VariableDeclaration = function (node, st, c) { +base$3.FunctionDeclaration = function (node, st, c) { return c(node, st, "Function"); }; +base$3.VariableDeclaration = function (node, st, c) { for (var i = 0, list = node.declarations; i < list.length; i += 1) { var decl = list[i]; @@ -18452,12 +10947,12 @@ base$1.VariableDeclaration = function (node, st, c) { c(decl, st); } }; -base$1.VariableDeclarator = function (node, st, c) { +base$3.VariableDeclarator = function (node, st, c) { c(node.id, st, "Pattern"); if (node.init) { c(node.init, st, "Expression"); } }; -base$1.Function = function (node, st, c) { +base$3.Function = function (node, st, c) { if (node.id) { c(node.id, st, "Pattern"); } for (var i = 0, list = node.params; i < list.length; i += 1) { @@ -18468,7 +10963,7 @@ base$1.Function = function (node, st, c) { c(node.body, st, node.expression ? "Expression" : "Statement"); }; -base$1.Pattern = function (node, st, c) { +base$3.Pattern = function (node, st, c) { if (node.type === "Identifier") { c(node, st, "VariablePattern"); } else if (node.type === "MemberExpression") @@ -18476,17 +10971,17 @@ base$1.Pattern = function (node, st, c) { else { c(node, st); } }; -base$1.VariablePattern = ignore; -base$1.MemberPattern = skipThrough; -base$1.RestElement = function (node, st, c) { return c(node.argument, st, "Pattern"); }; -base$1.ArrayPattern = function (node, st, c) { +base$3.VariablePattern = ignore$2; +base$3.MemberPattern = skipThrough$2; +base$3.RestElement = function (node, st, c) { return c(node.argument, st, "Pattern"); }; +base$3.ArrayPattern = function (node, st, c) { for (var i = 0, list = node.elements; i < list.length; i += 1) { var elt = list[i]; if (elt) { c(elt, st, "Pattern"); } } }; -base$1.ObjectPattern = function (node, st, c) { +base$3.ObjectPattern = function (node, st, c) { for (var i = 0, list = node.properties; i < list.length; i += 1) { var prop = list[i]; @@ -18499,16 +10994,16 @@ base$1.ObjectPattern = function (node, st, c) { } }; -base$1.Expression = skipThrough; -base$1.ThisExpression = base$1.Super = base$1.MetaProperty = ignore; -base$1.ArrayExpression = function (node, st, c) { +base$3.Expression = skipThrough$2; +base$3.ThisExpression = base$3.Super = base$3.MetaProperty = ignore$2; +base$3.ArrayExpression = function (node, st, c) { for (var i = 0, list = node.elements; i < list.length; i += 1) { var elt = list[i]; if (elt) { c(elt, st, "Expression"); } } }; -base$1.ObjectExpression = function (node, st, c) { +base$3.ObjectExpression = function (node, st, c) { for (var i = 0, list = node.properties; i < list.length; i += 1) { var prop = list[i]; @@ -18516,8 +11011,8 @@ base$1.ObjectExpression = function (node, st, c) { c(prop, st); } }; -base$1.FunctionExpression = base$1.ArrowFunctionExpression = base$1.FunctionDeclaration; -base$1.SequenceExpression = function (node, st, c) { +base$3.FunctionExpression = base$3.ArrowFunctionExpression = base$3.FunctionDeclaration; +base$3.SequenceExpression = function (node, st, c) { for (var i = 0, list = node.expressions; i < list.length; i += 1) { var expr = list[i]; @@ -18525,7 +11020,7 @@ base$1.SequenceExpression = function (node, st, c) { c(expr, st, "Expression"); } }; -base$1.TemplateLiteral = function (node, st, c) { +base$3.TemplateLiteral = function (node, st, c) { for (var i = 0, list = node.quasis; i < list.length; i += 1) { var quasi = list[i]; @@ -18540,24 +11035,24 @@ base$1.TemplateLiteral = function (node, st, c) { c(expr, st, "Expression"); } }; -base$1.TemplateElement = ignore; -base$1.UnaryExpression = base$1.UpdateExpression = function (node, st, c) { +base$3.TemplateElement = ignore$2; +base$3.UnaryExpression = base$3.UpdateExpression = function (node, st, c) { c(node.argument, st, "Expression"); }; -base$1.BinaryExpression = base$1.LogicalExpression = function (node, st, c) { +base$3.BinaryExpression = base$3.LogicalExpression = function (node, st, c) { c(node.left, st, "Expression"); c(node.right, st, "Expression"); }; -base$1.AssignmentExpression = base$1.AssignmentPattern = function (node, st, c) { +base$3.AssignmentExpression = base$3.AssignmentPattern = function (node, st, c) { c(node.left, st, "Pattern"); c(node.right, st, "Expression"); }; -base$1.ConditionalExpression = function (node, st, c) { +base$3.ConditionalExpression = function (node, st, c) { c(node.test, st, "Expression"); c(node.consequent, st, "Expression"); c(node.alternate, st, "Expression"); }; -base$1.NewExpression = base$1.CallExpression = function (node, st, c) { +base$3.NewExpression = base$3.CallExpression = function (node, st, c) { c(node.callee, st, "Expression"); if (node.arguments) { for (var i = 0, list = node.arguments; i < list.length; i += 1) @@ -18567,21 +11062,21 @@ base$1.NewExpression = base$1.CallExpression = function (node, st, c) { c(arg, st, "Expression"); } } }; -base$1.MemberExpression = function (node, st, c) { +base$3.MemberExpression = function (node, st, c) { c(node.object, st, "Expression"); if (node.computed) { c(node.property, st, "Expression"); } }; -base$1.ExportNamedDeclaration = base$1.ExportDefaultDeclaration = function (node, st, c) { +base$3.ExportNamedDeclaration = base$3.ExportDefaultDeclaration = function (node, st, c) { if (node.declaration) { c(node.declaration, st, node.type === "ExportNamedDeclaration" || node.declaration.id ? "Statement" : "Expression"); } if (node.source) { c(node.source, st, "Expression"); } }; -base$1.ExportAllDeclaration = function (node, st, c) { +base$3.ExportAllDeclaration = function (node, st, c) { if (node.exported) { c(node.exported, st); } c(node.source, st, "Expression"); }; -base$1.ImportDeclaration = function (node, st, c) { +base$3.ImportDeclaration = function (node, st, c) { for (var i = 0, list = node.specifiers; i < list.length; i += 1) { var spec = list[i]; @@ -18590,22 +11085,22 @@ base$1.ImportDeclaration = function (node, st, c) { } c(node.source, st, "Expression"); }; -base$1.ImportExpression = function (node, st, c) { +base$3.ImportExpression = function (node, st, c) { c(node.source, st, "Expression"); }; -base$1.ImportSpecifier = base$1.ImportDefaultSpecifier = base$1.ImportNamespaceSpecifier = base$1.Identifier = base$1.PrivateIdentifier = base$1.Literal = ignore; +base$3.ImportSpecifier = base$3.ImportDefaultSpecifier = base$3.ImportNamespaceSpecifier = base$3.Identifier = base$3.Literal = ignore$2; -base$1.TaggedTemplateExpression = function (node, st, c) { +base$3.TaggedTemplateExpression = function (node, st, c) { c(node.tag, st, "Expression"); c(node.quasi, st, "Expression"); }; -base$1.ClassDeclaration = base$1.ClassExpression = function (node, st, c) { return c(node, st, "Class"); }; -base$1.Class = function (node, st, c) { +base$3.ClassDeclaration = base$3.ClassExpression = function (node, st, c) { return c(node, st, "Class"); }; +base$3.Class = function (node, st, c) { if (node.id) { c(node.id, st, "Pattern"); } if (node.superClass) { c(node.superClass, st, "Expression"); } c(node.body, st); }; -base$1.ClassBody = function (node, st, c) { +base$3.ClassBody = function (node, st, c) { for (var i = 0, list = node.body; i < list.length; i += 1) { var elt = list[i]; @@ -18613,12 +11108,12 @@ base$1.ClassBody = function (node, st, c) { c(elt, st); } }; -base$1.MethodDefinition = base$1.PropertyDefinition = base$1.Property = function (node, st, c) { +base$3.MethodDefinition = base$3.Property = function (node, st, c) { if (node.computed) { c(node.key, st, "Expression"); } - if (node.value) { c(node.value, st, "Expression"); } + c(node.value, st, "Expression"); }; -var walk = make({ +var walk$1 = make$2({ Import() {}, ViewExpression(node, st, c) { c(node.id, st, "Identifier"); @@ -18629,28 +11124,31 @@ var walk = make({ }); // Based on https://github.com/ForbesLindesay/acorn-globals +// Copyright (c) 2014 Forbes Lindesay +// https://github.com/ForbesLindesay/acorn-globals/blob/master/LICENSE -function isScope(node) { + +function isScope$1(node) { return node.type === "FunctionExpression" || node.type === "FunctionDeclaration" || node.type === "ArrowFunctionExpression" || node.type === "Program"; } -function isBlockScope(node) { +function isBlockScope$1(node) { return node.type === "BlockStatement" || node.type === "ForInStatement" || node.type === "ForOfStatement" || node.type === "ForStatement" - || isScope(node); + || isScope$1(node); } -function declaresArguments(node) { +function declaresArguments$1(node) { return node.type === "FunctionExpression" || node.type === "FunctionDeclaration"; } -function findReferences(cell, globals) { +function findReferences$1(cell, globals) { const ast = {type: "Program", body: [cell.body]}; const locals = new Map; const globalSet = new Set(globals); @@ -18709,13 +11207,13 @@ function findReferences(cell, globals) { declareLocal(ast, node.local); } - ancestor( + ancestor$1( ast, { VariableDeclaration: (node, parents) => { let parent = null; for (let i = parents.length - 1; i >= 0 && parent === null; --i) { - if (node.kind === "var" ? isScope(parents[i]) : isBlockScope(parents[i])) { + if (node.kind === "var" ? isScope$1(parents[i]) : isBlockScope$1(parents[i])) { parent = parents[i]; } } @@ -18724,7 +11222,7 @@ function findReferences(cell, globals) { FunctionDeclaration: (node, parents) => { let parent = null; for (let i = parents.length - 2; i >= 0 && parent === null; --i) { - if (isScope(parents[i])) { + if (isScope$1(parents[i])) { parent = parents[i]; } } @@ -18735,7 +11233,7 @@ function findReferences(cell, globals) { ClassDeclaration: (node, parents) => { let parent = null; for (let i = parents.length - 2; i >= 0 && parent === null; i--) { - if (isScope(parents[i])) { + if (isScope$1(parents[i])) { parent = parents[i]; } } @@ -18747,7 +11245,7 @@ function findReferences(cell, globals) { ImportSpecifier: declareModuleSpecifier, ImportNamespaceSpecifier: declareModuleSpecifier }, - walk + walk$1 ); function identifier(node, parents) { @@ -18755,7 +11253,7 @@ function findReferences(cell, globals) { if (name === "undefined") return; for (let i = parents.length - 2; i >= 0; --i) { if (name === "arguments") { - if (declaresArguments(parents[i])) { + if (declaresArguments$1(parents[i])) { return; } } @@ -18779,50 +11277,45 @@ function findReferences(cell, globals) { } } - ancestor( + ancestor$1( ast, { VariablePattern: identifier, Identifier: identifier }, - walk + walk$1 ); function checkConst(node, parents) { - if (!node) return; switch (node.type) { case "Identifier": case "VariablePattern": { - for (const parent of parents) { - if (hasLocal(parent, node.name)) { - return; - } - } - if (parents[parents.length - 2].type === "MutableExpression") { - return; - } - throw Object.assign(new SyntaxError(`Assignment to constant variable ${node.name}`), {node}); - } - case "ArrayPattern": { - for (const element of node.elements) { - checkConst(element, parents); - } - return; + identifier(node, parents); + break; } + case "ArrayPattern": case "ObjectPattern": { - for (const property of node.properties) { - checkConst(property, parents); + ancestor$1( + node, + { + Identifier: identifier, + VariablePattern: identifier + }, + walk$1 + ); + break; + } + } + function identifier(node, nodeParents) { + for (const parent of parents) { + if (hasLocal(parent, node.name)) { + return; } - return; } - case "Property": { - checkConst(node.value, parents); - return; - } - case "RestElement": { - checkConst(node.argument, parents); + if (nodeParents[nodeParents.length - 2].type === "MutableExpression") { return; } + throw Object.assign(new SyntaxError(`Assignment to constant variable ${node.name}`), {node}); } } @@ -18834,27 +11327,26 @@ function findReferences(cell, globals) { checkConst(node.left, parents); } - ancestor( + ancestor$1( ast, { AssignmentExpression: checkConstLeft, - AssignmentPattern: checkConstLeft, UpdateExpression: checkConstArgument, ForOfStatement: checkConstLeft, ForInStatement: checkConstLeft }, - walk + walk$1 ); return references; } -function findFeatures(cell, featureName) { +function findFeatures$1(cell, featureName) { const ast = {type: "Program", body: [cell.body]}; const features = new Map(); const {references} = cell; - simple( + simple$2( ast, { CallExpression: node => { @@ -18883,26 +11375,33 @@ function findFeatures(cell, featureName) { else features.set(name, [location]); } }, - walk + walk$1 ); return features; } -const SCOPE_FUNCTION = 2; -const SCOPE_ASYNC = 4; -const SCOPE_GENERATOR = 8; +const SCOPE_FUNCTION$2 = 2; +const SCOPE_ASYNC$2 = 4; +const SCOPE_GENERATOR$2 = 8; -class CellParser extends Parser { +function parseCell(input, {globals} = {}) { + const cell = CellParser$1.parse(input); + parseReferences$1(cell, input, globals); + parseFeatures$1(cell); + return cell; +} + +let CellParser$1 = class CellParser extends Parser$1 { constructor(options, ...args) { - super(Object.assign({ecmaVersion: 13}, options), ...args); + super(Object.assign({ecmaVersion: 12}, options), ...args); } enterScope(flags) { - if (flags & SCOPE_FUNCTION) ++this.O_function; + if (flags & SCOPE_FUNCTION$2) ++this.O_function; return super.enterScope(flags); } exitScope() { - if (this.currentScope().flags & SCOPE_FUNCTION) --this.O_function; + if (this.currentScope().flags & SCOPE_FUNCTION$2) --this.O_function; return super.exitScope(); } parseForIn(node, init) { @@ -18920,25 +11419,25 @@ class CellParser extends Parser { parseImport(node) { this.next(); node.specifiers = this.parseImportSpecifiers(); - if (this.type === types$1._with) { + if (this.type === types$3._with) { this.next(); node.injections = this.parseImportSpecifiers(); } this.expectContextual("from"); - node.source = this.type === types$1.string ? this.parseExprAtom() : this.unexpected(); + node.source = this.type === types$3.string ? this.parseExprAtom() : this.unexpected(); return this.finishNode(node, "ImportDeclaration"); } parseImportSpecifiers() { const nodes = []; const identifiers = new Set; let first = true; - this.expect(types$1.braceL); - while (!this.eat(types$1.braceR)) { + this.expect(types$3.braceL); + while (!this.eat(types$3.braceR)) { if (first) { first = false; } else { - this.expect(types$1.comma); - if (this.afterTrailingComma(types$1.braceR)) break; + this.expect(types$3.comma); + if (this.afterTrailingComma(types$3.braceR)) break; } const node = this.startNode(); node.view = this.eatContextual("viewof"); @@ -18953,7 +11452,7 @@ class CellParser extends Parser { } else { node.local = node.imported; } - this.checkLValSimple(node.local, "let"); + this.checkLVal(node.local, "let"); if (identifiers.has(node.local.name)) { this.raise(node.local.start, `Identifier '${node.local.name}' has already been declared`); } @@ -18969,58 +11468,46 @@ class CellParser extends Parser { super.parseExprAtom(refDestructuringErrors) ); } - startCell() { - this.O_function = 0; - this.O_async = false; - this.O_generator = false; - this.strict = true; - this.enterScope(SCOPE_FUNCTION | SCOPE_ASYNC | SCOPE_GENERATOR); - } - finishCell(node, body, id) { - if (id) this.checkLocal(id); - node.id = id; - node.body = body; - node.async = this.O_async; - node.generator = this.O_generator; - this.exitScope(); - return this.finishNode(node, "Cell"); - } parseCell(node, eof) { const lookahead = new CellParser({}, this.input, this.start); let token = lookahead.getToken(); let body = null; let id = null; - this.startCell(); + this.O_function = 0; + this.O_async = false; + this.O_generator = false; + this.strict = true; + this.enterScope(SCOPE_FUNCTION$2 | SCOPE_ASYNC$2 | SCOPE_GENERATOR$2); // An import? - if (token.type === types$1._import && lookahead.getToken().type !== types$1.parenL) { + if (token.type === types$3._import && lookahead.getToken().type !== types$3.parenL) { body = this.parseImport(this.startNode()); } // A non-empty cell? - else if (token.type !== types$1.eof && token.type !== types$1.semi) { + else if (token.type !== types$3.eof && token.type !== types$3.semi) { // A named cell? - if (token.type === types$1.name) { + if (token.type === types$3.name) { if (token.value === "viewof" || token.value === "mutable") { token = lookahead.getToken(); - if (token.type !== types$1.name) { + if (token.type !== types$3.name) { lookahead.unexpected(); } } token = lookahead.getToken(); - if (token.type === types$1.eq) { + if (token.type === types$3.eq) { id = this.parseMaybeKeywordExpression("viewof", "ViewExpression") || this.parseMaybeKeywordExpression("mutable", "MutableExpression") || this.parseIdent(); token = lookahead.getToken(); - this.expect(types$1.eq); + this.expect(types$3.eq); } } // A block? - if (token.type === types$1.braceL) { + if (token.type === types$3.braceL) { body = this.parseBlock(); } @@ -19039,9 +11526,15 @@ class CellParser extends Parser { } this.semicolon(); - if (eof) this.expect(types$1.eof); // TODO + if (eof) this.expect(types$3.eof); // TODO - return this.finishCell(node, body, id); + if (id) this.checkLocal(id); + node.id = id; + node.async = this.O_async; + node.generator = this.O_generator; + node.body = body; + this.exitScope(); + return this.finishNode(node, "Cell"); } parseTopLevel(node) { return this.parseCell(node, true); @@ -19053,7 +11546,7 @@ class CellParser extends Parser { } checkLocal(id) { const node = id.id || id; - if (defaultGlobals.has(node.name) || node.name === "arguments") { + if (defaultGlobals$1.has(node.name) || node.name === "arguments") { this.raise(node.start, `Identifier '${node.name}' is reserved`); } } @@ -19063,8 +11556,8 @@ class CellParser extends Parser { } return super.checkUnreserved(node); } - checkLValSimple(expr, bindingType, checkClashes) { - return super.checkLValSimple( + checkLVal(expr, bindingType, checkClashes) { + return super.checkLVal( expr.type === "MutableExpression" ? expr.id : expr, bindingType, checkClashes @@ -19073,7 +11566,7 @@ class CellParser extends Parser { unexpected(pos) { this.raise( pos != null ? pos : this.start, - this.type === types$1.eof ? "Unexpected end of input" : "Unexpected token" + this.type === types$3.eof ? "Unexpected end of input" : "Unexpected token" ); } parseMaybeKeywordExpression(keyword, type) { @@ -19084,59 +11577,40 @@ class CellParser extends Parser { return this.finishNode(node, type); } } -} +}; -// Based on acorn’s q_tmpl. We will use this to initialize the -// parser context so our `readTemplateToken` override is called. -// `readTemplateToken` is based on acorn's `readTmplToken` which -// is used inside template literals. Our version allows backQuotes. -new TokContext( - "`", // token - true, // isExpr - true, // preserveSpace - parser => readTemplateToken.call(parser) // override -); +function parseModule$1(input, {globals} = {}) { + const program = ModuleParser$1.parse(input); + for (const cell of program.cells) { + parseReferences$1(cell, input, globals); + parseFeatures$1(cell, input); + } + return program; +} -// This is our custom override for parsing a template that allows backticks. -// Based on acorn's readInvalidTemplateToken. -function readTemplateToken() { - out: for (; this.pos < this.input.length; this.pos++) { - switch (this.input.charCodeAt(this.pos)) { - case 92: { // slash - if (this.pos < this.input.length - 1) ++this.pos; // not a terminal slash - break; - } - case 36: { // dollar - if (this.input.charCodeAt(this.pos + 1) === 123) { // dollar curly - if (this.pos === this.start && this.type === types$1.invalidTemplate) { - this.pos += 2; - return this.finishToken(types$1.dollarBraceL); - } - break out; - } - break; - } +let ModuleParser$1 = class ModuleParser extends CellParser$1 { + parseTopLevel(node) { + if (!node.cells) node.cells = []; + while (this.type !== types$3.eof) { + const cell = this.parseCell(this.startNode()); + cell.input = this.input; + node.cells.push(cell); } + this.next(); + return this.finishNode(node, "Program"); } - return this.finishToken(types$1.invalidTemplate, this.input.slice(this.start, this.pos)); -} +}; // Find references. // Check for illegal references to arguments. // Check for illegal assignments to global references. -function parseReferences(cell, input, globals = defaultGlobals) { - if (!cell.body) { - cell.references = []; - } else if (cell.body.type === "ImportDeclaration") { - cell.references = cell.body.injections - ? cell.body.injections.map(i => i.imported) - : []; - } else { +function parseReferences$1(cell, input, globals = defaultGlobals$1) { + if (cell.body && cell.body.type !== "ImportDeclaration") { try { - cell.references = findReferences(cell, globals); + cell.references = findReferences$1(cell, globals); } catch (error) { if (error.node) { - const loc = getLineInfo(input, error.node.start); + const loc = getLineInfo$1(input, error.node.start); error.message += ` (${loc.line}:${loc.column})`; error.pos = error.node.start; error.loc = loc; @@ -19151,16 +11625,15 @@ function parseReferences(cell, input, globals = defaultGlobals) { // Find features: file attachments, secrets, database clients. // Check for illegal references to arguments. // Check for illegal assignments to global references. -function parseFeatures(cell, input) { +function parseFeatures$1(cell, input) { if (cell.body && cell.body.type !== "ImportDeclaration") { try { - cell.fileAttachments = findFeatures(cell, "FileAttachment"); - cell.databaseClients = findFeatures(cell, "DatabaseClient"); - cell.secrets = findFeatures(cell, "Secret"); - cell.notificationClients = findFeatures(cell, "NotificationClient"); + cell.fileAttachments = findFeatures$1(cell, "FileAttachment"); + cell.databaseClients = findFeatures$1(cell, "DatabaseClient"); + cell.secrets = findFeatures$1(cell, "Secret"); } catch (error) { if (error.node) { - const loc = getLineInfo(input, error.node.start); + const loc = getLineInfo$1(input, error.node.start); error.message += ` (${loc.line}:${loc.column})`; error.pos = error.node.start; error.loc = loc; @@ -19172,356 +11645,7904 @@ function parseFeatures(cell, input) { cell.fileAttachments = new Map(); cell.databaseClients = new Map(); cell.secrets = new Map(); - cell.notificationClients = new Map(); } return cell; } -/* Fork changes begin here */ - -function parseModule(input, {globals} = {}) { - const program = ModuleParser.parse(input); - for (const cell of program.cells) { - parseReferences(cell, input, globals); - parseFeatures(cell, input); - } - return program; -} - -class ModuleParser extends CellParser { - parseTopLevel(node) { - if (!node.cells) node.cells = []; - while (this.type !== types$1.eof) { - const cell = this.parseCell(this.startNode()); - cell.input = this.input; - node.cells.push(cell); - } - this.next(); - return this.finishNode(node, "Program"); - } -} +/** + * FINISH REPLACING THE SIMPLE WALKER WITH A FULL WALKER THAT DOES SUBSTITUTION ALL AT ONCE. + * + */ -/* Fork changes end here */ +const extractPath = path => { + let source = path; + let m; -// https://developer.mozilla.org/en-US/docs/Glossary/Base64 + // "https://api.observablehq.com/@jashkenas/inputs.js?v=3" => strip off ".js" + if ((m = /\.js(\?|$)/i.exec(source))) source = source.slice(0, m.index); -function base64ToBytes(base64) { - const binString = atob(base64); - return Uint8Array.from(binString, (m) => m.codePointAt(0)); -} + // "74f872c4fde62e35" => "d/..." + if ((m = /^[0-9a-f]{16}$/i.test(source))) source = `d/${source}`; -function base64ToStr(base64) { - return new TextDecoder().decode(base64ToBytes(base64)); -} + // link of notebook + if ((m = /^https:\/\/(api\.|beta\.|)observablehq\.com\//i.exec(source))) + source = source.slice(m[0].length); + return source; +}; -/*global Shiny, $, DOMParser, MutationObserver, URL -* -* ojs-connector.js -* -* Copyright (C) 2022 RStudio, PBC -* -*/ +function setupImportCell(cell) { + const specifiers = []; -////////////////////////////////////////////////////////////////////////////// + if (cell.body.specifiers) + for (const specifier of cell.body.specifiers) { + if (specifier.view) { + specifiers.push({ + name: "viewof " + specifier.imported.name, + alias: "viewof " + specifier.local.name + }); + } else if (specifier.mutable) { + specifiers.push({ + name: "mutable " + specifier.imported.name, + alias: "mutable " + specifier.local.name + }); + } + specifiers.push({ + name: specifier.imported.name, + alias: specifier.local.name + }); + } + // If injections is undefined, do not derive! + const hasInjections = cell.body.injections !== undefined; + const injections = []; + if (hasInjections) + for (const injection of cell.body.injections) { + // This currently behaves like notebooks on observablehq.com + // Commenting out the if & else if blocks result in behavior like Example 3 here: https://observablehq.com/d/7ccad009e4d89969 + if (injection.view) { + injections.push({ + name: "viewof " + injection.imported.name, + alias: "viewof " + injection.local.name + }); + } else if (injection.mutable) { + injections.push({ + name: "mutable " + injection.imported.name, + alias: "mutable " + injection.local.name + }); + } + injections.push({ + name: injection.imported.name, + alias: injection.local.name + }); + } + const importString = `import {${specifiers + .map(specifier => `${specifier.name} as ${specifier.alias}`) + .join(", ")}} ${ + hasInjections + ? `with {${injections + .map(injection => `${injection.name} as ${injection.alias}`) + .join(", ")}} ` + : `` + }from "${cell.body.source.value}"`; + + return { specifiers, hasInjections, injections, importString }; +} + +function setupRegularCell(cell) { + let name = null; + if (cell.id && cell.id.name) name = cell.id.name; + else if (cell.id && cell.id.id && cell.id.id.name) name = cell.id.id.name; + let bodyText = cell.input.substring(cell.body.start, cell.body.end); + let expressionMap = {}; + let references = []; + let counter = 0; + const cellReferences = Array.from(new Set((cell.references || []).map(ref => { + if (ref.type === "ViewExpression") { + if (expressionMap[ref.id.name] === undefined) { + const newName = `$${counter++}`; + expressionMap[ref.id.name] = newName; + references.push(newName); + } + return "viewof " + ref.id.name; + } else if (ref.type === "MutableExpression") { + if (expressionMap[ref.id.name] === undefined) { + const newName = `$${counter++}`; + expressionMap[ref.id.name] = newName; + references.push(newName); + } + return "mutable " + ref.id.name; + } else { + references.push(ref.name); + return ref.name; + } + }))); + const uniq = (lst) => { + const result = []; + const s = new Set(); + for (const v of lst) { + if (s.has(v)) continue; + s.add(v); + result.push(v); + } + return result; + }; + const patches = []; + let latestPatch = { span: [cell.body.start, cell.body.start] }; + full(cell.body, node => { + if (node.type === "ViewExpression" || node.type === "MutableExpression") { + // cover previous ground? + if (node.start !== latestPatch.span[1]) { + patches.push({ newStr: cell.input.substring(latestPatch.span[1], node.start)}); + } + const suffix = node.type === "MutableExpression" ? ".value" : ""; + const newStr = `${expressionMap[node.id.name]}${suffix}`; + const patch = { + newStr, + span: [node.start, node.end] + }; + latestPatch = patch; + patches.push(patch); + } + }, walk$1); + patches.push({newStr: cell.input.substring(latestPatch.span[1], cell.body.end), span: [latestPatch.span[1], cell.body.end]}); + bodyText = patches.map(x => x.newStr).join(""); -class EmptyInspector { - pending() { - } - fulfilled(_value, _name) { - } - rejected(_error, _name) { - // TODO we should probably communicate this upstream somehow. - } + return { + cellName: name, + references: uniq(references), + bodyText, + cellReferences: uniq(cellReferences) + }; } -// here we need to convert from an ES6 module to an observable module -// in, well, a best-effort kind of way. -function es6ImportAsObservableModule(modulePromise, specs) { - const promiseMap = {}; - const resolveMap = {}; - specs.forEach(spec => { - promiseMap[spec] = new Promise((resolve, reject) => { resolveMap[spec] = { resolve, reject }; }); - }); - modulePromise.then(m => { - specs.forEach(spec => { - resolveMap[spec].resolve(m[spec]); - }); - }).catch(error => { - specs.forEach(spec => { - resolveMap[spec].reject(error); - }); - }); - return function (runtime, observer) { - const main = runtime.module(); +const AsyncFunction = Object.getPrototypeOf(async function() {}).constructor; +const GeneratorFunction = Object.getPrototypeOf(function*() {}).constructor; +const AsyncGeneratorFunction = Object.getPrototypeOf(async function*() {}) + .constructor; - specs.forEach(key => { - main.variable(observer(key)).define(key, [], () => promiseMap[key]); - }); -/* - Object.keys(m).forEach((key) => { - const v = m[key]; +function createRegularCellDefinition(cell) { + const { cellName, references, bodyText, cellReferences } = setupRegularCell( + cell + ); - main.variable(observer(key)).define(key, [], () => promiseMap[key]v); - }); - */ - return main; + let code; + if (cell.body.type !== "BlockStatement") { + if (cell.async) + code = `return (async function(){ return (${bodyText});})()`; + else code = `return (function(){ return (${bodyText});})()`; + } else code = bodyText; + + let f; + if (cell.generator && cell.async) + f = new AsyncGeneratorFunction(...references, code); + else if (cell.async) f = new AsyncFunction(...references, code); + else if (cell.generator) f = new GeneratorFunction(...references, code); + else f = new Function(...references, code); + return { + cellName, + cellFunction: f, + cellReferences }; } - -// this is essentially the import resolution code from observable's -// runtime. we change it to add a license check for permissive -// open-source licenses before resolving the import -async function defaultResolveImportPath(path) { - const extractPath = (path) => { - let source = path; - let m; - if ((m = /\.js(\?|$)/i.exec(source))) { - source = source.slice(0, m.index); - } - if ((m = /^[0-9a-f]{16}$/i.test(source))) { - source = `d/${source}`; - } - if ((m = /^https:\/\/(api\.|beta\.|)observablehq\.com\//i.exec(source))) { - source = source.slice(m[0].length); - } - return source; - }; +function defaultResolveImportPath$1(path) { const source = extractPath(path); - const moduleURL = `https://api.observablehq.com/${source}.js?v=3`; - - /* TODO This should be the implementation we use, once/if observable - starts reporting notebook license on their metadata. - - const metadata = await fetch(metadataURL, { mode: 'no-cors' }); - const nbJson = metadata.json(); - if (["isc", "mit", "bsd-3-clause", "apache-2.0"].indexOf(nbJson.license) === -1) { - throw new Error(`Notebook doesn't have a permissive open-source license`); - } */ + return import(`https://api.observablehq.com/${source}.js?v=3`).then( + m => m.default + ); +} - const m = await import(moduleURL); - return m.default; +function defaultResolveFileAttachments(name) { + return name; } -/* - importPathResolver encodes the rules for ojsconnector to resolve - import statements. +class Interpreter { + constructor(params = {}) { + const { + module = null, + observer = null, + resolveImportPath = defaultResolveImportPath$1, + resolveFileAttachments = defaultResolveFileAttachments, + defineImportMarkdown = true, + observeViewofValues = true, + observeMutableValues = true + } = params; - This code doesn't depend have any dependencies on quarto, but some - of the decisions here are influence by the needs of the quarto - system. + // can't be this.module bc of async module(). + // so make defaultObserver follow same convention. + this.defaultModule = module; + this.defaultObserver = observer; - We use the same name from observable's runtime so the intended - functionality is clear. However, note that their name is slightly - misleading. importPathResolver not only resolves import paths but - performs module imports as well. This is useful for us because it - allows us to extend the meaning of ojs's import statement, but it - makes the name confusing. + this.resolveImportPath = resolveImportPath; + this.resolveFileAttachments = resolveFileAttachments; + this.defineImportMarkdown = defineImportMarkdown; + this.observeViewofValues = observeViewofValues; + this.observeMutableValues = observeMutableValues; + } - Here are the rules for our version of the import statement. + async module(input, module, observer) { + module = module || this.defaultModule; + observer = observer || this.defaultObserver; - The function returned by importPathResolver expects a "module specifier", and - produces a module as defined by observable's runtime. + if (!module) throw Error("No module provided."); + if (!observer) throw Error("No observer provided."); - ## Local vs remote vs observable imports + const parsedModule = parseModule$1(input); + const cellPromises = []; + for (const cell of parsedModule.cells) { + cell.input = input; + cellPromises.push(this.cell(cell, module, observer)); + } + return Promise.all(cellPromises); + } - A module specifier is a string, interpreted differently depending on - the following properties: + async cell(input, module, observer) { + module = module || this.defaultModule; + observer = observer || this.defaultObserver; - - it starts with "." or "/", in which case we call it a "local module" + if (!module) throw Error("No module provided."); + if (!observer) throw Error("No observer provided."); - - it is a well-defined absolute URL which does _not_ match the regexp: - /^https:\/\/(api\.|beta\.|)observablehq\.com\//i - in which case we call it a "remote import" + let cell; + if (typeof input === "string") { + cell = parseCell(input); + cell.input = input; + } else { + cell = input; + } - - otherwise, it is an "observable import" + if (cell.body.type === "ImportDeclaration") { + const path = cell.body.source.value; + const specs = cell.body.specifiers.map(d => { + const prefix = d.view ? "viewof " : d.mutable ? "mutable " : ""; + return `${prefix}${d.imported.name}`; + }); + const fromModule = await this.resolveImportPath(path, specs); + let mdVariable, vars; + + const { + specifiers, + hasInjections, + injections, + importString + } = setupImportCell(cell); + + const other = module._runtime.module(fromModule); + + if (this.defineImportMarkdown) + mdVariable = module.variable(observer()).define( + null, + ["md"], + md => md`~~~javascript + ${importString} + ~~~` + ); + if (hasInjections) { + const child = other.derive(injections, module); + vars = specifiers.map(({ name, alias }) => + module.import(name, alias, child) + ); + } else { + vars = specifiers.map(({ name, alias }) => + module.import(name, alias, other) + ); + } + return mdVariable ? [mdVariable, ...vars] : vars; + } else { + const { + cellName, + cellFunction, + cellReferences + } = createRegularCellDefinition(cell); + if (cell.id && cell.id.type === "ViewExpression") { + const reference = `viewof ${cellName}`; + return [ + module + .variable(observer(reference)) + .define(reference, cellReferences, cellFunction.bind(this)), + module + .variable(this.observeViewofValues ? observer(cellName) : null) + .define(cellName, ["Generators", reference], (G, _) => G.input(_)) + ]; + } else if (cell.id && cell.id.type === "MutableExpression") { + const initialName = `initial ${cellName}`; + const mutableName = `mutable ${cellName}`; + return [ + module + .variable(null) + .define(initialName, cellReferences, cellFunction), + module + .variable(observer(mutableName)) + .define(mutableName, ["Mutable", initialName], (M, _) => new M(_)), + module + .variable(this.observeMutableValues ? observer(cellName) : null) + .define(cellName, [mutableName], _ => _.generator) + ]; + } else { + return [ + module + .variable(observer(cellName)) + .define(cellName, cellReferences, cellFunction.bind(this)) + ]; + } + } + } +} - If the string is an observable import, it behaves exactly like the import - statement inside observable notebooks (we actually defer to their function - call.) Otherwise, the import statement first retrieves the text content - of the resource referenced by the path, and then interprets it. +// This file was generated. Do not modify manually! +var astralIdentifierCodes = [509, 0, 227, 0, 150, 4, 294, 9, 1368, 2, 2, 1, 6, 3, 41, 2, 5, 0, 166, 1, 574, 3, 9, 9, 7, 9, 32, 4, 318, 1, 78, 5, 71, 10, 50, 3, 123, 2, 54, 14, 32, 10, 3, 1, 11, 3, 46, 10, 8, 0, 46, 9, 7, 2, 37, 13, 2, 9, 6, 1, 45, 0, 13, 2, 49, 13, 9, 3, 2, 11, 83, 11, 7, 0, 3, 0, 158, 11, 6, 9, 7, 3, 56, 1, 2, 6, 3, 1, 3, 2, 10, 0, 11, 1, 3, 6, 4, 4, 68, 8, 2, 0, 3, 0, 2, 3, 2, 4, 2, 0, 15, 1, 83, 17, 10, 9, 5, 0, 82, 19, 13, 9, 214, 6, 3, 8, 28, 1, 83, 16, 16, 9, 82, 12, 9, 9, 7, 19, 58, 14, 5, 9, 243, 14, 166, 9, 71, 5, 2, 1, 3, 3, 2, 0, 2, 1, 13, 9, 120, 6, 3, 6, 4, 0, 29, 9, 41, 6, 2, 3, 9, 0, 10, 10, 47, 15, 199, 7, 137, 9, 54, 7, 2, 7, 17, 9, 57, 21, 2, 13, 123, 5, 4, 0, 2, 1, 2, 6, 2, 0, 9, 9, 49, 4, 2, 1, 2, 4, 9, 9, 55, 9, 266, 3, 10, 1, 2, 0, 49, 6, 4, 4, 14, 10, 5350, 0, 7, 14, 11465, 27, 2343, 9, 87, 9, 39, 4, 60, 6, 26, 9, 535, 9, 470, 0, 2, 54, 8, 3, 82, 0, 12, 1, 19628, 1, 4178, 9, 519, 45, 3, 22, 543, 4, 4, 5, 9, 7, 3, 6, 31, 3, 149, 2, 1418, 49, 513, 54, 5, 49, 9, 0, 15, 0, 23, 4, 2, 14, 1361, 6, 2, 16, 3, 6, 2, 1, 2, 4, 101, 0, 161, 6, 10, 9, 357, 0, 62, 13, 499, 13, 245, 1, 2, 9, 233, 0, 3, 0, 8, 1, 6, 0, 475, 6, 110, 6, 6, 9, 4759, 9, 787719, 239]; - ## where resources come from +// This file was generated. Do not modify manually! +var astralIdentifierStartCodes = [0, 11, 2, 25, 2, 18, 2, 1, 2, 14, 3, 13, 35, 122, 70, 52, 268, 28, 4, 48, 48, 31, 14, 29, 6, 37, 11, 29, 3, 35, 5, 7, 2, 4, 43, 157, 19, 35, 5, 35, 5, 39, 9, 51, 13, 10, 2, 14, 2, 6, 2, 1, 2, 10, 2, 14, 2, 6, 2, 1, 4, 51, 13, 310, 10, 21, 11, 7, 25, 5, 2, 41, 2, 8, 70, 5, 3, 0, 2, 43, 2, 1, 4, 0, 3, 22, 11, 22, 10, 30, 66, 18, 2, 1, 11, 21, 11, 25, 7, 25, 39, 55, 7, 1, 65, 0, 16, 3, 2, 2, 2, 28, 43, 28, 4, 28, 36, 7, 2, 27, 28, 53, 11, 21, 11, 18, 14, 17, 111, 72, 56, 50, 14, 50, 14, 35, 39, 27, 10, 22, 251, 41, 7, 1, 17, 5, 57, 28, 11, 0, 9, 21, 43, 17, 47, 20, 28, 22, 13, 52, 58, 1, 3, 0, 14, 44, 33, 24, 27, 35, 30, 0, 3, 0, 9, 34, 4, 0, 13, 47, 15, 3, 22, 0, 2, 0, 36, 17, 2, 24, 20, 1, 64, 6, 2, 0, 2, 3, 2, 14, 2, 9, 8, 46, 39, 7, 3, 1, 3, 21, 2, 6, 2, 1, 2, 4, 4, 0, 19, 0, 13, 4, 31, 9, 2, 0, 3, 0, 2, 37, 2, 0, 26, 0, 2, 0, 45, 52, 19, 3, 21, 2, 31, 47, 21, 1, 2, 0, 185, 46, 42, 3, 37, 47, 21, 0, 60, 42, 14, 0, 72, 26, 38, 6, 186, 43, 117, 63, 32, 7, 3, 0, 3, 7, 2, 1, 2, 23, 16, 0, 2, 0, 95, 7, 3, 38, 17, 0, 2, 0, 29, 0, 11, 39, 8, 0, 22, 0, 12, 45, 20, 0, 19, 72, 200, 32, 32, 8, 2, 36, 18, 0, 50, 29, 113, 6, 2, 1, 2, 37, 22, 0, 26, 5, 2, 1, 2, 31, 15, 0, 24, 43, 261, 18, 16, 0, 2, 12, 2, 33, 125, 0, 80, 921, 103, 110, 18, 195, 2637, 96, 16, 1071, 18, 5, 26, 3994, 6, 582, 6842, 29, 1763, 568, 8, 30, 18, 78, 18, 29, 19, 47, 17, 3, 32, 20, 6, 18, 433, 44, 212, 63, 33, 24, 3, 24, 45, 74, 6, 0, 67, 12, 65, 1, 2, 0, 15, 4, 10, 7381, 42, 31, 98, 114, 8702, 3, 2, 6, 2, 1, 2, 290, 16, 0, 30, 2, 3, 0, 15, 3, 9, 395, 2309, 106, 6, 12, 4, 8, 8, 9, 5991, 84, 2, 70, 2, 1, 3, 0, 3, 1, 3, 3, 2, 11, 2, 0, 2, 6, 2, 64, 2, 3, 3, 7, 2, 6, 2, 27, 2, 3, 2, 4, 2, 0, 4, 6, 2, 339, 3, 24, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 7, 1845, 30, 7, 5, 262, 61, 147, 44, 11, 6, 17, 0, 322, 29, 19, 43, 485, 27, 229, 29, 3, 0, 208, 30, 2, 2, 2, 1, 2, 6, 3, 4, 10, 1, 225, 6, 2, 3, 2, 1, 2, 14, 2, 196, 60, 67, 8, 0, 1205, 3, 2, 26, 2, 1, 2, 0, 3, 0, 2, 9, 2, 3, 2, 0, 2, 0, 7, 0, 5, 0, 2, 0, 2, 0, 2, 2, 2, 1, 2, 0, 3, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 1, 2, 0, 3, 3, 2, 6, 2, 3, 2, 3, 2, 0, 2, 9, 2, 16, 6, 2, 2, 4, 2, 16, 4421, 42719, 33, 4381, 3, 5773, 3, 7472, 16, 621, 2467, 541, 1507, 4938, 6, 8489]; - When operating in non-self-contained mode, local and remote import - paths are then interpreted as relative URLs (RFC 1808) with base URL - window.location (specifically as "relative path" and "absolute path" - relative URLs). +// This file was generated. Do not modify manually! +var nonASCIIidentifierChars = "\u200c\u200d\xb7\u0300-\u036f\u0387\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u0669\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u06f0-\u06f9\u0711\u0730-\u074a\u07a6-\u07b0\u07c0-\u07c9\u07eb-\u07f3\u07fd\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u0897-\u089f\u08ca-\u08e1\u08e3-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u09e6-\u09ef\u09fe\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0ae6-\u0aef\u0afa-\u0aff\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b55-\u0b57\u0b62\u0b63\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c00-\u0c04\u0c3c\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c66-\u0c6f\u0c81-\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0ce6-\u0cef\u0cf3\u0d00-\u0d03\u0d3b\u0d3c\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d66-\u0d6f\u0d81-\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0de6-\u0def\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0e50-\u0e59\u0eb1\u0eb4-\u0ebc\u0ec8-\u0ece\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1040-\u1049\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u1369-\u1371\u1712-\u1715\u1732-\u1734\u1752\u1753\u1772\u1773\u17b4-\u17d3\u17dd\u17e0-\u17e9\u180b-\u180d\u180f-\u1819\u18a9\u1920-\u192b\u1930-\u193b\u1946-\u194f\u19d0-\u19da\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1ab0-\u1abd\u1abf-\u1add\u1ae0-\u1aeb\u1b00-\u1b04\u1b34-\u1b44\u1b50-\u1b59\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1bad\u1bb0-\u1bb9\u1be6-\u1bf3\u1c24-\u1c37\u1c40-\u1c49\u1c50-\u1c59\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf4\u1cf7-\u1cf9\u1dc0-\u1dff\u200c\u200d\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\u30fb\ua620-\ua629\ua66f\ua674-\ua67d\ua69e\ua69f\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua82c\ua880\ua881\ua8b4-\ua8c5\ua8d0-\ua8d9\ua8e0-\ua8f1\ua8ff-\ua909\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\ua9d0-\ua9d9\ua9e5\ua9f0-\ua9f9\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa50-\uaa59\uaa7b-\uaa7d\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uaaeb-\uaaef\uaaf5\uaaf6\uabe3-\uabea\uabec\uabed\uabf0-\uabf9\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f\uff65"; - In self-contained mode, these paths are interpreted as paths in the - quarto project, either as root-relative or relative paths. The - contents of these files are converted to data URLs and stored in a - local resolution map. +// This file was generated. Do not modify manually! +var nonASCIIidentifierStartChars = "\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u037f\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u052f\u0531-\u0556\u0559\u0560-\u0588\u05d0-\u05ea\u05ef-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u0860-\u086a\u0870-\u0887\u0889-\u088f\u08a0-\u08c9\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u09fc\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0af9\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c39\u0c3d\u0c58-\u0c5a\u0c5c\u0c5d\u0c60\u0c61\u0c80\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cdc-\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d04-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d54-\u0d56\u0d5f-\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e86-\u0e8a\u0e8c-\u0ea3\u0ea5\u0ea7-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f5\u13f8-\u13fd\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f8\u1700-\u1711\u171f-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1878\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191e\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19b0-\u19c9\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4c\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1c80-\u1c8a\u1c90-\u1cba\u1cbd-\u1cbf\u1ce9-\u1cec\u1cee-\u1cf3\u1cf5\u1cf6\u1cfa\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2118-\u211d\u2124\u2126\u2128\u212a-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309b-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312f\u3131-\u318e\u31a0-\u31bf\u31f0-\u31ff\u3400-\u4dbf\u4e00-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua69d\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua7dc\ua7f1-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua8fd\ua8fe\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\ua9e0-\ua9e4\ua9e6-\ua9ef\ua9fa-\ua9fe\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa7e-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uab30-\uab5a\uab5c-\uab69\uab70-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc"; - ## how are contents interpreted +// These are a run-length and offset encoded representation of the +// >0xffff code points that are a valid part of identifiers. The +// offset starts at 0x10000, and each pair of numbers represents an +// offset to the next range, and then a size of the range. - The contents of the resource are then interpreted differently - depending on the file type of the requested resource. +// Reserved word lists for various dialects of the language - For non-self-contained imports, the file type is determined by the - extension of the URL pathname. If the extension is "js", we take the - specifier to mean an ES module; If the extension is "ojs", we take - the specifier to mean an "ojs" module (a collection of observable - statements packaged into a module, suitable for reuse). If the - extension is "ts" or "tsx", then this is an import that was actually transpiled - into js during quarto render, and we change the extension to .js and - resolve that. Finally, if the extension is "qmd", we take the specifier - to mean an "implicit ojs module", equivalent to extracting all - the ojs statements from the .qmd file and producing an OJS module. +var reservedWords = { + 3: "abstract boolean byte char class double enum export extends final float goto implements import int interface long native package private protected public short static super synchronized throws transient volatile", + 5: "class enum extends super const export import", + 6: "enum", + strict: "implements interface let package private protected public static yield", + strictBind: "eval arguments" +}; - For self-contained imports, the file type is determined by the MIME - type of the data URL. "application/javascript" is interpreted to - mean an ES module, and "application/ojs-javascript" is interpreted - to mean an "ojs" module. (.qmd imports will have been - translated to ojs modules by the compilation step.) +// And the keywords - The resources are finally retrieved, compiled into modules - compatible with the observable runtime, and returned as - the result of the import statement. +var ecma5AndLessKeywords = "break case catch continue debugger default do else finally for function if return switch throw try var while with null true false instanceof typeof void delete new in this"; -*/ +var keywords$1 = { + 5: ecma5AndLessKeywords, + "5module": ecma5AndLessKeywords + " export import", + 6: ecma5AndLessKeywords + " const class extends export import super" +}; -function importPathResolver(paths, localResolverMap) { - // NB: only resolve the field values in paths when calling rootPath - // and relativePath. If we prematurely optimize this by moving the - // const declarations outside, then we will capture the - // uninitialized values. +var keywordRelationalOperator = /^in(stanceof)?$/; - // fetch() and import() have different relative path semantics, so - // we need different paths for each use case +// ## Character categories - function importRootPath(path) { - const { runtimeToRoot } = paths; - if (!runtimeToRoot) { - return path; - } else { - return `${runtimeToRoot}/${path}`; - } - } +var nonASCIIidentifierStart = new RegExp("[" + nonASCIIidentifierStartChars + "]"); +var nonASCIIidentifier = new RegExp("[" + nonASCIIidentifierStartChars + nonASCIIidentifierChars + "]"); - function importRelativePath(path) { - const { runtimeToDoc } = paths; - if (!runtimeToDoc) { - return path; - } else { - return `${runtimeToDoc}/${path}`; - } +// This has a complexity linear to the value of the code. The +// assumption is that looking up astral identifier characters is +// rare. +function isInAstralSet(code, set) { + var pos = 0x10000; + for (var i = 0; i < set.length; i += 2) { + pos += set[i]; + if (pos > code) { return false } + pos += set[i + 1]; + if (pos >= code) { return true } } + return false +} - // a fetch path of a root-relative path is resolved wrt to - // the document root - function fetchRootPath(path) { - const { docToRoot } = paths; - if (!docToRoot) { - return path; - } else { - return `${docToRoot}/${path}`; - } - } +// Test whether a given character code starts an identifier. - // a fetch path of a relative path is resolved the naive way - function fetchRelativePath(path) { - return path; - } +function isIdentifierStart(code, astral) { + if (code < 65) { return code === 36 } + if (code < 91) { return true } + if (code < 97) { return code === 95 } + if (code < 123) { return true } + if (code <= 0xffff) { return code >= 0xaa && nonASCIIidentifierStart.test(String.fromCharCode(code)) } + if (astral === false) { return false } + return isInAstralSet(code, astralIdentifierStartCodes) +} - return async (path, specs) => { - const isLocalModule = path.startsWith("/") || path.startsWith("."); - const isImportFromObservableWebsite = path.match( - /^https:\/\/(api\.|beta\.|)observablehq\.com\//i, - ); +// Test whether a given character is part of an identifier. - if (!isLocalModule || isImportFromObservableWebsite) { - return defaultResolveImportPath(path); - } +function isIdentifierChar(code, astral) { + if (code < 48) { return code === 36 } + if (code < 58) { return true } + if (code < 65) { return false } + if (code < 91) { return true } + if (code < 97) { return code === 95 } + if (code < 123) { return true } + if (code <= 0xffff) { return code >= 0xaa && nonASCIIidentifier.test(String.fromCharCode(code)) } + if (astral === false) { return false } + return isInAstralSet(code, astralIdentifierStartCodes) || isInAstralSet(code, astralIdentifierCodes) +} - let importPath, fetchPath; - let moduleType; - if (window._ojs.selfContained) { - if (path.endsWith(".ts")) { - path = path.replace(/\.ts$/, ".js"); - } else if (path.endsWith(".tsx")) { - path = path.replace(/\.tsx$/, ".js"); - } - const resolved = localResolverMap.get(path); - if (resolved === undefined) { - throw new Error(`missing local file ${path} in self-contained mode`); - } - // self-contained resolves to data URLs, so they behave the same. - importPath = resolved; - fetchPath = resolved; +// ## Token types - // we have a data URL here. - const mimeType = resolved.match(/data:(.*);base64/)[1]; - switch (mimeType) { - case "application/javascript": - moduleType = "js"; - break; - case "application/ojs-javascript": - moduleType = "ojs"; - break; - default: - throw new Error(`unrecognized MIME type ${mimeType}`); - } - } else { - // we have a relative URL here - const resourceURL = new URL(path, window.location); - moduleType = resourceURL.pathname.match(/\.(ojs|js|ts|tsx|qmd)$/)[1]; +// The assignment of fine-grained, information-carrying type objects +// allows the tokenizer to store the information it has about a +// token in a way that is very cheap for the parser to look up. - // resolve path according to quarto path resolution rules. - if (path.startsWith("/")) { - importPath = importRootPath(path); - fetchPath = fetchRootPath(path); - } else { - importPath = importRelativePath(path); - fetchPath = fetchRelativePath(path); - } - } +// All token type variables start with an underscore, to make them +// easy to recognize. - if (moduleType === "ts" || moduleType === "tsx") { - try { - const modulePromise = import(window._ojs.selfContained ? - importPath : - importPath.replace(/\.ts$/, ".js").replace(/\.tsx$/, ".js")); - return es6ImportAsObservableModule(modulePromise, specs); - } catch (e) { - // record the error on the browser console to make debugging - // slightly more convenient. - console.error(e); - throw e; - } - } else if (moduleType === "js") { - try { - const modulePromise = import(importPath); - return es6ImportAsObservableModule(modulePromise, specs); - } catch (e) { - // record the error on the browser console to make debugging - // slightly more convenient. - console.error(e); - throw e; - } - } else if (moduleType === "ojs") { - return importOjsFromURL(fetchPath); - } else if (moduleType === "qmd") { - const htmlPath = `${fetchPath.slice(0, -4)}.html`; - const response = await fetch(htmlPath); - const text = await response.text(); - return createOjsModuleFromHTMLSrc(text); - } else { - throw new Error(`internal error, unrecognized module type ${moduleType}`); - } - }; -} +// The `beforeExpr` property is used to disambiguate between regular +// expressions and divisions. It is set on all token types that can +// be followed by an expression (thus, a slash after them would be a +// regular expression). +// +// The `startsExpr` property is used to check if the token ends a +// `yield` expression. It is set on all token types that either can +// directly start an expression (like a quotation mark) or can +// continue an expression (like the body of a string). +// +// `isLoop` marks a keyword as starting a loop, which is important +// to know when parsing a label, in order to allow or disallow +// continue jumps to that label. +var TokenType = function TokenType(label, conf) { + if ( conf === void 0 ) conf = {}; -function createOjsModuleFromHTMLSrc(text) { - const parser = new DOMParser(); - const doc = parser.parseFromString(text, "text/html"); - const staticDefns = []; - for (const el of doc.querySelectorAll('script[type="ojs-define"]')) { - staticDefns.push(el.text); - } - const ojsSource = []; - for ( + this.label = label; + this.keyword = conf.keyword; + this.beforeExpr = !!conf.beforeExpr; + this.startsExpr = !!conf.startsExpr; + this.isLoop = !!conf.isLoop; + this.isAssign = !!conf.isAssign; + this.prefix = !!conf.prefix; + this.postfix = !!conf.postfix; + this.binop = conf.binop || null; + this.updateContext = null; +}; + +function binop(name, prec) { + return new TokenType(name, {beforeExpr: true, binop: prec}) +} +var beforeExpr = {beforeExpr: true}, startsExpr = {startsExpr: true}; + +// Map keyword names to token types. + +var keywords = {}; + +// Succinct definitions of keyword token types +function kw(name, options) { + if ( options === void 0 ) options = {}; + + options.keyword = name; + return keywords[name] = new TokenType(name, options) +} + +var types$1$1 = { + num: new TokenType("num", startsExpr), + regexp: new TokenType("regexp", startsExpr), + string: new TokenType("string", startsExpr), + name: new TokenType("name", startsExpr), + privateId: new TokenType("privateId", startsExpr), + eof: new TokenType("eof"), + + // Punctuation token types. + bracketL: new TokenType("[", {beforeExpr: true, startsExpr: true}), + bracketR: new TokenType("]"), + braceL: new TokenType("{", {beforeExpr: true, startsExpr: true}), + braceR: new TokenType("}"), + parenL: new TokenType("(", {beforeExpr: true, startsExpr: true}), + parenR: new TokenType(")"), + comma: new TokenType(",", beforeExpr), + semi: new TokenType(";", beforeExpr), + colon: new TokenType(":", beforeExpr), + dot: new TokenType("."), + question: new TokenType("?", beforeExpr), + questionDot: new TokenType("?."), + arrow: new TokenType("=>", beforeExpr), + template: new TokenType("template"), + invalidTemplate: new TokenType("invalidTemplate"), + ellipsis: new TokenType("...", beforeExpr), + backQuote: new TokenType("`", startsExpr), + dollarBraceL: new TokenType("${", {beforeExpr: true, startsExpr: true}), + + // Operators. These carry several kinds of properties to help the + // parser use them properly (the presence of these properties is + // what categorizes them as operators). + // + // `binop`, when present, specifies that this operator is a binary + // operator, and will refer to its precedence. + // + // `prefix` and `postfix` mark the operator as a prefix or postfix + // unary operator. + // + // `isAssign` marks all of `=`, `+=`, `-=` etcetera, which act as + // binary operators with a very low precedence, that should result + // in AssignmentExpression nodes. + + eq: new TokenType("=", {beforeExpr: true, isAssign: true}), + assign: new TokenType("_=", {beforeExpr: true, isAssign: true}), + incDec: new TokenType("++/--", {prefix: true, postfix: true, startsExpr: true}), + prefix: new TokenType("!/~", {beforeExpr: true, prefix: true, startsExpr: true}), + logicalOR: binop("||", 1), + logicalAND: binop("&&", 2), + bitwiseOR: binop("|", 3), + bitwiseXOR: binop("^", 4), + bitwiseAND: binop("&", 5), + equality: binop("==/!=/===/!==", 6), + relational: binop("/<=/>=", 7), + bitShift: binop("<>/>>>", 8), + plusMin: new TokenType("+/-", {beforeExpr: true, binop: 9, prefix: true, startsExpr: true}), + modulo: binop("%", 10), + star: binop("*", 10), + slash: binop("/", 10), + starstar: new TokenType("**", {beforeExpr: true}), + coalesce: binop("??", 1), + + // Keyword token types. + _break: kw("break"), + _case: kw("case", beforeExpr), + _catch: kw("catch"), + _continue: kw("continue"), + _debugger: kw("debugger"), + _default: kw("default", beforeExpr), + _do: kw("do", {isLoop: true, beforeExpr: true}), + _else: kw("else", beforeExpr), + _finally: kw("finally"), + _for: kw("for", {isLoop: true}), + _function: kw("function", startsExpr), + _if: kw("if"), + _return: kw("return", beforeExpr), + _switch: kw("switch"), + _throw: kw("throw", beforeExpr), + _try: kw("try"), + _var: kw("var"), + _const: kw("const"), + _while: kw("while", {isLoop: true}), + _with: kw("with"), + _new: kw("new", {beforeExpr: true, startsExpr: true}), + _this: kw("this", startsExpr), + _super: kw("super", startsExpr), + _class: kw("class", startsExpr), + _extends: kw("extends", beforeExpr), + _export: kw("export"), + _import: kw("import", startsExpr), + _null: kw("null", startsExpr), + _true: kw("true", startsExpr), + _false: kw("false", startsExpr), + _in: kw("in", {beforeExpr: true, binop: 7}), + _instanceof: kw("instanceof", {beforeExpr: true, binop: 7}), + _typeof: kw("typeof", {beforeExpr: true, prefix: true, startsExpr: true}), + _void: kw("void", {beforeExpr: true, prefix: true, startsExpr: true}), + _delete: kw("delete", {beforeExpr: true, prefix: true, startsExpr: true}) +}; + +// Matches a whole line break (where CRLF is considered a single +// line break). Used to count lines. + +var lineBreak = /\r\n?|\n|\u2028|\u2029/; +var lineBreakG = new RegExp(lineBreak.source, "g"); + +function isNewLine(code) { + return code === 10 || code === 13 || code === 0x2028 || code === 0x2029 +} + +function nextLineBreak(code, from, end) { + if ( end === void 0 ) end = code.length; + + for (var i = from; i < end; i++) { + var next = code.charCodeAt(i); + if (isNewLine(next)) + { return i < end - 1 && next === 13 && code.charCodeAt(i + 1) === 10 ? i + 2 : i + 1 } + } + return -1 +} + +var nonASCIIwhitespace = /[\u1680\u2000-\u200a\u202f\u205f\u3000\ufeff]/; + +var skipWhiteSpace = /(?:\s|\/\/.*|\/\*[^]*?\*\/)*/g; + +var ref = Object.prototype; +var hasOwnProperty = ref.hasOwnProperty; +var toString = ref.toString; + +var hasOwn = Object.hasOwn || (function (obj, propName) { return ( + hasOwnProperty.call(obj, propName) +); }); + +var isArray = Array.isArray || (function (obj) { return ( + toString.call(obj) === "[object Array]" +); }); + +var regexpCache = Object.create(null); + +function wordsRegexp(words) { + return regexpCache[words] || (regexpCache[words] = new RegExp("^(?:" + words.replace(/ /g, "|") + ")$")) +} + +function codePointToString(code) { + // UTF-16 Decoding + if (code <= 0xFFFF) { return String.fromCharCode(code) } + code -= 0x10000; + return String.fromCharCode((code >> 10) + 0xD800, (code & 1023) + 0xDC00) +} + +var loneSurrogate = /(?:[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])/; + +// These are used when `options.locations` is on, for the +// `startLoc` and `endLoc` properties. + +var Position = function Position(line, col) { + this.line = line; + this.column = col; +}; + +Position.prototype.offset = function offset (n) { + return new Position(this.line, this.column + n) +}; + +var SourceLocation = function SourceLocation(p, start, end) { + this.start = start; + this.end = end; + if (p.sourceFile !== null) { this.source = p.sourceFile; } +}; + +// The `getLineInfo` function is mostly useful when the +// `locations` option is off (for performance reasons) and you +// want to find the line/column position for a given character +// offset. `input` should be the code string that the offset refers +// into. + +function getLineInfo(input, offset) { + for (var line = 1, cur = 0;;) { + var nextBreak = nextLineBreak(input, cur, offset); + if (nextBreak < 0) { return new Position(line, offset - cur) } + ++line; + cur = nextBreak; + } +} + +// A second argument must be given to configure the parser process. +// These options are recognized (only `ecmaVersion` is required): + +var defaultOptions = { + // `ecmaVersion` indicates the ECMAScript version to parse. Must be + // either 3, 5, 6 (or 2015), 7 (2016), 8 (2017), 9 (2018), 10 + // (2019), 11 (2020), 12 (2021), 13 (2022), 14 (2023), or `"latest"` + // (the latest version the library supports). This influences + // support for strict mode, the set of reserved words, and support + // for new syntax features. + ecmaVersion: null, + // `sourceType` indicates the mode the code should be parsed in. + // Can be either `"script"`, `"module"` or `"commonjs"`. This influences global + // strict mode and parsing of `import` and `export` declarations. + sourceType: "script", + // When set to true, enable strict parsing mode even if `sourceType` + // is `"script"`. + strict: false, + // `onInsertedSemicolon` can be a callback that will be called when + // a semicolon is automatically inserted. It will be passed the + // position of the inserted semicolon as an offset, and if + // `locations` is enabled, it is given the location as a `{line, + // column}` object as second argument. + onInsertedSemicolon: null, + // `onTrailingComma` is similar to `onInsertedSemicolon`, but for + // trailing commas. + onTrailingComma: null, + // By default, reserved words are only enforced if ecmaVersion >= 5. + // Set `allowReserved` to a boolean value to explicitly turn this on + // an off. When this option has the value "never", reserved words + // and keywords can also not be used as property names. + allowReserved: null, + // When enabled, a return at the top level is not considered an + // error. + allowReturnOutsideFunction: false, + // When enabled, import/export statements are not constrained to + // appearing at the top of the program, and an import.meta expression + // in a script isn't considered an error. + allowImportExportEverywhere: false, + // By default, await identifiers are allowed to appear at the top-level scope only if ecmaVersion >= 2022. + // When enabled, await identifiers are allowed to appear at the top-level scope, + // but they are still not allowed in non-async functions. + allowAwaitOutsideFunction: null, + // When enabled, super identifiers are not constrained to + // appearing in methods and do not raise an error when they appear elsewhere. + allowSuperOutsideMethod: null, + // When enabled, hashbang directive in the beginning of file is + // allowed and treated as a line comment. Enabled by default when + // `ecmaVersion` >= 2023. + allowHashBang: false, + // By default, the parser will verify that private properties are + // only used in places where they are valid and have been declared. + // Set this to false to turn such checks off. + checkPrivateFields: true, + // When `locations` is on, `loc` properties holding objects with + // `start` and `end` properties in `{line, column}` form (with + // line being 1-based and column 0-based) will be attached to the + // nodes. + locations: false, + // A function can be passed as `onToken` option, which will + // cause Acorn to call that function with object in the same + // format as tokens returned from `tokenizer().getToken()`. Note + // that you are not allowed to call the parser from the + // callback—that will corrupt its internal state. + onToken: null, + // A function can be passed as `onComment` option, which will + // cause Acorn to call that function with `(block, text, start, + // end)` parameters whenever a comment is skipped. `block` is a + // boolean indicating whether this is a block (`/* */`) comment, + // `text` is the content of the comment, and `start` and `end` are + // character offsets that denote the start and end of the comment. + // When the `locations` option is on, two more parameters are + // passed, the full `{line, column}` locations of the start and + // end of the comments. Note that you are not allowed to call the + // parser from the callback—that will corrupt its internal state. + // When this option has an array as value, objects representing the + // comments are pushed to it. + onComment: null, + // Nodes have their start and end characters offsets recorded in + // `start` and `end` properties (directly on the node, rather than + // the `loc` object, which holds line/column data. To also add a + // [semi-standardized][range] `range` property holding a `[start, + // end]` array with the same numbers, set the `ranges` option to + // `true`. + // + // [range]: https://bugzilla.mozilla.org/show_bug.cgi?id=745678 + ranges: false, + // It is possible to parse multiple files into a single AST by + // passing the tree produced by parsing the first file as + // `program` option in subsequent parses. This will add the + // toplevel forms of the parsed file to the `Program` (top) node + // of an existing parse tree. + program: null, + // When `locations` is on, you can pass this to record the source + // file in every node's `loc` object. + sourceFile: null, + // This value, if given, is stored in every node, whether + // `locations` is on or off. + directSourceFile: null, + // When enabled, parenthesized expressions are represented by + // (non-standard) ParenthesizedExpression nodes + preserveParens: false +}; + +// Interpret and default an options object + +var warnedAboutEcmaVersion = false; + +function getOptions(opts) { + var options = {}; + + for (var opt in defaultOptions) + { options[opt] = opts && hasOwn(opts, opt) ? opts[opt] : defaultOptions[opt]; } + + if (options.ecmaVersion === "latest") { + options.ecmaVersion = 1e8; + } else if (options.ecmaVersion == null) { + if (!warnedAboutEcmaVersion && typeof console === "object" && console.warn) { + warnedAboutEcmaVersion = true; + console.warn("Since Acorn 8.0.0, options.ecmaVersion is required.\nDefaulting to 2020, but this will stop working in the future."); + } + options.ecmaVersion = 11; + } else if (options.ecmaVersion >= 2015) { + options.ecmaVersion -= 2009; + } + + if (options.allowReserved == null) + { options.allowReserved = options.ecmaVersion < 5; } + + if (!opts || opts.allowHashBang == null) + { options.allowHashBang = options.ecmaVersion >= 14; } + + if (isArray(options.onToken)) { + var tokens = options.onToken; + options.onToken = function (token) { return tokens.push(token); }; + } + if (isArray(options.onComment)) + { options.onComment = pushComment(options, options.onComment); } + + if (options.sourceType === "commonjs" && options.allowAwaitOutsideFunction) + { throw new Error("Cannot use allowAwaitOutsideFunction with sourceType: commonjs") } + + return options +} + +function pushComment(options, array) { + return function(block, text, start, end, startLoc, endLoc) { + var comment = { + type: block ? "Block" : "Line", + value: text, + start: start, + end: end + }; + if (options.locations) + { comment.loc = new SourceLocation(this, startLoc, endLoc); } + if (options.ranges) + { comment.range = [start, end]; } + array.push(comment); + } +} + +// Each scope gets a bitset that may contain these flags +var + SCOPE_TOP = 1, + SCOPE_FUNCTION$1 = 2, + SCOPE_ASYNC$1 = 4, + SCOPE_GENERATOR$1 = 8, + SCOPE_ARROW = 16, + SCOPE_SIMPLE_CATCH = 32, + SCOPE_SUPER = 64, + SCOPE_DIRECT_SUPER = 128, + SCOPE_CLASS_STATIC_BLOCK = 256, + SCOPE_CLASS_FIELD_INIT = 512, + SCOPE_SWITCH = 1024, + SCOPE_VAR = SCOPE_TOP | SCOPE_FUNCTION$1 | SCOPE_CLASS_STATIC_BLOCK; + +function functionFlags(async, generator) { + return SCOPE_FUNCTION$1 | (async ? SCOPE_ASYNC$1 : 0) | (generator ? SCOPE_GENERATOR$1 : 0) +} + +// Used in checkLVal* and declareName to determine the type of a binding +var + BIND_NONE = 0, // Not a binding + BIND_VAR = 1, // Var-style binding + BIND_LEXICAL = 2, // Let- or const-style binding + BIND_FUNCTION = 3, // Function declaration + BIND_SIMPLE_CATCH = 4, // Simple (identifier pattern) catch binding + BIND_OUTSIDE = 5; // Special case for function names as bound inside the function + +var Parser = function Parser(options, input, startPos) { + this.options = options = getOptions(options); + this.sourceFile = options.sourceFile; + this.keywords = wordsRegexp(keywords$1[options.ecmaVersion >= 6 ? 6 : options.sourceType === "module" ? "5module" : 5]); + var reserved = ""; + if (options.allowReserved !== true) { + reserved = reservedWords[options.ecmaVersion >= 6 ? 6 : options.ecmaVersion === 5 ? 5 : 3]; + if (options.sourceType === "module") { reserved += " await"; } + } + this.reservedWords = wordsRegexp(reserved); + var reservedStrict = (reserved ? reserved + " " : "") + reservedWords.strict; + this.reservedWordsStrict = wordsRegexp(reservedStrict); + this.reservedWordsStrictBind = wordsRegexp(reservedStrict + " " + reservedWords.strictBind); + this.input = String(input); + + // Used to signal to callers of `readWord1` whether the word + // contained any escape sequences. This is needed because words with + // escape sequences must not be interpreted as keywords. + this.containsEsc = false; + + // Set up token state + + // The current position of the tokenizer in the input. + if (startPos) { + this.pos = startPos; + this.lineStart = this.input.lastIndexOf("\n", startPos - 1) + 1; + this.curLine = this.input.slice(0, this.lineStart).split(lineBreak).length; + } else { + this.pos = this.lineStart = 0; + this.curLine = 1; + } + + // Properties of the current token: + // Its type + this.type = types$1$1.eof; + // For tokens that include more information than their type, the value + this.value = null; + // Its start and end offset + this.start = this.end = this.pos; + // And, if locations are used, the {line, column} object + // corresponding to those offsets + this.startLoc = this.endLoc = this.curPosition(); + + // Position information for the previous token + this.lastTokEndLoc = this.lastTokStartLoc = null; + this.lastTokStart = this.lastTokEnd = this.pos; + + // The context stack is used to superficially track syntactic + // context to predict whether a regular expression is allowed in a + // given position. + this.context = this.initialContext(); + this.exprAllowed = true; + + // Figure out if it's a module code. + this.inModule = options.sourceType === "module"; + this.strict = this.inModule || options.strict === true || this.strictDirective(this.pos); + + // Used to signify the start of a potential arrow function + this.potentialArrowAt = -1; + this.potentialArrowInForAwait = false; + + // Positions to delayed-check that yield/await does not exist in default parameters. + this.yieldPos = this.awaitPos = this.awaitIdentPos = 0; + // Labels in scope. + this.labels = []; + // Thus-far undefined exports. + this.undefinedExports = Object.create(null); + + // If enabled, skip leading hashbang line. + if (this.pos === 0 && options.allowHashBang && this.input.slice(0, 2) === "#!") + { this.skipLineComment(2); } + + // Scope tracking for duplicate variable names (see scope.js) + this.scopeStack = []; + this.enterScope( + this.options.sourceType === "commonjs" + // In commonjs, the top-level scope behaves like a function scope + ? SCOPE_FUNCTION$1 + : SCOPE_TOP + ); + + // For RegExp validation + this.regexpState = null; + + // The stack of private names. + // Each element has two properties: 'declared' and 'used'. + // When it exited from the outermost class definition, all used private names must be declared. + this.privateNameStack = []; +}; + +var prototypeAccessors = { inFunction: { configurable: true },inGenerator: { configurable: true },inAsync: { configurable: true },canAwait: { configurable: true },allowReturn: { configurable: true },allowSuper: { configurable: true },allowDirectSuper: { configurable: true },treatFunctionsAsVar: { configurable: true },allowNewDotTarget: { configurable: true },allowUsing: { configurable: true },inClassStaticBlock: { configurable: true } }; + +Parser.prototype.parse = function parse () { + var this$1$1 = this; + + var node = this.options.program || this.startNode(); + this.nextToken(); + return this.catchStackOverflow(function () { return this$1$1.parseTopLevel(node); }) +}; + +prototypeAccessors.inFunction.get = function () { return (this.currentVarScope().flags & SCOPE_FUNCTION$1) > 0 }; + +prototypeAccessors.inGenerator.get = function () { return (this.currentVarScope().flags & SCOPE_GENERATOR$1) > 0 }; + +prototypeAccessors.inAsync.get = function () { return (this.currentVarScope().flags & SCOPE_ASYNC$1) > 0 }; + +prototypeAccessors.canAwait.get = function () { + for (var i = this.scopeStack.length - 1; i >= 0; i--) { + var ref = this.scopeStack[i]; + var flags = ref.flags; + if (flags & (SCOPE_CLASS_STATIC_BLOCK | SCOPE_CLASS_FIELD_INIT)) { return false } + if (flags & SCOPE_FUNCTION$1) { return (flags & SCOPE_ASYNC$1) > 0 } + } + return (this.inModule && this.options.ecmaVersion >= 13) || this.options.allowAwaitOutsideFunction +}; + +prototypeAccessors.allowReturn.get = function () { + if (this.inFunction) { return true } + if (this.options.allowReturnOutsideFunction && this.currentVarScope().flags & SCOPE_TOP) { return true } + return false +}; + +prototypeAccessors.allowSuper.get = function () { + var ref = this.currentThisScope(); + var flags = ref.flags; + return (flags & SCOPE_SUPER) > 0 || this.options.allowSuperOutsideMethod +}; + +prototypeAccessors.allowDirectSuper.get = function () { return (this.currentThisScope().flags & SCOPE_DIRECT_SUPER) > 0 }; + +prototypeAccessors.treatFunctionsAsVar.get = function () { return this.treatFunctionsAsVarInScope(this.currentScope()) }; + +prototypeAccessors.allowNewDotTarget.get = function () { + for (var i = this.scopeStack.length - 1; i >= 0; i--) { + var ref = this.scopeStack[i]; + var flags = ref.flags; + if (flags & (SCOPE_CLASS_STATIC_BLOCK | SCOPE_CLASS_FIELD_INIT) || + ((flags & SCOPE_FUNCTION$1) && !(flags & SCOPE_ARROW))) { return true } + } + return false +}; + +prototypeAccessors.allowUsing.get = function () { + var ref = this.currentScope(); + var flags = ref.flags; + if (flags & SCOPE_SWITCH) { return false } + if (!this.inModule && flags & SCOPE_TOP) { return false } + return true +}; + +prototypeAccessors.inClassStaticBlock.get = function () { + return (this.currentVarScope().flags & SCOPE_CLASS_STATIC_BLOCK) > 0 +}; + +Parser.extend = function extend () { + var plugins = [], len = arguments.length; + while ( len-- ) plugins[ len ] = arguments[ len ]; + + var cls = this; + for (var i = 0; i < plugins.length; i++) { cls = plugins[i](cls); } + return cls +}; + +Parser.parse = function parse (input, options) { + return new this(options, input).parse() +}; + +Parser.parseExpressionAt = function parseExpressionAt (input, pos, options) { + var parser = new this(options, input, pos); + parser.nextToken(); + return parser.parseExpression() +}; + +Parser.tokenizer = function tokenizer (input, options) { + return new this(options, input) +}; + +Object.defineProperties( Parser.prototype, prototypeAccessors ); + +var pp$9 = Parser.prototype; + +// ## Parser utilities + +var literal = /^(?:'((?:\\[^]|[^'\\])*?)'|"((?:\\[^]|[^"\\])*?)")/; +pp$9.strictDirective = function(start) { + if (this.options.ecmaVersion < 5) { return false } + for (;;) { + // Try to find string literal. + skipWhiteSpace.lastIndex = start; + start += skipWhiteSpace.exec(this.input)[0].length; + var match = literal.exec(this.input.slice(start)); + if (!match) { return false } + if ((match[1] || match[2]) === "use strict") { + skipWhiteSpace.lastIndex = start + match[0].length; + var spaceAfter = skipWhiteSpace.exec(this.input), end = spaceAfter.index + spaceAfter[0].length; + var next = this.input.charAt(end); + return next === ";" || next === "}" || + (lineBreak.test(spaceAfter[0]) && + !(/[(`.[+\-/*%<>=,?^&]/.test(next) || next === "!" && this.input.charAt(end + 1) === "=")) + } + start += match[0].length; + + // Skip semicolon, if any. + skipWhiteSpace.lastIndex = start; + start += skipWhiteSpace.exec(this.input)[0].length; + if (this.input[start] === ";") + { start++; } + } +}; + +// Predicate that tests whether the next token is of the given +// type, and if yes, consumes it as a side effect. + +pp$9.eat = function(type) { + if (this.type === type) { + this.next(); + return true + } else { + return false + } +}; + +// Tests whether parsed token is a contextual keyword. + +pp$9.isContextual = function(name) { + return this.type === types$1$1.name && this.value === name && !this.containsEsc +}; + +// Consumes contextual keyword if possible. + +pp$9.eatContextual = function(name) { + if (!this.isContextual(name)) { return false } + this.next(); + return true +}; + +pp$9.catchStackOverflow = function(f) { + try { + return f() + } catch (e) { + if (e instanceof Error && (/\bstack\b.*\b(exceeded|overflow)\b/i.test(e.message) || /\btoo much recursion\b/i.test(e.message))) + { this.raise(this.start, "Not enough stack space to parse input"); } + else + { throw e } + } +}; + +// Asserts that following token is given contextual keyword. + +pp$9.expectContextual = function(name) { + if (!this.eatContextual(name)) { this.unexpected(); } +}; + +// Test whether a semicolon can be inserted at the current position. + +pp$9.canInsertSemicolon = function() { + return this.type === types$1$1.eof || + this.type === types$1$1.braceR || + lineBreak.test(this.input.slice(this.lastTokEnd, this.start)) +}; + +pp$9.insertSemicolon = function() { + if (this.canInsertSemicolon()) { + if (this.options.onInsertedSemicolon) + { this.options.onInsertedSemicolon(this.lastTokEnd, this.lastTokEndLoc); } + return true + } +}; + +// Consume a semicolon, or, failing that, see if we are allowed to +// pretend that there is a semicolon at this position. + +pp$9.semicolon = function() { + if (!this.eat(types$1$1.semi) && !this.insertSemicolon()) { this.unexpected(); } +}; + +pp$9.afterTrailingComma = function(tokType, notNext) { + if (this.type === tokType) { + if (this.options.onTrailingComma) + { this.options.onTrailingComma(this.lastTokStart, this.lastTokStartLoc); } + if (!notNext) + { this.next(); } + return true + } +}; + +// Expect a token of a given type. If found, consume it, otherwise, +// raise an unexpected token error. + +pp$9.expect = function(type) { + this.eat(type) || this.unexpected(); +}; + +// Raise an unexpected token error. + +pp$9.unexpected = function(pos) { + this.raise(pos != null ? pos : this.start, "Unexpected token"); +}; + +var DestructuringErrors = function DestructuringErrors() { + this.shorthandAssign = + this.trailingComma = + this.parenthesizedAssign = + this.parenthesizedBind = + this.doubleProto = + -1; +}; + +pp$9.checkPatternErrors = function(refDestructuringErrors, isAssign) { + if (!refDestructuringErrors) { return } + if (refDestructuringErrors.trailingComma > -1) + { this.raiseRecoverable(refDestructuringErrors.trailingComma, "Comma is not permitted after the rest element"); } + var parens = isAssign ? refDestructuringErrors.parenthesizedAssign : refDestructuringErrors.parenthesizedBind; + if (parens > -1) { this.raiseRecoverable(parens, isAssign ? "Assigning to rvalue" : "Parenthesized pattern"); } +}; + +pp$9.checkExpressionErrors = function(refDestructuringErrors, andThrow) { + if (!refDestructuringErrors) { return false } + var shorthandAssign = refDestructuringErrors.shorthandAssign; + var doubleProto = refDestructuringErrors.doubleProto; + if (!andThrow) { return shorthandAssign >= 0 || doubleProto >= 0 } + if (shorthandAssign >= 0) + { this.raise(shorthandAssign, "Shorthand property assignments are valid only in destructuring patterns"); } + if (doubleProto >= 0) + { this.raiseRecoverable(doubleProto, "Redefinition of __proto__ property"); } +}; + +pp$9.checkYieldAwaitInDefaultParams = function() { + if (this.yieldPos && (!this.awaitPos || this.yieldPos < this.awaitPos)) + { this.raise(this.yieldPos, "Yield expression cannot be a default value"); } + if (this.awaitPos) + { this.raise(this.awaitPos, "Await expression cannot be a default value"); } +}; + +pp$9.isSimpleAssignTarget = function(expr) { + if (expr.type === "ParenthesizedExpression") + { return this.isSimpleAssignTarget(expr.expression) } + return expr.type === "Identifier" || expr.type === "MemberExpression" +}; + +var pp$8 = Parser.prototype; + +// ### Statement parsing + +// Parse a program. Initializes the parser, reads any number of +// statements, and wraps them in a Program node. Optionally takes a +// `program` argument. If present, the statements will be appended +// to its body instead of creating a new node. + +pp$8.parseTopLevel = function(node) { + var exports$1 = Object.create(null); + if (!node.body) { node.body = []; } + while (this.type !== types$1$1.eof) { + var stmt = this.parseStatement(null, true, exports$1); + node.body.push(stmt); + } + if (this.inModule) + { for (var i = 0, list = Object.keys(this.undefinedExports); i < list.length; i += 1) + { + var name = list[i]; + + this.raiseRecoverable(this.undefinedExports[name].start, ("Export '" + name + "' is not defined")); + } } + this.adaptDirectivePrologue(node.body); + this.next(); + node.sourceType = this.options.sourceType === "commonjs" ? "script" : this.options.sourceType; + return this.finishNode(node, "Program") +}; + +var loopLabel = {kind: "loop"}, switchLabel = {kind: "switch"}; + +pp$8.isLet = function(context) { + if (this.options.ecmaVersion < 6 || !this.isContextual("let")) { return false } + skipWhiteSpace.lastIndex = this.pos; + var skip = skipWhiteSpace.exec(this.input); + var next = this.pos + skip[0].length, nextCh = this.fullCharCodeAt(next); + // For ambiguous cases, determine if a LexicalDeclaration (or only a + // Statement) is allowed here. If context is not empty then only a Statement + // is allowed. However, `let [` is an explicit negative lookahead for + // ExpressionStatement, so special-case it first. + if (nextCh === 91 || nextCh === 92) { return true } // '[', '\' + if (context) { return false } + + if (nextCh === 123) { return true } // '{' + if (isIdentifierStart(nextCh)) { + var start = next; + do { next += nextCh <= 0xffff ? 1 : 2; } + while (isIdentifierChar(nextCh = this.fullCharCodeAt(next))) + if (nextCh === 92) { return true } + var ident = this.input.slice(start, next); + if (!keywordRelationalOperator.test(ident)) { return true } + } + return false +}; + +// check 'async [no LineTerminator here] function' +// - 'async /*foo*/ function' is OK. +// - 'async /*\n*/ function' is invalid. +pp$8.isAsyncFunction = function() { + if (this.options.ecmaVersion < 8 || !this.isContextual("async")) + { return false } + + skipWhiteSpace.lastIndex = this.pos; + var skip = skipWhiteSpace.exec(this.input); + var next = this.pos + skip[0].length, after; + return !lineBreak.test(this.input.slice(this.pos, next)) && + this.input.slice(next, next + 8) === "function" && + (next + 8 === this.input.length || + !(isIdentifierChar(after = this.fullCharCodeAt(next + 8)) || after === 92 /* '\' */)) +}; + +pp$8.isUsingKeyword = function(isAwaitUsing, isFor) { + if (this.options.ecmaVersion < 17 || !this.isContextual(isAwaitUsing ? "await" : "using")) + { return false } + + skipWhiteSpace.lastIndex = this.pos; + var skip = skipWhiteSpace.exec(this.input); + var next = this.pos + skip[0].length; + + if (lineBreak.test(this.input.slice(this.pos, next))) { return false } + + if (isAwaitUsing) { + var usingEndPos = next + 5 /* using */, after; + if (this.input.slice(next, usingEndPos) !== "using" || + usingEndPos === this.input.length || + isIdentifierChar(after = this.fullCharCodeAt(usingEndPos)) || + after === 92 /* '\' */ + ) { return false } + + skipWhiteSpace.lastIndex = usingEndPos; + var skipAfterUsing = skipWhiteSpace.exec(this.input); + next = usingEndPos + skipAfterUsing[0].length; + if (skipAfterUsing && lineBreak.test(this.input.slice(usingEndPos, next))) { return false } + } + + var ch = this.fullCharCodeAt(next); + if (!isIdentifierStart(ch) && ch !== 92 /* '\' */) { return false } + var idStart = next; + do { next += ch <= 0xffff ? 1 : 2; } + while (isIdentifierChar(ch = this.fullCharCodeAt(next))) + if (ch === 92) { return true } + var id = this.input.slice(idStart, next); + if (keywordRelationalOperator.test(id)) { return false } + if (isFor && !isAwaitUsing && id === "of") { + // Look ahead for using declaration with initializer, i.e., `for (using of = ...)` + skipWhiteSpace.lastIndex = next; + var skipAfterOf = skipWhiteSpace.exec(this.input); + next = next + skipAfterOf[0].length; + if (this.input.charCodeAt(next) !== 61 /* '=' */ || + // Check for ==, === and => operators + (ch = this.input.charCodeAt(next + 1)) === 61 /* '=' */ || ch === 62 /* '>' */) { + return false + } + } + return true +}; + +pp$8.isAwaitUsing = function(isFor) { + return this.isUsingKeyword(true, isFor) +}; + +pp$8.isUsing = function(isFor) { + return this.isUsingKeyword(false, isFor) +}; + +// Parse a single statement. +// +// If expecting a statement and finding a slash operator, parse a +// regular expression literal. This is to handle cases like +// `if (foo) /blah/.exec(foo)`, where looking at the previous token +// does not help. + +pp$8.parseStatement = function(context, topLevel, exports$1) { + var starttype = this.type, node = this.startNode(), kind; + + if (this.isLet(context)) { + starttype = types$1$1._var; + kind = "let"; + } + + // Most types of statements are recognized by the keyword they + // start with. Many are trivial to parse, some require a bit of + // complexity. + + switch (starttype) { + case types$1$1._break: case types$1$1._continue: return this.parseBreakContinueStatement(node, starttype.keyword) + case types$1$1._debugger: return this.parseDebuggerStatement(node) + case types$1$1._do: return this.parseDoStatement(node) + case types$1$1._for: return this.parseForStatement(node) + case types$1$1._function: + // Function as sole body of either an if statement or a labeled statement + // works, but not when it is part of a labeled statement that is the sole + // body of an if statement. + if ((context && (this.strict || context !== "if" && context !== "label")) && this.options.ecmaVersion >= 6) { this.unexpected(); } + return this.parseFunctionStatement(node, false, !context) + case types$1$1._class: + if (context) { this.unexpected(); } + return this.parseClass(node, true) + case types$1$1._if: return this.parseIfStatement(node) + case types$1$1._return: return this.parseReturnStatement(node) + case types$1$1._switch: return this.parseSwitchStatement(node) + case types$1$1._throw: return this.parseThrowStatement(node) + case types$1$1._try: return this.parseTryStatement(node) + case types$1$1._const: case types$1$1._var: + kind = kind || this.value; + if (context && kind !== "var") { this.unexpected(); } + return this.parseVarStatement(node, kind) + case types$1$1._while: return this.parseWhileStatement(node) + case types$1$1._with: return this.parseWithStatement(node) + case types$1$1.braceL: return this.parseBlock(true, node) + case types$1$1.semi: return this.parseEmptyStatement(node) + case types$1$1._export: + case types$1$1._import: + if (this.options.ecmaVersion > 10 && starttype === types$1$1._import) { + skipWhiteSpace.lastIndex = this.pos; + var skip = skipWhiteSpace.exec(this.input); + var next = this.pos + skip[0].length, nextCh = this.input.charCodeAt(next); + if (nextCh === 40 || nextCh === 46) // '(' or '.' + { return this.parseExpressionStatement(node, this.parseExpression()) } + } + + if (!this.options.allowImportExportEverywhere) { + if (!topLevel) + { this.raise(this.start, "'import' and 'export' may only appear at the top level"); } + if (!this.inModule) + { this.raise(this.start, "'import' and 'export' may appear only with 'sourceType: module'"); } + } + return starttype === types$1$1._import ? this.parseImport(node) : this.parseExport(node, exports$1) + + // If the statement does not start with a statement keyword or a + // brace, it's an ExpressionStatement or LabeledStatement. We + // simply start parsing an expression, and afterwards, if the + // next token is a colon and the expression was a simple + // Identifier node, we switch to interpreting it as a label. + default: + if (this.isAsyncFunction()) { + if (context) { this.unexpected(); } + this.next(); + return this.parseFunctionStatement(node, true, !context) + } + + var usingKind = this.isAwaitUsing(false) ? "await using" : this.isUsing(false) ? "using" : null; + if (usingKind) { + if (!this.allowUsing) { + this.raise(this.start, "Using declaration cannot appear in the top level when source type is `script` or in the bare case statement"); + } + if (context) { + // Cases like `for (;;) using x = ...;`, `if (true) await using x = ...;`, etc. are not allowed. + this.raise(this.start, "Using declaration is not allowed in single-statement positions"); + } + if (usingKind === "await using") { + if (!this.canAwait) { + this.raise(this.start, "Await using cannot appear outside of async function"); + } + this.next(); + } + this.next(); + this.parseVar(node, false, usingKind); + this.semicolon(); + return this.finishNode(node, "VariableDeclaration") + } + + var maybeName = this.value, expr = this.parseExpression(); + if (starttype === types$1$1.name && expr.type === "Identifier" && this.eat(types$1$1.colon)) + { return this.parseLabeledStatement(node, maybeName, expr, context) } + else { return this.parseExpressionStatement(node, expr) } + } +}; + +pp$8.parseBreakContinueStatement = function(node, keyword) { + var isBreak = keyword === "break"; + this.next(); + if (this.eat(types$1$1.semi) || this.insertSemicolon()) { node.label = null; } + else if (this.type !== types$1$1.name) { this.unexpected(); } + else { + node.label = this.parseIdent(); + this.semicolon(); + } + + // Verify that there is an actual destination to break or + // continue to. + var i = 0; + for (; i < this.labels.length; ++i) { + var lab = this.labels[i]; + if (node.label == null || lab.name === node.label.name) { + if (lab.kind != null && (isBreak || lab.kind === "loop")) { break } + if (node.label && isBreak) { break } + } + } + if (i === this.labels.length) { this.raise(node.start, "Unsyntactic " + keyword); } + return this.finishNode(node, isBreak ? "BreakStatement" : "ContinueStatement") +}; + +pp$8.parseDebuggerStatement = function(node) { + this.next(); + this.semicolon(); + return this.finishNode(node, "DebuggerStatement") +}; + +pp$8.parseDoStatement = function(node) { + this.next(); + this.labels.push(loopLabel); + node.body = this.parseStatement("do"); + this.labels.pop(); + this.expect(types$1$1._while); + node.test = this.parseParenExpression(); + if (this.options.ecmaVersion >= 6) + { this.eat(types$1$1.semi); } + else + { this.semicolon(); } + return this.finishNode(node, "DoWhileStatement") +}; + +// Disambiguating between a `for` and a `for`/`in` or `for`/`of` +// loop is non-trivial. Basically, we have to parse the init `var` +// statement or expression, disallowing the `in` operator (see +// the second parameter to `parseExpression`), and then check +// whether the next token is `in` or `of`. When there is no init +// part (semicolon immediately after the opening parenthesis), it +// is a regular `for` loop. + +pp$8.parseForStatement = function(node) { + this.next(); + var awaitAt = (this.options.ecmaVersion >= 9 && this.canAwait && this.eatContextual("await")) ? this.lastTokStart : -1; + this.labels.push(loopLabel); + this.enterScope(0); + this.expect(types$1$1.parenL); + if (this.type === types$1$1.semi) { + if (awaitAt > -1) { this.unexpected(awaitAt); } + return this.parseFor(node, null) + } + var isLet = this.isLet(); + if (this.type === types$1$1._var || this.type === types$1$1._const || isLet) { + var init$1 = this.startNode(), kind = isLet ? "let" : this.value; + this.next(); + this.parseVar(init$1, true, kind); + this.finishNode(init$1, "VariableDeclaration"); + return this.parseForAfterInit(node, init$1, awaitAt) + } + var startsWithLet = this.isContextual("let"), isForOf = false; + + var usingKind = this.isUsing(true) ? "using" : this.isAwaitUsing(true) ? "await using" : null; + if (usingKind) { + var init$2 = this.startNode(); + this.next(); + if (usingKind === "await using") { + if (!this.canAwait) { + this.raise(this.start, "Await using cannot appear outside of async function"); + } + this.next(); + } + this.parseVar(init$2, true, usingKind); + this.finishNode(init$2, "VariableDeclaration"); + return this.parseForAfterInit(node, init$2, awaitAt) + } + var containsEsc = this.containsEsc; + var refDestructuringErrors = new DestructuringErrors; + var initPos = this.start; + var init = awaitAt > -1 + ? this.parseExprSubscripts(refDestructuringErrors, "await") + : this.parseExpression(true, refDestructuringErrors); + if (this.type === types$1$1._in || (isForOf = this.options.ecmaVersion >= 6 && this.isContextual("of"))) { + if (awaitAt > -1) { // implies `ecmaVersion >= 9` (see declaration of awaitAt) + if (this.type === types$1$1._in) { this.unexpected(awaitAt); } + node.await = true; + } else if (isForOf && this.options.ecmaVersion >= 8) { + if (init.start === initPos && !containsEsc && init.type === "Identifier" && init.name === "async") { this.unexpected(); } + else if (this.options.ecmaVersion >= 9) { node.await = false; } + } + if (startsWithLet && isForOf) { this.raise(init.start, "The left-hand side of a for-of loop may not start with 'let'."); } + this.toAssignable(init, false, refDestructuringErrors); + this.checkLValPattern(init); + return this.parseForIn(node, init) + } else { + this.checkExpressionErrors(refDestructuringErrors, true); + } + if (awaitAt > -1) { this.unexpected(awaitAt); } + return this.parseFor(node, init) +}; + +// Helper method to parse for loop after variable initialization +pp$8.parseForAfterInit = function(node, init, awaitAt) { + if ((this.type === types$1$1._in || (this.options.ecmaVersion >= 6 && this.isContextual("of"))) && init.declarations.length === 1) { + if (this.type === types$1$1._in) { + if ((init.kind === "using" || init.kind === "await using") && !init.declarations[0].init) { + this.raise(this.start, "Using declaration is not allowed in for-in loops"); + } + if (this.options.ecmaVersion >= 9 && awaitAt > -1) { this.unexpected(awaitAt); } + } else if (this.options.ecmaVersion >= 9) { node.await = awaitAt > -1; } + return this.parseForIn(node, init) + } + if (awaitAt > -1) { this.unexpected(awaitAt); } + return this.parseFor(node, init) +}; + +pp$8.parseFunctionStatement = function(node, isAsync, declarationPosition) { + this.next(); + return this.parseFunction(node, FUNC_STATEMENT | (declarationPosition ? 0 : FUNC_HANGING_STATEMENT), false, isAsync) +}; + +pp$8.parseIfStatement = function(node) { + this.next(); + node.test = this.parseParenExpression(); + // allow function declarations in branches, but only in non-strict mode + node.consequent = this.parseStatement("if"); + node.alternate = this.eat(types$1$1._else) ? this.parseStatement("if") : null; + return this.finishNode(node, "IfStatement") +}; + +pp$8.parseReturnStatement = function(node) { + if (!this.allowReturn) + { this.raise(this.start, "'return' outside of function"); } + this.next(); + + // In `return` (and `break`/`continue`), the keywords with + // optional arguments, we eagerly look for a semicolon or the + // possibility to insert one. + + if (this.eat(types$1$1.semi) || this.insertSemicolon()) { node.argument = null; } + else { node.argument = this.parseExpression(); this.semicolon(); } + return this.finishNode(node, "ReturnStatement") +}; + +pp$8.parseSwitchStatement = function(node) { + this.next(); + node.discriminant = this.parseParenExpression(); + node.cases = []; + this.expect(types$1$1.braceL); + this.labels.push(switchLabel); + this.enterScope(SCOPE_SWITCH); + + // Statements under must be grouped (by label) in SwitchCase + // nodes. `cur` is used to keep the node that we are currently + // adding statements to. + + var cur; + for (var sawDefault = false; this.type !== types$1$1.braceR;) { + if (this.type === types$1$1._case || this.type === types$1$1._default) { + var isCase = this.type === types$1$1._case; + if (cur) { this.finishNode(cur, "SwitchCase"); } + node.cases.push(cur = this.startNode()); + cur.consequent = []; + this.next(); + if (isCase) { + cur.test = this.parseExpression(); + } else { + if (sawDefault) { this.raiseRecoverable(this.lastTokStart, "Multiple default clauses"); } + sawDefault = true; + cur.test = null; + } + this.expect(types$1$1.colon); + } else { + if (!cur) { this.unexpected(); } + cur.consequent.push(this.parseStatement(null)); + } + } + this.exitScope(); + if (cur) { this.finishNode(cur, "SwitchCase"); } + this.next(); // Closing brace + this.labels.pop(); + return this.finishNode(node, "SwitchStatement") +}; + +pp$8.parseThrowStatement = function(node) { + this.next(); + if (lineBreak.test(this.input.slice(this.lastTokEnd, this.start))) + { this.raise(this.lastTokEnd, "Illegal newline after throw"); } + node.argument = this.parseExpression(); + this.semicolon(); + return this.finishNode(node, "ThrowStatement") +}; + +// Reused empty array added for node fields that are always empty. + +var empty$1 = []; + +pp$8.parseCatchClauseParam = function() { + var param = this.parseBindingAtom(); + var simple = param.type === "Identifier"; + this.enterScope(simple ? SCOPE_SIMPLE_CATCH : 0); + this.checkLValPattern(param, simple ? BIND_SIMPLE_CATCH : BIND_LEXICAL); + this.expect(types$1$1.parenR); + + return param +}; + +pp$8.parseTryStatement = function(node) { + this.next(); + node.block = this.parseBlock(); + node.handler = null; + if (this.type === types$1$1._catch) { + var clause = this.startNode(); + this.next(); + if (this.eat(types$1$1.parenL)) { + clause.param = this.parseCatchClauseParam(); + } else { + if (this.options.ecmaVersion < 10) { this.unexpected(); } + clause.param = null; + this.enterScope(0); + } + clause.body = this.parseBlock(false); + this.exitScope(); + node.handler = this.finishNode(clause, "CatchClause"); + } + node.finalizer = this.eat(types$1$1._finally) ? this.parseBlock() : null; + if (!node.handler && !node.finalizer) + { this.raise(node.start, "Missing catch or finally clause"); } + return this.finishNode(node, "TryStatement") +}; + +pp$8.parseVarStatement = function(node, kind, allowMissingInitializer) { + this.next(); + this.parseVar(node, false, kind, allowMissingInitializer); + this.semicolon(); + return this.finishNode(node, "VariableDeclaration") +}; + +pp$8.parseWhileStatement = function(node) { + this.next(); + node.test = this.parseParenExpression(); + this.labels.push(loopLabel); + node.body = this.parseStatement("while"); + this.labels.pop(); + return this.finishNode(node, "WhileStatement") +}; + +pp$8.parseWithStatement = function(node) { + if (this.strict) { this.raise(this.start, "'with' in strict mode"); } + this.next(); + node.object = this.parseParenExpression(); + node.body = this.parseStatement("with"); + return this.finishNode(node, "WithStatement") +}; + +pp$8.parseEmptyStatement = function(node) { + this.next(); + return this.finishNode(node, "EmptyStatement") +}; + +pp$8.parseLabeledStatement = function(node, maybeName, expr, context) { + for (var i$1 = 0, list = this.labels; i$1 < list.length; i$1 += 1) + { + var label = list[i$1]; + + if (label.name === maybeName) + { this.raise(expr.start, "Label '" + maybeName + "' is already declared"); + } } + var kind = this.type.isLoop ? "loop" : this.type === types$1$1._switch ? "switch" : null; + for (var i = this.labels.length - 1; i >= 0; i--) { + var label$1 = this.labels[i]; + if (label$1.statementStart === node.start) { + // Update information about previous labels on this node + label$1.statementStart = this.start; + label$1.kind = kind; + } else { break } + } + this.labels.push({name: maybeName, kind: kind, statementStart: this.start}); + node.body = this.parseStatement(context ? context.indexOf("label") === -1 ? context + "label" : context : "label"); + this.labels.pop(); + node.label = expr; + return this.finishNode(node, "LabeledStatement") +}; + +pp$8.parseExpressionStatement = function(node, expr) { + node.expression = expr; + this.semicolon(); + return this.finishNode(node, "ExpressionStatement") +}; + +// Parse a semicolon-enclosed block of statements, handling `"use +// strict"` declarations when `allowStrict` is true (used for +// function bodies). + +pp$8.parseBlock = function(createNewLexicalScope, node, exitStrict) { + if ( createNewLexicalScope === void 0 ) createNewLexicalScope = true; + if ( node === void 0 ) node = this.startNode(); + + node.body = []; + this.expect(types$1$1.braceL); + if (createNewLexicalScope) { this.enterScope(0); } + while (this.type !== types$1$1.braceR) { + var stmt = this.parseStatement(null); + node.body.push(stmt); + } + if (exitStrict) { this.strict = false; } + this.next(); + if (createNewLexicalScope) { this.exitScope(); } + return this.finishNode(node, "BlockStatement") +}; + +// Parse a regular `for` loop. The disambiguation code in +// `parseStatement` will already have parsed the init statement or +// expression. + +pp$8.parseFor = function(node, init) { + node.init = init; + this.expect(types$1$1.semi); + node.test = this.type === types$1$1.semi ? null : this.parseExpression(); + this.expect(types$1$1.semi); + node.update = this.type === types$1$1.parenR ? null : this.parseExpression(); + this.expect(types$1$1.parenR); + node.body = this.parseStatement("for"); + this.exitScope(); + this.labels.pop(); + return this.finishNode(node, "ForStatement") +}; + +// Parse a `for`/`in` and `for`/`of` loop, which are almost +// same from parser's perspective. + +pp$8.parseForIn = function(node, init) { + var isForIn = this.type === types$1$1._in; + this.next(); + + if ( + init.type === "VariableDeclaration" && + init.declarations[0].init != null && + ( + !isForIn || + this.options.ecmaVersion < 8 || + this.strict || + init.kind !== "var" || + init.declarations[0].id.type !== "Identifier" + ) + ) { + this.raise( + init.start, + ((isForIn ? "for-in" : "for-of") + " loop variable declaration may not have an initializer") + ); + } + node.left = init; + node.right = isForIn ? this.parseExpression() : this.parseMaybeAssign(); + this.expect(types$1$1.parenR); + node.body = this.parseStatement("for"); + this.exitScope(); + this.labels.pop(); + return this.finishNode(node, isForIn ? "ForInStatement" : "ForOfStatement") +}; + +// Parse a list of variable declarations. + +pp$8.parseVar = function(node, isFor, kind, allowMissingInitializer) { + node.declarations = []; + node.kind = kind; + for (;;) { + var decl = this.startNode(); + this.parseVarId(decl, kind); + if (this.eat(types$1$1.eq)) { + decl.init = this.parseMaybeAssign(isFor); + } else if (!allowMissingInitializer && kind === "const" && !(this.type === types$1$1._in || (this.options.ecmaVersion >= 6 && this.isContextual("of")))) { + this.unexpected(); + } else if (!allowMissingInitializer && (kind === "using" || kind === "await using") && this.options.ecmaVersion >= 17 && this.type !== types$1$1._in && !this.isContextual("of")) { + this.raise(this.lastTokEnd, ("Missing initializer in " + kind + " declaration")); + } else if (!allowMissingInitializer && decl.id.type !== "Identifier" && !(isFor && (this.type === types$1$1._in || this.isContextual("of")))) { + this.raise(this.lastTokEnd, "Complex binding patterns require an initialization value"); + } else { + decl.init = null; + } + node.declarations.push(this.finishNode(decl, "VariableDeclarator")); + if (!this.eat(types$1$1.comma)) { break } + } + return node +}; + +pp$8.parseVarId = function(decl, kind) { + decl.id = kind === "using" || kind === "await using" + ? this.parseIdent() + : this.parseBindingAtom(); + + this.checkLValPattern(decl.id, kind === "var" ? BIND_VAR : BIND_LEXICAL, false); +}; + +var FUNC_STATEMENT = 1, FUNC_HANGING_STATEMENT = 2, FUNC_NULLABLE_ID = 4; + +// Parse a function declaration or literal (depending on the +// `statement & FUNC_STATEMENT`). + +// Remove `allowExpressionBody` for 7.0.0, as it is only called with false +pp$8.parseFunction = function(node, statement, allowExpressionBody, isAsync, forInit) { + this.initFunction(node); + if (this.options.ecmaVersion >= 9 || this.options.ecmaVersion >= 6 && !isAsync) { + if (this.type === types$1$1.star && (statement & FUNC_HANGING_STATEMENT)) + { this.unexpected(); } + node.generator = this.eat(types$1$1.star); + } + if (this.options.ecmaVersion >= 8) + { node.async = !!isAsync; } + + if (statement & FUNC_STATEMENT) { + node.id = (statement & FUNC_NULLABLE_ID) && this.type !== types$1$1.name ? null : this.parseIdent(); + if (node.id && !(statement & FUNC_HANGING_STATEMENT)) + // If it is a regular function declaration in sloppy mode, then it is + // subject to Annex B semantics (BIND_FUNCTION). Otherwise, the binding + // mode depends on properties of the current scope (see + // treatFunctionsAsVar). + { this.checkLValSimple(node.id, (this.strict || node.generator || node.async) ? this.treatFunctionsAsVar ? BIND_VAR : BIND_LEXICAL : BIND_FUNCTION); } + } + + var oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos, oldAwaitIdentPos = this.awaitIdentPos; + this.yieldPos = 0; + this.awaitPos = 0; + this.awaitIdentPos = 0; + this.enterScope(functionFlags(node.async, node.generator)); + + if (!(statement & FUNC_STATEMENT)) + { node.id = this.type === types$1$1.name ? this.parseIdent() : null; } + + this.parseFunctionParams(node); + this.parseFunctionBody(node, allowExpressionBody, false, forInit); + + this.yieldPos = oldYieldPos; + this.awaitPos = oldAwaitPos; + this.awaitIdentPos = oldAwaitIdentPos; + return this.finishNode(node, (statement & FUNC_STATEMENT) ? "FunctionDeclaration" : "FunctionExpression") +}; + +pp$8.parseFunctionParams = function(node) { + this.expect(types$1$1.parenL); + node.params = this.parseBindingList(types$1$1.parenR, false, this.options.ecmaVersion >= 8); + this.checkYieldAwaitInDefaultParams(); +}; + +// Parse a class declaration or literal (depending on the +// `isStatement` parameter). + +pp$8.parseClass = function(node, isStatement) { + this.next(); + + // ecma-262 14.6 Class Definitions + // A class definition is always strict mode code. + var oldStrict = this.strict; + this.strict = true; + + this.parseClassId(node, isStatement); + this.parseClassSuper(node); + var privateNameMap = this.enterClassBody(); + var classBody = this.startNode(); + var hadConstructor = false; + classBody.body = []; + this.expect(types$1$1.braceL); + while (this.type !== types$1$1.braceR) { + var element = this.parseClassElement(node.superClass !== null); + if (element) { + classBody.body.push(element); + if (element.type === "MethodDefinition" && element.kind === "constructor") { + if (hadConstructor) { this.raiseRecoverable(element.start, "Duplicate constructor in the same class"); } + hadConstructor = true; + } else if (element.key && element.key.type === "PrivateIdentifier" && isPrivateNameConflicted(privateNameMap, element)) { + this.raiseRecoverable(element.key.start, ("Identifier '#" + (element.key.name) + "' has already been declared")); + } + } + } + this.strict = oldStrict; + this.next(); + node.body = this.finishNode(classBody, "ClassBody"); + this.exitClassBody(); + return this.finishNode(node, isStatement ? "ClassDeclaration" : "ClassExpression") +}; + +pp$8.parseClassElement = function(constructorAllowsSuper) { + if (this.eat(types$1$1.semi)) { return null } + + var ecmaVersion = this.options.ecmaVersion; + var node = this.startNode(); + var keyName = ""; + var isGenerator = false; + var isAsync = false; + var kind = "method"; + var isStatic = false; + + if (this.eatContextual("static")) { + // Parse static init block + if (ecmaVersion >= 13 && this.eat(types$1$1.braceL)) { + this.parseClassStaticBlock(node); + return node + } + if (this.isClassElementNameStart() || this.type === types$1$1.star) { + isStatic = true; + } else { + keyName = "static"; + } + } + node.static = isStatic; + if (!keyName && ecmaVersion >= 8 && this.eatContextual("async")) { + if ((this.isClassElementNameStart() || this.type === types$1$1.star) && !this.canInsertSemicolon()) { + isAsync = true; + } else { + keyName = "async"; + } + } + if (!keyName && (ecmaVersion >= 9 || !isAsync) && this.eat(types$1$1.star)) { + isGenerator = true; + } + if (!keyName && !isAsync && !isGenerator) { + var lastValue = this.value; + if (this.eatContextual("get") || this.eatContextual("set")) { + if (this.isClassElementNameStart()) { + kind = lastValue; + } else { + keyName = lastValue; + } + } + } + + // Parse element name + if (keyName) { + // 'async', 'get', 'set', or 'static' were not a keyword contextually. + // The last token is any of those. Make it the element name. + node.computed = false; + node.key = this.startNodeAt(this.lastTokStart, this.lastTokStartLoc); + node.key.name = keyName; + this.finishNode(node.key, "Identifier"); + } else { + this.parseClassElementName(node); + } + + // Parse element value + if (ecmaVersion < 13 || this.type === types$1$1.parenL || kind !== "method" || isGenerator || isAsync) { + var isConstructor = !node.static && checkKeyName(node, "constructor"); + var allowsDirectSuper = isConstructor && constructorAllowsSuper; + // Couldn't move this check into the 'parseClassMethod' method for backward compatibility. + if (isConstructor && kind !== "method") { this.raise(node.key.start, "Constructor can't have get/set modifier"); } + node.kind = isConstructor ? "constructor" : kind; + this.parseClassMethod(node, isGenerator, isAsync, allowsDirectSuper); + } else { + this.parseClassField(node); + } + + return node +}; + +pp$8.isClassElementNameStart = function() { + return ( + this.type === types$1$1.name || + this.type === types$1$1.privateId || + this.type === types$1$1.num || + this.type === types$1$1.string || + this.type === types$1$1.bracketL || + this.type.keyword + ) +}; + +pp$8.parseClassElementName = function(element) { + if (this.type === types$1$1.privateId) { + if (this.value === "constructor") { + this.raise(this.start, "Classes can't have an element named '#constructor'"); + } + element.computed = false; + element.key = this.parsePrivateIdent(); + } else { + this.parsePropertyName(element); + } +}; + +pp$8.parseClassMethod = function(method, isGenerator, isAsync, allowsDirectSuper) { + // Check key and flags + var key = method.key; + if (method.kind === "constructor") { + if (isGenerator) { this.raise(key.start, "Constructor can't be a generator"); } + if (isAsync) { this.raise(key.start, "Constructor can't be an async method"); } + } else if (method.static && checkKeyName(method, "prototype")) { + this.raise(key.start, "Classes may not have a static property named prototype"); + } + + // Parse value + var value = method.value = this.parseMethod(isGenerator, isAsync, allowsDirectSuper); + + // Check value + if (method.kind === "get" && value.params.length !== 0) + { this.raiseRecoverable(value.start, "getter should have no params"); } + if (method.kind === "set" && value.params.length !== 1) + { this.raiseRecoverable(value.start, "setter should have exactly one param"); } + if (method.kind === "set" && value.params[0].type === "RestElement") + { this.raiseRecoverable(value.params[0].start, "Setter cannot use rest params"); } + + return this.finishNode(method, "MethodDefinition") +}; + +pp$8.parseClassField = function(field) { + if (checkKeyName(field, "constructor")) { + this.raise(field.key.start, "Classes can't have a field named 'constructor'"); + } else if (field.static && checkKeyName(field, "prototype")) { + this.raise(field.key.start, "Classes can't have a static field named 'prototype'"); + } + + if (this.eat(types$1$1.eq)) { + // To raise SyntaxError if 'arguments' exists in the initializer. + this.enterScope(SCOPE_CLASS_FIELD_INIT | SCOPE_SUPER); + field.value = this.parseMaybeAssign(); + this.exitScope(); + } else { + field.value = null; + } + this.semicolon(); + + return this.finishNode(field, "PropertyDefinition") +}; + +pp$8.parseClassStaticBlock = function(node) { + node.body = []; + + var oldLabels = this.labels; + this.labels = []; + this.enterScope(SCOPE_CLASS_STATIC_BLOCK | SCOPE_SUPER); + while (this.type !== types$1$1.braceR) { + var stmt = this.parseStatement(null); + node.body.push(stmt); + } + this.next(); + this.exitScope(); + this.labels = oldLabels; + + return this.finishNode(node, "StaticBlock") +}; + +pp$8.parseClassId = function(node, isStatement) { + if (this.type === types$1$1.name) { + node.id = this.parseIdent(); + if (isStatement) + { this.checkLValSimple(node.id, BIND_LEXICAL, false); } + } else { + if (isStatement === true) + { this.unexpected(); } + node.id = null; + } +}; + +pp$8.parseClassSuper = function(node) { + node.superClass = this.eat(types$1$1._extends) ? this.parseExprSubscripts(null, false) : null; +}; + +pp$8.enterClassBody = function() { + var element = {declared: Object.create(null), used: []}; + this.privateNameStack.push(element); + return element.declared +}; + +pp$8.exitClassBody = function() { + var ref = this.privateNameStack.pop(); + var declared = ref.declared; + var used = ref.used; + if (!this.options.checkPrivateFields) { return } + var len = this.privateNameStack.length; + var parent = len === 0 ? null : this.privateNameStack[len - 1]; + for (var i = 0; i < used.length; ++i) { + var id = used[i]; + if (!hasOwn(declared, id.name)) { + if (parent) { + parent.used.push(id); + } else { + this.raiseRecoverable(id.start, ("Private field '#" + (id.name) + "' must be declared in an enclosing class")); + } + } + } +}; + +function isPrivateNameConflicted(privateNameMap, element) { + var name = element.key.name; + var curr = privateNameMap[name]; + + var next = "true"; + if (element.type === "MethodDefinition" && (element.kind === "get" || element.kind === "set")) { + next = (element.static ? "s" : "i") + element.kind; + } + + // `class { get #a(){}; static set #a(_){} }` is also conflict. + if ( + curr === "iget" && next === "iset" || + curr === "iset" && next === "iget" || + curr === "sget" && next === "sset" || + curr === "sset" && next === "sget" + ) { + privateNameMap[name] = "true"; + return false + } else if (!curr) { + privateNameMap[name] = next; + return false + } else { + return true + } +} + +function checkKeyName(node, name) { + var computed = node.computed; + var key = node.key; + return !computed && ( + key.type === "Identifier" && key.name === name || + key.type === "Literal" && key.value === name + ) +} + +// Parses module export declaration. + +pp$8.parseExportAllDeclaration = function(node, exports$1) { + if (this.options.ecmaVersion >= 11) { + if (this.eatContextual("as")) { + node.exported = this.parseModuleExportName(); + this.checkExport(exports$1, node.exported, this.lastTokStart); + } else { + node.exported = null; + } + } + this.expectContextual("from"); + if (this.type !== types$1$1.string) { this.unexpected(); } + node.source = this.parseExprAtom(); + if (this.options.ecmaVersion >= 16) + { node.attributes = this.parseWithClause(); } + this.semicolon(); + return this.finishNode(node, "ExportAllDeclaration") +}; + +pp$8.parseExport = function(node, exports$1) { + this.next(); + // export * from '...' + if (this.eat(types$1$1.star)) { + return this.parseExportAllDeclaration(node, exports$1) + } + if (this.eat(types$1$1._default)) { // export default ... + this.checkExport(exports$1, "default", this.lastTokStart); + node.declaration = this.parseExportDefaultDeclaration(); + return this.finishNode(node, "ExportDefaultDeclaration") + } + // export var|const|let|function|class ... + if (this.shouldParseExportStatement()) { + node.declaration = this.parseExportDeclaration(node); + if (node.declaration.type === "VariableDeclaration") + { this.checkVariableExport(exports$1, node.declaration.declarations); } + else + { this.checkExport(exports$1, node.declaration.id, node.declaration.id.start); } + node.specifiers = []; + node.source = null; + if (this.options.ecmaVersion >= 16) + { node.attributes = []; } + } else { // export { x, y as z } [from '...'] + node.declaration = null; + node.specifiers = this.parseExportSpecifiers(exports$1); + if (this.eatContextual("from")) { + if (this.type !== types$1$1.string) { this.unexpected(); } + node.source = this.parseExprAtom(); + if (this.options.ecmaVersion >= 16) + { node.attributes = this.parseWithClause(); } + } else { + for (var i = 0, list = node.specifiers; i < list.length; i += 1) { + // check for keywords used as local names + var spec = list[i]; + + this.checkUnreserved(spec.local); + // check if export is defined + this.checkLocalExport(spec.local); + + if (spec.local.type === "Literal") { + this.raise(spec.local.start, "A string literal cannot be used as an exported binding without `from`."); + } + } + + node.source = null; + if (this.options.ecmaVersion >= 16) + { node.attributes = []; } + } + this.semicolon(); + } + return this.finishNode(node, "ExportNamedDeclaration") +}; + +pp$8.parseExportDeclaration = function(node) { + return this.parseStatement(null) +}; + +pp$8.parseExportDefaultDeclaration = function() { + var isAsync; + if (this.type === types$1$1._function || (isAsync = this.isAsyncFunction())) { + var fNode = this.startNode(); + this.next(); + if (isAsync) { this.next(); } + return this.parseFunction(fNode, FUNC_STATEMENT | FUNC_NULLABLE_ID, false, isAsync) + } else if (this.type === types$1$1._class) { + var cNode = this.startNode(); + return this.parseClass(cNode, "nullableID") + } else { + var declaration = this.parseMaybeAssign(); + this.semicolon(); + return declaration + } +}; + +pp$8.checkExport = function(exports$1, name, pos) { + if (!exports$1) { return } + if (typeof name !== "string") + { name = name.type === "Identifier" ? name.name : name.value; } + if (hasOwn(exports$1, name)) + { this.raiseRecoverable(pos, "Duplicate export '" + name + "'"); } + exports$1[name] = true; +}; + +pp$8.checkPatternExport = function(exports$1, pat) { + var type = pat.type; + if (type === "Identifier") + { this.checkExport(exports$1, pat, pat.start); } + else if (type === "ObjectPattern") + { for (var i = 0, list = pat.properties; i < list.length; i += 1) + { + var prop = list[i]; + + this.checkPatternExport(exports$1, prop); + } } + else if (type === "ArrayPattern") + { for (var i$1 = 0, list$1 = pat.elements; i$1 < list$1.length; i$1 += 1) { + var elt = list$1[i$1]; + + if (elt) { this.checkPatternExport(exports$1, elt); } + } } + else if (type === "Property") + { this.checkPatternExport(exports$1, pat.value); } + else if (type === "AssignmentPattern") + { this.checkPatternExport(exports$1, pat.left); } + else if (type === "RestElement") + { this.checkPatternExport(exports$1, pat.argument); } +}; + +pp$8.checkVariableExport = function(exports$1, decls) { + if (!exports$1) { return } + for (var i = 0, list = decls; i < list.length; i += 1) + { + var decl = list[i]; + + this.checkPatternExport(exports$1, decl.id); + } +}; + +pp$8.shouldParseExportStatement = function() { + return this.type.keyword === "var" || + this.type.keyword === "const" || + this.type.keyword === "class" || + this.type.keyword === "function" || + this.isLet() || + this.isAsyncFunction() +}; + +// Parses a comma-separated list of module exports. + +pp$8.parseExportSpecifier = function(exports$1) { + var node = this.startNode(); + node.local = this.parseModuleExportName(); + + node.exported = this.eatContextual("as") ? this.parseModuleExportName() : node.local; + this.checkExport( + exports$1, + node.exported, + node.exported.start + ); + + return this.finishNode(node, "ExportSpecifier") +}; + +pp$8.parseExportSpecifiers = function(exports$1) { + var nodes = [], first = true; + // export { x, y as z } [from '...'] + this.expect(types$1$1.braceL); + while (!this.eat(types$1$1.braceR)) { + if (!first) { + this.expect(types$1$1.comma); + if (this.afterTrailingComma(types$1$1.braceR)) { break } + } else { first = false; } + + nodes.push(this.parseExportSpecifier(exports$1)); + } + return nodes +}; + +// Parses import declaration. + +pp$8.parseImport = function(node) { + this.next(); + + // import '...' + if (this.type === types$1$1.string) { + node.specifiers = empty$1; + node.source = this.parseExprAtom(); + } else { + node.specifiers = this.parseImportSpecifiers(); + this.expectContextual("from"); + node.source = this.type === types$1$1.string ? this.parseExprAtom() : this.unexpected(); + } + if (this.options.ecmaVersion >= 16) + { node.attributes = this.parseWithClause(); } + this.semicolon(); + return this.finishNode(node, "ImportDeclaration") +}; + +// Parses a comma-separated list of module imports. + +pp$8.parseImportSpecifier = function() { + var node = this.startNode(); + node.imported = this.parseModuleExportName(); + + if (this.eatContextual("as")) { + node.local = this.parseIdent(); + } else { + this.checkUnreserved(node.imported); + node.local = node.imported; + } + this.checkLValSimple(node.local, BIND_LEXICAL); + + return this.finishNode(node, "ImportSpecifier") +}; + +pp$8.parseImportDefaultSpecifier = function() { + // import defaultObj, { x, y as z } from '...' + var node = this.startNode(); + node.local = this.parseIdent(); + this.checkLValSimple(node.local, BIND_LEXICAL); + return this.finishNode(node, "ImportDefaultSpecifier") +}; + +pp$8.parseImportNamespaceSpecifier = function() { + var node = this.startNode(); + this.next(); + this.expectContextual("as"); + node.local = this.parseIdent(); + this.checkLValSimple(node.local, BIND_LEXICAL); + return this.finishNode(node, "ImportNamespaceSpecifier") +}; + +pp$8.parseImportSpecifiers = function() { + var nodes = [], first = true; + if (this.type === types$1$1.name) { + nodes.push(this.parseImportDefaultSpecifier()); + if (!this.eat(types$1$1.comma)) { return nodes } + } + if (this.type === types$1$1.star) { + nodes.push(this.parseImportNamespaceSpecifier()); + return nodes + } + this.expect(types$1$1.braceL); + while (!this.eat(types$1$1.braceR)) { + if (!first) { + this.expect(types$1$1.comma); + if (this.afterTrailingComma(types$1$1.braceR)) { break } + } else { first = false; } + + nodes.push(this.parseImportSpecifier()); + } + return nodes +}; + +pp$8.parseWithClause = function() { + var nodes = []; + if (!this.eat(types$1$1._with)) { + return nodes + } + this.expect(types$1$1.braceL); + var attributeKeys = {}; + var first = true; + while (!this.eat(types$1$1.braceR)) { + if (!first) { + this.expect(types$1$1.comma); + if (this.afterTrailingComma(types$1$1.braceR)) { break } + } else { first = false; } + + var attr = this.parseImportAttribute(); + var keyName = attr.key.type === "Identifier" ? attr.key.name : attr.key.value; + if (hasOwn(attributeKeys, keyName)) + { this.raiseRecoverable(attr.key.start, "Duplicate attribute key '" + keyName + "'"); } + attributeKeys[keyName] = true; + nodes.push(attr); + } + return nodes +}; + +pp$8.parseImportAttribute = function() { + var node = this.startNode(); + node.key = this.type === types$1$1.string ? this.parseExprAtom() : this.parseIdent(this.options.allowReserved !== "never"); + this.expect(types$1$1.colon); + if (this.type !== types$1$1.string) { + this.unexpected(); + } + node.value = this.parseExprAtom(); + return this.finishNode(node, "ImportAttribute") +}; + +pp$8.parseModuleExportName = function() { + if (this.options.ecmaVersion >= 13 && this.type === types$1$1.string) { + var stringLiteral = this.parseLiteral(this.value); + if (loneSurrogate.test(stringLiteral.value)) { + this.raise(stringLiteral.start, "An export name cannot include a lone surrogate."); + } + return stringLiteral + } + return this.parseIdent(true) +}; + +// Set `ExpressionStatement#directive` property for directive prologues. +pp$8.adaptDirectivePrologue = function(statements) { + for (var i = 0; i < statements.length && this.isDirectiveCandidate(statements[i]); ++i) { + statements[i].directive = statements[i].expression.raw.slice(1, -1); + } +}; +pp$8.isDirectiveCandidate = function(statement) { + return ( + this.options.ecmaVersion >= 5 && + statement.type === "ExpressionStatement" && + statement.expression.type === "Literal" && + typeof statement.expression.value === "string" && + // Reject parenthesized strings. + (this.input[statement.start] === "\"" || this.input[statement.start] === "'") + ) +}; + +var pp$7 = Parser.prototype; + +// Convert existing expression atom to assignable pattern +// if possible. + +pp$7.toAssignable = function(node, isBinding, refDestructuringErrors) { + if (this.options.ecmaVersion >= 6 && node) { + switch (node.type) { + case "Identifier": + if (this.inAsync && node.name === "await") + { this.raise(node.start, "Cannot use 'await' as identifier inside an async function"); } + break + + case "ObjectPattern": + case "ArrayPattern": + case "AssignmentPattern": + case "RestElement": + break + + case "ObjectExpression": + node.type = "ObjectPattern"; + if (refDestructuringErrors) { this.checkPatternErrors(refDestructuringErrors, true); } + for (var i = 0, list = node.properties; i < list.length; i += 1) { + var prop = list[i]; + + this.toAssignable(prop, isBinding); + // Early error: + // AssignmentRestProperty[Yield, Await] : + // `...` DestructuringAssignmentTarget[Yield, Await] + // + // It is a Syntax Error if |DestructuringAssignmentTarget| is an |ArrayLiteral| or an |ObjectLiteral|. + if ( + prop.type === "RestElement" && + (prop.argument.type === "ArrayPattern" || prop.argument.type === "ObjectPattern") + ) { + this.raise(prop.argument.start, "Unexpected token"); + } + } + break + + case "Property": + // AssignmentProperty has type === "Property" + if (node.kind !== "init") { this.raise(node.key.start, "Object pattern can't contain getter or setter"); } + this.toAssignable(node.value, isBinding); + break + + case "ArrayExpression": + node.type = "ArrayPattern"; + if (refDestructuringErrors) { this.checkPatternErrors(refDestructuringErrors, true); } + this.toAssignableList(node.elements, isBinding); + break + + case "SpreadElement": + node.type = "RestElement"; + this.toAssignable(node.argument, isBinding); + if (node.argument.type === "AssignmentPattern") + { this.raise(node.argument.start, "Rest elements cannot have a default value"); } + break + + case "AssignmentExpression": + if (node.operator !== "=") { this.raise(node.left.end, "Only '=' operator can be used for specifying default value."); } + node.type = "AssignmentPattern"; + delete node.operator; + this.toAssignable(node.left, isBinding); + break + + case "ParenthesizedExpression": + this.toAssignable(node.expression, isBinding, refDestructuringErrors); + break + + case "ChainExpression": + this.raiseRecoverable(node.start, "Optional chaining cannot appear in left-hand side"); + break + + case "MemberExpression": + if (!isBinding) { break } + + default: + this.raise(node.start, "Assigning to rvalue"); + } + } else if (refDestructuringErrors) { this.checkPatternErrors(refDestructuringErrors, true); } + return node +}; + +// Convert list of expression atoms to binding list. + +pp$7.toAssignableList = function(exprList, isBinding) { + var end = exprList.length; + for (var i = 0; i < end; i++) { + var elt = exprList[i]; + if (elt) { this.toAssignable(elt, isBinding); } + } + if (end) { + var last = exprList[end - 1]; + if (this.options.ecmaVersion === 6 && isBinding && last && last.type === "RestElement" && last.argument.type !== "Identifier") + { this.unexpected(last.argument.start); } + } + return exprList +}; + +// Parses spread element. + +pp$7.parseSpread = function(refDestructuringErrors) { + var node = this.startNode(); + this.next(); + node.argument = this.parseMaybeAssign(false, refDestructuringErrors); + return this.finishNode(node, "SpreadElement") +}; + +pp$7.parseRestBinding = function() { + var node = this.startNode(); + this.next(); + + // RestElement inside of a function parameter must be an identifier + if (this.options.ecmaVersion === 6 && this.type !== types$1$1.name) + { this.unexpected(); } + + node.argument = this.parseBindingAtom(); + + return this.finishNode(node, "RestElement") +}; + +// Parses lvalue (assignable) atom. + +pp$7.parseBindingAtom = function() { + if (this.options.ecmaVersion >= 6) { + switch (this.type) { + case types$1$1.bracketL: + var node = this.startNode(); + this.next(); + node.elements = this.parseBindingList(types$1$1.bracketR, true, true); + return this.finishNode(node, "ArrayPattern") + + case types$1$1.braceL: + return this.parseObj(true) + } + } + return this.parseIdent() +}; + +pp$7.parseBindingList = function(close, allowEmpty, allowTrailingComma, allowModifiers) { + var elts = [], first = true; + while (!this.eat(close)) { + if (first) { first = false; } + else { this.expect(types$1$1.comma); } + if (allowEmpty && this.type === types$1$1.comma) { + elts.push(null); + } else if (allowTrailingComma && this.afterTrailingComma(close)) { + break + } else if (this.type === types$1$1.ellipsis) { + var rest = this.parseRestBinding(); + this.parseBindingListItem(rest); + elts.push(rest); + if (this.type === types$1$1.comma) { this.raiseRecoverable(this.start, "Comma is not permitted after the rest element"); } + this.expect(close); + break + } else { + elts.push(this.parseAssignableListItem(allowModifiers)); + } + } + return elts +}; + +pp$7.parseAssignableListItem = function(allowModifiers) { + var elem = this.parseMaybeDefault(this.start, this.startLoc); + this.parseBindingListItem(elem); + return elem +}; + +pp$7.parseBindingListItem = function(param) { + return param +}; + +// Parses assignment pattern around given atom if possible. + +pp$7.parseMaybeDefault = function(startPos, startLoc, left) { + left = left || this.parseBindingAtom(); + if (this.options.ecmaVersion < 6 || !this.eat(types$1$1.eq)) { return left } + var node = this.startNodeAt(startPos, startLoc); + node.left = left; + node.right = this.parseMaybeAssign(); + return this.finishNode(node, "AssignmentPattern") +}; + +// The following three functions all verify that a node is an lvalue — +// something that can be bound, or assigned to. In order to do so, they perform +// a variety of checks: +// +// - Check that none of the bound/assigned-to identifiers are reserved words. +// - Record name declarations for bindings in the appropriate scope. +// - Check duplicate argument names, if checkClashes is set. +// +// If a complex binding pattern is encountered (e.g., object and array +// destructuring), the entire pattern is recursively checked. +// +// There are three versions of checkLVal*() appropriate for different +// circumstances: +// +// - checkLValSimple() shall be used if the syntactic construct supports +// nothing other than identifiers and member expressions. Parenthesized +// expressions are also correctly handled. This is generally appropriate for +// constructs for which the spec says +// +// > It is a Syntax Error if AssignmentTargetType of [the production] is not +// > simple. +// +// It is also appropriate for checking if an identifier is valid and not +// defined elsewhere, like import declarations or function/class identifiers. +// +// Examples where this is used include: +// a += …; +// import a from '…'; +// where a is the node to be checked. +// +// - checkLValPattern() shall be used if the syntactic construct supports +// anything checkLValSimple() supports, as well as object and array +// destructuring patterns. This is generally appropriate for constructs for +// which the spec says +// +// > It is a Syntax Error if [the production] is neither an ObjectLiteral nor +// > an ArrayLiteral and AssignmentTargetType of [the production] is not +// > simple. +// +// Examples where this is used include: +// (a = …); +// const a = …; +// try { … } catch (a) { … } +// where a is the node to be checked. +// +// - checkLValInnerPattern() shall be used if the syntactic construct supports +// anything checkLValPattern() supports, as well as default assignment +// patterns, rest elements, and other constructs that may appear within an +// object or array destructuring pattern. +// +// As a special case, function parameters also use checkLValInnerPattern(), +// as they also support defaults and rest constructs. +// +// These functions deliberately support both assignment and binding constructs, +// as the logic for both is exceedingly similar. If the node is the target of +// an assignment, then bindingType should be set to BIND_NONE. Otherwise, it +// should be set to the appropriate BIND_* constant, like BIND_VAR or +// BIND_LEXICAL. +// +// If the function is called with a non-BIND_NONE bindingType, then +// additionally a checkClashes object may be specified to allow checking for +// duplicate argument names. checkClashes is ignored if the provided construct +// is an assignment (i.e., bindingType is BIND_NONE). + +pp$7.checkLValSimple = function(expr, bindingType, checkClashes) { + if ( bindingType === void 0 ) bindingType = BIND_NONE; + + var isBind = bindingType !== BIND_NONE; + + switch (expr.type) { + case "Identifier": + if (this.strict && this.reservedWordsStrictBind.test(expr.name)) + { this.raiseRecoverable(expr.start, (isBind ? "Binding " : "Assigning to ") + expr.name + " in strict mode"); } + if (isBind) { + if (bindingType === BIND_LEXICAL && expr.name === "let") + { this.raiseRecoverable(expr.start, "let is disallowed as a lexically bound name"); } + if (checkClashes) { + if (hasOwn(checkClashes, expr.name)) + { this.raiseRecoverable(expr.start, "Argument name clash"); } + checkClashes[expr.name] = true; + } + if (bindingType !== BIND_OUTSIDE) { this.declareName(expr.name, bindingType, expr.start); } + } + break + + case "ChainExpression": + this.raiseRecoverable(expr.start, "Optional chaining cannot appear in left-hand side"); + break + + case "MemberExpression": + if (isBind) { this.raiseRecoverable(expr.start, "Binding member expression"); } + break + + case "ParenthesizedExpression": + if (isBind) { this.raiseRecoverable(expr.start, "Binding parenthesized expression"); } + return this.checkLValSimple(expr.expression, bindingType, checkClashes) + + default: + this.raise(expr.start, (isBind ? "Binding" : "Assigning to") + " rvalue"); + } +}; + +pp$7.checkLValPattern = function(expr, bindingType, checkClashes) { + if ( bindingType === void 0 ) bindingType = BIND_NONE; + + switch (expr.type) { + case "ObjectPattern": + for (var i = 0, list = expr.properties; i < list.length; i += 1) { + var prop = list[i]; + + this.checkLValInnerPattern(prop, bindingType, checkClashes); + } + break + + case "ArrayPattern": + for (var i$1 = 0, list$1 = expr.elements; i$1 < list$1.length; i$1 += 1) { + var elem = list$1[i$1]; + + if (elem) { this.checkLValInnerPattern(elem, bindingType, checkClashes); } + } + break + + default: + this.checkLValSimple(expr, bindingType, checkClashes); + } +}; + +pp$7.checkLValInnerPattern = function(expr, bindingType, checkClashes) { + if ( bindingType === void 0 ) bindingType = BIND_NONE; + + switch (expr.type) { + case "Property": + // AssignmentProperty has type === "Property" + this.checkLValInnerPattern(expr.value, bindingType, checkClashes); + break + + case "AssignmentPattern": + this.checkLValPattern(expr.left, bindingType, checkClashes); + break + + case "RestElement": + this.checkLValPattern(expr.argument, bindingType, checkClashes); + break + + default: + this.checkLValPattern(expr, bindingType, checkClashes); + } +}; + +// The algorithm used to determine whether a regexp can appear at a +// given point in the program is loosely based on sweet.js' approach. +// See https://github.com/mozilla/sweet.js/wiki/design + + +var TokContext = function TokContext(token, isExpr, preserveSpace, override, generator) { + this.token = token; + this.isExpr = !!isExpr; + this.preserveSpace = !!preserveSpace; + this.override = override; + this.generator = !!generator; +}; + +var types$2 = { + b_stat: new TokContext("{", false), + b_expr: new TokContext("{", true), + b_tmpl: new TokContext("${", false), + p_stat: new TokContext("(", false), + p_expr: new TokContext("(", true), + q_tmpl: new TokContext("`", true, true, function (p) { return p.tryReadTemplateToken(); }), + f_stat: new TokContext("function", false), + f_expr: new TokContext("function", true), + f_expr_gen: new TokContext("function", true, false, null, true), + f_gen: new TokContext("function", false, false, null, true) +}; + +var pp$6 = Parser.prototype; + +pp$6.initialContext = function() { + return [types$2.b_stat] +}; + +pp$6.curContext = function() { + return this.context[this.context.length - 1] +}; + +pp$6.braceIsBlock = function(prevType) { + var parent = this.curContext(); + if (parent === types$2.f_expr || parent === types$2.f_stat) + { return true } + if (prevType === types$1$1.colon && (parent === types$2.b_stat || parent === types$2.b_expr)) + { return !parent.isExpr } + + // The check for `tt.name && exprAllowed` detects whether we are + // after a `yield` or `of` construct. See the `updateContext` for + // `tt.name`. + if (prevType === types$1$1._return || prevType === types$1$1.name && this.exprAllowed) + { return lineBreak.test(this.input.slice(this.lastTokEnd, this.start)) } + if (prevType === types$1$1._else || prevType === types$1$1.semi || prevType === types$1$1.eof || prevType === types$1$1.parenR || prevType === types$1$1.arrow) + { return true } + if (prevType === types$1$1.braceL) + { return parent === types$2.b_stat } + if (prevType === types$1$1._var || prevType === types$1$1._const || prevType === types$1$1.name) + { return false } + return !this.exprAllowed +}; + +pp$6.inGeneratorContext = function() { + for (var i = this.context.length - 1; i >= 1; i--) { + var context = this.context[i]; + if (context.token === "function") + { return context.generator } + } + return false +}; + +pp$6.updateContext = function(prevType) { + var update, type = this.type; + if (type.keyword && prevType === types$1$1.dot) + { this.exprAllowed = false; } + else if (update = type.updateContext) + { update.call(this, prevType); } + else + { this.exprAllowed = type.beforeExpr; } +}; + +// Used to handle edge cases when token context could not be inferred correctly during tokenization phase + +pp$6.overrideContext = function(tokenCtx) { + if (this.curContext() !== tokenCtx) { + this.context[this.context.length - 1] = tokenCtx; + } +}; + +// Token-specific context update code + +types$1$1.parenR.updateContext = types$1$1.braceR.updateContext = function() { + if (this.context.length === 1) { + this.exprAllowed = true; + return + } + var out = this.context.pop(); + if (out === types$2.b_stat && this.curContext().token === "function") { + out = this.context.pop(); + } + this.exprAllowed = !out.isExpr; +}; + +types$1$1.braceL.updateContext = function(prevType) { + this.context.push(this.braceIsBlock(prevType) ? types$2.b_stat : types$2.b_expr); + this.exprAllowed = true; +}; + +types$1$1.dollarBraceL.updateContext = function() { + this.context.push(types$2.b_tmpl); + this.exprAllowed = true; +}; + +types$1$1.parenL.updateContext = function(prevType) { + var statementParens = prevType === types$1$1._if || prevType === types$1$1._for || prevType === types$1$1._with || prevType === types$1$1._while; + this.context.push(statementParens ? types$2.p_stat : types$2.p_expr); + this.exprAllowed = true; +}; + +types$1$1.incDec.updateContext = function() { + // tokExprAllowed stays unchanged +}; + +types$1$1._function.updateContext = types$1$1._class.updateContext = function(prevType) { + if (prevType.beforeExpr && prevType !== types$1$1._else && + !(prevType === types$1$1.semi && this.curContext() !== types$2.p_stat) && + !(prevType === types$1$1._return && lineBreak.test(this.input.slice(this.lastTokEnd, this.start))) && + !((prevType === types$1$1.colon || prevType === types$1$1.braceL) && this.curContext() === types$2.b_stat)) + { this.context.push(types$2.f_expr); } + else + { this.context.push(types$2.f_stat); } + this.exprAllowed = false; +}; + +types$1$1.colon.updateContext = function() { + if (this.curContext().token === "function") { this.context.pop(); } + this.exprAllowed = true; +}; + +types$1$1.backQuote.updateContext = function() { + if (this.curContext() === types$2.q_tmpl) + { this.context.pop(); } + else + { this.context.push(types$2.q_tmpl); } + this.exprAllowed = false; +}; + +types$1$1.star.updateContext = function(prevType) { + if (prevType === types$1$1._function) { + var index = this.context.length - 1; + if (this.context[index] === types$2.f_expr) + { this.context[index] = types$2.f_expr_gen; } + else + { this.context[index] = types$2.f_gen; } + } + this.exprAllowed = true; +}; + +types$1$1.name.updateContext = function(prevType) { + var allowed = false; + if (this.options.ecmaVersion >= 6 && prevType !== types$1$1.dot) { + if (this.value === "of" && !this.exprAllowed || + this.value === "yield" && this.inGeneratorContext()) + { allowed = true; } + } + this.exprAllowed = allowed; +}; + +// A recursive descent parser operates by defining functions for all +// syntactic elements, and recursively calling those, each function +// advancing the input stream and returning an AST node. Precedence +// of constructs (for example, the fact that `!x[1]` means `!(x[1])` +// instead of `(!x)[1]` is handled by the fact that the parser +// function that parses unary prefix operators is called first, and +// in turn calls the function that parses `[]` subscripts — that +// way, it'll receive the node for `x[1]` already parsed, and wraps +// *that* in the unary operator node. +// +// Acorn uses an [operator precedence parser][opp] to handle binary +// operator precedence, because it is much more compact than using +// the technique outlined above, which uses different, nesting +// functions to specify precedence, for all of the ten binary +// precedence levels that JavaScript defines. +// +// [opp]: http://en.wikipedia.org/wiki/Operator-precedence_parser + + +var pp$5 = Parser.prototype; + +// Check if property name clashes with already added. +// Object/class getters and setters are not allowed to clash — +// either with each other or with an init property — and in +// strict mode, init properties are also not allowed to be repeated. + +pp$5.checkPropClash = function(prop, propHash, refDestructuringErrors) { + if (this.options.ecmaVersion >= 9 && prop.type === "SpreadElement") + { return } + if (this.options.ecmaVersion >= 6 && (prop.computed || prop.method || prop.shorthand)) + { return } + var key = prop.key; + var name; + switch (key.type) { + case "Identifier": name = key.name; break + case "Literal": name = String(key.value); break + default: return + } + var kind = prop.kind; + if (this.options.ecmaVersion >= 6) { + if (name === "__proto__" && kind === "init") { + if (propHash.proto) { + if (refDestructuringErrors) { + if (refDestructuringErrors.doubleProto < 0) { + refDestructuringErrors.doubleProto = key.start; + } + } else { + this.raiseRecoverable(key.start, "Redefinition of __proto__ property"); + } + } + propHash.proto = true; + } + return + } + name = "$" + name; + var other = propHash[name]; + if (other) { + var redefinition; + if (kind === "init") { + redefinition = this.strict && other.init || other.get || other.set; + } else { + redefinition = other.init || other[kind]; + } + if (redefinition) + { this.raiseRecoverable(key.start, "Redefinition of property"); } + } else { + other = propHash[name] = { + init: false, + get: false, + set: false + }; + } + other[kind] = true; +}; + +// ### Expression parsing + +// These nest, from the most general expression type at the top to +// 'atomic', nondivisible expression types at the bottom. Most of +// the functions will simply let the function(s) below them parse, +// and, *if* the syntactic construct they handle is present, wrap +// the AST node that the inner parser gave them in another node. + +// Parse a full expression. The optional arguments are used to +// forbid the `in` operator (in for loops initalization expressions) +// and provide reference for storing '=' operator inside shorthand +// property assignment in contexts where both object expression +// and object pattern might appear (so it's possible to raise +// delayed syntax error at correct position). + +pp$5.parseExpression = function(forInit, refDestructuringErrors) { + var this$1$1 = this; + + return this.catchStackOverflow(function () { + var startPos = this$1$1.start, startLoc = this$1$1.startLoc; + var expr = this$1$1.parseMaybeAssign(forInit, refDestructuringErrors); + if (this$1$1.type === types$1$1.comma) { + var node = this$1$1.startNodeAt(startPos, startLoc); + node.expressions = [expr]; + while (this$1$1.eat(types$1$1.comma)) { node.expressions.push(this$1$1.parseMaybeAssign(forInit, refDestructuringErrors)); } + return this$1$1.finishNode(node, "SequenceExpression") + } + return expr + }) +}; + +// Parse an assignment expression. This includes applications of +// operators like `+=`. + +pp$5.parseMaybeAssign = function(forInit, refDestructuringErrors, afterLeftParse) { + if (this.isContextual("yield")) { + if (this.inGenerator) { return this.parseYield(forInit) } + // The tokenizer will assume an expression is allowed after + // `yield`, but this isn't that kind of yield + else { this.exprAllowed = false; } + } + + var ownDestructuringErrors = false, oldParenAssign = -1, oldTrailingComma = -1, oldDoubleProto = -1; + if (refDestructuringErrors) { + oldParenAssign = refDestructuringErrors.parenthesizedAssign; + oldTrailingComma = refDestructuringErrors.trailingComma; + oldDoubleProto = refDestructuringErrors.doubleProto; + refDestructuringErrors.parenthesizedAssign = refDestructuringErrors.trailingComma = -1; + } else { + refDestructuringErrors = new DestructuringErrors; + ownDestructuringErrors = true; + } + + var startPos = this.start, startLoc = this.startLoc; + if (this.type === types$1$1.parenL || this.type === types$1$1.name) { + this.potentialArrowAt = this.start; + this.potentialArrowInForAwait = forInit === "await"; + } + var left = this.parseMaybeConditional(forInit, refDestructuringErrors); + if (afterLeftParse) { left = afterLeftParse.call(this, left, startPos, startLoc); } + if (this.type.isAssign) { + var node = this.startNodeAt(startPos, startLoc); + node.operator = this.value; + if (this.type === types$1$1.eq) + { left = this.toAssignable(left, false, refDestructuringErrors); } + if (!ownDestructuringErrors) { + refDestructuringErrors.parenthesizedAssign = refDestructuringErrors.trailingComma = refDestructuringErrors.doubleProto = -1; + } + if (refDestructuringErrors.shorthandAssign >= left.start) + { refDestructuringErrors.shorthandAssign = -1; } // reset because shorthand default was used correctly + if (this.type === types$1$1.eq) + { this.checkLValPattern(left); } + else + { this.checkLValSimple(left); } + node.left = left; + this.next(); + node.right = this.parseMaybeAssign(forInit); + if (oldDoubleProto > -1) { refDestructuringErrors.doubleProto = oldDoubleProto; } + return this.finishNode(node, "AssignmentExpression") + } else { + if (ownDestructuringErrors) { this.checkExpressionErrors(refDestructuringErrors, true); } + } + if (oldParenAssign > -1) { refDestructuringErrors.parenthesizedAssign = oldParenAssign; } + if (oldTrailingComma > -1) { refDestructuringErrors.trailingComma = oldTrailingComma; } + return left +}; + +// Parse a ternary conditional (`?:`) operator. + +pp$5.parseMaybeConditional = function(forInit, refDestructuringErrors) { + var startPos = this.start, startLoc = this.startLoc; + var expr = this.parseExprOps(forInit, refDestructuringErrors); + if (this.checkExpressionErrors(refDestructuringErrors)) { return expr } + if (!(expr.type === "ArrowFunctionExpression" && expr.start === startPos) && this.eat(types$1$1.question)) { + var node = this.startNodeAt(startPos, startLoc); + node.test = expr; + node.consequent = this.parseMaybeAssign(); + this.expect(types$1$1.colon); + node.alternate = this.parseMaybeAssign(forInit); + return this.finishNode(node, "ConditionalExpression") + } + return expr +}; + +// Start the precedence parser. + +pp$5.parseExprOps = function(forInit, refDestructuringErrors) { + var startPos = this.start, startLoc = this.startLoc; + var expr = this.parseMaybeUnary(refDestructuringErrors, false, false, forInit); + if (this.checkExpressionErrors(refDestructuringErrors)) { return expr } + return expr.start === startPos && expr.type === "ArrowFunctionExpression" ? expr : this.parseExprOp(expr, startPos, startLoc, -1, forInit) +}; + +// Parse binary operators with the operator precedence parsing +// algorithm. `left` is the left-hand side of the operator. +// `minPrec` provides context that allows the function to stop and +// defer further parser to one of its callers when it encounters an +// operator that has a lower precedence than the set it is parsing. + +pp$5.parseExprOp = function(left, leftStartPos, leftStartLoc, minPrec, forInit) { + var prec = this.type.binop; + if (prec != null && (!forInit || this.type !== types$1$1._in)) { + if (prec > minPrec) { + var logical = this.type === types$1$1.logicalOR || this.type === types$1$1.logicalAND; + var coalesce = this.type === types$1$1.coalesce; + if (coalesce) { + // Handle the precedence of `tt.coalesce` as equal to the range of logical expressions. + // In other words, `node.right` shouldn't contain logical expressions in order to check the mixed error. + prec = types$1$1.logicalAND.binop; + } + var op = this.value; + this.next(); + var startPos = this.start, startLoc = this.startLoc; + var right = this.parseExprOp(this.parseMaybeUnary(null, false, false, forInit), startPos, startLoc, prec, forInit); + var node = this.buildBinary(leftStartPos, leftStartLoc, left, right, op, logical || coalesce); + if ((logical && this.type === types$1$1.coalesce) || (coalesce && (this.type === types$1$1.logicalOR || this.type === types$1$1.logicalAND))) { + this.raiseRecoverable(this.start, "Logical expressions and coalesce expressions cannot be mixed. Wrap either by parentheses"); + } + return this.parseExprOp(node, leftStartPos, leftStartLoc, minPrec, forInit) + } + } + return left +}; + +pp$5.buildBinary = function(startPos, startLoc, left, right, op, logical) { + if (right.type === "PrivateIdentifier") { this.raise(right.start, "Private identifier can only be left side of binary expression"); } + var node = this.startNodeAt(startPos, startLoc); + node.left = left; + node.operator = op; + node.right = right; + return this.finishNode(node, logical ? "LogicalExpression" : "BinaryExpression") +}; + +// Parse unary operators, both prefix and postfix. + +pp$5.parseMaybeUnary = function(refDestructuringErrors, sawUnary, incDec, forInit) { + var startPos = this.start, startLoc = this.startLoc, expr; + if (this.isContextual("await") && this.canAwait) { + expr = this.parseAwait(forInit); + sawUnary = true; + } else if (this.type.prefix) { + var node = this.startNode(), update = this.type === types$1$1.incDec; + node.operator = this.value; + node.prefix = true; + this.next(); + node.argument = this.parseMaybeUnary(null, true, update, forInit); + this.checkExpressionErrors(refDestructuringErrors, true); + if (update) { this.checkLValSimple(node.argument); } + else if (this.strict && node.operator === "delete" && isLocalVariableAccess(node.argument)) + { this.raiseRecoverable(node.start, "Deleting local variable in strict mode"); } + else if (node.operator === "delete" && isPrivateFieldAccess(node.argument)) + { this.raiseRecoverable(node.start, "Private fields can not be deleted"); } + else { sawUnary = true; } + expr = this.finishNode(node, update ? "UpdateExpression" : "UnaryExpression"); + } else if (!sawUnary && this.type === types$1$1.privateId) { + if ((forInit || this.privateNameStack.length === 0) && this.options.checkPrivateFields) { this.unexpected(); } + expr = this.parsePrivateIdent(); + // only could be private fields in 'in', such as #x in obj + if (this.type !== types$1$1._in) { this.unexpected(); } + } else { + expr = this.parseExprSubscripts(refDestructuringErrors, forInit); + if (this.checkExpressionErrors(refDestructuringErrors)) { return expr } + while (this.type.postfix && !this.canInsertSemicolon()) { + var node$1 = this.startNodeAt(startPos, startLoc); + node$1.operator = this.value; + node$1.prefix = false; + node$1.argument = expr; + this.checkLValSimple(expr); + this.next(); + expr = this.finishNode(node$1, "UpdateExpression"); + } + } + + if (!incDec && this.eat(types$1$1.starstar)) { + if (sawUnary) + { this.unexpected(this.lastTokStart); } + else + { return this.buildBinary(startPos, startLoc, expr, this.parseMaybeUnary(null, false, false, forInit), "**", false) } + } else { + return expr + } +}; + +function isLocalVariableAccess(node) { + return ( + node.type === "Identifier" || + node.type === "ParenthesizedExpression" && isLocalVariableAccess(node.expression) + ) +} + +function isPrivateFieldAccess(node) { + return ( + node.type === "MemberExpression" && node.property.type === "PrivateIdentifier" || + node.type === "ChainExpression" && isPrivateFieldAccess(node.expression) || + node.type === "ParenthesizedExpression" && isPrivateFieldAccess(node.expression) + ) +} + +// Parse call, dot, and `[]`-subscript expressions. + +pp$5.parseExprSubscripts = function(refDestructuringErrors, forInit) { + var startPos = this.start, startLoc = this.startLoc; + var expr = this.parseExprAtom(refDestructuringErrors, forInit); + if (expr.type === "ArrowFunctionExpression" && this.input.slice(this.lastTokStart, this.lastTokEnd) !== ")") + { return expr } + var result = this.parseSubscripts(expr, startPos, startLoc, false, forInit); + if (refDestructuringErrors && result.type === "MemberExpression") { + if (refDestructuringErrors.parenthesizedAssign >= result.start) { refDestructuringErrors.parenthesizedAssign = -1; } + if (refDestructuringErrors.parenthesizedBind >= result.start) { refDestructuringErrors.parenthesizedBind = -1; } + if (refDestructuringErrors.trailingComma >= result.start) { refDestructuringErrors.trailingComma = -1; } + } + return result +}; + +pp$5.parseSubscripts = function(base, startPos, startLoc, noCalls, forInit) { + var maybeAsyncArrow = this.options.ecmaVersion >= 8 && base.type === "Identifier" && base.name === "async" && + this.lastTokEnd === base.end && !this.canInsertSemicolon() && base.end - base.start === 5 && + this.potentialArrowAt === base.start; + var optionalChained = false; + + while (true) { + var element = this.parseSubscript(base, startPos, startLoc, noCalls, maybeAsyncArrow, optionalChained, forInit); + + if (element.optional) { optionalChained = true; } + if (element === base || element.type === "ArrowFunctionExpression") { + if (optionalChained) { + var chainNode = this.startNodeAt(startPos, startLoc); + chainNode.expression = element; + element = this.finishNode(chainNode, "ChainExpression"); + } + return element + } + + base = element; + } +}; + +pp$5.shouldParseAsyncArrow = function() { + return !this.canInsertSemicolon() && this.eat(types$1$1.arrow) +}; + +pp$5.parseSubscriptAsyncArrow = function(startPos, startLoc, exprList, forInit) { + return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), exprList, true, forInit) +}; + +pp$5.parseSubscript = function(base, startPos, startLoc, noCalls, maybeAsyncArrow, optionalChained, forInit) { + var optionalSupported = this.options.ecmaVersion >= 11; + var optional = optionalSupported && this.eat(types$1$1.questionDot); + if (noCalls && optional) { this.raise(this.lastTokStart, "Optional chaining cannot appear in the callee of new expressions"); } + + var computed = this.eat(types$1$1.bracketL); + if (computed || (optional && this.type !== types$1$1.parenL && this.type !== types$1$1.backQuote) || this.eat(types$1$1.dot)) { + var node = this.startNodeAt(startPos, startLoc); + node.object = base; + if (computed) { + node.property = this.parseExpression(); + this.expect(types$1$1.bracketR); + } else if (this.type === types$1$1.privateId && base.type !== "Super") { + node.property = this.parsePrivateIdent(); + } else { + node.property = this.parseIdent(this.options.allowReserved !== "never"); + } + node.computed = !!computed; + if (optionalSupported) { + node.optional = optional; + } + base = this.finishNode(node, "MemberExpression"); + } else if (!noCalls && this.eat(types$1$1.parenL)) { + var refDestructuringErrors = new DestructuringErrors, oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos, oldAwaitIdentPos = this.awaitIdentPos; + this.yieldPos = 0; + this.awaitPos = 0; + this.awaitIdentPos = 0; + var exprList = this.parseExprList(types$1$1.parenR, this.options.ecmaVersion >= 8, false, refDestructuringErrors); + if (maybeAsyncArrow && !optional && this.shouldParseAsyncArrow()) { + this.checkPatternErrors(refDestructuringErrors, false); + this.checkYieldAwaitInDefaultParams(); + if (this.awaitIdentPos > 0) + { this.raise(this.awaitIdentPos, "Cannot use 'await' as identifier inside an async function"); } + this.yieldPos = oldYieldPos; + this.awaitPos = oldAwaitPos; + this.awaitIdentPos = oldAwaitIdentPos; + return this.parseSubscriptAsyncArrow(startPos, startLoc, exprList, forInit) + } + this.checkExpressionErrors(refDestructuringErrors, true); + this.yieldPos = oldYieldPos || this.yieldPos; + this.awaitPos = oldAwaitPos || this.awaitPos; + this.awaitIdentPos = oldAwaitIdentPos || this.awaitIdentPos; + var node$1 = this.startNodeAt(startPos, startLoc); + node$1.callee = base; + node$1.arguments = exprList; + if (optionalSupported) { + node$1.optional = optional; + } + base = this.finishNode(node$1, "CallExpression"); + } else if (this.type === types$1$1.backQuote) { + if (optional || optionalChained) { + this.raise(this.start, "Optional chaining cannot appear in the tag of tagged template expressions"); + } + var node$2 = this.startNodeAt(startPos, startLoc); + node$2.tag = base; + node$2.quasi = this.parseTemplate({isTagged: true}); + base = this.finishNode(node$2, "TaggedTemplateExpression"); + } + return base +}; + +// Parse an atomic expression — either a single token that is an +// expression, an expression started by a keyword like `function` or +// `new`, or an expression wrapped in punctuation like `()`, `[]`, +// or `{}`. + +pp$5.parseExprAtom = function(refDestructuringErrors, forInit, forNew) { + // If a division operator appears in an expression position, the + // tokenizer got confused, and we force it to read a regexp instead. + if (this.type === types$1$1.slash) { this.readRegexp(); } + + var node, canBeArrow = this.potentialArrowAt === this.start; + switch (this.type) { + case types$1$1._super: + if (!this.allowSuper) + { this.raise(this.start, "'super' keyword outside a method"); } + node = this.startNode(); + this.next(); + if (this.type === types$1$1.parenL && !this.allowDirectSuper) + { this.raise(node.start, "super() call outside constructor of a subclass"); } + // The `super` keyword can appear at below: + // SuperProperty: + // super [ Expression ] + // super . IdentifierName + // SuperCall: + // super ( Arguments ) + if (this.type !== types$1$1.dot && this.type !== types$1$1.bracketL && this.type !== types$1$1.parenL) + { this.unexpected(); } + return this.finishNode(node, "Super") + + case types$1$1._this: + node = this.startNode(); + this.next(); + return this.finishNode(node, "ThisExpression") + + case types$1$1.name: + var startPos = this.start, startLoc = this.startLoc, containsEsc = this.containsEsc; + var id = this.parseIdent(false); + if (this.options.ecmaVersion >= 8 && !containsEsc && id.name === "async" && !this.canInsertSemicolon() && this.eat(types$1$1._function)) { + this.overrideContext(types$2.f_expr); + return this.parseFunction(this.startNodeAt(startPos, startLoc), 0, false, true, forInit) + } + if (canBeArrow && !this.canInsertSemicolon()) { + if (this.eat(types$1$1.arrow)) + { return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), [id], false, forInit) } + if (this.options.ecmaVersion >= 8 && id.name === "async" && this.type === types$1$1.name && !containsEsc && + (!this.potentialArrowInForAwait || this.value !== "of" || this.containsEsc)) { + id = this.parseIdent(false); + if (this.canInsertSemicolon() || !this.eat(types$1$1.arrow)) + { this.unexpected(); } + return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), [id], true, forInit) + } + } + return id + + case types$1$1.regexp: + var value = this.value; + node = this.parseLiteral(value.value); + node.regex = {pattern: value.pattern, flags: value.flags}; + return node + + case types$1$1.num: case types$1$1.string: + return this.parseLiteral(this.value) + + case types$1$1._null: case types$1$1._true: case types$1$1._false: + node = this.startNode(); + node.value = this.type === types$1$1._null ? null : this.type === types$1$1._true; + node.raw = this.type.keyword; + this.next(); + return this.finishNode(node, "Literal") + + case types$1$1.parenL: + var start = this.start, expr = this.parseParenAndDistinguishExpression(canBeArrow, forInit); + if (refDestructuringErrors) { + if (refDestructuringErrors.parenthesizedAssign < 0 && !this.isSimpleAssignTarget(expr)) + { refDestructuringErrors.parenthesizedAssign = start; } + if (refDestructuringErrors.parenthesizedBind < 0) + { refDestructuringErrors.parenthesizedBind = start; } + } + return expr + + case types$1$1.bracketL: + node = this.startNode(); + this.next(); + node.elements = this.parseExprList(types$1$1.bracketR, true, true, refDestructuringErrors); + return this.finishNode(node, "ArrayExpression") + + case types$1$1.braceL: + this.overrideContext(types$2.b_expr); + return this.parseObj(false, refDestructuringErrors) + + case types$1$1._function: + node = this.startNode(); + this.next(); + return this.parseFunction(node, 0) + + case types$1$1._class: + return this.parseClass(this.startNode(), false) + + case types$1$1._new: + return this.parseNew() + + case types$1$1.backQuote: + return this.parseTemplate() + + case types$1$1._import: + if (this.options.ecmaVersion >= 11) { + return this.parseExprImport(forNew) + } else { + return this.unexpected() + } + + default: + return this.parseExprAtomDefault() + } +}; + +pp$5.parseExprAtomDefault = function() { + this.unexpected(); +}; + +pp$5.parseExprImport = function(forNew) { + var node = this.startNode(); + + // Consume `import` as an identifier for `import.meta`. + // Because `this.parseIdent(true)` doesn't check escape sequences, it needs the check of `this.containsEsc`. + if (this.containsEsc) { this.raiseRecoverable(this.start, "Escape sequence in keyword import"); } + this.next(); + + if (this.type === types$1$1.parenL && !forNew) { + return this.parseDynamicImport(node) + } else if (this.type === types$1$1.dot) { + var meta = this.startNodeAt(node.start, node.loc && node.loc.start); + meta.name = "import"; + node.meta = this.finishNode(meta, "Identifier"); + return this.parseImportMeta(node) + } else { + this.unexpected(); + } +}; + +pp$5.parseDynamicImport = function(node) { + this.next(); // skip `(` + + // Parse node.source. + node.source = this.parseMaybeAssign(); + + if (this.options.ecmaVersion >= 16) { + if (!this.eat(types$1$1.parenR)) { + this.expect(types$1$1.comma); + if (!this.afterTrailingComma(types$1$1.parenR)) { + node.options = this.parseMaybeAssign(); + if (!this.eat(types$1$1.parenR)) { + this.expect(types$1$1.comma); + if (!this.afterTrailingComma(types$1$1.parenR)) { + this.unexpected(); + } + } + } else { + node.options = null; + } + } else { + node.options = null; + } + } else { + // Verify ending. + if (!this.eat(types$1$1.parenR)) { + var errorPos = this.start; + if (this.eat(types$1$1.comma) && this.eat(types$1$1.parenR)) { + this.raiseRecoverable(errorPos, "Trailing comma is not allowed in import()"); + } else { + this.unexpected(errorPos); + } + } + } + + return this.finishNode(node, "ImportExpression") +}; + +pp$5.parseImportMeta = function(node) { + this.next(); // skip `.` + + var containsEsc = this.containsEsc; + node.property = this.parseIdent(true); + + if (node.property.name !== "meta") + { this.raiseRecoverable(node.property.start, "The only valid meta property for import is 'import.meta'"); } + if (containsEsc) + { this.raiseRecoverable(node.start, "'import.meta' must not contain escaped characters"); } + if (this.options.sourceType !== "module" && !this.options.allowImportExportEverywhere) + { this.raiseRecoverable(node.start, "Cannot use 'import.meta' outside a module"); } + + return this.finishNode(node, "MetaProperty") +}; + +pp$5.parseLiteral = function(value) { + var node = this.startNode(); + node.value = value; + node.raw = this.input.slice(this.start, this.end); + if (node.raw.charCodeAt(node.raw.length - 1) === 110) + { node.bigint = node.value != null ? node.value.toString() : node.raw.slice(0, -1).replace(/_/g, ""); } + this.next(); + return this.finishNode(node, "Literal") +}; + +pp$5.parseParenExpression = function() { + this.expect(types$1$1.parenL); + var val = this.parseExpression(); + this.expect(types$1$1.parenR); + return val +}; + +pp$5.shouldParseArrow = function(exprList) { + return !this.canInsertSemicolon() +}; + +pp$5.parseParenAndDistinguishExpression = function(canBeArrow, forInit) { + var startPos = this.start, startLoc = this.startLoc, val, allowTrailingComma = this.options.ecmaVersion >= 8; + if (this.options.ecmaVersion >= 6) { + this.next(); + + var innerStartPos = this.start, innerStartLoc = this.startLoc; + var exprList = [], first = true, lastIsComma = false; + var refDestructuringErrors = new DestructuringErrors, oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos, spreadStart; + this.yieldPos = 0; + this.awaitPos = 0; + // Do not save awaitIdentPos to allow checking awaits nested in parameters + while (this.type !== types$1$1.parenR) { + first ? first = false : this.expect(types$1$1.comma); + if (allowTrailingComma && this.afterTrailingComma(types$1$1.parenR, true)) { + lastIsComma = true; + break + } else if (this.type === types$1$1.ellipsis) { + spreadStart = this.start; + exprList.push(this.parseParenItem(this.parseRestBinding())); + if (this.type === types$1$1.comma) { + this.raiseRecoverable( + this.start, + "Comma is not permitted after the rest element" + ); + } + break + } else { + exprList.push(this.parseMaybeAssign(false, refDestructuringErrors, this.parseParenItem)); + } + } + var innerEndPos = this.lastTokEnd, innerEndLoc = this.lastTokEndLoc; + this.expect(types$1$1.parenR); + + if (canBeArrow && this.shouldParseArrow(exprList) && this.eat(types$1$1.arrow)) { + this.checkPatternErrors(refDestructuringErrors, false); + this.checkYieldAwaitInDefaultParams(); + this.yieldPos = oldYieldPos; + this.awaitPos = oldAwaitPos; + return this.parseParenArrowList(startPos, startLoc, exprList, forInit) + } + + if (!exprList.length || lastIsComma) { this.unexpected(this.lastTokStart); } + if (spreadStart) { this.unexpected(spreadStart); } + this.checkExpressionErrors(refDestructuringErrors, true); + this.yieldPos = oldYieldPos || this.yieldPos; + this.awaitPos = oldAwaitPos || this.awaitPos; + + if (exprList.length > 1) { + val = this.startNodeAt(innerStartPos, innerStartLoc); + val.expressions = exprList; + this.finishNodeAt(val, "SequenceExpression", innerEndPos, innerEndLoc); + } else { + val = exprList[0]; + } + } else { + val = this.parseParenExpression(); + } + + if (this.options.preserveParens) { + var par = this.startNodeAt(startPos, startLoc); + par.expression = val; + return this.finishNode(par, "ParenthesizedExpression") + } else { + return val + } +}; + +pp$5.parseParenItem = function(item) { + return item +}; + +pp$5.parseParenArrowList = function(startPos, startLoc, exprList, forInit) { + return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), exprList, false, forInit) +}; + +// New's precedence is slightly tricky. It must allow its argument to +// be a `[]` or dot subscript expression, but not a call — at least, +// not without wrapping it in parentheses. Thus, it uses the noCalls +// argument to parseSubscripts to prevent it from consuming the +// argument list. + +var empty = []; + +pp$5.parseNew = function() { + if (this.containsEsc) { this.raiseRecoverable(this.start, "Escape sequence in keyword new"); } + var node = this.startNode(); + this.next(); + if (this.options.ecmaVersion >= 6 && this.type === types$1$1.dot) { + var meta = this.startNodeAt(node.start, node.loc && node.loc.start); + meta.name = "new"; + node.meta = this.finishNode(meta, "Identifier"); + this.next(); + var containsEsc = this.containsEsc; + node.property = this.parseIdent(true); + if (node.property.name !== "target") + { this.raiseRecoverable(node.property.start, "The only valid meta property for new is 'new.target'"); } + if (containsEsc) + { this.raiseRecoverable(node.start, "'new.target' must not contain escaped characters"); } + if (!this.allowNewDotTarget) + { this.raiseRecoverable(node.start, "'new.target' can only be used in functions and class static block"); } + return this.finishNode(node, "MetaProperty") + } + var startPos = this.start, startLoc = this.startLoc; + node.callee = this.parseSubscripts(this.parseExprAtom(null, false, true), startPos, startLoc, true, false); + if (node.callee.type === "Super") + { this.raiseRecoverable(startPos, "Invalid use of 'super'"); } + if (this.eat(types$1$1.parenL)) { node.arguments = this.parseExprList(types$1$1.parenR, this.options.ecmaVersion >= 8, false); } + else { node.arguments = empty; } + return this.finishNode(node, "NewExpression") +}; + +// Parse template expression. + +pp$5.parseTemplateElement = function(ref) { + var isTagged = ref.isTagged; + + var elem = this.startNode(); + if (this.type === types$1$1.invalidTemplate) { + if (!isTagged) { + this.raiseRecoverable(this.start, "Bad escape sequence in untagged template literal"); + } + elem.value = { + raw: this.value.replace(/\r\n?/g, "\n"), + cooked: null + }; + } else { + elem.value = { + raw: this.input.slice(this.start, this.end).replace(/\r\n?/g, "\n"), + cooked: this.value + }; + } + this.next(); + elem.tail = this.type === types$1$1.backQuote; + return this.finishNode(elem, "TemplateElement") +}; + +pp$5.parseTemplate = function(ref) { + if ( ref === void 0 ) ref = {}; + var isTagged = ref.isTagged; if ( isTagged === void 0 ) isTagged = false; + + var node = this.startNode(); + this.next(); + node.expressions = []; + var curElt = this.parseTemplateElement({isTagged: isTagged}); + node.quasis = [curElt]; + while (!curElt.tail) { + if (this.type === types$1$1.eof) { this.raise(this.pos, "Unterminated template literal"); } + this.expect(types$1$1.dollarBraceL); + node.expressions.push(this.parseExpression()); + this.expect(types$1$1.braceR); + node.quasis.push(curElt = this.parseTemplateElement({isTagged: isTagged})); + } + this.next(); + return this.finishNode(node, "TemplateLiteral") +}; + +pp$5.isAsyncProp = function(prop) { + return !prop.computed && prop.key.type === "Identifier" && prop.key.name === "async" && + (this.type === types$1$1.name || this.type === types$1$1.num || this.type === types$1$1.string || this.type === types$1$1.bracketL || this.type.keyword || (this.options.ecmaVersion >= 9 && this.type === types$1$1.star)) && + !lineBreak.test(this.input.slice(this.lastTokEnd, this.start)) +}; + +// Parse an object literal or binding pattern. + +pp$5.parseObj = function(isPattern, refDestructuringErrors) { + var node = this.startNode(), first = true, propHash = {}; + node.properties = []; + this.next(); + while (!this.eat(types$1$1.braceR)) { + if (!first) { + this.expect(types$1$1.comma); + if (this.options.ecmaVersion >= 5 && this.afterTrailingComma(types$1$1.braceR)) { break } + } else { first = false; } + + var prop = this.parseProperty(isPattern, refDestructuringErrors); + if (!isPattern) { this.checkPropClash(prop, propHash, refDestructuringErrors); } + node.properties.push(prop); + } + return this.finishNode(node, isPattern ? "ObjectPattern" : "ObjectExpression") +}; + +pp$5.parseProperty = function(isPattern, refDestructuringErrors) { + var prop = this.startNode(), isGenerator, isAsync, startPos, startLoc; + if (this.options.ecmaVersion >= 9 && this.eat(types$1$1.ellipsis)) { + if (isPattern) { + prop.argument = this.parseIdent(false); + if (this.type === types$1$1.comma) { + this.raiseRecoverable(this.start, "Comma is not permitted after the rest element"); + } + return this.finishNode(prop, "RestElement") + } + // Parse argument. + prop.argument = this.parseMaybeAssign(false, refDestructuringErrors); + // To disallow trailing comma via `this.toAssignable()`. + if (this.type === types$1$1.comma && refDestructuringErrors && refDestructuringErrors.trailingComma < 0) { + refDestructuringErrors.trailingComma = this.start; + } + // Finish + return this.finishNode(prop, "SpreadElement") + } + if (this.options.ecmaVersion >= 6) { + prop.method = false; + prop.shorthand = false; + if (isPattern || refDestructuringErrors) { + startPos = this.start; + startLoc = this.startLoc; + } + if (!isPattern) + { isGenerator = this.eat(types$1$1.star); } + } + var containsEsc = this.containsEsc; + this.parsePropertyName(prop); + if (!isPattern && !containsEsc && this.options.ecmaVersion >= 8 && !isGenerator && this.isAsyncProp(prop)) { + isAsync = true; + isGenerator = this.options.ecmaVersion >= 9 && this.eat(types$1$1.star); + this.parsePropertyName(prop); + } else { + isAsync = false; + } + this.parsePropertyValue(prop, isPattern, isGenerator, isAsync, startPos, startLoc, refDestructuringErrors, containsEsc); + return this.finishNode(prop, "Property") +}; + +pp$5.parseGetterSetter = function(prop) { + var kind = prop.key.name; + this.parsePropertyName(prop); + prop.value = this.parseMethod(false); + prop.kind = kind; + var paramCount = prop.kind === "get" ? 0 : 1; + if (prop.value.params.length !== paramCount) { + var start = prop.value.start; + if (prop.kind === "get") + { this.raiseRecoverable(start, "getter should have no params"); } + else + { this.raiseRecoverable(start, "setter should have exactly one param"); } + } else { + if (prop.kind === "set" && prop.value.params[0].type === "RestElement") + { this.raiseRecoverable(prop.value.params[0].start, "Setter cannot use rest params"); } + } +}; + +pp$5.parsePropertyValue = function(prop, isPattern, isGenerator, isAsync, startPos, startLoc, refDestructuringErrors, containsEsc) { + if ((isGenerator || isAsync) && this.type === types$1$1.colon) + { this.unexpected(); } + + if (this.eat(types$1$1.colon)) { + prop.value = isPattern ? this.parseMaybeDefault(this.start, this.startLoc) : this.parseMaybeAssign(false, refDestructuringErrors); + prop.kind = "init"; + } else if (this.options.ecmaVersion >= 6 && this.type === types$1$1.parenL) { + if (isPattern) { this.unexpected(); } + prop.method = true; + prop.value = this.parseMethod(isGenerator, isAsync); + prop.kind = "init"; + } else if (!isPattern && !containsEsc && + this.options.ecmaVersion >= 5 && !prop.computed && prop.key.type === "Identifier" && + (prop.key.name === "get" || prop.key.name === "set") && + (this.type !== types$1$1.comma && this.type !== types$1$1.braceR && this.type !== types$1$1.eq)) { + if (isGenerator || isAsync) { this.unexpected(); } + this.parseGetterSetter(prop); + } else if (this.options.ecmaVersion >= 6 && !prop.computed && prop.key.type === "Identifier") { + if (isGenerator || isAsync) { this.unexpected(); } + this.checkUnreserved(prop.key); + if (prop.key.name === "await" && !this.awaitIdentPos) + { this.awaitIdentPos = startPos; } + if (isPattern) { + prop.value = this.parseMaybeDefault(startPos, startLoc, this.copyNode(prop.key)); + } else if (this.type === types$1$1.eq && refDestructuringErrors) { + if (refDestructuringErrors.shorthandAssign < 0) + { refDestructuringErrors.shorthandAssign = this.start; } + prop.value = this.parseMaybeDefault(startPos, startLoc, this.copyNode(prop.key)); + } else { + prop.value = this.copyNode(prop.key); + } + prop.kind = "init"; + prop.shorthand = true; + } else { this.unexpected(); } +}; + +pp$5.parsePropertyName = function(prop) { + if (this.options.ecmaVersion >= 6) { + if (this.eat(types$1$1.bracketL)) { + prop.computed = true; + prop.key = this.parseMaybeAssign(); + this.expect(types$1$1.bracketR); + return prop.key + } else { + prop.computed = false; + } + } + return prop.key = this.type === types$1$1.num || this.type === types$1$1.string ? this.parseExprAtom() : this.parseIdent(this.options.allowReserved !== "never") +}; + +// Initialize empty function node. + +pp$5.initFunction = function(node) { + node.id = null; + if (this.options.ecmaVersion >= 6) { node.generator = node.expression = false; } + if (this.options.ecmaVersion >= 8) { node.async = false; } +}; + +// Parse object or class method. + +pp$5.parseMethod = function(isGenerator, isAsync, allowDirectSuper) { + var node = this.startNode(), oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos, oldAwaitIdentPos = this.awaitIdentPos; + + this.initFunction(node); + if (this.options.ecmaVersion >= 6) + { node.generator = isGenerator; } + if (this.options.ecmaVersion >= 8) + { node.async = !!isAsync; } + + this.yieldPos = 0; + this.awaitPos = 0; + this.awaitIdentPos = 0; + this.enterScope(functionFlags(isAsync, node.generator) | SCOPE_SUPER | (allowDirectSuper ? SCOPE_DIRECT_SUPER : 0)); + + this.expect(types$1$1.parenL); + node.params = this.parseBindingList(types$1$1.parenR, false, this.options.ecmaVersion >= 8); + this.checkYieldAwaitInDefaultParams(); + this.parseFunctionBody(node, false, true, false); + + this.yieldPos = oldYieldPos; + this.awaitPos = oldAwaitPos; + this.awaitIdentPos = oldAwaitIdentPos; + return this.finishNode(node, "FunctionExpression") +}; + +// Parse arrow function expression with given parameters. + +pp$5.parseArrowExpression = function(node, params, isAsync, forInit) { + var oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos, oldAwaitIdentPos = this.awaitIdentPos; + + this.enterScope(functionFlags(isAsync, false) | SCOPE_ARROW); + this.initFunction(node); + if (this.options.ecmaVersion >= 8) { node.async = !!isAsync; } + + this.yieldPos = 0; + this.awaitPos = 0; + this.awaitIdentPos = 0; + + node.params = this.toAssignableList(params, true); + this.parseFunctionBody(node, true, false, forInit); + + this.yieldPos = oldYieldPos; + this.awaitPos = oldAwaitPos; + this.awaitIdentPos = oldAwaitIdentPos; + return this.finishNode(node, "ArrowFunctionExpression") +}; + +// Parse function body and check parameters. + +pp$5.parseFunctionBody = function(node, isArrowFunction, isMethod, forInit) { + var isExpression = isArrowFunction && this.type !== types$1$1.braceL; + var oldStrict = this.strict, useStrict = false; + + if (isExpression) { + node.body = this.parseMaybeAssign(forInit); + node.expression = true; + this.checkParams(node, false); + } else { + var nonSimple = this.options.ecmaVersion >= 7 && !this.isSimpleParamList(node.params); + if (!oldStrict || nonSimple) { + useStrict = this.strictDirective(this.end); + // If this is a strict mode function, verify that argument names + // are not repeated, and it does not try to bind the words `eval` + // or `arguments`. + if (useStrict && nonSimple) + { this.raiseRecoverable(node.start, "Illegal 'use strict' directive in function with non-simple parameter list"); } + } + // Start a new scope with regard to labels and the `inFunction` + // flag (restore them to their old value afterwards). + var oldLabels = this.labels; + this.labels = []; + if (useStrict) { this.strict = true; } + + // Add the params to varDeclaredNames to ensure that an error is thrown + // if a let/const declaration in the function clashes with one of the params. + this.checkParams(node, !oldStrict && !useStrict && !isArrowFunction && !isMethod && this.isSimpleParamList(node.params)); + // Ensure the function name isn't a forbidden identifier in strict mode, e.g. 'eval' + if (this.strict && node.id) { this.checkLValSimple(node.id, BIND_OUTSIDE); } + node.body = this.parseBlock(false, undefined, useStrict && !oldStrict); + node.expression = false; + this.adaptDirectivePrologue(node.body.body); + this.labels = oldLabels; + } + this.exitScope(); +}; + +pp$5.isSimpleParamList = function(params) { + for (var i = 0, list = params; i < list.length; i += 1) + { + var param = list[i]; + + if (param.type !== "Identifier") { return false + } } + return true +}; + +// Checks function params for various disallowed patterns such as using "eval" +// or "arguments" and duplicate parameters. + +pp$5.checkParams = function(node, allowDuplicates) { + var nameHash = Object.create(null); + for (var i = 0, list = node.params; i < list.length; i += 1) + { + var param = list[i]; + + this.checkLValInnerPattern(param, BIND_VAR, allowDuplicates ? null : nameHash); + } +}; + +// Parses a comma-separated list of expressions, and returns them as +// an array. `close` is the token type that ends the list, and +// `allowEmpty` can be turned on to allow subsequent commas with +// nothing in between them to be parsed as `null` (which is needed +// for array literals). + +pp$5.parseExprList = function(close, allowTrailingComma, allowEmpty, refDestructuringErrors) { + var elts = [], first = true; + while (!this.eat(close)) { + if (!first) { + this.expect(types$1$1.comma); + if (allowTrailingComma && this.afterTrailingComma(close)) { break } + } else { first = false; } + + var elt = (void 0); + if (allowEmpty && this.type === types$1$1.comma) + { elt = null; } + else if (this.type === types$1$1.ellipsis) { + elt = this.parseSpread(refDestructuringErrors); + if (refDestructuringErrors && this.type === types$1$1.comma && refDestructuringErrors.trailingComma < 0) + { refDestructuringErrors.trailingComma = this.start; } + } else { + elt = this.parseMaybeAssign(false, refDestructuringErrors); + } + elts.push(elt); + } + return elts +}; + +pp$5.checkUnreserved = function(ref) { + var start = ref.start; + var end = ref.end; + var name = ref.name; + + if (this.inGenerator && name === "yield") + { this.raiseRecoverable(start, "Cannot use 'yield' as identifier inside a generator"); } + if (this.inAsync && name === "await") + { this.raiseRecoverable(start, "Cannot use 'await' as identifier inside an async function"); } + if (!(this.currentThisScope().flags & SCOPE_VAR) && name === "arguments") + { this.raiseRecoverable(start, "Cannot use 'arguments' in class field initializer"); } + if (this.inClassStaticBlock && (name === "arguments" || name === "await")) + { this.raise(start, ("Cannot use " + name + " in class static initialization block")); } + if (this.keywords.test(name)) + { this.raise(start, ("Unexpected keyword '" + name + "'")); } + if (this.options.ecmaVersion < 6 && + this.input.slice(start, end).indexOf("\\") !== -1) { return } + var re = this.strict ? this.reservedWordsStrict : this.reservedWords; + if (re.test(name)) { + if (!this.inAsync && name === "await") + { this.raiseRecoverable(start, "Cannot use keyword 'await' outside an async function"); } + this.raiseRecoverable(start, ("The keyword '" + name + "' is reserved")); + } +}; + +// Parse the next token as an identifier. If `liberal` is true (used +// when parsing properties), it will also convert keywords into +// identifiers. + +pp$5.parseIdent = function(liberal) { + var node = this.parseIdentNode(); + this.next(!!liberal); + this.finishNode(node, "Identifier"); + if (!liberal) { + this.checkUnreserved(node); + if (node.name === "await" && !this.awaitIdentPos) + { this.awaitIdentPos = node.start; } + } + return node +}; + +pp$5.parseIdentNode = function() { + var node = this.startNode(); + if (this.type === types$1$1.name) { + node.name = this.value; + } else if (this.type.keyword) { + node.name = this.type.keyword; + + // To fix https://github.com/acornjs/acorn/issues/575 + // `class` and `function` keywords push new context into this.context. + // But there is no chance to pop the context if the keyword is consumed as an identifier such as a property name. + // If the previous token is a dot, this does not apply because the context-managing code already ignored the keyword + if ((node.name === "class" || node.name === "function") && + (this.lastTokEnd !== this.lastTokStart + 1 || this.input.charCodeAt(this.lastTokStart) !== 46)) { + this.context.pop(); + } + this.type = types$1$1.name; + } else { + this.unexpected(); + } + return node +}; + +pp$5.parsePrivateIdent = function() { + var node = this.startNode(); + if (this.type === types$1$1.privateId) { + node.name = this.value; + } else { + this.unexpected(); + } + this.next(); + this.finishNode(node, "PrivateIdentifier"); + + // For validating existence + if (this.options.checkPrivateFields) { + if (this.privateNameStack.length === 0) { + this.raise(node.start, ("Private field '#" + (node.name) + "' must be declared in an enclosing class")); + } else { + this.privateNameStack[this.privateNameStack.length - 1].used.push(node); + } + } + + return node +}; + +// Parses yield expression inside generator. + +pp$5.parseYield = function(forInit) { + if (!this.yieldPos) { this.yieldPos = this.start; } + + var node = this.startNode(); + this.next(); + if (this.type === types$1$1.semi || this.canInsertSemicolon() || (this.type !== types$1$1.star && !this.type.startsExpr)) { + node.delegate = false; + node.argument = null; + } else { + node.delegate = this.eat(types$1$1.star); + node.argument = this.parseMaybeAssign(forInit); + } + return this.finishNode(node, "YieldExpression") +}; + +pp$5.parseAwait = function(forInit) { + if (!this.awaitPos) { this.awaitPos = this.start; } + + var node = this.startNode(); + this.next(); + node.argument = this.parseMaybeUnary(null, true, false, forInit); + return this.finishNode(node, "AwaitExpression") +}; + +var pp$4 = Parser.prototype; + +// This function is used to raise exceptions on parse errors. It +// takes an offset integer (into the current `input`) to indicate +// the location of the error, attaches the position to the end +// of the error message, and then raises a `SyntaxError` with that +// message. + +pp$4.raise = function(pos, message) { + var loc = getLineInfo(this.input, pos); + message += " (" + loc.line + ":" + loc.column + ")"; + if (this.sourceFile) { + message += " in " + this.sourceFile; + } + var err = new SyntaxError(message); + err.pos = pos; err.loc = loc; err.raisedAt = this.pos; + throw err +}; + +pp$4.raiseRecoverable = pp$4.raise; + +pp$4.curPosition = function() { + if (this.options.locations) { + return new Position(this.curLine, this.pos - this.lineStart) + } +}; + +var pp$3 = Parser.prototype; + +var Scope = function Scope(flags) { + this.flags = flags; + // A list of var-declared names in the current lexical scope + this.var = []; + // A list of lexically-declared names in the current lexical scope + this.lexical = []; + // A list of lexically-declared FunctionDeclaration names in the current lexical scope + this.functions = []; +}; + +// The functions in this module keep track of declared variables in the current scope in order to detect duplicate variable names. + +pp$3.enterScope = function(flags) { + this.scopeStack.push(new Scope(flags)); +}; + +pp$3.exitScope = function() { + this.scopeStack.pop(); +}; + +// The spec says: +// > At the top level of a function, or script, function declarations are +// > treated like var declarations rather than like lexical declarations. +pp$3.treatFunctionsAsVarInScope = function(scope) { + return (scope.flags & SCOPE_FUNCTION$1) || !this.inModule && (scope.flags & SCOPE_TOP) +}; + +pp$3.declareName = function(name, bindingType, pos) { + var redeclared = false; + if (bindingType === BIND_LEXICAL) { + var scope = this.currentScope(); + redeclared = scope.lexical.indexOf(name) > -1 || scope.functions.indexOf(name) > -1 || scope.var.indexOf(name) > -1; + scope.lexical.push(name); + if (this.inModule && (scope.flags & SCOPE_TOP)) + { delete this.undefinedExports[name]; } + } else if (bindingType === BIND_SIMPLE_CATCH) { + var scope$1 = this.currentScope(); + scope$1.lexical.push(name); + } else if (bindingType === BIND_FUNCTION) { + var scope$2 = this.currentScope(); + if (this.treatFunctionsAsVar) + { redeclared = scope$2.lexical.indexOf(name) > -1; } + else + { redeclared = scope$2.lexical.indexOf(name) > -1 || scope$2.var.indexOf(name) > -1; } + scope$2.functions.push(name); + } else { + for (var i = this.scopeStack.length - 1; i >= 0; --i) { + var scope$3 = this.scopeStack[i]; + if (scope$3.lexical.indexOf(name) > -1 && !((scope$3.flags & SCOPE_SIMPLE_CATCH) && scope$3.lexical[0] === name) || + !this.treatFunctionsAsVarInScope(scope$3) && scope$3.functions.indexOf(name) > -1) { + redeclared = true; + break + } + scope$3.var.push(name); + if (this.inModule && (scope$3.flags & SCOPE_TOP)) + { delete this.undefinedExports[name]; } + if (scope$3.flags & SCOPE_VAR) { break } + } + } + if (redeclared) { this.raiseRecoverable(pos, ("Identifier '" + name + "' has already been declared")); } +}; + +pp$3.checkLocalExport = function(id) { + // scope.functions must be empty as Module code is always strict. + if (this.scopeStack[0].lexical.indexOf(id.name) === -1 && + this.scopeStack[0].var.indexOf(id.name) === -1) { + this.undefinedExports[id.name] = id; + } +}; + +pp$3.currentScope = function() { + return this.scopeStack[this.scopeStack.length - 1] +}; + +pp$3.currentVarScope = function() { + for (var i = this.scopeStack.length - 1;; i--) { + var scope = this.scopeStack[i]; + if (scope.flags & (SCOPE_VAR | SCOPE_CLASS_FIELD_INIT | SCOPE_CLASS_STATIC_BLOCK)) { return scope } + } +}; + +// Could be useful for `this`, `new.target`, `super()`, `super.property`, and `super[property]`. +pp$3.currentThisScope = function() { + for (var i = this.scopeStack.length - 1;; i--) { + var scope = this.scopeStack[i]; + if (scope.flags & (SCOPE_VAR | SCOPE_CLASS_FIELD_INIT | SCOPE_CLASS_STATIC_BLOCK) && + !(scope.flags & SCOPE_ARROW)) { return scope } + } +}; + +var Node$1 = function Node(parser, pos, loc) { + this.type = ""; + this.start = pos; + this.end = 0; + if (parser.options.locations) + { this.loc = new SourceLocation(parser, loc); } + if (parser.options.directSourceFile) + { this.sourceFile = parser.options.directSourceFile; } + if (parser.options.ranges) + { this.range = [pos, 0]; } +}; + +// Start an AST node, attaching a start offset. + +var pp$2 = Parser.prototype; + +pp$2.startNode = function() { + return new Node$1(this, this.start, this.startLoc) +}; + +pp$2.startNodeAt = function(pos, loc) { + return new Node$1(this, pos, loc) +}; + +// Finish an AST node, adding `type` and `end` properties. + +function finishNodeAt(node, type, pos, loc) { + node.type = type; + node.end = pos; + if (this.options.locations) + { node.loc.end = loc; } + if (this.options.ranges) + { node.range[1] = pos; } + return node +} + +pp$2.finishNode = function(node, type) { + return finishNodeAt.call(this, node, type, this.lastTokEnd, this.lastTokEndLoc) +}; + +// Finish node at given position + +pp$2.finishNodeAt = function(node, type, pos, loc) { + return finishNodeAt.call(this, node, type, pos, loc) +}; + +pp$2.copyNode = function(node) { + var newNode = new Node$1(this, node.start, this.startLoc); + for (var prop in node) { newNode[prop] = node[prop]; } + return newNode +}; + +// This file was generated by "bin/generate-unicode-script-values.js". Do not modify manually! +var scriptValuesAddedInUnicode = "Berf Beria_Erfe Gara Garay Gukh Gurung_Khema Hrkt Katakana_Or_Hiragana Kawi Kirat_Rai Krai Nag_Mundari Nagm Ol_Onal Onao Sidetic Sidt Sunu Sunuwar Tai_Yo Tayo Todhri Todr Tolong_Siki Tols Tulu_Tigalari Tutg Unknown Zzzz"; + +// This file contains Unicode properties extracted from the ECMAScript specification. +// The lists are extracted like so: +// $$('#table-binary-unicode-properties > figure > table > tbody > tr > td:nth-child(1) code').map(el => el.innerText) + +// #table-binary-unicode-properties +var ecma9BinaryProperties = "ASCII ASCII_Hex_Digit AHex Alphabetic Alpha Any Assigned Bidi_Control Bidi_C Bidi_Mirrored Bidi_M Case_Ignorable CI Cased Changes_When_Casefolded CWCF Changes_When_Casemapped CWCM Changes_When_Lowercased CWL Changes_When_NFKC_Casefolded CWKCF Changes_When_Titlecased CWT Changes_When_Uppercased CWU Dash Default_Ignorable_Code_Point DI Deprecated Dep Diacritic Dia Emoji Emoji_Component Emoji_Modifier Emoji_Modifier_Base Emoji_Presentation Extender Ext Grapheme_Base Gr_Base Grapheme_Extend Gr_Ext Hex_Digit Hex IDS_Binary_Operator IDSB IDS_Trinary_Operator IDST ID_Continue IDC ID_Start IDS Ideographic Ideo Join_Control Join_C Logical_Order_Exception LOE Lowercase Lower Math Noncharacter_Code_Point NChar Pattern_Syntax Pat_Syn Pattern_White_Space Pat_WS Quotation_Mark QMark Radical Regional_Indicator RI Sentence_Terminal STerm Soft_Dotted SD Terminal_Punctuation Term Unified_Ideograph UIdeo Uppercase Upper Variation_Selector VS White_Space space XID_Continue XIDC XID_Start XIDS"; +var ecma10BinaryProperties = ecma9BinaryProperties + " Extended_Pictographic"; +var ecma11BinaryProperties = ecma10BinaryProperties; +var ecma12BinaryProperties = ecma11BinaryProperties + " EBase EComp EMod EPres ExtPict"; +var ecma13BinaryProperties = ecma12BinaryProperties; +var ecma14BinaryProperties = ecma13BinaryProperties; + +var unicodeBinaryProperties = { + 9: ecma9BinaryProperties, + 10: ecma10BinaryProperties, + 11: ecma11BinaryProperties, + 12: ecma12BinaryProperties, + 13: ecma13BinaryProperties, + 14: ecma14BinaryProperties +}; + +// #table-binary-unicode-properties-of-strings +var ecma14BinaryPropertiesOfStrings = "Basic_Emoji Emoji_Keycap_Sequence RGI_Emoji_Modifier_Sequence RGI_Emoji_Flag_Sequence RGI_Emoji_Tag_Sequence RGI_Emoji_ZWJ_Sequence RGI_Emoji"; + +var unicodeBinaryPropertiesOfStrings = { + 9: "", + 10: "", + 11: "", + 12: "", + 13: "", + 14: ecma14BinaryPropertiesOfStrings +}; + +// #table-unicode-general-category-values +var unicodeGeneralCategoryValues = "Cased_Letter LC Close_Punctuation Pe Connector_Punctuation Pc Control Cc cntrl Currency_Symbol Sc Dash_Punctuation Pd Decimal_Number Nd digit Enclosing_Mark Me Final_Punctuation Pf Format Cf Initial_Punctuation Pi Letter L Letter_Number Nl Line_Separator Zl Lowercase_Letter Ll Mark M Combining_Mark Math_Symbol Sm Modifier_Letter Lm Modifier_Symbol Sk Nonspacing_Mark Mn Number N Open_Punctuation Ps Other C Other_Letter Lo Other_Number No Other_Punctuation Po Other_Symbol So Paragraph_Separator Zp Private_Use Co Punctuation P punct Separator Z Space_Separator Zs Spacing_Mark Mc Surrogate Cs Symbol S Titlecase_Letter Lt Unassigned Cn Uppercase_Letter Lu"; + +// #table-unicode-script-values +var ecma9ScriptValues = "Adlam Adlm Ahom Anatolian_Hieroglyphs Hluw Arabic Arab Armenian Armn Avestan Avst Balinese Bali Bamum Bamu Bassa_Vah Bass Batak Batk Bengali Beng Bhaiksuki Bhks Bopomofo Bopo Brahmi Brah Braille Brai Buginese Bugi Buhid Buhd Canadian_Aboriginal Cans Carian Cari Caucasian_Albanian Aghb Chakma Cakm Cham Cham Cherokee Cher Common Zyyy Coptic Copt Qaac Cuneiform Xsux Cypriot Cprt Cyrillic Cyrl Deseret Dsrt Devanagari Deva Duployan Dupl Egyptian_Hieroglyphs Egyp Elbasan Elba Ethiopic Ethi Georgian Geor Glagolitic Glag Gothic Goth Grantha Gran Greek Grek Gujarati Gujr Gurmukhi Guru Han Hani Hangul Hang Hanunoo Hano Hatran Hatr Hebrew Hebr Hiragana Hira Imperial_Aramaic Armi Inherited Zinh Qaai Inscriptional_Pahlavi Phli Inscriptional_Parthian Prti Javanese Java Kaithi Kthi Kannada Knda Katakana Kana Kayah_Li Kali Kharoshthi Khar Khmer Khmr Khojki Khoj Khudawadi Sind Lao Laoo Latin Latn Lepcha Lepc Limbu Limb Linear_A Lina Linear_B Linb Lisu Lisu Lycian Lyci Lydian Lydi Mahajani Mahj Malayalam Mlym Mandaic Mand Manichaean Mani Marchen Marc Masaram_Gondi Gonm Meetei_Mayek Mtei Mende_Kikakui Mend Meroitic_Cursive Merc Meroitic_Hieroglyphs Mero Miao Plrd Modi Mongolian Mong Mro Mroo Multani Mult Myanmar Mymr Nabataean Nbat New_Tai_Lue Talu Newa Newa Nko Nkoo Nushu Nshu Ogham Ogam Ol_Chiki Olck Old_Hungarian Hung Old_Italic Ital Old_North_Arabian Narb Old_Permic Perm Old_Persian Xpeo Old_South_Arabian Sarb Old_Turkic Orkh Oriya Orya Osage Osge Osmanya Osma Pahawh_Hmong Hmng Palmyrene Palm Pau_Cin_Hau Pauc Phags_Pa Phag Phoenician Phnx Psalter_Pahlavi Phlp Rejang Rjng Runic Runr Samaritan Samr Saurashtra Saur Sharada Shrd Shavian Shaw Siddham Sidd SignWriting Sgnw Sinhala Sinh Sora_Sompeng Sora Soyombo Soyo Sundanese Sund Syloti_Nagri Sylo Syriac Syrc Tagalog Tglg Tagbanwa Tagb Tai_Le Tale Tai_Tham Lana Tai_Viet Tavt Takri Takr Tamil Taml Tangut Tang Telugu Telu Thaana Thaa Thai Thai Tibetan Tibt Tifinagh Tfng Tirhuta Tirh Ugaritic Ugar Vai Vaii Warang_Citi Wara Yi Yiii Zanabazar_Square Zanb"; +var ecma10ScriptValues = ecma9ScriptValues + " Dogra Dogr Gunjala_Gondi Gong Hanifi_Rohingya Rohg Makasar Maka Medefaidrin Medf Old_Sogdian Sogo Sogdian Sogd"; +var ecma11ScriptValues = ecma10ScriptValues + " Elymaic Elym Nandinagari Nand Nyiakeng_Puachue_Hmong Hmnp Wancho Wcho"; +var ecma12ScriptValues = ecma11ScriptValues + " Chorasmian Chrs Diak Dives_Akuru Khitan_Small_Script Kits Yezi Yezidi"; +var ecma13ScriptValues = ecma12ScriptValues + " Cypro_Minoan Cpmn Old_Uyghur Ougr Tangsa Tnsa Toto Vithkuqi Vith"; +var ecma14ScriptValues = ecma13ScriptValues + " " + scriptValuesAddedInUnicode; + +var unicodeScriptValues = { + 9: ecma9ScriptValues, + 10: ecma10ScriptValues, + 11: ecma11ScriptValues, + 12: ecma12ScriptValues, + 13: ecma13ScriptValues, + 14: ecma14ScriptValues +}; + +var data = {}; +function buildUnicodeData(ecmaVersion) { + var d = data[ecmaVersion] = { + binary: wordsRegexp(unicodeBinaryProperties[ecmaVersion] + " " + unicodeGeneralCategoryValues), + binaryOfStrings: wordsRegexp(unicodeBinaryPropertiesOfStrings[ecmaVersion]), + nonBinary: { + General_Category: wordsRegexp(unicodeGeneralCategoryValues), + Script: wordsRegexp(unicodeScriptValues[ecmaVersion]) + } + }; + d.nonBinary.Script_Extensions = d.nonBinary.Script; + + d.nonBinary.gc = d.nonBinary.General_Category; + d.nonBinary.sc = d.nonBinary.Script; + d.nonBinary.scx = d.nonBinary.Script_Extensions; +} + +for (var i = 0, list = [9, 10, 11, 12, 13, 14]; i < list.length; i += 1) { + var ecmaVersion = list[i]; + + buildUnicodeData(ecmaVersion); +} + +var pp$1 = Parser.prototype; + +// Track disjunction structure to determine whether a duplicate +// capture group name is allowed because it is in a separate branch. +var BranchID = function BranchID(parent, base) { + // Parent disjunction branch + this.parent = parent; + // Identifies this set of sibling branches + this.base = base || this; +}; + +BranchID.prototype.separatedFrom = function separatedFrom (alt) { + // A branch is separate from another branch if they or any of + // their parents are siblings in a given disjunction + for (var self = this; self; self = self.parent) { + for (var other = alt; other; other = other.parent) { + if (self.base === other.base && self !== other) { return true } + } + } + return false +}; + +BranchID.prototype.sibling = function sibling () { + return new BranchID(this.parent, this.base) +}; + +var RegExpValidationState = function RegExpValidationState(parser) { + this.parser = parser; + this.validFlags = "gim" + (parser.options.ecmaVersion >= 6 ? "uy" : "") + (parser.options.ecmaVersion >= 9 ? "s" : "") + (parser.options.ecmaVersion >= 13 ? "d" : "") + (parser.options.ecmaVersion >= 15 ? "v" : ""); + this.unicodeProperties = data[parser.options.ecmaVersion >= 14 ? 14 : parser.options.ecmaVersion]; + this.source = ""; + this.flags = ""; + this.start = 0; + this.switchU = false; + this.switchV = false; + this.switchN = false; + this.pos = 0; + this.lastIntValue = 0; + this.lastStringValue = ""; + this.lastAssertionIsQuantifiable = false; + this.numCapturingParens = 0; + this.maxBackReference = 0; + this.groupNames = Object.create(null); + this.backReferenceNames = []; + this.branchID = null; +}; + +RegExpValidationState.prototype.reset = function reset (start, pattern, flags) { + var unicodeSets = flags.indexOf("v") !== -1; + var unicode = flags.indexOf("u") !== -1; + this.start = start | 0; + this.source = pattern + ""; + this.flags = flags; + if (unicodeSets && this.parser.options.ecmaVersion >= 15) { + this.switchU = true; + this.switchV = true; + this.switchN = true; + } else { + this.switchU = unicode && this.parser.options.ecmaVersion >= 6; + this.switchV = false; + this.switchN = unicode && this.parser.options.ecmaVersion >= 9; + } +}; + +RegExpValidationState.prototype.raise = function raise (message) { + this.parser.raiseRecoverable(this.start, ("Invalid regular expression: /" + (this.source) + "/: " + message)); +}; + +// If u flag is given, this returns the code point at the index (it combines a surrogate pair). +// Otherwise, this returns the code unit of the index (can be a part of a surrogate pair). +RegExpValidationState.prototype.at = function at (i, forceU) { + if ( forceU === void 0 ) forceU = false; + + var s = this.source; + var l = s.length; + if (i >= l) { + return -1 + } + var c = s.charCodeAt(i); + if (!(forceU || this.switchU) || c <= 0xD7FF || c >= 0xE000 || i + 1 >= l) { + return c + } + var next = s.charCodeAt(i + 1); + return next >= 0xDC00 && next <= 0xDFFF ? (c << 10) + next - 0x35FDC00 : c +}; + +RegExpValidationState.prototype.nextIndex = function nextIndex (i, forceU) { + if ( forceU === void 0 ) forceU = false; + + var s = this.source; + var l = s.length; + if (i >= l) { + return l + } + var c = s.charCodeAt(i), next; + if (!(forceU || this.switchU) || c <= 0xD7FF || c >= 0xE000 || i + 1 >= l || + (next = s.charCodeAt(i + 1)) < 0xDC00 || next > 0xDFFF) { + return i + 1 + } + return i + 2 +}; + +RegExpValidationState.prototype.current = function current (forceU) { + if ( forceU === void 0 ) forceU = false; + + return this.at(this.pos, forceU) +}; + +RegExpValidationState.prototype.lookahead = function lookahead (forceU) { + if ( forceU === void 0 ) forceU = false; + + return this.at(this.nextIndex(this.pos, forceU), forceU) +}; + +RegExpValidationState.prototype.advance = function advance (forceU) { + if ( forceU === void 0 ) forceU = false; + + this.pos = this.nextIndex(this.pos, forceU); +}; + +RegExpValidationState.prototype.eat = function eat (ch, forceU) { + if ( forceU === void 0 ) forceU = false; + + if (this.current(forceU) === ch) { + this.advance(forceU); + return true + } + return false +}; + +RegExpValidationState.prototype.eatChars = function eatChars (chs, forceU) { + if ( forceU === void 0 ) forceU = false; + + var pos = this.pos; + for (var i = 0, list = chs; i < list.length; i += 1) { + var ch = list[i]; + + var current = this.at(pos, forceU); + if (current === -1 || current !== ch) { + return false + } + pos = this.nextIndex(pos, forceU); + } + this.pos = pos; + return true +}; + +/** + * Validate the flags part of a given RegExpLiteral. + * + * @param {RegExpValidationState} state The state to validate RegExp. + * @returns {void} + */ +pp$1.validateRegExpFlags = function(state) { + var validFlags = state.validFlags; + var flags = state.flags; + + var u = false; + var v = false; + + for (var i = 0; i < flags.length; i++) { + var flag = flags.charAt(i); + if (validFlags.indexOf(flag) === -1) { + this.raise(state.start, "Invalid regular expression flag"); + } + if (flags.indexOf(flag, i + 1) > -1) { + this.raise(state.start, "Duplicate regular expression flag"); + } + if (flag === "u") { u = true; } + if (flag === "v") { v = true; } + } + if (this.options.ecmaVersion >= 15 && u && v) { + this.raise(state.start, "Invalid regular expression flag"); + } +}; + +function hasProp(obj) { + for (var _ in obj) { return true } + return false +} + +/** + * Validate the pattern part of a given RegExpLiteral. + * + * @param {RegExpValidationState} state The state to validate RegExp. + * @returns {void} + */ +pp$1.validateRegExpPattern = function(state) { + this.regexp_pattern(state); + + // The goal symbol for the parse is |Pattern[~U, ~N]|. If the result of + // parsing contains a |GroupName|, reparse with the goal symbol + // |Pattern[~U, +N]| and use this result instead. Throw a *SyntaxError* + // exception if _P_ did not conform to the grammar, if any elements of _P_ + // were not matched by the parse, or if any Early Error conditions exist. + if (!state.switchN && this.options.ecmaVersion >= 9 && hasProp(state.groupNames)) { + state.switchN = true; + this.regexp_pattern(state); + } +}; + +// https://www.ecma-international.org/ecma-262/8.0/#prod-Pattern +pp$1.regexp_pattern = function(state) { + state.pos = 0; + state.lastIntValue = 0; + state.lastStringValue = ""; + state.lastAssertionIsQuantifiable = false; + state.numCapturingParens = 0; + state.maxBackReference = 0; + state.groupNames = Object.create(null); + state.backReferenceNames.length = 0; + state.branchID = null; + + this.regexp_disjunction(state); + + if (state.pos !== state.source.length) { + // Make the same messages as V8. + if (state.eat(0x29 /* ) */)) { + state.raise("Unmatched ')'"); + } + if (state.eat(0x5D /* ] */) || state.eat(0x7D /* } */)) { + state.raise("Lone quantifier brackets"); + } + } + if (state.maxBackReference > state.numCapturingParens) { + state.raise("Invalid escape"); + } + for (var i = 0, list = state.backReferenceNames; i < list.length; i += 1) { + var name = list[i]; + + if (!state.groupNames[name]) { + state.raise("Invalid named capture referenced"); + } + } +}; + +// https://www.ecma-international.org/ecma-262/8.0/#prod-Disjunction +pp$1.regexp_disjunction = function(state) { + var trackDisjunction = this.options.ecmaVersion >= 16; + if (trackDisjunction) { state.branchID = new BranchID(state.branchID, null); } + this.regexp_alternative(state); + while (state.eat(0x7C /* | */)) { + if (trackDisjunction) { state.branchID = state.branchID.sibling(); } + this.regexp_alternative(state); + } + if (trackDisjunction) { state.branchID = state.branchID.parent; } + + // Make the same message as V8. + if (this.regexp_eatQuantifier(state, true)) { + state.raise("Nothing to repeat"); + } + if (state.eat(0x7B /* { */)) { + state.raise("Lone quantifier brackets"); + } +}; + +// https://www.ecma-international.org/ecma-262/8.0/#prod-Alternative +pp$1.regexp_alternative = function(state) { + while (state.pos < state.source.length && this.regexp_eatTerm(state)) {} +}; + +// https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-Term +pp$1.regexp_eatTerm = function(state) { + if (this.regexp_eatAssertion(state)) { + // Handle `QuantifiableAssertion Quantifier` alternative. + // `state.lastAssertionIsQuantifiable` is true if the last eaten Assertion + // is a QuantifiableAssertion. + if (state.lastAssertionIsQuantifiable && this.regexp_eatQuantifier(state)) { + // Make the same message as V8. + if (state.switchU) { + state.raise("Invalid quantifier"); + } + } + return true + } + + if (state.switchU ? this.regexp_eatAtom(state) : this.regexp_eatExtendedAtom(state)) { + this.regexp_eatQuantifier(state); + return true + } + + return false +}; + +// https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-Assertion +pp$1.regexp_eatAssertion = function(state) { + var start = state.pos; + state.lastAssertionIsQuantifiable = false; + + // ^, $ + if (state.eat(0x5E /* ^ */) || state.eat(0x24 /* $ */)) { + return true + } + + // \b \B + if (state.eat(0x5C /* \ */)) { + if (state.eat(0x42 /* B */) || state.eat(0x62 /* b */)) { + return true + } + state.pos = start; + } + + // Lookahead / Lookbehind + if (state.eat(0x28 /* ( */) && state.eat(0x3F /* ? */)) { + var lookbehind = false; + if (this.options.ecmaVersion >= 9) { + lookbehind = state.eat(0x3C /* < */); + } + if (state.eat(0x3D /* = */) || state.eat(0x21 /* ! */)) { + this.regexp_disjunction(state); + if (!state.eat(0x29 /* ) */)) { + state.raise("Unterminated group"); + } + state.lastAssertionIsQuantifiable = !lookbehind; + return true + } + } + + state.pos = start; + return false +}; + +// https://www.ecma-international.org/ecma-262/8.0/#prod-Quantifier +pp$1.regexp_eatQuantifier = function(state, noError) { + if ( noError === void 0 ) noError = false; + + if (this.regexp_eatQuantifierPrefix(state, noError)) { + state.eat(0x3F /* ? */); + return true + } + return false +}; + +// https://www.ecma-international.org/ecma-262/8.0/#prod-QuantifierPrefix +pp$1.regexp_eatQuantifierPrefix = function(state, noError) { + return ( + state.eat(0x2A /* * */) || + state.eat(0x2B /* + */) || + state.eat(0x3F /* ? */) || + this.regexp_eatBracedQuantifier(state, noError) + ) +}; +pp$1.regexp_eatBracedQuantifier = function(state, noError) { + var start = state.pos; + if (state.eat(0x7B /* { */)) { + var min = 0, max = -1; + if (this.regexp_eatDecimalDigits(state)) { + min = state.lastIntValue; + if (state.eat(0x2C /* , */) && this.regexp_eatDecimalDigits(state)) { + max = state.lastIntValue; + } + if (state.eat(0x7D /* } */)) { + // SyntaxError in https://www.ecma-international.org/ecma-262/8.0/#sec-term + if (max !== -1 && max < min && !noError) { + state.raise("numbers out of order in {} quantifier"); + } + return true + } + } + if (state.switchU && !noError) { + state.raise("Incomplete quantifier"); + } + state.pos = start; + } + return false +}; + +// https://www.ecma-international.org/ecma-262/8.0/#prod-Atom +pp$1.regexp_eatAtom = function(state) { + return ( + this.regexp_eatPatternCharacters(state) || + state.eat(0x2E /* . */) || + this.regexp_eatReverseSolidusAtomEscape(state) || + this.regexp_eatCharacterClass(state) || + this.regexp_eatUncapturingGroup(state) || + this.regexp_eatCapturingGroup(state) + ) +}; +pp$1.regexp_eatReverseSolidusAtomEscape = function(state) { + var start = state.pos; + if (state.eat(0x5C /* \ */)) { + if (this.regexp_eatAtomEscape(state)) { + return true + } + state.pos = start; + } + return false +}; +pp$1.regexp_eatUncapturingGroup = function(state) { + var start = state.pos; + if (state.eat(0x28 /* ( */)) { + if (state.eat(0x3F /* ? */)) { + if (this.options.ecmaVersion >= 16) { + var addModifiers = this.regexp_eatModifiers(state); + var hasHyphen = state.eat(0x2D /* - */); + if (addModifiers || hasHyphen) { + for (var i = 0; i < addModifiers.length; i++) { + var modifier = addModifiers.charAt(i); + if (addModifiers.indexOf(modifier, i + 1) > -1) { + state.raise("Duplicate regular expression modifiers"); + } + } + if (hasHyphen) { + var removeModifiers = this.regexp_eatModifiers(state); + if (!addModifiers && !removeModifiers && state.current() === 0x3A /* : */) { + state.raise("Invalid regular expression modifiers"); + } + for (var i$1 = 0; i$1 < removeModifiers.length; i$1++) { + var modifier$1 = removeModifiers.charAt(i$1); + if ( + removeModifiers.indexOf(modifier$1, i$1 + 1) > -1 || + addModifiers.indexOf(modifier$1) > -1 + ) { + state.raise("Duplicate regular expression modifiers"); + } + } + } + } + } + if (state.eat(0x3A /* : */)) { + this.regexp_disjunction(state); + if (state.eat(0x29 /* ) */)) { + return true + } + state.raise("Unterminated group"); + } + } + state.pos = start; + } + return false +}; +pp$1.regexp_eatCapturingGroup = function(state) { + if (state.eat(0x28 /* ( */)) { + if (this.options.ecmaVersion >= 9) { + this.regexp_groupSpecifier(state); + } else if (state.current() === 0x3F /* ? */) { + state.raise("Invalid group"); + } + this.regexp_disjunction(state); + if (state.eat(0x29 /* ) */)) { + state.numCapturingParens += 1; + return true + } + state.raise("Unterminated group"); + } + return false +}; +// RegularExpressionModifiers :: +// [empty] +// RegularExpressionModifiers RegularExpressionModifier +pp$1.regexp_eatModifiers = function(state) { + var modifiers = ""; + var ch = 0; + while ((ch = state.current()) !== -1 && isRegularExpressionModifier(ch)) { + modifiers += codePointToString(ch); + state.advance(); + } + return modifiers +}; +// RegularExpressionModifier :: one of +// `i` `m` `s` +function isRegularExpressionModifier(ch) { + return ch === 0x69 /* i */ || ch === 0x6d /* m */ || ch === 0x73 /* s */ +} + +// https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-ExtendedAtom +pp$1.regexp_eatExtendedAtom = function(state) { + return ( + state.eat(0x2E /* . */) || + this.regexp_eatReverseSolidusAtomEscape(state) || + this.regexp_eatCharacterClass(state) || + this.regexp_eatUncapturingGroup(state) || + this.regexp_eatCapturingGroup(state) || + this.regexp_eatInvalidBracedQuantifier(state) || + this.regexp_eatExtendedPatternCharacter(state) + ) +}; + +// https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-InvalidBracedQuantifier +pp$1.regexp_eatInvalidBracedQuantifier = function(state) { + if (this.regexp_eatBracedQuantifier(state, true)) { + state.raise("Nothing to repeat"); + } + return false +}; + +// https://www.ecma-international.org/ecma-262/8.0/#prod-SyntaxCharacter +pp$1.regexp_eatSyntaxCharacter = function(state) { + var ch = state.current(); + if (isSyntaxCharacter(ch)) { + state.lastIntValue = ch; + state.advance(); + return true + } + return false +}; +function isSyntaxCharacter(ch) { + return ( + ch === 0x24 /* $ */ || + ch >= 0x28 /* ( */ && ch <= 0x2B /* + */ || + ch === 0x2E /* . */ || + ch === 0x3F /* ? */ || + ch >= 0x5B /* [ */ && ch <= 0x5E /* ^ */ || + ch >= 0x7B /* { */ && ch <= 0x7D /* } */ + ) +} + +// https://www.ecma-international.org/ecma-262/8.0/#prod-PatternCharacter +// But eat eager. +pp$1.regexp_eatPatternCharacters = function(state) { + var start = state.pos; + var ch = 0; + while ((ch = state.current()) !== -1 && !isSyntaxCharacter(ch)) { + state.advance(); + } + return state.pos !== start +}; + +// https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-ExtendedPatternCharacter +pp$1.regexp_eatExtendedPatternCharacter = function(state) { + var ch = state.current(); + if ( + ch !== -1 && + ch !== 0x24 /* $ */ && + !(ch >= 0x28 /* ( */ && ch <= 0x2B /* + */) && + ch !== 0x2E /* . */ && + ch !== 0x3F /* ? */ && + ch !== 0x5B /* [ */ && + ch !== 0x5E /* ^ */ && + ch !== 0x7C /* | */ + ) { + state.advance(); + return true + } + return false +}; + +// GroupSpecifier :: +// [empty] +// `?` GroupName +pp$1.regexp_groupSpecifier = function(state) { + if (state.eat(0x3F /* ? */)) { + if (!this.regexp_eatGroupName(state)) { state.raise("Invalid group"); } + var trackDisjunction = this.options.ecmaVersion >= 16; + var known = state.groupNames[state.lastStringValue]; + if (known) { + if (trackDisjunction) { + for (var i = 0, list = known; i < list.length; i += 1) { + var altID = list[i]; + + if (!altID.separatedFrom(state.branchID)) + { state.raise("Duplicate capture group name"); } + } + } else { + state.raise("Duplicate capture group name"); + } + } + if (trackDisjunction) { + (known || (state.groupNames[state.lastStringValue] = [])).push(state.branchID); + } else { + state.groupNames[state.lastStringValue] = true; + } + } +}; + +// GroupName :: +// `<` RegExpIdentifierName `>` +// Note: this updates `state.lastStringValue` property with the eaten name. +pp$1.regexp_eatGroupName = function(state) { + state.lastStringValue = ""; + if (state.eat(0x3C /* < */)) { + if (this.regexp_eatRegExpIdentifierName(state) && state.eat(0x3E /* > */)) { + return true + } + state.raise("Invalid capture group name"); + } + return false +}; + +// RegExpIdentifierName :: +// RegExpIdentifierStart +// RegExpIdentifierName RegExpIdentifierPart +// Note: this updates `state.lastStringValue` property with the eaten name. +pp$1.regexp_eatRegExpIdentifierName = function(state) { + state.lastStringValue = ""; + if (this.regexp_eatRegExpIdentifierStart(state)) { + state.lastStringValue += codePointToString(state.lastIntValue); + while (this.regexp_eatRegExpIdentifierPart(state)) { + state.lastStringValue += codePointToString(state.lastIntValue); + } + return true + } + return false +}; + +// RegExpIdentifierStart :: +// UnicodeIDStart +// `$` +// `_` +// `\` RegExpUnicodeEscapeSequence[+U] +pp$1.regexp_eatRegExpIdentifierStart = function(state) { + var start = state.pos; + var forceU = this.options.ecmaVersion >= 11; + var ch = state.current(forceU); + state.advance(forceU); + + if (ch === 0x5C /* \ */ && this.regexp_eatRegExpUnicodeEscapeSequence(state, forceU)) { + ch = state.lastIntValue; + } + if (isRegExpIdentifierStart(ch)) { + state.lastIntValue = ch; + return true + } + + state.pos = start; + return false +}; +function isRegExpIdentifierStart(ch) { + return isIdentifierStart(ch, true) || ch === 0x24 /* $ */ || ch === 0x5F /* _ */ +} + +// RegExpIdentifierPart :: +// UnicodeIDContinue +// `$` +// `_` +// `\` RegExpUnicodeEscapeSequence[+U] +// +// +pp$1.regexp_eatRegExpIdentifierPart = function(state) { + var start = state.pos; + var forceU = this.options.ecmaVersion >= 11; + var ch = state.current(forceU); + state.advance(forceU); + + if (ch === 0x5C /* \ */ && this.regexp_eatRegExpUnicodeEscapeSequence(state, forceU)) { + ch = state.lastIntValue; + } + if (isRegExpIdentifierPart(ch)) { + state.lastIntValue = ch; + return true + } + + state.pos = start; + return false +}; +function isRegExpIdentifierPart(ch) { + return isIdentifierChar(ch, true) || ch === 0x24 /* $ */ || ch === 0x5F /* _ */ || ch === 0x200C /* */ || ch === 0x200D /* */ +} + +// https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-AtomEscape +pp$1.regexp_eatAtomEscape = function(state) { + if ( + this.regexp_eatBackReference(state) || + this.regexp_eatCharacterClassEscape(state) || + this.regexp_eatCharacterEscape(state) || + (state.switchN && this.regexp_eatKGroupName(state)) + ) { + return true + } + if (state.switchU) { + // Make the same message as V8. + if (state.current() === 0x63 /* c */) { + state.raise("Invalid unicode escape"); + } + state.raise("Invalid escape"); + } + return false +}; +pp$1.regexp_eatBackReference = function(state) { + var start = state.pos; + if (this.regexp_eatDecimalEscape(state)) { + var n = state.lastIntValue; + if (state.switchU) { + // For SyntaxError in https://www.ecma-international.org/ecma-262/8.0/#sec-atomescape + if (n > state.maxBackReference) { + state.maxBackReference = n; + } + return true + } + if (n <= state.numCapturingParens) { + return true + } + state.pos = start; + } + return false +}; +pp$1.regexp_eatKGroupName = function(state) { + if (state.eat(0x6B /* k */)) { + if (this.regexp_eatGroupName(state)) { + state.backReferenceNames.push(state.lastStringValue); + return true + } + state.raise("Invalid named reference"); + } + return false +}; + +// https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-CharacterEscape +pp$1.regexp_eatCharacterEscape = function(state) { + return ( + this.regexp_eatControlEscape(state) || + this.regexp_eatCControlLetter(state) || + this.regexp_eatZero(state) || + this.regexp_eatHexEscapeSequence(state) || + this.regexp_eatRegExpUnicodeEscapeSequence(state, false) || + (!state.switchU && this.regexp_eatLegacyOctalEscapeSequence(state)) || + this.regexp_eatIdentityEscape(state) + ) +}; +pp$1.regexp_eatCControlLetter = function(state) { + var start = state.pos; + if (state.eat(0x63 /* c */)) { + if (this.regexp_eatControlLetter(state)) { + return true + } + state.pos = start; + } + return false +}; +pp$1.regexp_eatZero = function(state) { + if (state.current() === 0x30 /* 0 */ && !isDecimalDigit(state.lookahead())) { + state.lastIntValue = 0; + state.advance(); + return true + } + return false +}; + +// https://www.ecma-international.org/ecma-262/8.0/#prod-ControlEscape +pp$1.regexp_eatControlEscape = function(state) { + var ch = state.current(); + if (ch === 0x74 /* t */) { + state.lastIntValue = 0x09; /* \t */ + state.advance(); + return true + } + if (ch === 0x6E /* n */) { + state.lastIntValue = 0x0A; /* \n */ + state.advance(); + return true + } + if (ch === 0x76 /* v */) { + state.lastIntValue = 0x0B; /* \v */ + state.advance(); + return true + } + if (ch === 0x66 /* f */) { + state.lastIntValue = 0x0C; /* \f */ + state.advance(); + return true + } + if (ch === 0x72 /* r */) { + state.lastIntValue = 0x0D; /* \r */ + state.advance(); + return true + } + return false +}; + +// https://www.ecma-international.org/ecma-262/8.0/#prod-ControlLetter +pp$1.regexp_eatControlLetter = function(state) { + var ch = state.current(); + if (isControlLetter(ch)) { + state.lastIntValue = ch % 0x20; + state.advance(); + return true + } + return false +}; +function isControlLetter(ch) { + return ( + (ch >= 0x41 /* A */ && ch <= 0x5A /* Z */) || + (ch >= 0x61 /* a */ && ch <= 0x7A /* z */) + ) +} + +// https://www.ecma-international.org/ecma-262/8.0/#prod-RegExpUnicodeEscapeSequence +pp$1.regexp_eatRegExpUnicodeEscapeSequence = function(state, forceU) { + if ( forceU === void 0 ) forceU = false; + + var start = state.pos; + var switchU = forceU || state.switchU; + + if (state.eat(0x75 /* u */)) { + if (this.regexp_eatFixedHexDigits(state, 4)) { + var lead = state.lastIntValue; + if (switchU && lead >= 0xD800 && lead <= 0xDBFF) { + var leadSurrogateEnd = state.pos; + if (state.eat(0x5C /* \ */) && state.eat(0x75 /* u */) && this.regexp_eatFixedHexDigits(state, 4)) { + var trail = state.lastIntValue; + if (trail >= 0xDC00 && trail <= 0xDFFF) { + state.lastIntValue = (lead - 0xD800) * 0x400 + (trail - 0xDC00) + 0x10000; + return true + } + } + state.pos = leadSurrogateEnd; + state.lastIntValue = lead; + } + return true + } + if ( + switchU && + state.eat(0x7B /* { */) && + this.regexp_eatHexDigits(state) && + state.eat(0x7D /* } */) && + isValidUnicode(state.lastIntValue) + ) { + return true + } + if (switchU) { + state.raise("Invalid unicode escape"); + } + state.pos = start; + } + + return false +}; +function isValidUnicode(ch) { + return ch >= 0 && ch <= 0x10FFFF +} + +// https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-IdentityEscape +pp$1.regexp_eatIdentityEscape = function(state) { + if (state.switchU) { + if (this.regexp_eatSyntaxCharacter(state)) { + return true + } + if (state.eat(0x2F /* / */)) { + state.lastIntValue = 0x2F; /* / */ + return true + } + return false + } + + var ch = state.current(); + if (ch !== 0x63 /* c */ && (!state.switchN || ch !== 0x6B /* k */)) { + state.lastIntValue = ch; + state.advance(); + return true + } + + return false +}; + +// https://www.ecma-international.org/ecma-262/8.0/#prod-DecimalEscape +pp$1.regexp_eatDecimalEscape = function(state) { + state.lastIntValue = 0; + var ch = state.current(); + if (ch >= 0x31 /* 1 */ && ch <= 0x39 /* 9 */) { + do { + state.lastIntValue = 10 * state.lastIntValue + (ch - 0x30 /* 0 */); + state.advance(); + } while ((ch = state.current()) >= 0x30 /* 0 */ && ch <= 0x39 /* 9 */) + return true + } + return false +}; + +// Return values used by character set parsing methods, needed to +// forbid negation of sets that can match strings. +var CharSetNone = 0; // Nothing parsed +var CharSetOk = 1; // Construct parsed, cannot contain strings +var CharSetString = 2; // Construct parsed, can contain strings + +// https://www.ecma-international.org/ecma-262/8.0/#prod-CharacterClassEscape +pp$1.regexp_eatCharacterClassEscape = function(state) { + var ch = state.current(); + + if (isCharacterClassEscape(ch)) { + state.lastIntValue = -1; + state.advance(); + return CharSetOk + } + + var negate = false; + if ( + state.switchU && + this.options.ecmaVersion >= 9 && + ((negate = ch === 0x50 /* P */) || ch === 0x70 /* p */) + ) { + state.lastIntValue = -1; + state.advance(); + var result; + if ( + state.eat(0x7B /* { */) && + (result = this.regexp_eatUnicodePropertyValueExpression(state)) && + state.eat(0x7D /* } */) + ) { + if (negate && result === CharSetString) { state.raise("Invalid property name"); } + return result + } + state.raise("Invalid property name"); + } + + return CharSetNone +}; + +function isCharacterClassEscape(ch) { + return ( + ch === 0x64 /* d */ || + ch === 0x44 /* D */ || + ch === 0x73 /* s */ || + ch === 0x53 /* S */ || + ch === 0x77 /* w */ || + ch === 0x57 /* W */ + ) +} + +// UnicodePropertyValueExpression :: +// UnicodePropertyName `=` UnicodePropertyValue +// LoneUnicodePropertyNameOrValue +pp$1.regexp_eatUnicodePropertyValueExpression = function(state) { + var start = state.pos; + + // UnicodePropertyName `=` UnicodePropertyValue + if (this.regexp_eatUnicodePropertyName(state) && state.eat(0x3D /* = */)) { + var name = state.lastStringValue; + if (this.regexp_eatUnicodePropertyValue(state)) { + var value = state.lastStringValue; + this.regexp_validateUnicodePropertyNameAndValue(state, name, value); + return CharSetOk + } + } + state.pos = start; + + // LoneUnicodePropertyNameOrValue + if (this.regexp_eatLoneUnicodePropertyNameOrValue(state)) { + var nameOrValue = state.lastStringValue; + return this.regexp_validateUnicodePropertyNameOrValue(state, nameOrValue) + } + return CharSetNone +}; + +pp$1.regexp_validateUnicodePropertyNameAndValue = function(state, name, value) { + if (!hasOwn(state.unicodeProperties.nonBinary, name)) + { state.raise("Invalid property name"); } + if (!state.unicodeProperties.nonBinary[name].test(value)) + { state.raise("Invalid property value"); } +}; + +pp$1.regexp_validateUnicodePropertyNameOrValue = function(state, nameOrValue) { + if (state.unicodeProperties.binary.test(nameOrValue)) { return CharSetOk } + if (state.switchV && state.unicodeProperties.binaryOfStrings.test(nameOrValue)) { return CharSetString } + state.raise("Invalid property name"); +}; + +// UnicodePropertyName :: +// UnicodePropertyNameCharacters +pp$1.regexp_eatUnicodePropertyName = function(state) { + var ch = 0; + state.lastStringValue = ""; + while (isUnicodePropertyNameCharacter(ch = state.current())) { + state.lastStringValue += codePointToString(ch); + state.advance(); + } + return state.lastStringValue !== "" +}; + +function isUnicodePropertyNameCharacter(ch) { + return isControlLetter(ch) || ch === 0x5F /* _ */ +} + +// UnicodePropertyValue :: +// UnicodePropertyValueCharacters +pp$1.regexp_eatUnicodePropertyValue = function(state) { + var ch = 0; + state.lastStringValue = ""; + while (isUnicodePropertyValueCharacter(ch = state.current())) { + state.lastStringValue += codePointToString(ch); + state.advance(); + } + return state.lastStringValue !== "" +}; +function isUnicodePropertyValueCharacter(ch) { + return isUnicodePropertyNameCharacter(ch) || isDecimalDigit(ch) +} + +// LoneUnicodePropertyNameOrValue :: +// UnicodePropertyValueCharacters +pp$1.regexp_eatLoneUnicodePropertyNameOrValue = function(state) { + return this.regexp_eatUnicodePropertyValue(state) +}; + +// https://www.ecma-international.org/ecma-262/8.0/#prod-CharacterClass +pp$1.regexp_eatCharacterClass = function(state) { + if (state.eat(0x5B /* [ */)) { + var negate = state.eat(0x5E /* ^ */); + var result = this.regexp_classContents(state); + if (!state.eat(0x5D /* ] */)) + { state.raise("Unterminated character class"); } + if (negate && result === CharSetString) + { state.raise("Negated character class may contain strings"); } + return true + } + return false +}; + +// https://tc39.es/ecma262/#prod-ClassContents +// https://www.ecma-international.org/ecma-262/8.0/#prod-ClassRanges +pp$1.regexp_classContents = function(state) { + if (state.current() === 0x5D /* ] */) { return CharSetOk } + if (state.switchV) { return this.regexp_classSetExpression(state) } + this.regexp_nonEmptyClassRanges(state); + return CharSetOk +}; + +// https://www.ecma-international.org/ecma-262/8.0/#prod-NonemptyClassRanges +// https://www.ecma-international.org/ecma-262/8.0/#prod-NonemptyClassRangesNoDash +pp$1.regexp_nonEmptyClassRanges = function(state) { + while (this.regexp_eatClassAtom(state)) { + var left = state.lastIntValue; + if (state.eat(0x2D /* - */) && this.regexp_eatClassAtom(state)) { + var right = state.lastIntValue; + if (state.switchU && (left === -1 || right === -1)) { + state.raise("Invalid character class"); + } + if (left !== -1 && right !== -1 && left > right) { + state.raise("Range out of order in character class"); + } + } + } +}; + +// https://www.ecma-international.org/ecma-262/8.0/#prod-ClassAtom +// https://www.ecma-international.org/ecma-262/8.0/#prod-ClassAtomNoDash +pp$1.regexp_eatClassAtom = function(state) { + var start = state.pos; + + if (state.eat(0x5C /* \ */)) { + if (this.regexp_eatClassEscape(state)) { + return true + } + if (state.switchU) { + // Make the same message as V8. + var ch$1 = state.current(); + if (ch$1 === 0x63 /* c */ || isOctalDigit(ch$1)) { + state.raise("Invalid class escape"); + } + state.raise("Invalid escape"); + } + state.pos = start; + } + + var ch = state.current(); + if (ch !== 0x5D /* ] */) { + state.lastIntValue = ch; + state.advance(); + return true + } + + return false +}; + +// https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-ClassEscape +pp$1.regexp_eatClassEscape = function(state) { + var start = state.pos; + + if (state.eat(0x62 /* b */)) { + state.lastIntValue = 0x08; /* */ + return true + } + + if (state.switchU && state.eat(0x2D /* - */)) { + state.lastIntValue = 0x2D; /* - */ + return true + } + + if (!state.switchU && state.eat(0x63 /* c */)) { + if (this.regexp_eatClassControlLetter(state)) { + return true + } + state.pos = start; + } + + return ( + this.regexp_eatCharacterClassEscape(state) || + this.regexp_eatCharacterEscape(state) + ) +}; + +// https://tc39.es/ecma262/#prod-ClassSetExpression +// https://tc39.es/ecma262/#prod-ClassUnion +// https://tc39.es/ecma262/#prod-ClassIntersection +// https://tc39.es/ecma262/#prod-ClassSubtraction +pp$1.regexp_classSetExpression = function(state) { + var result = CharSetOk, subResult; + if (this.regexp_eatClassSetRange(state)) ; else if (subResult = this.regexp_eatClassSetOperand(state)) { + if (subResult === CharSetString) { result = CharSetString; } + // https://tc39.es/ecma262/#prod-ClassIntersection + var start = state.pos; + while (state.eatChars([0x26, 0x26] /* && */)) { + if ( + state.current() !== 0x26 /* & */ && + (subResult = this.regexp_eatClassSetOperand(state)) + ) { + if (subResult !== CharSetString) { result = CharSetOk; } + continue + } + state.raise("Invalid character in character class"); + } + if (start !== state.pos) { return result } + // https://tc39.es/ecma262/#prod-ClassSubtraction + while (state.eatChars([0x2D, 0x2D] /* -- */)) { + if (this.regexp_eatClassSetOperand(state)) { continue } + state.raise("Invalid character in character class"); + } + if (start !== state.pos) { return result } + } else { + state.raise("Invalid character in character class"); + } + // https://tc39.es/ecma262/#prod-ClassUnion + for (;;) { + if (this.regexp_eatClassSetRange(state)) { continue } + subResult = this.regexp_eatClassSetOperand(state); + if (!subResult) { return result } + if (subResult === CharSetString) { result = CharSetString; } + } +}; + +// https://tc39.es/ecma262/#prod-ClassSetRange +pp$1.regexp_eatClassSetRange = function(state) { + var start = state.pos; + if (this.regexp_eatClassSetCharacter(state)) { + var left = state.lastIntValue; + if (state.eat(0x2D /* - */) && this.regexp_eatClassSetCharacter(state)) { + var right = state.lastIntValue; + if (left !== -1 && right !== -1 && left > right) { + state.raise("Range out of order in character class"); + } + return true + } + state.pos = start; + } + return false +}; + +// https://tc39.es/ecma262/#prod-ClassSetOperand +pp$1.regexp_eatClassSetOperand = function(state) { + if (this.regexp_eatClassSetCharacter(state)) { return CharSetOk } + return this.regexp_eatClassStringDisjunction(state) || this.regexp_eatNestedClass(state) +}; + +// https://tc39.es/ecma262/#prod-NestedClass +pp$1.regexp_eatNestedClass = function(state) { + var start = state.pos; + if (state.eat(0x5B /* [ */)) { + var negate = state.eat(0x5E /* ^ */); + var result = this.regexp_classContents(state); + if (state.eat(0x5D /* ] */)) { + if (negate && result === CharSetString) { + state.raise("Negated character class may contain strings"); + } + return result + } + state.pos = start; + } + if (state.eat(0x5C /* \ */)) { + var result$1 = this.regexp_eatCharacterClassEscape(state); + if (result$1) { + return result$1 + } + state.pos = start; + } + return null +}; + +// https://tc39.es/ecma262/#prod-ClassStringDisjunction +pp$1.regexp_eatClassStringDisjunction = function(state) { + var start = state.pos; + if (state.eatChars([0x5C, 0x71] /* \q */)) { + if (state.eat(0x7B /* { */)) { + var result = this.regexp_classStringDisjunctionContents(state); + if (state.eat(0x7D /* } */)) { + return result + } + } else { + // Make the same message as V8. + state.raise("Invalid escape"); + } + state.pos = start; + } + return null +}; + +// https://tc39.es/ecma262/#prod-ClassStringDisjunctionContents +pp$1.regexp_classStringDisjunctionContents = function(state) { + var result = this.regexp_classString(state); + while (state.eat(0x7C /* | */)) { + if (this.regexp_classString(state) === CharSetString) { result = CharSetString; } + } + return result +}; + +// https://tc39.es/ecma262/#prod-ClassString +// https://tc39.es/ecma262/#prod-NonEmptyClassString +pp$1.regexp_classString = function(state) { + var count = 0; + while (this.regexp_eatClassSetCharacter(state)) { count++; } + return count === 1 ? CharSetOk : CharSetString +}; + +// https://tc39.es/ecma262/#prod-ClassSetCharacter +pp$1.regexp_eatClassSetCharacter = function(state) { + var start = state.pos; + if (state.eat(0x5C /* \ */)) { + if ( + this.regexp_eatCharacterEscape(state) || + this.regexp_eatClassSetReservedPunctuator(state) + ) { + return true + } + if (state.eat(0x62 /* b */)) { + state.lastIntValue = 0x08; /* */ + return true + } + state.pos = start; + return false + } + var ch = state.current(); + if (ch < 0 || ch === state.lookahead() && isClassSetReservedDoublePunctuatorCharacter(ch)) { return false } + if (isClassSetSyntaxCharacter(ch)) { return false } + state.advance(); + state.lastIntValue = ch; + return true +}; + +// https://tc39.es/ecma262/#prod-ClassSetReservedDoublePunctuator +function isClassSetReservedDoublePunctuatorCharacter(ch) { + return ( + ch === 0x21 /* ! */ || + ch >= 0x23 /* # */ && ch <= 0x26 /* & */ || + ch >= 0x2A /* * */ && ch <= 0x2C /* , */ || + ch === 0x2E /* . */ || + ch >= 0x3A /* : */ && ch <= 0x40 /* @ */ || + ch === 0x5E /* ^ */ || + ch === 0x60 /* ` */ || + ch === 0x7E /* ~ */ + ) +} + +// https://tc39.es/ecma262/#prod-ClassSetSyntaxCharacter +function isClassSetSyntaxCharacter(ch) { + return ( + ch === 0x28 /* ( */ || + ch === 0x29 /* ) */ || + ch === 0x2D /* - */ || + ch === 0x2F /* / */ || + ch >= 0x5B /* [ */ && ch <= 0x5D /* ] */ || + ch >= 0x7B /* { */ && ch <= 0x7D /* } */ + ) +} + +// https://tc39.es/ecma262/#prod-ClassSetReservedPunctuator +pp$1.regexp_eatClassSetReservedPunctuator = function(state) { + var ch = state.current(); + if (isClassSetReservedPunctuator(ch)) { + state.lastIntValue = ch; + state.advance(); + return true + } + return false +}; + +// https://tc39.es/ecma262/#prod-ClassSetReservedPunctuator +function isClassSetReservedPunctuator(ch) { + return ( + ch === 0x21 /* ! */ || + ch === 0x23 /* # */ || + ch === 0x25 /* % */ || + ch === 0x26 /* & */ || + ch === 0x2C /* , */ || + ch === 0x2D /* - */ || + ch >= 0x3A /* : */ && ch <= 0x3E /* > */ || + ch === 0x40 /* @ */ || + ch === 0x60 /* ` */ || + ch === 0x7E /* ~ */ + ) +} + +// https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-ClassControlLetter +pp$1.regexp_eatClassControlLetter = function(state) { + var ch = state.current(); + if (isDecimalDigit(ch) || ch === 0x5F /* _ */) { + state.lastIntValue = ch % 0x20; + state.advance(); + return true + } + return false +}; + +// https://www.ecma-international.org/ecma-262/8.0/#prod-HexEscapeSequence +pp$1.regexp_eatHexEscapeSequence = function(state) { + var start = state.pos; + if (state.eat(0x78 /* x */)) { + if (this.regexp_eatFixedHexDigits(state, 2)) { + return true + } + if (state.switchU) { + state.raise("Invalid escape"); + } + state.pos = start; + } + return false +}; + +// https://www.ecma-international.org/ecma-262/8.0/#prod-DecimalDigits +pp$1.regexp_eatDecimalDigits = function(state) { + var start = state.pos; + var ch = 0; + state.lastIntValue = 0; + while (isDecimalDigit(ch = state.current())) { + state.lastIntValue = 10 * state.lastIntValue + (ch - 0x30 /* 0 */); + state.advance(); + } + return state.pos !== start +}; +function isDecimalDigit(ch) { + return ch >= 0x30 /* 0 */ && ch <= 0x39 /* 9 */ +} + +// https://www.ecma-international.org/ecma-262/8.0/#prod-HexDigits +pp$1.regexp_eatHexDigits = function(state) { + var start = state.pos; + var ch = 0; + state.lastIntValue = 0; + while (isHexDigit(ch = state.current())) { + state.lastIntValue = 16 * state.lastIntValue + hexToInt(ch); + state.advance(); + } + return state.pos !== start +}; +function isHexDigit(ch) { + return ( + (ch >= 0x30 /* 0 */ && ch <= 0x39 /* 9 */) || + (ch >= 0x41 /* A */ && ch <= 0x46 /* F */) || + (ch >= 0x61 /* a */ && ch <= 0x66 /* f */) + ) +} +function hexToInt(ch) { + if (ch >= 0x41 /* A */ && ch <= 0x46 /* F */) { + return 10 + (ch - 0x41 /* A */) + } + if (ch >= 0x61 /* a */ && ch <= 0x66 /* f */) { + return 10 + (ch - 0x61 /* a */) + } + return ch - 0x30 /* 0 */ +} + +// https://www.ecma-international.org/ecma-262/8.0/#prod-annexB-LegacyOctalEscapeSequence +// Allows only 0-377(octal) i.e. 0-255(decimal). +pp$1.regexp_eatLegacyOctalEscapeSequence = function(state) { + if (this.regexp_eatOctalDigit(state)) { + var n1 = state.lastIntValue; + if (this.regexp_eatOctalDigit(state)) { + var n2 = state.lastIntValue; + if (n1 <= 3 && this.regexp_eatOctalDigit(state)) { + state.lastIntValue = n1 * 64 + n2 * 8 + state.lastIntValue; + } else { + state.lastIntValue = n1 * 8 + n2; + } + } else { + state.lastIntValue = n1; + } + return true + } + return false +}; + +// https://www.ecma-international.org/ecma-262/8.0/#prod-OctalDigit +pp$1.regexp_eatOctalDigit = function(state) { + var ch = state.current(); + if (isOctalDigit(ch)) { + state.lastIntValue = ch - 0x30; /* 0 */ + state.advance(); + return true + } + state.lastIntValue = 0; + return false +}; +function isOctalDigit(ch) { + return ch >= 0x30 /* 0 */ && ch <= 0x37 /* 7 */ +} + +// https://www.ecma-international.org/ecma-262/8.0/#prod-Hex4Digits +// https://www.ecma-international.org/ecma-262/8.0/#prod-HexDigit +// And HexDigit HexDigit in https://www.ecma-international.org/ecma-262/8.0/#prod-HexEscapeSequence +pp$1.regexp_eatFixedHexDigits = function(state, length) { + var start = state.pos; + state.lastIntValue = 0; + for (var i = 0; i < length; ++i) { + var ch = state.current(); + if (!isHexDigit(ch)) { + state.pos = start; + return false + } + state.lastIntValue = 16 * state.lastIntValue + hexToInt(ch); + state.advance(); + } + return true +}; + +// Object type used to represent tokens. Note that normally, tokens +// simply exist as properties on the parser object. This is only +// used for the onToken callback and the external tokenizer. + +var Token = function Token(p) { + this.type = p.type; + this.value = p.value; + this.start = p.start; + this.end = p.end; + if (p.options.locations) + { this.loc = new SourceLocation(p, p.startLoc, p.endLoc); } + if (p.options.ranges) + { this.range = [p.start, p.end]; } +}; + +// ## Tokenizer + +var pp = Parser.prototype; + +// Move to the next token + +pp.next = function(ignoreEscapeSequenceInKeyword) { + if (!ignoreEscapeSequenceInKeyword && this.type.keyword && this.containsEsc) + { this.raiseRecoverable(this.start, "Escape sequence in keyword " + this.type.keyword); } + if (this.options.onToken) + { this.options.onToken(new Token(this)); } + + this.lastTokEnd = this.end; + this.lastTokStart = this.start; + this.lastTokEndLoc = this.endLoc; + this.lastTokStartLoc = this.startLoc; + this.nextToken(); +}; + +pp.getToken = function() { + this.next(); + return new Token(this) +}; + +// If we're in an ES6 environment, make parsers iterable +if (typeof Symbol !== "undefined") + { pp[Symbol.iterator] = function() { + var this$1$1 = this; + + return { + next: function () { + var token = this$1$1.getToken(); + return { + done: token.type === types$1$1.eof, + value: token + } + } + } + }; } + +// Toggle strict mode. Re-reads the next number or string to please +// pedantic tests (`"use strict"; 010;` should fail). + +// Read a single token, updating the parser object's token-related +// properties. + +pp.nextToken = function() { + var curContext = this.curContext(); + if (!curContext || !curContext.preserveSpace) { this.skipSpace(); } + + this.start = this.pos; + if (this.options.locations) { this.startLoc = this.curPosition(); } + if (this.pos >= this.input.length) { return this.finishToken(types$1$1.eof) } + + if (curContext.override) { return curContext.override(this) } + else { this.readToken(this.fullCharCodeAtPos()); } +}; + +pp.readToken = function(code) { + // Identifier or keyword. '\uXXXX' sequences are allowed in + // identifiers, so '\' also dispatches to that. + if (isIdentifierStart(code, this.options.ecmaVersion >= 6) || code === 92 /* '\' */) + { return this.readWord() } + + return this.getTokenFromCode(code) +}; + +pp.fullCharCodeAt = function(pos) { + var code = this.input.charCodeAt(pos); + if (code <= 0xd7ff || code >= 0xdc00) { return code } + var next = this.input.charCodeAt(pos + 1); + return next <= 0xdbff || next >= 0xe000 ? code : (code << 10) + next - 0x35fdc00 +}; + +pp.fullCharCodeAtPos = function() { + return this.fullCharCodeAt(this.pos) +}; + +pp.skipBlockComment = function() { + var startLoc = this.options.onComment && this.curPosition(); + var start = this.pos, end = this.input.indexOf("*/", this.pos += 2); + if (end === -1) { this.raise(this.pos - 2, "Unterminated comment"); } + this.pos = end + 2; + if (this.options.locations) { + for (var nextBreak = (void 0), pos = start; (nextBreak = nextLineBreak(this.input, pos, this.pos)) > -1;) { + ++this.curLine; + pos = this.lineStart = nextBreak; + } + } + if (this.options.onComment) + { this.options.onComment(true, this.input.slice(start + 2, end), start, this.pos, + startLoc, this.curPosition()); } +}; + +pp.skipLineComment = function(startSkip) { + var start = this.pos; + var startLoc = this.options.onComment && this.curPosition(); + var ch = this.input.charCodeAt(this.pos += startSkip); + while (this.pos < this.input.length && !isNewLine(ch)) { + ch = this.input.charCodeAt(++this.pos); + } + if (this.options.onComment) + { this.options.onComment(false, this.input.slice(start + startSkip, this.pos), start, this.pos, + startLoc, this.curPosition()); } +}; + +// Called at the start of the parse and after every token. Skips +// whitespace and comments, and. + +pp.skipSpace = function() { + loop: while (this.pos < this.input.length) { + var ch = this.input.charCodeAt(this.pos); + switch (ch) { + case 32: case 160: // ' ' + ++this.pos; + break + case 13: + if (this.input.charCodeAt(this.pos + 1) === 10) { + ++this.pos; + } + case 10: case 8232: case 8233: + ++this.pos; + if (this.options.locations) { + ++this.curLine; + this.lineStart = this.pos; + } + break + case 47: // '/' + switch (this.input.charCodeAt(this.pos + 1)) { + case 42: // '*' + this.skipBlockComment(); + break + case 47: + this.skipLineComment(2); + break + default: + break loop + } + break + default: + if (ch > 8 && ch < 14 || ch >= 5760 && nonASCIIwhitespace.test(String.fromCharCode(ch))) { + ++this.pos; + } else { + break loop + } + } + } +}; + +// Called at the end of every token. Sets `end`, `val`, and +// maintains `context` and `exprAllowed`, and skips the space after +// the token, so that the next one's `start` will point at the +// right position. + +pp.finishToken = function(type, val) { + this.end = this.pos; + if (this.options.locations) { this.endLoc = this.curPosition(); } + var prevType = this.type; + this.type = type; + this.value = val; + + this.updateContext(prevType); +}; + +// ### Token reading + +// This is the function that is called to fetch the next token. It +// is somewhat obscure, because it works in character codes rather +// than characters, and because operator parsing has been inlined +// into it. +// +// All in the name of speed. +// +pp.readToken_dot = function() { + var next = this.input.charCodeAt(this.pos + 1); + if (next >= 48 && next <= 57) { return this.readNumber(true) } + var next2 = this.input.charCodeAt(this.pos + 2); + if (this.options.ecmaVersion >= 6 && next === 46 && next2 === 46) { // 46 = dot '.' + this.pos += 3; + return this.finishToken(types$1$1.ellipsis) + } else { + ++this.pos; + return this.finishToken(types$1$1.dot) + } +}; + +pp.readToken_slash = function() { // '/' + var next = this.input.charCodeAt(this.pos + 1); + if (this.exprAllowed) { ++this.pos; return this.readRegexp() } + if (next === 61) { return this.finishOp(types$1$1.assign, 2) } + return this.finishOp(types$1$1.slash, 1) +}; + +pp.readToken_mult_modulo_exp = function(code) { // '%*' + var next = this.input.charCodeAt(this.pos + 1); + var size = 1; + var tokentype = code === 42 ? types$1$1.star : types$1$1.modulo; + + // exponentiation operator ** and **= + if (this.options.ecmaVersion >= 7 && code === 42 && next === 42) { + ++size; + tokentype = types$1$1.starstar; + next = this.input.charCodeAt(this.pos + 2); + } + + if (next === 61) { return this.finishOp(types$1$1.assign, size + 1) } + return this.finishOp(tokentype, size) +}; + +pp.readToken_pipe_amp = function(code) { // '|&' + var next = this.input.charCodeAt(this.pos + 1); + if (next === code) { + if (this.options.ecmaVersion >= 12) { + var next2 = this.input.charCodeAt(this.pos + 2); + if (next2 === 61) { return this.finishOp(types$1$1.assign, 3) } + } + return this.finishOp(code === 124 ? types$1$1.logicalOR : types$1$1.logicalAND, 2) + } + if (next === 61) { return this.finishOp(types$1$1.assign, 2) } + return this.finishOp(code === 124 ? types$1$1.bitwiseOR : types$1$1.bitwiseAND, 1) +}; + +pp.readToken_caret = function() { // '^' + var next = this.input.charCodeAt(this.pos + 1); + if (next === 61) { return this.finishOp(types$1$1.assign, 2) } + return this.finishOp(types$1$1.bitwiseXOR, 1) +}; + +pp.readToken_plus_min = function(code) { // '+-' + var next = this.input.charCodeAt(this.pos + 1); + if (next === code) { + if (next === 45 && !this.inModule && this.input.charCodeAt(this.pos + 2) === 62 && + (this.lastTokEnd === 0 || lineBreak.test(this.input.slice(this.lastTokEnd, this.pos)))) { + // A `-->` line comment + this.skipLineComment(3); + this.skipSpace(); + return this.nextToken() + } + return this.finishOp(types$1$1.incDec, 2) + } + if (next === 61) { return this.finishOp(types$1$1.assign, 2) } + return this.finishOp(types$1$1.plusMin, 1) +}; + +pp.readToken_lt_gt = function(code) { // '<>' + var next = this.input.charCodeAt(this.pos + 1); + var size = 1; + if (next === code) { + size = code === 62 && this.input.charCodeAt(this.pos + 2) === 62 ? 3 : 2; + if (this.input.charCodeAt(this.pos + size) === 61) { return this.finishOp(types$1$1.assign, size + 1) } + return this.finishOp(types$1$1.bitShift, size) + } + if (next === 33 && code === 60 && !this.inModule && this.input.charCodeAt(this.pos + 2) === 45 && + this.input.charCodeAt(this.pos + 3) === 45) { + // `