-
Notifications
You must be signed in to change notification settings - Fork 64
Add support for custom scripts #903
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,210 @@ | ||
/** | ||
* This source file is part of the Swift.org open source project | ||
* | ||
* Copyright (c) 2021 Apple Inc. and the Swift project authors | ||
* Licensed under Apache License v2.0 with Runtime Library Exception | ||
* | ||
* See https://swift.org/LICENSE.txt for license information | ||
* See https://swift.org/CONTRIBUTORS.txt for Swift project authors | ||
*/ | ||
|
||
import fetchText from 'docc-render/utils/fetch-text'; | ||
import { | ||
copyPresentProperties, | ||
copyPropertyIfPresent, | ||
has, | ||
mustNotHave, | ||
} from 'docc-render/utils/object-properties'; | ||
import { resolveAbsoluteUrl } from 'docc-render/utils/url-helper'; | ||
|
||
/** Enum for the allowed values of the `run` property in a custom script. */ | ||
const Run = { | ||
onLoad: 'on-load', | ||
onLoadAndNavigate: 'on-load-and-navigate', | ||
onNavigate: 'on-navigate', | ||
}; | ||
|
||
/** | ||
* Returns whether the custom script should be run when the reader navigates to a subpage. | ||
* @param {object} customScript | ||
* @returns {boolean} Returns whether the custom script has a `run` property with a value of | ||
* "on-load" or "on-load-and-navigate". Also returns true if the `run` property is absent. | ||
*/ | ||
function shouldRunOnPageLoad(customScript) { | ||
return !has(customScript, 'run') | ||
|| customScript.run === Run.onLoad || customScript.run === Run.onLoadAndNavigate; | ||
} | ||
|
||
/** | ||
* Returns whether the custom script should be run when the reader navigates to a topic. | ||
* @param {object} customScript | ||
* @returns {boolean} Returns whether the custom script has a `run` property with a value of | ||
* "on-navigate" or "on-load-and-navigate". | ||
*/ | ||
function shouldRunOnNavigate(customScript) { | ||
return has(customScript, 'run') | ||
&& (customScript.run === Run.onNavigate || customScript.run === Run.onLoadAndNavigate); | ||
} | ||
|
||
/** | ||
* Gets the URL for a local custom script given its name. | ||
* @param {string} customScriptName The name of the custom script as spelled in | ||
* custom-scripts.json. While the actual filename (in the custom-scripts directory) is always | ||
* expected to end in ".js", the name in custom-scripts.json may or may not include the ".js" | ||
* extension. | ||
* @returns {string} The absolute URL where the script is, accounting for baseURL. | ||
* @example | ||
* // if baseURL is '/foo' | ||
* urlGivenScriptName('hello-world') // http://localhost:8080/foo/hello-world.js | ||
* urlGivenScriptName('hello-world.js') // http://localhost:8080/foo/hello-world.js | ||
*/ | ||
function urlGivenScriptName(customScriptName) { | ||
let scriptNameWithExtension = customScriptName; | ||
|
||
// If the provided name does not already include the ".js" extension, add it. | ||
if (customScriptName.slice(-3) !== '.js') { | ||
scriptNameWithExtension = `${customScriptName}.js`; | ||
} | ||
|
||
return resolveAbsoluteUrl(['', 'custom-scripts', scriptNameWithExtension]); | ||
} | ||
|
||
/** | ||
* Add an HTMLScriptElement containing the custom script to the document's head, which runs the | ||
* script on page load. | ||
* @param {object} customScript The custom script, assuming it should be run on page load. | ||
*/ | ||
function addScriptElement(customScript) { | ||
const scriptElement = document.createElement('script'); | ||
|
||
copyPropertyIfPresent('type', customScript, scriptElement); | ||
|
||
if (has(customScript, 'url')) { | ||
mustNotHave(customScript, 'name', 'Custom script cannot have both `url` and `name`.'); | ||
mustNotHave(customScript, 'code', 'Custom script cannot have both `url` and `code`.'); | ||
|
||
scriptElement.src = customScript.url; | ||
|
||
// Dynamically-created script elements are `async` by default. But we don't want custom | ||
// scripts to be implicitly async, because if a documentation author adds `defer` to some or | ||
// all of their custom scripts (meaning that they want the execution order of those scripts to | ||
// be deterministic), then the author's `defer` will be overriden by the implicit `async`, | ||
// meaning that the execution order will be unexpectedly nondeterministic. | ||
// | ||
// Therefore, remove the script element's `async` unless async is explicitly enabled. | ||
scriptElement.async = customScript.async || false; | ||
|
||
copyPresentProperties(['defer', 'integrity'], customScript, scriptElement); | ||
|
||
// If `integrity` is set on an external script, then CORS must be enabled as well. | ||
if (has(customScript, 'integrity')) { | ||
scriptElement.crossOrigin = 'anonymous'; | ||
} | ||
} else if (has(customScript, 'name')) { | ||
mustNotHave(customScript, 'code', 'Custom script cannot have both `name` and `code`.'); | ||
|
||
scriptElement.src = urlGivenScriptName(customScript.name); | ||
scriptElement.async = customScript.async || false; | ||
|
||
copyPresentProperties(['async', 'defer', 'integrity'], customScript, scriptElement); | ||
} else if (has(customScript, 'code')) { | ||
mustNotHave(customScript, 'async', 'Inline script cannot be `async`.'); | ||
mustNotHave(customScript, 'defer', 'Inline script cannot have `defer`.'); | ||
mustNotHave(customScript, 'integrity', 'Inline script cannot have `integrity`.'); | ||
|
||
scriptElement.innerHTML = customScript.code; | ||
} else { | ||
throw new Error('Custom script does not have `url`, `name`, or `code` properties.'); | ||
} | ||
|
||
document.head.appendChild(scriptElement); | ||
} | ||
|
||
/** | ||
* Run the custom script using `new Function`, which is essentially `eval` but without exposing | ||
* local variables. Useful for running a custom script anytime after page load, namely when the | ||
* reader navigates to a subpage. | ||
* @param {object} customScript The custom script, assuming it should be run on navigate. | ||
*/ | ||
async function evalScript(customScript) { | ||
let codeToEval; | ||
|
||
if (has(customScript, 'url')) { | ||
mustNotHave(customScript, 'name', 'Custom script cannot have both `url` and `name`.'); | ||
mustNotHave(customScript, 'code', 'Custom script cannot have both `url` and `code`.'); | ||
|
||
if (has(customScript, 'integrity')) { | ||
// External script with integrity. Must also use CORS. | ||
codeToEval = await fetchText(customScript.url, { | ||
integrity: customScript.integrity, | ||
crossOrigin: 'anonymous', | ||
}); | ||
} else { | ||
// External script without integrity. | ||
codeToEval = await fetchText(customScript.url); | ||
} | ||
} else if (has(customScript, 'name')) { | ||
mustNotHave(customScript, 'code', 'Custom script cannot have both `name` and `code`.'); | ||
|
||
const url = urlGivenScriptName(customScript.name); | ||
|
||
if (has(customScript, 'integrity')) { | ||
// Local script with integrity. Do not use CORS. | ||
codeToEval = await fetchText(url, { integrity: customScript.integrity }); | ||
} else { | ||
// Local script without integrity. | ||
codeToEval = await fetchText(url); | ||
} | ||
} else if (has(customScript, 'code')) { | ||
mustNotHave(customScript, 'async', 'Inline script cannot be `async`.'); | ||
mustNotHave(customScript, 'defer', 'Inline script cannot have `defer`.'); | ||
mustNotHave(customScript, 'integrity', 'Inline script cannot have `integrity`.'); | ||
|
||
codeToEval = customScript.code; | ||
} else { | ||
throw new Error('Custom script does not have `url`, `name`, or `code` properties.'); | ||
} | ||
|
||
// eslint-disable-next-line no-new-func | ||
new Function(codeToEval)(); | ||
} | ||
|
||
/** | ||
* Run all custom scripts that pass the `predicate` using the `executor`. | ||
* @param {(customScript: object) => boolean} predicate | ||
* @param {(customScript: object) => void} executor | ||
* @returns {Promise<void>} | ||
*/ | ||
async function runCustomScripts(predicate, executor) { | ||
const customScriptsFileName = 'custom-scripts.json'; | ||
const url = resolveAbsoluteUrl(`/${customScriptsFileName}`); | ||
|
||
const response = await fetch(url); | ||
if (!response.ok) { | ||
// If the file is absent, fail silently. | ||
return; | ||
} | ||
|
||
const customScripts = await response.json(); | ||
if (!Array.isArray(customScripts)) { | ||
throw new Error(`Content of ${customScriptsFileName} should be an array.`); | ||
} | ||
|
||
customScripts.filter(predicate).forEach(executor); | ||
} | ||
|
||
/** | ||
* Runs all "on-load" and "on-load-and-navigate" scripts. | ||
* @returns {Promise<void>} | ||
*/ | ||
export async function runCustomPageLoadScripts() { | ||
await runCustomScripts(shouldRunOnPageLoad, addScriptElement); | ||
} | ||
|
||
/** | ||
* Runs all "on-navigate" and "on-load-and-navigate" scripts. | ||
* @returns {Promise<void>} | ||
*/ | ||
export async function runCustomNavigateScripts() { | ||
await runCustomScripts(shouldRunOnNavigate, evalScript); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I’m using
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I would personally prefer the latter since all inline scripts could be expressed as simple local scripts, and I would much prefer using dynamic imports over manually evaluating the code. I could be convinced otherwise if there's a strong need to explicitly support inline code, but I think the dynamic import approach would be simpler code-wise and also less prone to possible issues. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hey, @mportiz08! Sorry I disappeared for a couple months there. I’ve pushed a new branch that uses dynamic imports instead of Should I keep There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
No worries at all!
Good point. I wasn't thinking about that. The I'll think on this a bit, but maybe the new function approach is the only reasonable solution for now. This may be an issue with some server environments with a strict content security policy that restrict inline scripts and things like eval/new-function...maybe there's no good way around that though. |
||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
/** | ||
* This source file is part of the Swift.org open source project | ||
* | ||
* Copyright (c) 2021 Apple Inc. and the Swift project authors | ||
* Licensed under Apache License v2.0 with Runtime Library Exception | ||
* | ||
* See https://swift.org/LICENSE.txt for license information | ||
* See https://swift.org/CONTRIBUTORS.txt for Swift project authors | ||
*/ | ||
|
||
import { resolveAbsoluteUrl } from 'docc-render/utils/url-helper'; | ||
|
||
/** | ||
* Fetch the contents of a file as text. | ||
* @param {string} filepath The file path. | ||
* @param {RequestInit?} options Optional request settings. | ||
* @returns {Promise<string>} The text contents of the file. | ||
*/ | ||
export default async function fetchText(filepath, options) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Would this maybe make sense to live in the (Not a major issue, and there's a possibility this function might not even be needed based on my other comment about avoiding eval if possible.) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sounds good, I’ll move |
||
const url = resolveAbsoluteUrl(filepath); | ||
return fetch(url, options) | ||
.then(r => r.text()); | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
/** | ||
* This source file is part of the Swift.org open source project | ||
* | ||
* Copyright (c) 2021 Apple Inc. and the Swift project authors | ||
* Licensed under Apache License v2.0 with Runtime Library Exception | ||
* | ||
* See https://swift.org/LICENSE.txt for license information | ||
* See https://swift.org/CONTRIBUTORS.txt for Swift project authors | ||
*/ | ||
|
||
/** Convenient shorthand for `Object.hasOwn`. */ | ||
export const has = Object.hasOwn; | ||
/** | ||
* Copies source.property, if it exists, to destination.property. | ||
* @param {string} property | ||
* @param {object} source | ||
* @param {object} destination | ||
*/ | ||
export function copyPropertyIfPresent(property, source, destination) { | ||
if (has(source, property)) { | ||
// eslint-disable-next-line no-param-reassign | ||
destination[property] = source[property]; | ||
} | ||
} | ||
|
||
/** | ||
* Copies all specified properties present in the source to the destination. | ||
* @param {string[]} properties | ||
* @param {object} source | ||
* @param {object} destination | ||
*/ | ||
export function copyPresentProperties(properties, source, destination) { | ||
properties.forEach((property) => { | ||
copyPropertyIfPresent(property, source, destination); | ||
}); | ||
} | ||
|
||
/** | ||
* Throws an error if `object` has the property `property`. | ||
* @param {object} object | ||
* @param {string} property | ||
* @param {string} errorMessage | ||
*/ | ||
export function mustNotHave(object, property, errorMessage) { | ||
if (has(object, property)) { | ||
throw new Error(errorMessage); | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One existing problem we have with the same pattern from
theme-settings.json
is that we always try to fetch the file, and the 404 is always reported in the console in the case where one wasn't provided.I don't think this needs to be solved with this PR, but it would be nice to fix this for both files so that the renderer is informed in some way of the fact that the catalog even has one of these files before it tries to fetch them, so this "always 404" problem goes away in the normal case.
(This would need to be addressed in a coordinated way between DocC and DocC-Render in the future)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, that's an unfortunate behavior of
fetch
... something we can look into in a later PR.Sidenote: I should probably point out that the way I’m error-handling
custom-scripts.json
intentionally does not match howtheme-settings.json
is error-handled.fetchThemeSettings
has a blanketcatch
statement, which means that documentation authors aren’t notified if the file is malformed or if it violates the theme-settings schema. Messing with this choice fortheme-settings.json
is outside the scope of the proposal, so I didn’t; but forcustom-scripts.json
, if the file is malformed or violates the custom-scripts schema then we throw an error and don’t catch it. Please let me know if schema violations should be caught for custom-scripts.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That sounds good.
I don't think it's necessarily a problem with the fetch behavior—it's just that we shouldn't even be trying to fetch any of these JSON files if they haven't been provided in the documentation catalog in the first place—we would just need some added infrastructure so that DocC could inform the renderer that it will never even need to make an http request for these files if they weren't used.
Again, not any issue with your implementation—just noting an existing problem that will happen here as well.