@@ -34,35 +34,35 @@ function createModifierCard(name, previews, removeBy) {
`
- const image = modifierCard.querySelector('.modifier-card-image')
- const errorText = modifierCard.querySelector('.modifier-card-error-label')
- const label = modifierCard.querySelector('.modifier-card-label')
+ const image = modifierCard.querySelector(".modifier-card-image")
+ const errorText = modifierCard.querySelector(".modifier-card-error-label")
+ const label = modifierCard.querySelector(".modifier-card-label")
- errorText.innerText = 'No Image'
+ errorText.innerText = "No Image"
- if (typeof previews == 'object') {
- image.src = previews[styleIndex]; // portrait
- image.setAttribute('preview-type', style)
+ if (typeof previews == "object") {
+ image.src = previews[styleIndex] // portrait
+ image.setAttribute("preview-type", style)
} else {
image.remove()
}
const maxLabelLength = 30
- const cardLabel = removeBy ? name.replace('by ', '') : name
+ const cardLabel = removeBy ? name.replace("by ", "") : name
- if(cardLabel.length <= maxLabelLength) {
- label.querySelector('p').innerText = cardLabel
+ if (cardLabel.length <= maxLabelLength) {
+ label.querySelector("p").innerText = cardLabel
} else {
- const tooltipText = document.createElement('span')
- tooltipText.className = 'tooltip-text'
+ const tooltipText = document.createElement("span")
+ tooltipText.className = "tooltip-text"
tooltipText.innerText = name
- label.classList.add('tooltip')
+ label.classList.add("tooltip")
label.appendChild(tooltipText)
- label.querySelector('p').innerText = cardLabel.substring(0, maxLabelLength) + '...'
+ label.querySelector("p").innerText = cardLabel.substring(0, maxLabelLength) + "..."
}
- label.querySelector('p').dataset.fullName = name // preserve the full name
+ label.querySelector("p").dataset.fullName = name // preserve the full name
return modifierCard
}
@@ -71,55 +71,58 @@ function createModifierGroup(modifierGroup, initiallyExpanded, removeBy) {
const title = modifierGroup.category
const modifiers = modifierGroup.modifiers
- const titleEl = document.createElement('h5')
- titleEl.className = 'collapsible'
+ const titleEl = document.createElement("h5")
+ titleEl.className = "collapsible"
titleEl.innerText = title
- const modifiersEl = document.createElement('div')
- modifiersEl.classList.add('collapsible-content', 'editor-modifiers-leaf')
+ const modifiersEl = document.createElement("div")
+ modifiersEl.classList.add("collapsible-content", "editor-modifiers-leaf")
if (initiallyExpanded === true) {
- titleEl.className += ' active'
+ titleEl.className += " active"
}
- modifiers.forEach(modObj => {
+ modifiers.forEach((modObj) => {
const modifierName = modObj.modifier
- const modifierPreviews = modObj?.previews?.map(preview => `${IMAGE_REGEX.test(preview.image) ? preview.image : modifierThumbnailPath + '/' + preview.path}`)
+ const modifierPreviews = modObj?.previews?.map(
+ (preview) =>
+ `${IMAGE_REGEX.test(preview.image) ? preview.image : modifierThumbnailPath + "/" + preview.path}`
+ )
const modifierCard = createModifierCard(modifierName, modifierPreviews, removeBy)
- if(typeof modifierCard == 'object') {
+ if (typeof modifierCard == "object") {
modifiersEl.appendChild(modifierCard)
const trimmedName = trimModifiers(modifierName)
- modifierCard.addEventListener('click', () => {
- if (activeTags.map(x => trimModifiers(x.name)).includes(trimmedName)) {
+ modifierCard.addEventListener("click", () => {
+ if (activeTags.map((x) => trimModifiers(x.name)).includes(trimmedName)) {
// remove modifier from active array
- activeTags = activeTags.filter(x => trimModifiers(x.name) != trimmedName)
+ activeTags = activeTags.filter((x) => trimModifiers(x.name) != trimmedName)
toggleCardState(trimmedName, false)
} else {
// add modifier to active array
activeTags.push({
- 'name': modifierName,
- 'element': modifierCard.cloneNode(true),
- 'originElement': modifierCard,
- 'previews': modifierPreviews
+ name: modifierName,
+ element: modifierCard.cloneNode(true),
+ originElement: modifierCard,
+ previews: modifierPreviews
})
toggleCardState(trimmedName, true)
}
refreshTagsList()
- document.dispatchEvent(new Event('refreshImageModifiers'))
+ document.dispatchEvent(new Event("refreshImageModifiers"))
})
}
})
- let brk = document.createElement('br')
- brk.style.clear = 'both'
+ let brk = document.createElement("br")
+ brk.style.clear = "both"
modifiersEl.appendChild(brk)
- let e = document.createElement('div')
- e.className = 'modifier-category'
+ let e = document.createElement("div")
+ e.className = "modifier-category"
e.appendChild(titleEl)
e.appendChild(modifiersEl)
@@ -130,87 +133,98 @@ function createModifierGroup(modifierGroup, initiallyExpanded, removeBy) {
function trimModifiers(tag) {
// Remove trailing '-' and/or '+'
- tag = tag.replace(/[-+]+$/, '');
+ tag = tag.replace(/[-+]+$/, "")
// Remove parentheses at beginning and end
- return tag.replace(/^[(]+|[\s)]+$/g, '');
+ return tag.replace(/^[(]+|[\s)]+$/g, "")
}
async function loadModifiers() {
try {
- let res = await fetch('/get/modifiers')
+ let res = await fetch("/get/modifiers")
if (res.status === 200) {
res = await res.json()
- modifiers = res; // update global variable
+ modifiers = res // update global variable
res.reverse()
res.forEach((modifierGroup, idx) => {
- createModifierGroup(modifierGroup, idx === res.length - 1, modifierGroup === 'Artist' ? true : false) // only remove "By " for artists
+ createModifierGroup(modifierGroup, idx === res.length - 1, modifierGroup === "Artist" ? true : false) // only remove "By " for artists
})
createCollapsibles(editorModifierEntries)
}
} catch (e) {
- console.error('error fetching modifiers', e)
+ console.error("error fetching modifiers", e)
}
loadCustomModifiers()
resizeModifierCards(modifierCardSizeSlider.value)
- document.dispatchEvent(new Event('loadImageModifiers'))
+ document.dispatchEvent(new Event("loadImageModifiers"))
}
function refreshModifiersState(newTags, inactiveTags) {
// clear existing modifiers
- document.querySelector('#editor-modifiers').querySelectorAll('.modifier-card').forEach(modifierCard => {
- const modifierName = modifierCard.querySelector('.modifier-card-label p').dataset.fullName // pick the full modifier name
- if (activeTags.map(x => x.name).includes(modifierName)) {
- modifierCard.classList.remove(activeCardClass)
- modifierCard.querySelector('.modifier-card-image-overlay').innerText = '+'
- }
- })
+ document
+ .querySelector("#editor-modifiers")
+ .querySelectorAll(".modifier-card")
+ .forEach((modifierCard) => {
+ const modifierName = modifierCard.querySelector(".modifier-card-label p").dataset.fullName // pick the full modifier name
+ if (activeTags.map((x) => x.name).includes(modifierName)) {
+ modifierCard.classList.remove(activeCardClass)
+ modifierCard.querySelector(".modifier-card-image-overlay").innerText = "+"
+ }
+ })
activeTags = []
// set new modifiers
- newTags.forEach(tag => {
+ newTags.forEach((tag) => {
let found = false
- document.querySelector('#editor-modifiers').querySelectorAll('.modifier-card').forEach(modifierCard => {
- const modifierName = modifierCard.querySelector('.modifier-card-label p').dataset.fullName
- const shortModifierName = modifierCard.querySelector('.modifier-card-label p').innerText
- if (trimModifiers(tag) == trimModifiers(modifierName)) {
- // add modifier to active array
- if (!activeTags.map(x => x.name).includes(tag)) { // only add each tag once even if several custom modifier cards share the same tag
- const imageModifierCard = modifierCard.cloneNode(true)
- imageModifierCard.querySelector('.modifier-card-label p').innerText = tag.replace(modifierName, shortModifierName)
- activeTags.push({
- 'name': tag,
- 'element': imageModifierCard,
- 'originElement': modifierCard
- })
+ document
+ .querySelector("#editor-modifiers")
+ .querySelectorAll(".modifier-card")
+ .forEach((modifierCard) => {
+ const modifierName = modifierCard.querySelector(".modifier-card-label p").dataset.fullName
+ const shortModifierName = modifierCard.querySelector(".modifier-card-label p").innerText
+ if (trimModifiers(tag) == trimModifiers(modifierName)) {
+ // add modifier to active array
+ if (!activeTags.map((x) => x.name).includes(tag)) {
+ // only add each tag once even if several custom modifier cards share the same tag
+ const imageModifierCard = modifierCard.cloneNode(true)
+ imageModifierCard.querySelector(".modifier-card-label p").innerText = tag.replace(
+ modifierName,
+ shortModifierName
+ )
+ activeTags.push({
+ name: tag,
+ element: imageModifierCard,
+ originElement: modifierCard
+ })
+ }
+ modifierCard.classList.add(activeCardClass)
+ modifierCard.querySelector(".modifier-card-image-overlay").innerText = "-"
+ found = true
}
- modifierCard.classList.add(activeCardClass)
- modifierCard.querySelector('.modifier-card-image-overlay').innerText = '-'
- found = true
- }
- })
- if (found == false) { // custom tag went missing, create one here
+ })
+ if (found == false) {
+ // custom tag went missing, create one here
let modifierCard = createModifierCard(tag, undefined, false) // create a modifier card for the missing tag, no image
-
- modifierCard.addEventListener('click', () => {
- if (activeTags.map(x => x.name).includes(tag)) {
+
+ modifierCard.addEventListener("click", () => {
+ if (activeTags.map((x) => x.name).includes(tag)) {
// remove modifier from active array
- activeTags = activeTags.filter(x => x.name != tag)
+ activeTags = activeTags.filter((x) => x.name != tag)
modifierCard.classList.remove(activeCardClass)
- modifierCard.querySelector('.modifier-card-image-overlay').innerText = '+'
+ modifierCard.querySelector(".modifier-card-image-overlay").innerText = "+"
}
refreshTagsList()
})
activeTags.push({
- 'name': tag,
- 'element': modifierCard,
- 'originElement': undefined // no origin element for missing tags
+ name: tag,
+ element: modifierCard,
+ originElement: undefined // no origin element for missing tags
})
}
})
@@ -220,41 +234,44 @@ function refreshModifiersState(newTags, inactiveTags) {
function refreshInactiveTags(inactiveTags) {
// update inactive tags
if (inactiveTags !== undefined && inactiveTags.length > 0) {
- activeTags.forEach (tag => {
- if (inactiveTags.find(element => element === tag.name) !== undefined) {
+ activeTags.forEach((tag) => {
+ if (inactiveTags.find((element) => element === tag.name) !== undefined) {
tag.inactive = true
}
})
}
-
+
// update cards
- let overlays = document.querySelector('#editor-inputs-tags-list').querySelectorAll('.modifier-card-overlay')
- overlays.forEach (i => {
- let modifierName = i.parentElement.getElementsByClassName('modifier-card-label')[0].getElementsByTagName("p")[0].dataset.fullName
- if (inactiveTags?.find(element => element === modifierName) !== undefined) {
- i.parentElement.classList.add('modifier-toggle-inactive')
+ let overlays = document.querySelector("#editor-inputs-tags-list").querySelectorAll(".modifier-card-overlay")
+ overlays.forEach((i) => {
+ let modifierName = i.parentElement.getElementsByClassName("modifier-card-label")[0].getElementsByTagName("p")[0]
+ .dataset.fullName
+ if (inactiveTags?.find((element) => element === modifierName) !== undefined) {
+ i.parentElement.classList.add("modifier-toggle-inactive")
}
})
}
function refreshTagsList(inactiveTags) {
- editorModifierTagsList.innerHTML = ''
+ editorModifierTagsList.innerHTML = ""
if (activeTags.length == 0) {
- editorTagsContainer.style.display = 'none'
+ editorTagsContainer.style.display = "none"
return
} else {
- editorTagsContainer.style.display = 'block'
+ editorTagsContainer.style.display = "block"
}
activeTags.forEach((tag, index) => {
- tag.element.querySelector('.modifier-card-image-overlay').innerText = '-'
- tag.element.classList.add('modifier-card-tiny')
+ tag.element.querySelector(".modifier-card-image-overlay").innerText = "-"
+ tag.element.classList.add("modifier-card-tiny")
editorModifierTagsList.appendChild(tag.element)
- tag.element.addEventListener('click', () => {
- let idx = activeTags.findIndex(o => { return o.name === tag.name })
+ tag.element.addEventListener("click", () => {
+ let idx = activeTags.findIndex((o) => {
+ return o.name === tag.name
+ })
if (idx !== -1) {
toggleCardState(activeTags[idx].name, false)
@@ -262,88 +279,91 @@ function refreshTagsList(inactiveTags) {
activeTags.splice(idx, 1)
refreshTagsList()
}
- document.dispatchEvent(new Event('refreshImageModifiers'))
+ document.dispatchEvent(new Event("refreshImageModifiers"))
})
})
- let brk = document.createElement('br')
- brk.style.clear = 'both'
+ let brk = document.createElement("br")
+ brk.style.clear = "both"
editorModifierTagsList.appendChild(brk)
refreshInactiveTags(inactiveTags)
- document.dispatchEvent(new Event('refreshImageModifiers')) // notify plugins that the image tags have been refreshed
+ document.dispatchEvent(new Event("refreshImageModifiers")) // notify plugins that the image tags have been refreshed
}
function toggleCardState(modifierName, makeActive) {
- document.querySelector('#editor-modifiers').querySelectorAll('.modifier-card').forEach(card => {
- const name = card.querySelector('.modifier-card-label').innerText
- if ( trimModifiers(modifierName) == trimModifiers(name)
- || trimModifiers(modifierName) == 'by ' + trimModifiers(name)) {
- if(makeActive) {
- card.classList.add(activeCardClass)
- card.querySelector('.modifier-card-image-overlay').innerText = '-'
+ document
+ .querySelector("#editor-modifiers")
+ .querySelectorAll(".modifier-card")
+ .forEach((card) => {
+ const name = card.querySelector(".modifier-card-label").innerText
+ if (
+ trimModifiers(modifierName) == trimModifiers(name) ||
+ trimModifiers(modifierName) == "by " + trimModifiers(name)
+ ) {
+ if (makeActive) {
+ card.classList.add(activeCardClass)
+ card.querySelector(".modifier-card-image-overlay").innerText = "-"
+ } else {
+ card.classList.remove(activeCardClass)
+ card.querySelector(".modifier-card-image-overlay").innerText = "+"
+ }
}
- else{
- card.classList.remove(activeCardClass)
- card.querySelector('.modifier-card-image-overlay').innerText = '+'
- }
- }
- })
+ })
}
function changePreviewImages(val) {
- const previewImages = document.querySelectorAll('.modifier-card-image-container img')
+ const previewImages = document.querySelectorAll(".modifier-card-image-container img")
let previewArr = []
- modifiers.map(x => x.modifiers).forEach(x => previewArr.push(...x.map(m => m.previews)))
-
- previewArr = previewArr.map(x => {
+ modifiers.map((x) => x.modifiers).forEach((x) => previewArr.push(...x.map((m) => m.previews)))
+
+ previewArr = previewArr.map((x) => {
let obj = {}
- x.forEach(preview => {
+ x.forEach((preview) => {
obj[preview.name] = preview.path
})
-
+
return obj
})
- previewImages.forEach(previewImage => {
- const currentPreviewType = previewImage.getAttribute('preview-type')
- const relativePreviewPath = previewImage.src.split(modifierThumbnailPath + '/').pop()
+ previewImages.forEach((previewImage) => {
+ const currentPreviewType = previewImage.getAttribute("preview-type")
+ const relativePreviewPath = previewImage.src.split(modifierThumbnailPath + "/").pop()
- const previews = previewArr.find(preview => relativePreviewPath == preview[currentPreviewType])
+ const previews = previewArr.find((preview) => relativePreviewPath == preview[currentPreviewType])
- if(typeof previews == 'object') {
+ if (typeof previews == "object") {
let preview = null
- if (val == 'portrait') {
+ if (val == "portrait") {
preview = previews.portrait
- }
- else if (val == 'landscape') {
+ } else if (val == "landscape") {
preview = previews.landscape
}
- if(preview != null) {
+ if (preview != null) {
previewImage.src = `${modifierThumbnailPath}/${preview}`
- previewImage.setAttribute('preview-type', val)
+ previewImage.setAttribute("preview-type", val)
}
}
})
}
function resizeModifierCards(val) {
- const cardSizePrefix = 'modifier-card-size_'
- const modifierCardClass = 'modifier-card'
+ const cardSizePrefix = "modifier-card-size_"
+ const modifierCardClass = "modifier-card"
const modifierCards = document.querySelectorAll(`.${modifierCardClass}`)
- const cardSize = n => `${cardSizePrefix}${n}`
+ const cardSize = (n) => `${cardSizePrefix}${n}`
- modifierCards.forEach(card => {
+ modifierCards.forEach((card) => {
// remove existing size classes
- const classes = card.className.split(' ').filter(c => !c.startsWith(cardSizePrefix))
- card.className = classes.join(' ').trim()
+ const classes = card.className.split(" ").filter((c) => !c.startsWith(cardSizePrefix))
+ card.className = classes.join(" ").trim()
- if(val != 0) {
+ if (val != 0) {
card.classList.add(cardSize(val))
}
})
@@ -352,7 +372,7 @@ function resizeModifierCards(val) {
modifierCardSizeSlider.onchange = () => resizeModifierCards(modifierCardSizeSlider.value)
previewImageField.onchange = () => changePreviewImages(previewImageField.value)
-modifierSettingsBtn.addEventListener('click', function(e) {
+modifierSettingsBtn.addEventListener("click", function(e) {
modifierSettingsOverlay.classList.add("active")
customModifiersTextBox.setSelectionRange(0, 0)
customModifiersTextBox.focus()
@@ -360,7 +380,7 @@ modifierSettingsBtn.addEventListener('click', function(e) {
e.stopPropagation()
})
-modifierSettingsOverlay.addEventListener('keydown', function(e) {
+modifierSettingsOverlay.addEventListener("keydown", function(e) {
switch (e.key) {
case "Escape": // Escape to cancel
customModifiersTextBox.value = customModifiersInitialContent // undo the changes
@@ -368,7 +388,8 @@ modifierSettingsOverlay.addEventListener('keydown', function(e) {
e.stopPropagation()
break
case "Enter":
- if (e.ctrlKey) { // Ctrl+Enter to confirm
+ if (e.ctrlKey) {
+ // Ctrl+Enter to confirm
modifierSettingsOverlay.classList.remove("active")
e.stopPropagation()
break
@@ -383,7 +404,7 @@ function saveCustomModifiers() {
}
function loadCustomModifiers() {
- PLUGINS['MODIFIERS_LOAD'].forEach(fn=>fn.loader.call())
+ PLUGINS["MODIFIERS_LOAD"].forEach((fn) => fn.loader.call())
}
-customModifiersTextBox.addEventListener('change', saveCustomModifiers)
+customModifiersTextBox.addEventListener("change", saveCustomModifiers)
diff --git a/ui/media/js/main.js b/ui/media/js/main.js
index 0720b988..2f63650b 100644
--- a/ui/media/js/main.js
+++ b/ui/media/js/main.js
@@ -2,80 +2,97 @@
const MAX_INIT_IMAGE_DIMENSION = 768
const MIN_GPUS_TO_SHOW_SELECTION = 2
-const IMAGE_REGEX = new RegExp('data:image/[A-Za-z]+;base64')
+const IMAGE_REGEX = new RegExp("data:image/[A-Za-z]+;base64")
const htmlTaskMap = new WeakMap()
const taskConfigSetup = {
taskConfig: {
- seed: { value: ({ seed }) => seed, label: 'Seed' },
- dimensions: { value: ({ reqBody }) => `${reqBody?.width}x${reqBody?.height}`, label: 'Dimensions' },
- sampler_name: 'Sampler',
- num_inference_steps: 'Inference Steps',
- guidance_scale: 'Guidance Scale',
- use_stable_diffusion_model: 'Model',
- use_vae_model: { label: 'VAE', visible: ({ reqBody }) => reqBody?.use_vae_model !== undefined && reqBody?.use_vae_model.trim() !== ''},
- negative_prompt: { label: 'Negative Prompt', visible: ({ reqBody }) => reqBody?.negative_prompt !== undefined && reqBody?.negative_prompt.trim() !== ''},
- prompt_strength: 'Prompt Strength',
- use_face_correction: 'Fix Faces',
- upscale: { value: ({ reqBody }) => `${reqBody?.use_upscale} (${reqBody?.upscale_amount || 4}x)`, label: 'Upscale', visible: ({ reqBody }) => !!reqBody?.use_upscale },
- use_hypernetwork_model: 'Hypernetwork',
- hypernetwork_strength: { label: 'Hypernetwork Strength', visible: ({ reqBody }) => !!reqBody?.use_hypernetwork_model },
- use_lora_model: { label: 'Lora Model', visible: ({ reqBody }) => !!reqBody?.use_lora_model },
- lora_alpha: { label: 'Lora Strength', visible: ({ reqBody }) => !!reqBody?.use_lora_model },
- preserve_init_image_color_profile: 'Preserve Color Profile',
+ seed: { value: ({ seed }) => seed, label: "Seed" },
+ dimensions: { value: ({ reqBody }) => `${reqBody?.width}x${reqBody?.height}`, label: "Dimensions" },
+ sampler_name: "Sampler",
+ num_inference_steps: "Inference Steps",
+ guidance_scale: "Guidance Scale",
+ use_stable_diffusion_model: "Model",
+ use_vae_model: {
+ label: "VAE",
+ visible: ({ reqBody }) => reqBody?.use_vae_model !== undefined && reqBody?.use_vae_model.trim() !== ""
+ },
+ negative_prompt: {
+ label: "Negative Prompt",
+ visible: ({ reqBody }) => reqBody?.negative_prompt !== undefined && reqBody?.negative_prompt.trim() !== ""
+ },
+ prompt_strength: "Prompt Strength",
+ use_face_correction: "Fix Faces",
+ upscale: {
+ value: ({ reqBody }) => `${reqBody?.use_upscale} (${reqBody?.upscale_amount || 4}x)`,
+ label: "Upscale",
+ visible: ({ reqBody }) => !!reqBody?.use_upscale
+ },
+ use_hypernetwork_model: "Hypernetwork",
+ hypernetwork_strength: {
+ label: "Hypernetwork Strength",
+ visible: ({ reqBody }) => !!reqBody?.use_hypernetwork_model
+ },
+ use_lora_model: { label: "Lora Model", visible: ({ reqBody }) => !!reqBody?.use_lora_model },
+ lora_alpha: { label: "Lora Strength", visible: ({ reqBody }) => !!reqBody?.use_lora_model },
+ preserve_init_image_color_profile: "Preserve Color Profile"
},
pluginTaskConfig: {},
- getCSSKey: (key) => key.split('_').map((s) => s.charAt(0).toUpperCase() + s.slice(1)).join('')
+ getCSSKey: (key) =>
+ key
+ .split("_")
+ .map((s) => s.charAt(0).toUpperCase() + s.slice(1))
+ .join("")
}
let imageCounter = 0
let imageRequest = []
-let promptField = document.querySelector('#prompt')
-let promptsFromFileSelector = document.querySelector('#prompt_from_file')
-let promptsFromFileBtn = document.querySelector('#promptsFromFileBtn')
-let negativePromptField = document.querySelector('#negative_prompt')
-let numOutputsTotalField = document.querySelector('#num_outputs_total')
-let numOutputsParallelField = document.querySelector('#num_outputs_parallel')
-let numInferenceStepsField = document.querySelector('#num_inference_steps')
-let guidanceScaleSlider = document.querySelector('#guidance_scale_slider')
-let guidanceScaleField = document.querySelector('#guidance_scale')
-let outputQualitySlider = document.querySelector('#output_quality_slider')
-let outputQualityField = document.querySelector('#output_quality')
-let outputQualityRow = document.querySelector('#output_quality_row')
+let promptField = document.querySelector("#prompt")
+let promptsFromFileSelector = document.querySelector("#prompt_from_file")
+let promptsFromFileBtn = document.querySelector("#promptsFromFileBtn")
+let negativePromptField = document.querySelector("#negative_prompt")
+let numOutputsTotalField = document.querySelector("#num_outputs_total")
+let numOutputsParallelField = document.querySelector("#num_outputs_parallel")
+let numInferenceStepsField = document.querySelector("#num_inference_steps")
+let guidanceScaleSlider = document.querySelector("#guidance_scale_slider")
+let guidanceScaleField = document.querySelector("#guidance_scale")
+let outputQualitySlider = document.querySelector("#output_quality_slider")
+let outputQualityField = document.querySelector("#output_quality")
+let outputQualityRow = document.querySelector("#output_quality_row")
let randomSeedField = document.querySelector("#random_seed")
-let seedField = document.querySelector('#seed')
-let widthField = document.querySelector('#width')
-let heightField = document.querySelector('#height')
-let smallImageWarning = document.querySelector('#small_image_warning')
+let seedField = document.querySelector("#seed")
+let widthField = document.querySelector("#width")
+let heightField = document.querySelector("#height")
+let smallImageWarning = document.querySelector("#small_image_warning")
let initImageSelector = document.querySelector("#init_image")
let initImagePreview = document.querySelector("#init_image_preview")
let initImageSizeBox = document.querySelector("#init_image_size_box")
let maskImageSelector = document.querySelector("#mask")
let maskImagePreview = document.querySelector("#mask_preview")
-let applyColorCorrectionField = document.querySelector('#apply_color_correction')
-let colorCorrectionSetting = document.querySelector('#apply_color_correction_setting')
-let promptStrengthSlider = document.querySelector('#prompt_strength_slider')
-let promptStrengthField = document.querySelector('#prompt_strength')
-let samplerField = document.querySelector('#sampler_name')
+let applyColorCorrectionField = document.querySelector("#apply_color_correction")
+let colorCorrectionSetting = document.querySelector("#apply_color_correction_setting")
+let promptStrengthSlider = document.querySelector("#prompt_strength_slider")
+let promptStrengthField = document.querySelector("#prompt_strength")
+let samplerField = document.querySelector("#sampler_name")
let samplerSelectionContainer = document.querySelector("#samplerSelection")
let useFaceCorrectionField = document.querySelector("#use_face_correction")
-let gfpganModelField = new ModelDropdown(document.querySelector("#gfpgan_model"), 'gfpgan')
+let gfpganModelField = new ModelDropdown(document.querySelector("#gfpgan_model"), "gfpgan")
let useUpscalingField = document.querySelector("#use_upscale")
let upscaleModelField = document.querySelector("#upscale_model")
let upscaleAmountField = document.querySelector("#upscale_amount")
-let stableDiffusionModelField = new ModelDropdown(document.querySelector('#stable_diffusion_model'), 'stable-diffusion')
-let vaeModelField = new ModelDropdown(document.querySelector('#vae_model'), 'vae', 'None')
-let hypernetworkModelField = new ModelDropdown(document.querySelector('#hypernetwork_model'), 'hypernetwork', 'None')
-let hypernetworkStrengthSlider = document.querySelector('#hypernetwork_strength_slider')
-let hypernetworkStrengthField = document.querySelector('#hypernetwork_strength')
-let loraModelField = new ModelDropdown(document.querySelector('#lora_model'), 'lora', 'None')
-let loraAlphaSlider = document.querySelector('#lora_alpha_slider')
-let loraAlphaField = document.querySelector('#lora_alpha')
-let outputFormatField = document.querySelector('#output_format')
-let outputLosslessField = document.querySelector('#output_lossless')
-let outputLosslessContainer = document.querySelector('#output_lossless_container')
-let blockNSFWField = document.querySelector('#block_nsfw')
+let stableDiffusionModelField = new ModelDropdown(document.querySelector("#stable_diffusion_model"), "stable-diffusion")
+let vaeModelField = new ModelDropdown(document.querySelector("#vae_model"), "vae", "None")
+let hypernetworkModelField = new ModelDropdown(document.querySelector("#hypernetwork_model"), "hypernetwork", "None")
+let hypernetworkStrengthSlider = document.querySelector("#hypernetwork_strength_slider")
+let hypernetworkStrengthField = document.querySelector("#hypernetwork_strength")
+let loraModelField = new ModelDropdown(document.querySelector("#lora_model"), "lora", "None")
+let loraAlphaSlider = document.querySelector("#lora_alpha_slider")
+let loraAlphaField = document.querySelector("#lora_alpha")
+let outputFormatField = document.querySelector("#output_format")
+let outputLosslessField = document.querySelector("#output_lossless")
+let outputLosslessContainer = document.querySelector("#output_lossless_container")
+let blockNSFWField = document.querySelector("#block_nsfw")
let showOnlyFilteredImageField = document.querySelector("#show_only_filtered_image")
let updateBranchLabel = document.querySelector("#updateBranchLabel")
let streamImageProgressField = document.querySelector("#stream_image_progress")
@@ -83,16 +100,16 @@ let thumbnailSizeField = document.querySelector("#thumbnail_size-input")
let autoscrollBtn = document.querySelector("#auto_scroll_btn")
let autoScroll = document.querySelector("#auto_scroll")
-let makeImageBtn = document.querySelector('#makeImage')
-let stopImageBtn = document.querySelector('#stopImage')
-let pauseBtn = document.querySelector('#pause')
-let resumeBtn = document.querySelector('#resume')
-let renderButtons = document.querySelector('#render-buttons')
+let makeImageBtn = document.querySelector("#makeImage")
+let stopImageBtn = document.querySelector("#stopImage")
+let pauseBtn = document.querySelector("#pause")
+let resumeBtn = document.querySelector("#resume")
+let renderButtons = document.querySelector("#render-buttons")
-let imagesContainer = document.querySelector('#current-images')
-let initImagePreviewContainer = document.querySelector('#init_image_preview_container')
-let initImageClearBtn = document.querySelector('.init_image_clear')
-let promptStrengthContainer = document.querySelector('#prompt_strength_container')
+let imagesContainer = document.querySelector("#current-images")
+let initImagePreviewContainer = document.querySelector("#init_image_preview_container")
+let initImageClearBtn = document.querySelector(".init_image_clear")
+let promptStrengthContainer = document.querySelector("#prompt_strength_container")
let initialText = document.querySelector("#initial-text")
let previewTools = document.querySelector("#preview-tools")
@@ -105,9 +122,9 @@ let saveAllTreeToggle = document.querySelector("#tree_toggle")
let saveAllJSONToggle = document.querySelector("#json_toggle")
let saveAllFoldersOption = document.querySelector("#download-add-folders")
-let maskSetting = document.querySelector('#enable_mask')
+let maskSetting = document.querySelector("#enable_mask")
-const processOrder = document.querySelector('#process_order_toggle')
+const processOrder = document.querySelector("#process_order_toggle")
let imagePreview = document.querySelector("#preview")
let imagePreviewContent = document.querySelector("#preview-content")
@@ -116,8 +133,8 @@ let undoButton = document.querySelector("#undo")
let undoBuffer = []
const UNDO_LIMIT = 20
-imagePreview.addEventListener('drop', function(ev) {
- const data = ev.dataTransfer?.getData("text/plain");
+imagePreview.addEventListener("drop", function(ev) {
+ const data = ev.dataTransfer?.getData("text/plain")
if (!data) {
return
}
@@ -127,7 +144,7 @@ imagePreview.addEventListener('drop', function(ev) {
}
ev.preventDefault()
let moveTarget = ev.target
- while (moveTarget && typeof moveTarget === 'object' && moveTarget.parentNode !== imagePreviewContent) {
+ while (moveTarget && typeof moveTarget === "object" && moveTarget.parentNode !== imagePreviewContent) {
moveTarget = moveTarget.parentNode
}
if (moveTarget === initialText || moveTarget === previewTools) {
@@ -157,16 +174,14 @@ imagePreview.addEventListener('drop', function(ev) {
}
})
-
-
-let showConfigToggle = document.querySelector('#configToggleBtn')
+let showConfigToggle = document.querySelector("#configToggleBtn")
// let configBox = document.querySelector('#config')
// let outputMsg = document.querySelector('#outputMsg')
-let soundToggle = document.querySelector('#sound_toggle')
+let soundToggle = document.querySelector("#sound_toggle")
-let serverStatusColor = document.querySelector('#server-status-color')
-let serverStatusMsg = document.querySelector('#server-status-msg')
+let serverStatusColor = document.querySelector("#server-status-color")
+let serverStatusMsg = document.querySelector("#server-status-msg")
function getLocalStorageBoolItem(key, fallback) {
let item = localStorage.getItem(key)
@@ -174,7 +189,7 @@ function getLocalStorageBoolItem(key, fallback) {
return fallback
}
- return (item === 'true' ? true : false)
+ return item === "true" ? true : false
}
function handleBoolSettingChange(key) {
@@ -197,25 +212,24 @@ function getSavedDiskPath() {
return getSetting("diskPath")
}
-function setStatus(statusType, msg, msgType) {
-}
+function setStatus(statusType, msg, msgType) {}
function setServerStatus(event) {
- switch(event.type) {
- case 'online':
- serverStatusColor.style.color = 'var(--status-green)'
- serverStatusMsg.style.color = 'var(--status-green)'
- serverStatusMsg.innerText = 'Stable Diffusion is ' + event.message
+ switch (event.type) {
+ case "online":
+ serverStatusColor.style.color = "var(--status-green)"
+ serverStatusMsg.style.color = "var(--status-green)"
+ serverStatusMsg.innerText = "Stable Diffusion is " + event.message
break
- case 'busy':
- serverStatusColor.style.color = 'var(--status-orange)'
- serverStatusMsg.style.color = 'var(--status-orange)'
- serverStatusMsg.innerText = 'Stable Diffusion is ' + event.message
+ case "busy":
+ serverStatusColor.style.color = "var(--status-orange)"
+ serverStatusMsg.style.color = "var(--status-orange)"
+ serverStatusMsg.innerText = "Stable Diffusion is " + event.message
break
- case 'error':
- serverStatusColor.style.color = 'var(--status-red)'
- serverStatusMsg.style.color = 'var(--status-red)'
- serverStatusMsg.innerText = 'Stable Diffusion has stopped'
+ case "error":
+ serverStatusColor.style.color = "var(--status-red)"
+ serverStatusMsg.style.color = "var(--status-red)"
+ serverStatusMsg.innerText = "Stable Diffusion has stopped"
break
}
if (SD.serverState.devices) {
@@ -229,37 +243,40 @@ function setServerStatus(event) {
// fn : function to be called if the user confirms the dialog or has the shift key pressed
//
// If the user had the shift key pressed while clicking, the function fn will be executed.
-// If the setting "confirm_dangerous_actions" in the system settings is disabled, the function
+// If the setting "confirm_dangerous_actions" in the system settings is disabled, the function
// fn will be executed.
// Otherwise, a confirmation dialog is shown. If the user confirms, the function fn will also
// be executed.
function shiftOrConfirm(e, prompt, fn) {
e.stopPropagation()
if (e.shiftKey || !confirmDangerousActionsField.checked) {
- fn(e)
+ fn(e)
} else {
$.confirm({
- theme: 'modern',
+ theme: "modern",
title: prompt,
useBootstrap: false,
animateFromElement: false,
- content: 'Tip: To skip this dialog, use shift-click or disable the "Confirm dangerous actions" setting in the Settings tab.',
+ content:
+ 'Tip: To skip this dialog, use shift-click or disable the "Confirm dangerous actions" setting in the Settings tab.',
buttons: {
- yes: () => { fn(e) },
+ yes: () => {
+ fn(e)
+ },
cancel: () => {}
}
- });
+ })
}
}
function logMsg(msg, level, outputMsg) {
if (outputMsg.hasChildNodes()) {
- outputMsg.appendChild(document.createElement('br'))
+ outputMsg.appendChild(document.createElement("br"))
}
- if (level === 'error') {
- outputMsg.innerHTML += 'Error: ' + msg + ''
- } else if (level === 'warn') {
- outputMsg.innerHTML += 'Warning: ' + msg + ''
+ if (level === "error") {
+ outputMsg.innerHTML += 'Error: ' + msg + ""
+ } else if (level === "warn") {
+ outputMsg.innerHTML += 'Warning: ' + msg + ""
} else {
outputMsg.innerText += msg
}
@@ -267,35 +284,45 @@ function logMsg(msg, level, outputMsg) {
}
function logError(msg, res, outputMsg) {
- logMsg(msg, 'error', outputMsg)
+ logMsg(msg, "error", outputMsg)
- console.log('request error', res)
- setStatus('request', 'error', 'error')
+ console.log("request error", res)
+ setStatus("request", "error", "error")
}
function playSound() {
- const audio = new Audio('/media/ding.mp3')
+ const audio = new Audio("/media/ding.mp3")
audio.volume = 0.2
var promise = audio.play()
if (promise !== undefined) {
- promise.then(_ => {}).catch(error => {
- console.warn("browser blocked autoplay")
- })
+ promise
+ .then((_) => {})
+ .catch((error) => {
+ console.warn("browser blocked autoplay")
+ })
}
}
-function undoableRemove(element, doubleUndo=false) {
- let data = { 'element': element, 'parent': element.parentNode, 'prev': element.previousSibling, 'next': element.nextSibling, 'doubleUndo': doubleUndo }
+function undoableRemove(element, doubleUndo = false) {
+ let data = {
+ element: element,
+ parent: element.parentNode,
+ prev: element.previousSibling,
+ next: element.nextSibling,
+ doubleUndo: doubleUndo
+ }
undoBuffer.push(data)
if (undoBuffer.length > UNDO_LIMIT) {
// Remove item from memory and also remove it from the data structures
let item = undoBuffer.shift()
htmlTaskMap.delete(item.element)
- item.element.querySelectorAll('[data-imagecounter]').forEach( (img) => { delete imageRequest[img.dataset['imagecounter']] })
+ item.element.querySelectorAll("[data-imagecounter]").forEach((img) => {
+ delete imageRequest[img.dataset["imagecounter"]]
+ })
}
element.remove()
if (undoBuffer.length != 0) {
- undoButton.classList.remove('displayNone')
+ undoButton.classList.remove("displayNone")
}
}
@@ -313,42 +340,44 @@ function undoRemove() {
undoRemove()
}
if (undoBuffer.length == 0) {
- undoButton.classList.add('displayNone')
+ undoButton.classList.add("displayNone")
}
updateInitialText()
}
-undoButton.addEventListener('click', () => { undoRemove() })
+undoButton.addEventListener("click", () => {
+ undoRemove()
+})
-document.addEventListener('keydown', function(e) {
- if ((e.ctrlKey || e.metaKey) && e.key === 'z' && e.target == document.body) {
+document.addEventListener("keydown", function(e) {
+ if ((e.ctrlKey || e.metaKey) && e.key === "z" && e.target == document.body) {
undoRemove()
}
})
function showImages(reqBody, res, outputContainer, livePreview) {
- let imageItemElements = outputContainer.querySelectorAll('.imgItem')
- if(typeof res != 'object') return
+ let imageItemElements = outputContainer.querySelectorAll(".imgItem")
+ if (typeof res != "object") return
res.output.reverse()
res.output.forEach((result, index) => {
- const imageData = result?.data || result?.path + '?t=' + Date.now(),
+ const imageData = result?.data || result?.path + "?t=" + Date.now(),
imageSeed = result?.seed,
imagePrompt = reqBody.prompt,
imageInferenceSteps = reqBody.num_inference_steps,
imageGuidanceScale = reqBody.guidance_scale,
imageWidth = reqBody.width,
- imageHeight = reqBody.height;
+ imageHeight = reqBody.height
- if (!imageData.includes('/')) {
+ if (!imageData.includes("/")) {
// res contained no data for the image, stop execution
- setStatus('request', 'invalid image', 'error')
+ setStatus("request", "invalid image", "error")
return
}
- let imageItemElem = (index < imageItemElements.length ? imageItemElements[index] : null)
- if(!imageItemElem) {
- imageItemElem = document.createElement('div')
- imageItemElem.className = 'imgItem'
+ let imageItemElem = index < imageItemElements.length ? imageItemElements[index] : null
+ if (!imageItemElem) {
+ imageItemElem = document.createElement("div")
+ imageItemElem.className = "imgItem"
imageItemElem.innerHTML = `
'
+ logError(
+ "Stable Diffusion is still starting up, please wait. If this goes on beyond a few minutes, Stable Diffusion has probably crashed. Please check the error message in the command-line window.",
+ event,
+ outputMsg
+ )
+ } else if (typeof event?.response === "object") {
+ let msg = "Stable Diffusion had an error reading the response:
"
if (this.exception) {
msg += `Error: ${this.exception.message}
`
}
- try { // 'Response': body stream already read
- msg += 'Read: ' + await event.response.text()
- } catch(e) {
- msg += 'Unexpected end of stream. '
+ try {
+ // 'Response': body stream already read
+ msg += "Read: " + (await event.response.text())
+ } catch (e) {
+ msg += "Unexpected end of stream. "
}
const bufferString = event.reader.bufferedString
if (bufferString) {
- msg += 'Buffered data: ' + bufferString
+ msg += "Buffered data: " + bufferString
}
- msg += ''
+ msg += ""
logError(msg, event, outputMsg)
} else {
- let msg = `Unexpected Read Error:Error:${this.exception}
EventInfo: ${JSON.stringify(event, undefined, 4)}`
+ let msg = `Unexpected Read Error:Error:${
+ this.exception
+ }
EventInfo: ${JSON.stringify(event, undefined, 4)}`
logError(msg, event, outputMsg)
}
break
}
}
- if ('update' in event) {
+ if ("update" in event) {
const stepUpdate = event.update
- if (!('step' in stepUpdate)) {
+ if (!("step" in stepUpdate)) {
return
}
// task.instances can be a mix of different tasks with uneven number of steps (Render Vs Filter Tasks)
- const overallStepCount = task.instances.reduce(
- (sum, instance) => sum + (instance.isPending ? Math.max(0, instance.step || stepUpdate.step) / (instance.total_steps || stepUpdate.total_steps) : 1),
- 0 // Initial value
- ) * stepUpdate.total_steps // Scale to current number of steps.
+ const overallStepCount =
+ task.instances.reduce(
+ (sum, instance) =>
+ sum +
+ (instance.isPending
+ ? Math.max(0, instance.step || stepUpdate.step) /
+ (instance.total_steps || stepUpdate.total_steps)
+ : 1),
+ 0 // Initial value
+ ) * stepUpdate.total_steps // Scale to current number of steps.
const totalSteps = task.instances.reduce(
(sum, instance) => sum + (instance.total_steps || stepUpdate.total_steps),
stepUpdate.total_steps * (batchCount - task.batchesDone) // Initial value at (unstarted task count * Nbr of steps)
@@ -757,9 +808,9 @@ function getTaskUpdater(task, reqBody, outputContainer) {
const timeTaken = stepUpdate.step_time // sec
const stepsRemaining = Math.max(0, totalSteps - overallStepCount)
- const timeRemaining = (timeTaken < 0 ? '' : millisecondsToStr(stepsRemaining * timeTaken * 1000))
+ const timeRemaining = timeTaken < 0 ? "" : millisecondsToStr(stepsRemaining * timeTaken * 1000)
outputMsg.innerHTML = `Batch ${task.batchesDone} of ${batchCount}. Generating image(s): ${percent}%. Time remaining (approx): ${timeRemaining}`
- outputMsg.style.display = 'block'
+ outputMsg.style.display = "block"
progressBarInner.style.width = `${percent}%`
if (stepUpdate.output) {
@@ -775,8 +826,8 @@ function abortTask(task) {
}
task.isProcessing = false
task.progressBar.classList.remove("active")
- task['taskStatusLabel'].style.display = 'none'
- task['stopTask'].innerHTML = ' Remove'
+ task["taskStatusLabel"].style.display = "none"
+ task["stopTask"].innerHTML = ' Remove'
if (!task.instances?.some((r) => r.isPending)) {
return
}
@@ -793,24 +844,32 @@ function onTaskErrorHandler(task, reqBody, instance, reason) {
if (!task.isProcessing) {
return
}
- console.log('Render request %o, Instance: %o, Error: %s', reqBody, instance, reason)
+ console.log("Render request %o, Instance: %o, Error: %s", reqBody, instance, reason)
abortTask(task)
- const outputMsg = task['outputMsg']
- logError('Stable Diffusion had an error. Please check the logs in the command-line window. ' + reason + '
' + reason.stack + '', task, outputMsg) - setStatus('request', 'error', 'error') + const outputMsg = task["outputMsg"] + logError( + "Stable Diffusion had an error. Please check the logs in the command-line window.
" + + reason + + "
" + + reason.stack + + "", + task, + outputMsg + ) + setStatus("request", "error", "error") } function onTaskCompleted(task, reqBody, instance, outputContainer, stepUpdate) { - if (typeof stepUpdate === 'object') { - if (stepUpdate.status === 'succeeded') { + if (typeof stepUpdate === "object") { + if (stepUpdate.status === "succeeded") { showImages(reqBody, stepUpdate, outputContainer, false) } else { task.isProcessing = false - const outputMsg = task['outputMsg'] - let msg = '' - if ('detail' in stepUpdate && typeof stepUpdate.detail === 'string' && stepUpdate.detail.length > 0) { + const outputMsg = task["outputMsg"] + let msg = "" + if ("detail" in stepUpdate && typeof stepUpdate.detail === "string" && stepUpdate.detail.length > 0) { msg = stepUpdate.detail - if (msg.toLowerCase().includes('out of memory')) { + if (msg.toLowerCase().includes("out of memory")) { msg += `
Suggestions:
@@ -825,29 +884,29 @@ function onTaskCompleted(task, reqBody, instance, outputContainer, stepUpdate) { } } if (task.isProcessing && task.batchesDone < task.batchCount) { - task['taskStatusLabel'].innerText = "Pending" - task['taskStatusLabel'].classList.add('waitingTaskLabel') - task['taskStatusLabel'].classList.remove('activeTaskLabel') + task["taskStatusLabel"].innerText = "Pending" + task["taskStatusLabel"].classList.add("waitingTaskLabel") + task["taskStatusLabel"].classList.remove("activeTaskLabel") return } - if ('instances' in task && task.instances.some((ins) => ins != instance && ins.isPending)) { + if ("instances" in task && task.instances.some((ins) => ins != instance && ins.isPending)) { return } task.isProcessing = false - task['stopTask'].innerHTML = ' Remove' - task['taskStatusLabel'].style.display = 'none' + task["stopTask"].innerHTML = ' Remove' + task["taskStatusLabel"].style.display = "none" - let time = millisecondsToStr( Date.now() - task.startTime ) + let time = millisecondsToStr(Date.now() - task.startTime) if (task.batchesDone == task.batchCount) { - if (!task.outputMsg.innerText.toLowerCase().includes('error')) { + if (!task.outputMsg.innerText.toLowerCase().includes("error")) { task.outputMsg.innerText = `Processed ${task.numOutputsTotal} images in ${time}` } task.progressBar.style.height = "0px" task.progressBar.style.border = "0px solid var(--background-color3)" task.progressBar.classList.remove("active") - setStatus('request', 'done', 'success') + setStatus("request", "done", "success") } else { task.outputMsg.innerText += `. Task ended after ${time}` } @@ -864,10 +923,10 @@ function onTaskCompleted(task, reqBody, instance, outputContainer, stepUpdate) { return } - if (pauseClient) { - resumeBtn.click() + if (pauseClient) { + resumeBtn.click() } - renderButtons.style.display = 'none' + renderButtons.style.display = "none" renameMakeImageButton() if (isSoundEnabled()) { @@ -875,39 +934,40 @@ function onTaskCompleted(task, reqBody, instance, outputContainer, stepUpdate) { } } - async function onTaskStart(task) { if (!task.isProcessing || task.batchesDone >= task.batchCount) { return } - if (typeof task.startTime !== 'number') { + if (typeof task.startTime !== "number") { task.startTime = Date.now() } - if (!('instances' in task)) { - task['instances'] = [] + if (!("instances" in task)) { + task["instances"] = [] } - task['stopTask'].innerHTML = ' Stop' - task['taskStatusLabel'].innerText = "Starting" - task['taskStatusLabel'].classList.add('waitingTaskLabel') + task["stopTask"].innerHTML = ' Stop' + task["taskStatusLabel"].innerText = "Starting" + task["taskStatusLabel"].classList.add("waitingTaskLabel") let newTaskReqBody = task.reqBody if (task.batchCount > 1) { // Each output render batch needs it's own task reqBody instance to avoid altering the other runs after they are completed. newTaskReqBody = Object.assign({}, task.reqBody) - if (task.batchesDone == task.batchCount-1) { + if (task.batchesDone == task.batchCount - 1) { // Last batch of the task // If the number of parallel jobs is no factor of the total number of images, the last batch must create less than "parallel jobs count" images // E.g. with numOutputsTotal = 6 and num_outputs = 5, the last batch shall only generate 1 image. - newTaskReqBody.num_outputs = task.numOutputsTotal - task.reqBody.num_outputs * (task.batchCount-1) + newTaskReqBody.num_outputs = task.numOutputsTotal - task.reqBody.num_outputs * (task.batchCount - 1) } } const startSeed = task.seed || newTaskReqBody.seed - const genSeeds = Boolean(typeof newTaskReqBody.seed !== 'number' || (newTaskReqBody.seed === task.seed && task.numOutputsTotal > 1)) + const genSeeds = Boolean( + typeof newTaskReqBody.seed !== "number" || (newTaskReqBody.seed === task.seed && task.numOutputsTotal > 1) + ) if (genSeeds) { - newTaskReqBody.seed = parseInt(startSeed) + (task.batchesDone * task.reqBody.num_outputs) + newTaskReqBody.seed = parseInt(startSeed) + task.batchesDone * task.reqBody.num_outputs } // Update the seed *before* starting the processing so it's retained if user stops the task @@ -915,15 +975,15 @@ async function onTaskStart(task) { seedField.value = task.seed } - const outputContainer = document.createElement('div') - outputContainer.className = 'img-batch' + const outputContainer = document.createElement("div") + outputContainer.className = "img-batch" task.outputContainer.insertBefore(outputContainer, task.outputContainer.firstChild) - const eventInfo = {reqBody:newTaskReqBody} - const callbacksPromises = PLUGINS['TASK_CREATE'].map((hook) => { - if (typeof hook !== 'function') { - console.error('The provided TASK_CREATE hook is not a function. Hook: %o', hook) - return Promise.reject(new Error('hook is not a function.')) + const eventInfo = { reqBody: newTaskReqBody } + const callbacksPromises = PLUGINS["TASK_CREATE"].map((hook) => { + if (typeof hook !== "function") { + console.error("The provided TASK_CREATE hook is not a function. Hook: %o", hook) + return Promise.reject(new Error("hook is not a function.")) } try { return Promise.resolve(hook.call(task, eventInfo)) @@ -940,12 +1000,16 @@ async function onTaskStart(task) { instance = await Promise.resolve(factory(eventInfo.reqBody || newTaskReqBody)) } if (!instance) { - console.error(`${factory ? "Factory " + String(factory) : 'No factory defined'} for output format ${eventInfo.reqBody?.output_format || newTaskReqBody.output_format}. Instance is ${instance || 'undefined'}. Using default renderer.`) + console.error( + `${factory ? "Factory " + String(factory) : "No factory defined"} for output format ${eventInfo.reqBody + ?.output_format || newTaskReqBody.output_format}. Instance is ${instance || + "undefined"}. Using default renderer.` + ) instance = new SD.RenderTask(eventInfo.reqBody || newTaskReqBody) } } - task['instances'].push(instance) + task["instances"].push(instance) task.batchesDone++ instance.enqueue(getTaskUpdater(task, newTaskReqBody, outputContainer)).then( @@ -957,49 +1021,49 @@ async function onTaskStart(task) { } ) - setStatus('request', 'fetching..') - renderButtons.style.display = 'flex' + setStatus("request", "fetching..") + renderButtons.style.display = "flex" renameMakeImageButton() updateInitialText() } /* Hover effect for the init image in the task list */ function createInitImageHover(taskEntry) { - var $tooltip = $( taskEntry.querySelector('.task-fs-initimage') ) - var img = document.createElement('img') - img.src = taskEntry.querySelector('div.task-initimg > img').src + var $tooltip = $(taskEntry.querySelector(".task-fs-initimage")) + var img = document.createElement("img") + img.src = taskEntry.querySelector("div.task-initimg > img").src $tooltip.append(img) $tooltip.append(``) - $tooltip.find('button').on('click', (e) => { + $tooltip.find("button").on("click", (e) => { e.stopPropagation() - onUseAsInputClick(null,img) + onUseAsInputClick(null, img) }) } -let startX, startY; +let startX, startY function onTaskEntryDragOver(event) { - imagePreview.querySelectorAll(".imageTaskContainer").forEach(itc => { - if(itc != event.target.closest(".imageTaskContainer")){ - itc.classList.remove('dropTargetBefore','dropTargetAfter'); + imagePreview.querySelectorAll(".imageTaskContainer").forEach((itc) => { + if (itc != event.target.closest(".imageTaskContainer")) { + itc.classList.remove("dropTargetBefore", "dropTargetAfter") } - }); - if(event.target.closest(".imageTaskContainer")){ - if(startX && startY){ - if(event.target.closest(".imageTaskContainer").offsetTop > startY){ - event.target.closest(".imageTaskContainer").classList.add('dropTargetAfter'); - }else if(event.target.closest(".imageTaskContainer").offsetTop < startY){ - event.target.closest(".imageTaskContainer").classList.add('dropTargetBefore'); - }else if (event.target.closest(".imageTaskContainer").offsetLeft > startX){ - event.target.closest(".imageTaskContainer").classList.add('dropTargetAfter'); - }else if (event.target.closest(".imageTaskContainer").offsetLeft < startX){ - event.target.closest(".imageTaskContainer").classList.add('dropTargetBefore'); + }) + if (event.target.closest(".imageTaskContainer")) { + if (startX && startY) { + if (event.target.closest(".imageTaskContainer").offsetTop > startY) { + event.target.closest(".imageTaskContainer").classList.add("dropTargetAfter") + } else if (event.target.closest(".imageTaskContainer").offsetTop < startY) { + event.target.closest(".imageTaskContainer").classList.add("dropTargetBefore") + } else if (event.target.closest(".imageTaskContainer").offsetLeft > startX) { + event.target.closest(".imageTaskContainer").classList.add("dropTargetAfter") + } else if (event.target.closest(".imageTaskContainer").offsetLeft < startX) { + event.target.closest(".imageTaskContainer").classList.add("dropTargetBefore") } } } } function generateConfig({ label, value, visible, cssKey }) { - if (!visible) return null; + if (!visible) return null return `
${label}: ${value}`
}
@@ -1014,27 +1078,27 @@ function getVisibleConfig(config, task) {
return { label, visible, value, cssKey }
})
.map((obj) => generateConfig(obj))
- .filter(obj => obj)
+ .filter((obj) => obj)
}
function createTaskConfig(task) {
- return getVisibleConfig(taskConfigSetup, task).join(',
')
+ return getVisibleConfig(taskConfigSetup, task).join(", ")
}
function createTask(task) {
- let taskConfig = ''
+ let taskConfig = ""
if (task.reqBody.init_image !== undefined) {
let h = 80
- let w = task.reqBody.width * h / task.reqBody.height >>0
+ let w = ((task.reqBody.width * h) / task.reqBody.height) >> 0
taskConfig += `${createTaskConfig(task)}
`;
+ taskConfig += `${createTaskConfig(task)}
`
- let taskEntry = document.createElement('div')
+ let taskEntry = document.createElement("div")
taskEntry.id = `imageTaskContainer-${Date.now()}`
- taskEntry.className = 'imageTaskContainer'
+ taskEntry.className = "imageTaskContainer"
taskEntry.innerHTML = ` Enqueued
@@ -1051,46 +1115,49 @@ function createTask(task) {
createCollapsibles(taskEntry)
- let draghandle = taskEntry.querySelector('.drag-handle')
- draghandle.addEventListener('mousedown', (e) => {
- taskEntry.setAttribute('draggable', true)
+ let draghandle = taskEntry.querySelector(".drag-handle")
+ draghandle.addEventListener("mousedown", (e) => {
+ taskEntry.setAttribute("draggable", true)
})
// Add a debounce delay to allow mobile to bouble tap.
- draghandle.addEventListener('mouseup', debounce((e) => {
- taskEntry.setAttribute('draggable', false)
- }, 2000))
- draghandle.addEventListener('click', (e) => {
+ draghandle.addEventListener(
+ "mouseup",
+ debounce((e) => {
+ taskEntry.setAttribute("draggable", false)
+ }, 2000)
+ )
+ draghandle.addEventListener("click", (e) => {
e.preventDefault() // Don't allow the results to be collapsed...
})
- taskEntry.addEventListener('dragend', (e) => {
- taskEntry.setAttribute('draggable', false);
- imagePreview.querySelectorAll(".imageTaskContainer").forEach(itc => {
- itc.classList.remove('dropTargetBefore','dropTargetAfter');
- });
- imagePreview.removeEventListener("dragover", onTaskEntryDragOver );
+ taskEntry.addEventListener("dragend", (e) => {
+ taskEntry.setAttribute("draggable", false)
+ imagePreview.querySelectorAll(".imageTaskContainer").forEach((itc) => {
+ itc.classList.remove("dropTargetBefore", "dropTargetAfter")
+ })
+ imagePreview.removeEventListener("dragover", onTaskEntryDragOver)
})
- taskEntry.addEventListener('dragstart', function(e) {
- imagePreview.addEventListener("dragover", onTaskEntryDragOver );
- e.dataTransfer.setData("text/plain", taskEntry.id);
- startX = e.target.closest(".imageTaskContainer").offsetLeft;
- startY = e.target.closest(".imageTaskContainer").offsetTop;
+ taskEntry.addEventListener("dragstart", function(e) {
+ imagePreview.addEventListener("dragover", onTaskEntryDragOver)
+ e.dataTransfer.setData("text/plain", taskEntry.id)
+ startX = e.target.closest(".imageTaskContainer").offsetLeft
+ startY = e.target.closest(".imageTaskContainer").offsetTop
})
if (task.reqBody.init_image !== undefined) {
createInitImageHover(taskEntry)
}
- task['taskStatusLabel'] = taskEntry.querySelector('.taskStatusLabel')
- task['outputContainer'] = taskEntry.querySelector('.img-preview')
- task['outputMsg'] = taskEntry.querySelector('.outputMsg')
- task['previewPrompt'] = taskEntry.querySelector('.preview-prompt')
- task['progressBar'] = taskEntry.querySelector('.progress-bar')
- task['stopTask'] = taskEntry.querySelector('.stopTask')
+ task["taskStatusLabel"] = taskEntry.querySelector(".taskStatusLabel")
+ task["outputContainer"] = taskEntry.querySelector(".img-preview")
+ task["outputMsg"] = taskEntry.querySelector(".outputMsg")
+ task["previewPrompt"] = taskEntry.querySelector(".preview-prompt")
+ task["progressBar"] = taskEntry.querySelector(".progress-bar")
+ task["stopTask"] = taskEntry.querySelector(".stopTask")
- task['stopTask'].addEventListener('click', (e) => {
+ task["stopTask"].addEventListener("click", (e) => {
e.stopPropagation()
- if (task['isProcessing']) {
+ if (task["isProcessing"]) {
shiftOrConfirm(e, "Stop this task?", async function(e) {
if (task.batchesDone <= 0 || !task.isProcessing) {
removeTask(taskEntry)
@@ -1102,8 +1169,8 @@ function createTask(task) {
}
})
- task['useSettings'] = taskEntry.querySelector('.useSettings')
- task['useSettings'].addEventListener('click', function(e) {
+ task["useSettings"] = taskEntry.querySelector(".useSettings")
+ task["useSettings"].addEventListener("click", function(e) {
e.stopPropagation()
restoreTaskToUI(task, TASK_REQ_NO_EXPORT)
})
@@ -1113,8 +1180,8 @@ function createTask(task) {
htmlTaskMap.set(taskEntry, task)
task.previewPrompt.innerText = task.reqBody.prompt
- if (task.previewPrompt.innerText.trim() === '') {
- task.previewPrompt.innerHTML = ' ' // allows the results to be collapsed
+ if (task.previewPrompt.innerText.trim() === "") {
+ task.previewPrompt.innerHTML = " " // allows the results to be collapsed
}
return taskEntry.id
}
@@ -1122,7 +1189,7 @@ function createTask(task) {
function getCurrentUserRequest() {
const numOutputsTotal = parseInt(numOutputsTotalField.value)
const numOutputsParallel = parseInt(numOutputsParallelField.value)
- const seed = (randomSeedField.checked ? Math.floor(Math.random() * (2**32 - 1)) : parseInt(seedField.value))
+ const seed = randomSeedField.checked ? Math.floor(Math.random() * (2 ** 32 - 1)) : parseInt(seedField.value)
const newTask = {
batchesDone: 0,
@@ -1145,7 +1212,7 @@ function getCurrentUserRequest() {
use_stable_diffusion_model: stableDiffusionModelField.value,
use_vae_model: vaeModelField.value,
stream_progress_updates: true,
- stream_image_progress: (numOutputsTotal > 50 ? false : streamImageProgressField.checked),
+ stream_image_progress: numOutputsTotal > 50 ? false : streamImageProgressField.checked,
show_only_filtered_image: showOnlyFilteredImageField.checked,
block_nsfw: blockNSFWField.checked,
output_format: outputFormatField.value,
@@ -1153,8 +1220,8 @@ function getCurrentUserRequest() {
output_lossless: outputLosslessField.checked,
metadata_output_format: metadataOutputFormatField.value,
original_prompt: promptField.value,
- active_tags: (activeTags.map(x => x.name)),
- inactive_tags: (activeTags.filter(tag => tag.inactive === true).map(x => x.name))
+ active_tags: activeTags.map((x) => x.name),
+ inactive_tags: activeTags.filter((tag) => tag.inactive === true).map((x) => x.name)
}
}
if (IMAGE_REGEX.test(initImagePreview.src)) {
@@ -1168,10 +1235,10 @@ function getCurrentUserRequest() {
}
newTask.reqBody.preserve_init_image_color_profile = applyColorCorrectionField.checked
if (!testDiffusers.checked) {
- newTask.reqBody.sampler_name = 'ddim'
+ newTask.reqBody.sampler_name = "ddim"
}
}
- if (saveToDiskField.checked && diskPathField.value.trim() !== '') {
+ if (saveToDiskField.checked && diskPathField.value.trim() !== "") {
newTask.reqBody.save_to_disk_path = diskPathField.value.trim()
}
if (useFaceCorrectionField.checked) {
@@ -1193,30 +1260,28 @@ function getCurrentUserRequest() {
}
function getPrompts(prompts) {
- if (typeof prompts === 'undefined') {
+ if (typeof prompts === "undefined") {
prompts = promptField.value
}
- if (prompts.trim() === '' && activeTags.length === 0) {
- return ['']
+ if (prompts.trim() === "" && activeTags.length === 0) {
+ return [""]
}
let promptsToMake = []
- if (prompts.trim() !== '') {
- prompts = prompts.split('\n')
- prompts = prompts.map(prompt => prompt.trim())
- prompts = prompts.filter(prompt => prompt !== '')
-
+ if (prompts.trim() !== "") {
+ prompts = prompts.split("\n")
+ prompts = prompts.map((prompt) => prompt.trim())
+ prompts = prompts.filter((prompt) => prompt !== "")
+
promptsToMake = applyPermuteOperator(prompts)
promptsToMake = applySetOperator(promptsToMake)
}
- const newTags = activeTags.filter(tag => tag.inactive === undefined || tag.inactive === false)
+ const newTags = activeTags.filter((tag) => tag.inactive === undefined || tag.inactive === false)
if (newTags.length > 0) {
- const promptTags = newTags.map(x => x.name).join(", ")
+ const promptTags = newTags.map((x) => x.name).join(", ")
if (promptsToMake.length > 0) {
promptsToMake = promptsToMake.map((prompt) => `${prompt}, ${promptTags}`)
- }
- else
- {
+ } else {
promptsToMake.push(promptTags)
}
}
@@ -1224,7 +1289,9 @@ function getPrompts(prompts) {
promptsToMake = applyPermuteOperator(promptsToMake)
promptsToMake = applySetOperator(promptsToMake)
- PLUGINS['GET_PROMPTS_HOOK'].forEach(fn => { promptsToMake = fn(promptsToMake) })
+ PLUGINS["GET_PROMPTS_HOOK"].forEach((fn) => {
+ promptsToMake = fn(promptsToMake)
+ })
return promptsToMake
}
@@ -1232,7 +1299,7 @@ function getPrompts(prompts) {
function applySetOperator(prompts) {
let promptsToMake = []
let braceExpander = new BraceExpander()
- prompts.forEach(prompt => {
+ prompts.forEach((prompt) => {
let expandedPrompts = braceExpander.expand(prompt)
promptsToMake = promptsToMake.concat(expandedPrompts)
})
@@ -1242,13 +1309,13 @@ function applySetOperator(prompts) {
function applyPermuteOperator(prompts) {
let promptsToMake = []
- prompts.forEach(prompt => {
- let promptMatrix = prompt.split('|')
+ prompts.forEach((prompt) => {
+ let promptMatrix = prompt.split("|")
prompt = promptMatrix.shift().trim()
promptsToMake.push(prompt)
- promptMatrix = promptMatrix.map(p => p.trim())
- promptMatrix = promptMatrix.filter(p => p !== '')
+ promptMatrix = promptMatrix.map((p) => p.trim())
+ promptMatrix = promptMatrix.filter((p) => p !== "")
if (promptMatrix.length > 0) {
let promptPermutations = permutePrompts(prompt, promptMatrix)
@@ -1262,16 +1329,16 @@ function applyPermuteOperator(prompts) {
function permutePrompts(promptBase, promptMatrix) {
let prompts = []
let permutations = permute(promptMatrix)
- permutations.forEach(perm => {
+ permutations.forEach((perm) => {
let prompt = promptBase
if (perm.length > 0) {
- let promptAddition = perm.join(', ')
- if (promptAddition.trim() === '') {
+ let promptAddition = perm.join(", ")
+ if (promptAddition.trim() === "") {
return
}
- prompt += ', ' + promptAddition
+ prompt += ", " + promptAddition
}
prompts.push(prompt)
@@ -1283,9 +1350,8 @@ function permutePrompts(promptBase, promptMatrix) {
// create a file name with embedded prompt and metadata
// for easier cateloging and comparison
function createFileName(prompt, seed, steps, guidance, outputFormat) {
-
// Most important information is the prompt
- let underscoreName = prompt.replace(/[^a-zA-Z0-9]/g, '_')
+ let underscoreName = prompt.replace(/[^a-zA-Z0-9]/g, "_")
underscoreName = underscoreName.substring(0, 70)
// name and the top level metadata
@@ -1296,9 +1362,9 @@ function createFileName(prompt, seed, steps, guidance, outputFormat) {
async function stopAllTasks() {
getUncompletedTaskEntries().forEach((taskEntry) => {
- const taskStatusLabel = taskEntry.querySelector('.taskStatusLabel')
+ const taskStatusLabel = taskEntry.querySelector(".taskStatusLabel")
if (taskStatusLabel) {
- taskStatusLabel.style.display = 'none'
+ taskStatusLabel.style.display = "none"
}
const task = htmlTaskMap.get(taskEntry)
if (!task) {
@@ -1309,16 +1375,16 @@ async function stopAllTasks() {
}
function updateInitialText() {
- if (document.querySelector('.imageTaskContainer') === null) {
+ if (document.querySelector(".imageTaskContainer") === null) {
if (undoBuffer.length > 0) {
initialText.prepend(undoButton)
}
- previewTools.classList.add('displayNone')
- initialText.classList.remove('displayNone')
+ previewTools.classList.add("displayNone")
+ initialText.classList.remove("displayNone")
} else {
- initialText.classList.add('displayNone')
- previewTools.classList.remove('displayNone')
- document.querySelector('div.display-settings').prepend(undoButton)
+ initialText.classList.add("displayNone")
+ previewTools.classList.remove("displayNone")
+ document.querySelector("div.display-settings").prepend(undoButton)
}
}
@@ -1327,30 +1393,37 @@ function removeTask(taskToRemove) {
updateInitialText()
}
-clearAllPreviewsBtn.addEventListener('click', (e) => { shiftOrConfirm(e, "Clear all the results and tasks in this window?", async function() {
- await stopAllTasks()
+clearAllPreviewsBtn.addEventListener("click", (e) => {
+ shiftOrConfirm(e, "Clear all the results and tasks in this window?", async function() {
+ await stopAllTasks()
- let taskEntries = document.querySelectorAll('.imageTaskContainer')
- taskEntries.forEach(removeTask)
-})})
+ let taskEntries = document.querySelectorAll(".imageTaskContainer")
+ taskEntries.forEach(removeTask)
+ })
+})
/* Download images popup */
-showDownloadPopupBtn.addEventListener("click", (e) => { saveAllImagesPopup.classList.add("active") })
+showDownloadPopupBtn.addEventListener("click", (e) => {
+ saveAllImagesPopup.classList.add("active")
+})
-saveAllZipToggle.addEventListener('change', (e) => {
+saveAllZipToggle.addEventListener("change", (e) => {
if (saveAllZipToggle.checked) {
- saveAllFoldersOption.classList.remove('displayNone')
+ saveAllFoldersOption.classList.remove("displayNone")
} else {
- saveAllFoldersOption.classList.add('displayNone')
+ saveAllFoldersOption.classList.add("displayNone")
}
})
// convert base64 to raw binary data held in a string
function dataURItoBlob(dataURI) {
- var byteString = atob(dataURI.split(',')[1])
+ var byteString = atob(dataURI.split(",")[1])
// separate out the mime component
- var mimeString = dataURI.split(',')[0].split(':')[1].split(';')[0]
+ var mimeString = dataURI
+ .split(",")[0]
+ .split(":")[1]
+ .split(";")[0]
// write the bytes of the string to an ArrayBuffer
var ab = new ArrayBuffer(byteString.length)
@@ -1364,97 +1437,112 @@ function dataURItoBlob(dataURI) {
}
// write the ArrayBuffer to a blob, and you're done
- return new Blob([ab], {type: mimeString})
+ return new Blob([ab], { type: mimeString })
}
function downloadAllImages() {
let i = 0
- let optZIP = saveAllZipToggle.checked
+ let optZIP = saveAllZipToggle.checked
let optTree = optZIP && saveAllTreeToggle.checked
let optJSON = saveAllJSONToggle.checked
-
+
let zip = new JSZip()
let folder = zip
- document.querySelectorAll(".imageTaskContainer").forEach(container => {
+ document.querySelectorAll(".imageTaskContainer").forEach((container) => {
if (optTree) {
- let name = ++i + '-' + container.querySelector('.preview-prompt').textContent.replace(/[^a-zA-Z0-9]/g, '_').substring(0,25)
+ let name =
+ ++i +
+ "-" +
+ container
+ .querySelector(".preview-prompt")
+ .textContent.replace(/[^a-zA-Z0-9]/g, "_")
+ .substring(0, 25)
folder = zip.folder(name)
}
- container.querySelectorAll(".imgContainer img").forEach(img => {
- let imgItem = img.closest('.imgItem')
+ container.querySelectorAll(".imgContainer img").forEach((img) => {
+ let imgItem = img.closest(".imgItem")
- if (imgItem.style.display === 'none') {
+ if (imgItem.style.display === "none") {
return
}
- let req = imageRequest[img.dataset['imagecounter']]
+ let req = imageRequest[img.dataset["imagecounter"]]
if (optZIP) {
- let suffix = img.dataset['imagecounter'] + '.' + req['output_format']
+ let suffix = img.dataset["imagecounter"] + "." + req["output_format"]
folder.file(getDownloadFilename(img, suffix), dataURItoBlob(img.src))
if (optJSON) {
- suffix = img.dataset['imagecounter'] + '.json'
+ suffix = img.dataset["imagecounter"] + ".json"
folder.file(getDownloadFilename(img, suffix), JSON.stringify(req, null, 2))
}
} else {
- setTimeout(() => {imgItem.querySelector('.download-img').click()}, i*200)
- i = i+1
+ setTimeout(() => {
+ imgItem.querySelector(".download-img").click()
+ }, i * 200)
+ i = i + 1
if (optJSON) {
- setTimeout(() => {imgItem.querySelector('.download-json').click()}, i*200)
- i = i+1
+ setTimeout(() => {
+ imgItem.querySelector(".download-json").click()
+ }, i * 200)
+ i = i + 1
}
}
})
})
if (optZIP) {
- let now = Date.now().toString(36).toUpperCase()
- zip.generateAsync({type:"blob"}).then(function (blob) {
- saveAs(blob, `EasyDiffusion-Images-${now}.zip`);
+ let now = Date.now()
+ .toString(36)
+ .toUpperCase()
+ zip.generateAsync({ type: "blob" }).then(function(blob) {
+ saveAs(blob, `EasyDiffusion-Images-${now}.zip`)
})
}
+}
-}
+saveAllImagesBtn.addEventListener("click", (e) => {
+ downloadAllImages()
+})
-saveAllImagesBtn.addEventListener('click', (e) => { downloadAllImages() })
+stopImageBtn.addEventListener("click", (e) => {
+ shiftOrConfirm(e, "Stop all the tasks?", async function(e) {
+ await stopAllTasks()
+ })
+})
-stopImageBtn.addEventListener('click', (e) => { shiftOrConfirm(e, "Stop all the tasks?", async function(e) {
- await stopAllTasks()
-})})
-
-widthField.addEventListener('change', onDimensionChange)
-heightField.addEventListener('change', onDimensionChange)
+widthField.addEventListener("change", onDimensionChange)
+heightField.addEventListener("change", onDimensionChange)
function renameMakeImageButton() {
- let totalImages = Math.max(parseInt(numOutputsTotalField.value), parseInt(numOutputsParallelField.value)) * getPrompts().length
- let imageLabel = 'Image'
+ let totalImages =
+ Math.max(parseInt(numOutputsTotalField.value), parseInt(numOutputsParallelField.value)) * getPrompts().length
+ let imageLabel = "Image"
if (totalImages > 1) {
- imageLabel = totalImages + ' Images'
+ imageLabel = totalImages + " Images"
}
if (SD.activeTasks.size == 0) {
- makeImageBtn.innerText = 'Make ' + imageLabel
+ makeImageBtn.innerText = "Make " + imageLabel
} else {
- makeImageBtn.innerText = 'Enqueue Next ' + imageLabel
+ makeImageBtn.innerText = "Enqueue Next " + imageLabel
}
}
-numOutputsTotalField.addEventListener('change', renameMakeImageButton)
-numOutputsTotalField.addEventListener('keyup', debounce(renameMakeImageButton, 300))
-numOutputsParallelField.addEventListener('change', renameMakeImageButton)
-numOutputsParallelField.addEventListener('keyup', debounce(renameMakeImageButton, 300))
+numOutputsTotalField.addEventListener("change", renameMakeImageButton)
+numOutputsTotalField.addEventListener("keyup", debounce(renameMakeImageButton, 300))
+numOutputsParallelField.addEventListener("change", renameMakeImageButton)
+numOutputsParallelField.addEventListener("keyup", debounce(renameMakeImageButton, 300))
function onDimensionChange() {
let widthValue = parseInt(widthField.value)
let heightValue = parseInt(heightField.value)
if (!initImagePreviewContainer.classList.contains("has-image")) {
imageEditor.setImage(null, widthValue, heightValue)
- }
- else {
+ } else {
imageInpainter.setImage(initImagePreview.src, widthValue, heightValue)
}
- if ( widthValue < 512 && heightValue < 512 ) {
- smallImageWarning.classList.remove('displayNone')
+ if (widthValue < 512 && heightValue < 512) {
+ smallImageWarning.classList.remove("displayNone")
} else {
- smallImageWarning.classList.add('displayNone')
+ smallImageWarning.classList.add("displayNone")
}
}
@@ -1462,21 +1550,21 @@ diskPathField.disabled = !saveToDiskField.checked
metadataOutputFormatField.disabled = !saveToDiskField.checked
gfpganModelField.disabled = !useFaceCorrectionField.checked
-useFaceCorrectionField.addEventListener('change', function(e) {
+useFaceCorrectionField.addEventListener("change", function(e) {
gfpganModelField.disabled = !this.checked
})
upscaleModelField.disabled = !useUpscalingField.checked
upscaleAmountField.disabled = !useUpscalingField.checked
-useUpscalingField.addEventListener('change', function(e) {
+useUpscalingField.addEventListener("change", function(e) {
upscaleModelField.disabled = !this.checked
upscaleAmountField.disabled = !this.checked
})
-makeImageBtn.addEventListener('click', makeImage)
+makeImageBtn.addEventListener("click", makeImage)
document.onkeydown = function(e) {
- if (e.ctrlKey && e.code === 'Enter') {
+ if (e.ctrlKey && e.code === "Enter") {
makeImage()
e.preventDefault()
}
@@ -1499,8 +1587,8 @@ function updateGuidanceScaleSlider() {
guidanceScaleSlider.dispatchEvent(new Event("change"))
}
-guidanceScaleSlider.addEventListener('input', updateGuidanceScale)
-guidanceScaleField.addEventListener('input', updateGuidanceScaleSlider)
+guidanceScaleSlider.addEventListener("input", updateGuidanceScale)
+guidanceScaleField.addEventListener("input", updateGuidanceScaleSlider)
updateGuidanceScale()
/********************* Prompt Strength *******************/
@@ -1520,8 +1608,8 @@ function updatePromptStrengthSlider() {
promptStrengthSlider.dispatchEvent(new Event("change"))
}
-promptStrengthSlider.addEventListener('input', updatePromptStrength)
-promptStrengthField.addEventListener('input', updatePromptStrengthSlider)
+promptStrengthSlider.addEventListener("input", updatePromptStrength)
+promptStrengthField.addEventListener("input", updatePromptStrengthSlider)
updatePromptStrength()
/********************* Hypernetwork Strength **********************/
@@ -1541,14 +1629,15 @@ function updateHypernetworkStrengthSlider() {
hypernetworkStrengthSlider.dispatchEvent(new Event("change"))
}
-hypernetworkStrengthSlider.addEventListener('input', updateHypernetworkStrength)
-hypernetworkStrengthField.addEventListener('input', updateHypernetworkStrengthSlider)
+hypernetworkStrengthSlider.addEventListener("input", updateHypernetworkStrength)
+hypernetworkStrengthField.addEventListener("input", updateHypernetworkStrengthSlider)
updateHypernetworkStrength()
function updateHypernetworkStrengthContainer() {
- document.querySelector("#hypernetwork_strength_container").style.display = (hypernetworkModelField.value === "" ? 'none' : '')
+ document.querySelector("#hypernetwork_strength_container").style.display =
+ hypernetworkModelField.value === "" ? "none" : ""
}
-hypernetworkModelField.addEventListener('change', updateHypernetworkStrengthContainer)
+hypernetworkModelField.addEventListener("change", updateHypernetworkStrengthContainer)
updateHypernetworkStrengthContainer()
/********************* LoRA alpha **********************/
@@ -1568,19 +1657,19 @@ function updateLoraAlphaSlider() {
loraAlphaSlider.dispatchEvent(new Event("change"))
}
-loraAlphaSlider.addEventListener('input', updateLoraAlpha)
-loraAlphaField.addEventListener('input', updateLoraAlphaSlider)
+loraAlphaSlider.addEventListener("input", updateLoraAlpha)
+loraAlphaField.addEventListener("input", updateLoraAlphaSlider)
updateLoraAlpha()
function updateLoraAlphaContainer() {
- document.querySelector("#lora_alpha_container").style.display = (loraModelField.value === "" ? 'none' : '')
+ document.querySelector("#lora_alpha_container").style.display = loraModelField.value === "" ? "none" : ""
}
-loraModelField.addEventListener('change', updateLoraAlphaContainer)
+loraModelField.addEventListener("change", updateLoraAlphaContainer)
updateLoraAlphaContainer()
/********************* JPEG/WEBP Quality **********************/
function updateOutputQuality() {
- outputQualityField.value = 0 | outputQualitySlider.value
+ outputQualityField.value = 0 | outputQualitySlider.value
outputQualityField.dispatchEvent(new Event("change"))
}
@@ -1591,45 +1680,44 @@ function updateOutputQualitySlider() {
outputQualityField.value = 95
}
- outputQualitySlider.value = 0 | outputQualityField.value
+ outputQualitySlider.value = 0 | outputQualityField.value
outputQualitySlider.dispatchEvent(new Event("change"))
}
-outputQualitySlider.addEventListener('input', updateOutputQuality)
-outputQualityField.addEventListener('input', debounce(updateOutputQualitySlider, 1500))
+outputQualitySlider.addEventListener("input", updateOutputQuality)
+outputQualityField.addEventListener("input", debounce(updateOutputQualitySlider, 1500))
updateOutputQuality()
function updateOutputQualityVisibility() {
- if (outputFormatField.value === 'webp') {
- outputLosslessContainer.classList.remove('displayNone')
+ if (outputFormatField.value === "webp") {
+ outputLosslessContainer.classList.remove("displayNone")
if (outputLosslessField.checked) {
- outputQualityRow.classList.add('displayNone')
+ outputQualityRow.classList.add("displayNone")
} else {
- outputQualityRow.classList.remove('displayNone')
+ outputQualityRow.classList.remove("displayNone")
}
- }
- else if (outputFormatField.value === 'png') {
- outputQualityRow.classList.add('displayNone')
- outputLosslessContainer.classList.add('displayNone')
+ } else if (outputFormatField.value === "png") {
+ outputQualityRow.classList.add("displayNone")
+ outputLosslessContainer.classList.add("displayNone")
} else {
- outputQualityRow.classList.remove('displayNone')
- outputLosslessContainer.classList.add('displayNone')
+ outputQualityRow.classList.remove("displayNone")
+ outputLosslessContainer.classList.add("displayNone")
}
}
-outputFormatField.addEventListener('change', updateOutputQualityVisibility)
-outputLosslessField.addEventListener('change', updateOutputQualityVisibility)
+outputFormatField.addEventListener("change", updateOutputQualityVisibility)
+outputLosslessField.addEventListener("change", updateOutputQualityVisibility)
/********************* Zoom Slider **********************/
-thumbnailSizeField.addEventListener('change', () => {
- (function (s) {
- for (var j =0; j < document.styleSheets.length; j++) {
+thumbnailSizeField.addEventListener("change", () => {
+ ;(function(s) {
+ for (var j = 0; j < document.styleSheets.length; j++) {
let cssSheet = document.styleSheets[j]
for (var i = 0; i < cssSheet.cssRules.length; i++) {
- var rule = cssSheet.cssRules[i];
+ var rule = cssSheet.cssRules[i]
if (rule.selectorText == "div.img-preview img") {
- rule.style['max-height'] = s+'vh';
- rule.style['max-width'] = s+'vw';
- return;
+ rule.style["max-height"] = s + "vh"
+ rule.style["max-width"] = s + "vw"
+ return
}
}
}
@@ -1638,18 +1726,18 @@ thumbnailSizeField.addEventListener('change', () => {
function onAutoScrollUpdate() {
if (autoScroll.checked) {
- autoscrollBtn.classList.add('pressed')
+ autoscrollBtn.classList.add("pressed")
} else {
- autoscrollBtn.classList.remove('pressed')
+ autoscrollBtn.classList.remove("pressed")
}
- autoscrollBtn.querySelector(".state").innerHTML = (autoScroll.checked ? "ON" : "OFF")
+ autoscrollBtn.querySelector(".state").innerHTML = autoScroll.checked ? "ON" : "OFF"
}
-autoscrollBtn.addEventListener('click', function() {
+autoscrollBtn.addEventListener("click", function() {
autoScroll.checked = !autoScroll.checked
autoScroll.dispatchEvent(new Event("change"))
onAutoScrollUpdate()
})
-autoScroll.addEventListener('change', onAutoScrollUpdate)
+autoScroll.addEventListener("change", onAutoScrollUpdate)
function checkRandomSeed() {
if (randomSeedField.checked) {
@@ -1659,7 +1747,7 @@ function checkRandomSeed() {
seedField.disabled = false
}
}
-randomSeedField.addEventListener('input', checkRandomSeed)
+randomSeedField.addEventListener("input", checkRandomSeed)
checkRandomSeed()
function loadImg2ImgFromFile() {
@@ -1670,7 +1758,7 @@ function loadImg2ImgFromFile() {
let reader = new FileReader()
let file = initImageSelector.files[0]
- reader.addEventListener('load', function(event) {
+ reader.addEventListener("load", function(event) {
initImagePreview.src = reader.result
})
@@ -1678,16 +1766,16 @@ function loadImg2ImgFromFile() {
reader.readAsDataURL(file)
}
}
-initImageSelector.addEventListener('change', loadImg2ImgFromFile)
+initImageSelector.addEventListener("change", loadImg2ImgFromFile)
loadImg2ImgFromFile()
function img2imgLoad() {
- promptStrengthContainer.style.display = 'table-row'
+ promptStrengthContainer.style.display = "table-row"
if (!testDiffusers.checked) {
samplerSelectionContainer.style.display = "none"
}
initImagePreviewContainer.classList.add("has-image")
- colorCorrectionSetting.style.display = ''
+ colorCorrectionSetting.style.display = ""
initImageSizeBox.textContent = initImagePreview.naturalWidth + " x " + initImagePreview.naturalHeight
imageEditor.setImage(this.src, initImagePreview.naturalWidth, initImagePreview.naturalHeight)
@@ -1696,7 +1784,7 @@ function img2imgLoad() {
function img2imgUnload() {
initImageSelector.value = null
- initImagePreview.src = ''
+ initImagePreview.src = ""
maskSetting.checked = false
promptStrengthContainer.style.display = "none"
@@ -1704,22 +1792,21 @@ function img2imgUnload() {
samplerSelectionContainer.style.display = ""
}
initImagePreviewContainer.classList.remove("has-image")
- colorCorrectionSetting.style.display = 'none'
+ colorCorrectionSetting.style.display = "none"
imageEditor.setImage(null, parseInt(widthField.value), parseInt(heightField.value))
-
}
-initImagePreview.addEventListener('load', img2imgLoad)
-initImageClearBtn.addEventListener('click', img2imgUnload)
+initImagePreview.addEventListener("load", img2imgLoad)
+initImageClearBtn.addEventListener("click", img2imgUnload)
-maskSetting.addEventListener('click', function() {
+maskSetting.addEventListener("click", function() {
onDimensionChange()
})
-promptsFromFileBtn.addEventListener('click', function() {
+promptsFromFileBtn.addEventListener("click", function() {
promptsFromFileSelector.click()
})
-promptsFromFileSelector.addEventListener('change', async function() {
+promptsFromFileSelector.addEventListener("change", async function() {
if (promptsFromFileSelector.files.length === 0) {
return
}
@@ -1727,7 +1814,7 @@ promptsFromFileSelector.addEventListener('change', async function() {
let reader = new FileReader()
let file = promptsFromFileSelector.files[0]
- reader.addEventListener('load', async function() {
+ reader.addEventListener("load", async function() {
await parseContent(reader.result)
})
@@ -1737,15 +1824,15 @@ promptsFromFileSelector.addEventListener('change', async function() {
})
/* setup popup handlers */
-document.querySelectorAll('.popup').forEach(popup => {
- popup.addEventListener('click', event => {
+document.querySelectorAll(".popup").forEach((popup) => {
+ popup.addEventListener("click", (event) => {
if (event.target == popup) {
popup.classList.remove("active")
}
})
var closeButton = popup.querySelector(".close-button")
if (closeButton) {
- closeButton.addEventListener('click', () => {
+ closeButton.addEventListener("click", () => {
popup.classList.remove("active")
})
}
@@ -1753,9 +1840,9 @@ document.querySelectorAll('.popup').forEach(popup => {
var tabElements = []
function selectTab(tab_id) {
- let tabInfo = tabElements.find(t => t.tab.id == tab_id)
+ let tabInfo = tabElements.find((t) => t.tab.id == tab_id)
if (!tabInfo.tab.classList.contains("active")) {
- tabElements.forEach(info => {
+ tabElements.forEach((info) => {
if (info.tab.classList.contains("active") && info.tab.parentNode === tabInfo.tab.parentNode) {
info.tab.classList.toggle("active")
info.content.classList.toggle("active")
@@ -1764,7 +1851,7 @@ function selectTab(tab_id) {
tabInfo.tab.classList.toggle("active")
tabInfo.content.classList.toggle("active")
}
- document.dispatchEvent(new CustomEvent('tabClick', { detail: tabInfo }))
+ document.dispatchEvent(new CustomEvent("tabClick", { detail: tabInfo }))
}
function linkTabContents(tab) {
var name = tab.id.replace("tab-", "")
@@ -1775,7 +1862,7 @@ function linkTabContents(tab) {
content: content
})
- tab.addEventListener("click", event => selectTab(tab.id))
+ tab.addEventListener("click", (event) => selectTab(tab.id))
}
function isTabActive(tab) {
return tab.classList.contains("active")
@@ -1785,54 +1872,53 @@ let pauseClient = false
function resumeClient() {
if (pauseClient) {
- document.body.classList.remove('wait-pause')
- document.body.classList.add('pause')
+ document.body.classList.remove("wait-pause")
+ document.body.classList.add("pause")
}
- return new Promise(resolve => {
- let playbuttonclick = function () {
- resumeBtn.removeEventListener("click", playbuttonclick);
- resolve("resolved");
+ return new Promise((resolve) => {
+ let playbuttonclick = function() {
+ resumeBtn.removeEventListener("click", playbuttonclick)
+ resolve("resolved")
}
resumeBtn.addEventListener("click", playbuttonclick)
})
}
-promptField.addEventListener("input", debounce( renameMakeImageButton, 1000) )
+promptField.addEventListener("input", debounce(renameMakeImageButton, 1000))
-
-pauseBtn.addEventListener("click", function () {
+pauseBtn.addEventListener("click", function() {
pauseClient = true
- pauseBtn.style.display="none"
+ pauseBtn.style.display = "none"
resumeBtn.style.display = "inline"
- document.body.classList.add('wait-pause')
+ document.body.classList.add("wait-pause")
})
-resumeBtn.addEventListener("click", function () {
+resumeBtn.addEventListener("click", function() {
pauseClient = false
resumeBtn.style.display = "none"
pauseBtn.style.display = "inline"
- document.body.classList.remove('pause')
- document.body.classList.remove('wait-pause')
+ document.body.classList.remove("pause")
+ document.body.classList.remove("wait-pause")
})
/* Pause function */
document.querySelectorAll(".tab").forEach(linkTabContents)
window.addEventListener("beforeunload", function(e) {
- const msg = "Unsaved pictures will be lost!";
+ const msg = "Unsaved pictures will be lost!"
- let elementList = document.getElementsByClassName("imageTaskContainer");
+ let elementList = document.getElementsByClassName("imageTaskContainer")
if (elementList.length != 0) {
- e.preventDefault();
- (e || window.event).returnValue = msg;
- return msg;
+ e.preventDefault()
+ ;(e || window.event).returnValue = msg
+ return msg
} else {
- return true;
+ return true
}
-});
+})
createCollapsibles()
-prettifyInputs(document);
+prettifyInputs(document)
// set the textbox as focused on start
promptField.focus()
diff --git a/ui/media/js/parameters.js b/ui/media/js/parameters.js
index af399205..7a263315 100644
--- a/ui/media/js/parameters.js
+++ b/ui/media/js/parameters.js
@@ -8,8 +8,8 @@ var ParameterType = {
select: "select",
select_multiple: "select_multiple",
slider: "slider",
- custom: "custom",
-};
+ custom: "custom"
+}
/**
* JSDoc style
@@ -24,7 +24,6 @@ var ParameterType = {
* @property {boolean?} saveInAppConfig
*/
-
/** @type {Array." + - "Balanced: nearly as fast as High, much lower VRAM usage
" + - "High: fastest, maximum GPU memory usage" + - "Low: slowest, recommended for GPUs with 3 to 4 GB memory", + note: + "Faster performance requires more GPU memory (VRAM)
" + + "Balanced: nearly as fast as High, much lower VRAM usage
" + + "High: fastest, maximum GPU memory usage" + + "Low: slowest, recommended for GPUs with 3 to 4 GB memory", icon: "fa-forward", default: "balanced", options: [ - {value: "balanced", label: "Balanced"}, - {value: "high", label: "High"}, - {value: "low", label: "Low"} - ], + { value: "balanced", label: "Balanced" }, + { value: "high", label: "High" }, + { value: "low", label: "Low" } + ] }, { id: "use_cpu", @@ -145,20 +146,20 @@ var PARAMETERS = [ label: "Use CPU (not GPU)", note: "warning: this will be *very* slow", icon: "fa-microchip", - default: false, + default: false }, { id: "auto_pick_gpus", type: ParameterType.checkbox, label: "Automatically pick the GPUs (experimental)", - default: false, + default: false }, { id: "use_gpus", type: ParameterType.select_multiple, label: "GPUs to use (experimental)", note: "to process in parallel", - default: false, + default: false }, { id: "auto_save_settings", @@ -166,15 +167,16 @@ var PARAMETERS = [ label: "Auto-Save Settings", note: "restores settings on browser load", icon: "fa-gear", - default: true, + default: true }, { id: "confirm_dangerous_actions", type: ParameterType.checkbox, label: "Confirm dangerous actions", - note: "Actions that might lead to data loss must either be clicked with the shift key pressed, or confirmed in an 'Are you sure?' dialog", + note: + "Actions that might lead to data loss must either be clicked with the shift key pressed, or confirmed in an 'Are you sure?' dialog", icon: "fa-check-double", - default: true, + default: true }, { id: "listen_to_network", @@ -183,7 +185,7 @@ var PARAMETERS = [ note: "Other devices on your network can access this web page", icon: "fa-network-wired", default: true, - saveInAppConfig: true, + saveInAppConfig: true }, { id: "listen_port", @@ -194,29 +196,31 @@ var PARAMETERS = [ render: (parameter) => { return `` }, - saveInAppConfig: true, + saveInAppConfig: true }, { id: "use_beta_channel", type: ParameterType.checkbox, label: "Beta channel", - note: "Get the latest features immediately (but could be less stable). Please restart the program after changing this.", + note: + "Get the latest features immediately (but could be less stable). Please restart the program after changing this.", icon: "fa-fire", - default: false, + default: false }, { id: "test_diffusers", type: ParameterType.checkbox, label: "Test Diffusers", - note: "Experimental! Can have bugs! Use upcoming features (like LoRA) in our new engine. Please press Save, then restart the program after changing this.", + note: + "Experimental! Can have bugs! Use upcoming features (like LoRA) in our new engine. Please press Save, then restart the program after changing this.", icon: "fa-bolt", default: false, - saveInAppConfig: true, - }, -]; + saveInAppConfig: true + } +] function getParameterSettingsEntry(id) { - let parameter = PARAMETERS.filter(p => p.id === id) + let parameter = PARAMETERS.filter((p) => p.id === id) if (parameter.length === 0) { return } @@ -224,37 +228,39 @@ function getParameterSettingsEntry(id) { } function sliderUpdate(event) { - if (event.srcElement.id.endsWith('-input')) { - let slider = document.getElementById(event.srcElement.id.slice(0,-6)) + if (event.srcElement.id.endsWith("-input")) { + let slider = document.getElementById(event.srcElement.id.slice(0, -6)) slider.value = event.srcElement.value slider.dispatchEvent(new Event("change")) } else { - let field = document.getElementById(event.srcElement.id+'-input') + let field = document.getElementById(event.srcElement.id + "-input") field.value = event.srcElement.value field.dispatchEvent(new Event("change")) } } /** - * @param {Parameter} parameter + * @param {Parameter} parameter * @returns {string | HTMLElement} */ function getParameterElement(parameter) { switch (parameter.type) { case ParameterType.checkbox: - var is_checked = parameter.default ? " checked" : ""; + var is_checked = parameter.default ? " checked" : "" return `` case ParameterType.select: case ParameterType.select_multiple: - var options = (parameter.options || []).map(option => ``).join("") - var multiple = (parameter.type == ParameterType.select_multiple ? 'multiple' : '') + var options = (parameter.options || []) + .map((option) => ``) + .join("") + var multiple = parameter.type == ParameterType.select_multiple ? "multiple" : "" return `` case ParameterType.slider: return ` ${parameter.slider_unit}` case ParameterType.custom: return parameter.render(parameter) default: - console.error(`Invalid type ${parameter.type} for parameter ${parameter.id}`); + console.error(`Invalid type ${parameter.type} for parameter ${parameter.id}`) return "ERROR: Invalid Type" } } @@ -265,31 +271,31 @@ let parametersTable = document.querySelector("#system-settings .parameters-table * @param {Array
🔥Malware alert!🔥
The file ' + modelsCache['scan-error'] + ' in your models/stable-diffusion folder is probably malware infected.
Please delete this file from the folder before proceeding!
After deleting the file, reload this page.' + let previewPane = document.getElementById("preview") + previewPane.style.background = "red" + previewPane.style.textAlign = "center" + previewPane.innerHTML = + "
🔥Malware alert!🔥
The file " + + modelsCache["scan-error"] + + ' in your models/stable-diffusion folder is probably malware infected.
Please delete this file from the folder before proceeding!
After deleting the file, reload this page.' makeImageBtn.disabled = true } @@ -667,11 +641,11 @@ async function getModels() { */ // notify ModelDropdown objects to refresh - document.dispatchEvent(new Event('refreshModels')) + document.dispatchEvent(new Event("refreshModels")) } catch (e) { - console.log('get models error', e) + console.log("get models error", e) } } // reload models button -document.querySelector('#reload-models').addEventListener('click', getModels) +document.querySelector("#reload-models").addEventListener("click", getModels) diff --git a/ui/media/js/themes.js b/ui/media/js/themes.js index d8577d68..33c8fca0 100644 --- a/ui/media/js/themes.js +++ b/ui/media/js/themes.js @@ -1,28 +1,32 @@ -const themeField = document.getElementById("theme"); -var DEFAULT_THEME = {}; -var THEMES = []; // initialized in initTheme from data in css +const themeField = document.getElementById("theme") +var DEFAULT_THEME = {} +var THEMES = [] // initialized in initTheme from data in css function getThemeName(theme) { - theme = theme.replace("theme-", ""); - theme = theme.split("-").map(word => word.charAt(0).toUpperCase() + word.slice(1)).join(" "); - return theme; + theme = theme.replace("theme-", "") + theme = theme + .split("-") + .map((word) => word.charAt(0).toUpperCase() + word.slice(1)) + .join(" ") + return theme } // init themefield function initTheme() { Array.from(document.styleSheets) - .filter(sheet => sheet.href?.startsWith(window.location.origin)) - .flatMap(sheet => Array.from(sheet.cssRules)) - .forEach(rule => { - var selector = rule.selectorText; + .filter((sheet) => sheet.href?.startsWith(window.location.origin)) + .flatMap((sheet) => Array.from(sheet.cssRules)) + .forEach((rule) => { + var selector = rule.selectorText if (selector && selector.startsWith(".theme-") && !selector.includes(" ")) { - if (DEFAULT_THEME) { // re-add props that dont change (css needs this so they update correctly) + if (DEFAULT_THEME) { + // re-add props that dont change (css needs this so they update correctly) Array.from(DEFAULT_THEME.rule.style) - .filter(cssVariable => !Array.from(rule.style).includes(cssVariable)) - .forEach(cssVariable => { - rule.style.setProperty(cssVariable, DEFAULT_THEME.rule.style.getPropertyValue(cssVariable)); - }); + .filter((cssVariable) => !Array.from(rule.style).includes(cssVariable)) + .forEach((cssVariable) => { + rule.style.setProperty(cssVariable, DEFAULT_THEME.rule.style.getPropertyValue(cssVariable)) + }) } - var theme_key = selector.substring(1); + var theme_key = selector.substring(1) THEMES.push({ key: theme_key, name: getThemeName(theme_key), @@ -34,49 +38,48 @@ function initTheme() { key: "theme-default", name: "Default", rule: rule - }; + } } - }); - - THEMES.forEach(theme => { - var new_option = document.createElement("option"); - new_option.setAttribute("value", theme.key); - new_option.innerText = theme.name; - themeField.appendChild(new_option); - }); + }) + + THEMES.forEach((theme) => { + var new_option = document.createElement("option") + new_option.setAttribute("value", theme.key) + new_option.innerText = theme.name + themeField.appendChild(new_option) + }) - // setup the style transitions a second after app initializes, so initial style is instant setTimeout(() => { - var body = document.querySelector("body"); - var style = document.createElement('style'); - style.innerHTML = "* { transition: background 0.5s, color 0.5s, background-color 0.5s; }"; - body.appendChild(style); - }, 1000); + var body = document.querySelector("body") + var style = document.createElement("style") + style.innerHTML = "* { transition: background 0.5s, color 0.5s, background-color 0.5s; }" + body.appendChild(style) + }, 1000) } -initTheme(); +initTheme() function themeFieldChanged() { - var theme_key = themeField.value; + var theme_key = themeField.value - var body = document.querySelector("body"); - body.classList.remove(...THEMES.map(theme => theme.key)); - body.classList.add(theme_key); - - // + var body = document.querySelector("body") + body.classList.remove(...THEMES.map((theme) => theme.key)) + body.classList.add(theme_key) - body.style = ""; - var theme = THEMES.find(t => t.key == theme_key); + // + + body.style = "" + var theme = THEMES.find((t) => t.key == theme_key) let borderColor = undefined if (theme) { - borderColor = theme.rule.style.getPropertyValue('--input-border-color').trim() - if (!borderColor.startsWith('#')) { - borderColor = theme.rule.style.getPropertyValue('--theme-color-fallback') + borderColor = theme.rule.style.getPropertyValue("--input-border-color").trim() + if (!borderColor.startsWith("#")) { + borderColor = theme.rule.style.getPropertyValue("--theme-color-fallback") } } else { - borderColor = DEFAULT_THEME.rule.style.getPropertyValue('--theme-color-fallback') + borderColor = DEFAULT_THEME.rule.style.getPropertyValue("--theme-color-fallback") } document.querySelector('meta[name="theme-color"]').setAttribute("content", borderColor) } -themeField.addEventListener('change', themeFieldChanged); +themeField.addEventListener("change", themeFieldChanged) diff --git a/ui/media/js/utils.js b/ui/media/js/utils.js index 1eeddb99..6bc5a65d 100644 --- a/ui/media/js/utils.js +++ b/ui/media/js/utils.js @@ -1,4 +1,4 @@ -"use strict"; +"use strict" // https://gomakethings.com/finding-the-next-and-previous-sibling-elements-that-match-a-selector-with-vanilla-js/ function getNextSibling(elem, selector) { @@ -20,33 +20,34 @@ function getNextSibling(elem, selector) { } } - /* Panel Stuff */ // true = open -let COLLAPSIBLES_INITIALIZED = false; -const COLLAPSIBLES_KEY = "collapsibles"; -const COLLAPSIBLE_PANELS = []; // filled in by createCollapsibles with all the elements matching .collapsible +let COLLAPSIBLES_INITIALIZED = false +const COLLAPSIBLES_KEY = "collapsibles" +const COLLAPSIBLE_PANELS = [] // filled in by createCollapsibles with all the elements matching .collapsible // on-init call this for any panels that are marked open function toggleCollapsible(element) { - const collapsibleHeader = element.querySelector(".collapsible"); - const handle = element.querySelector(".collapsible-handle"); + const collapsibleHeader = element.querySelector(".collapsible") + const handle = element.querySelector(".collapsible-handle") collapsibleHeader.classList.toggle("active") - let content = getNextSibling(collapsibleHeader, '.collapsible-content') + let content = getNextSibling(collapsibleHeader, ".collapsible-content") if (!collapsibleHeader.classList.contains("active")) { content.style.display = "none" - if (handle != null) { // render results don't have a handle - handle.innerHTML = '➕' // plus + if (handle != null) { + // render results don't have a handle + handle.innerHTML = "➕" // plus } } else { content.style.display = "block" - if (handle != null) { // render results don't have a handle - handle.innerHTML = '➖' // minus + if (handle != null) { + // render results don't have a handle + handle.innerHTML = "➖" // minus } } - document.dispatchEvent(new CustomEvent('collapsibleClick', { detail: collapsibleHeader })) - + document.dispatchEvent(new CustomEvent("collapsibleClick", { detail: collapsibleHeader })) + if (COLLAPSIBLES_INITIALIZED && COLLAPSIBLE_PANELS.includes(element)) { saveCollapsibles() } @@ -54,7 +55,7 @@ function toggleCollapsible(element) { function saveCollapsibles() { let values = {} - COLLAPSIBLE_PANELS.forEach(element => { + COLLAPSIBLE_PANELS.forEach((element) => { let value = element.querySelector(".collapsible").className.indexOf("active") !== -1 values[element.id] = value }) @@ -72,31 +73,31 @@ function createCollapsibles(node) { if (save && c.parentElement.id) { COLLAPSIBLE_PANELS.push(c.parentElement) } - let handle = document.createElement('span') - handle.className = 'collapsible-handle' + let handle = document.createElement("span") + handle.className = "collapsible-handle" if (c.classList.contains("active")) { - handle.innerHTML = '➖' // minus + handle.innerHTML = "➖" // minus } else { - handle.innerHTML = '➕' // plus + handle.innerHTML = "➕" // plus } c.insertBefore(handle, c.firstChild) - c.addEventListener('click', function() { + c.addEventListener("click", function() { toggleCollapsible(c.parentElement) }) }) if (save) { let saved = localStorage.getItem(COLLAPSIBLES_KEY) - if (!saved) { - saved = tryLoadOldCollapsibles(); + if (!saved) { + saved = tryLoadOldCollapsibles() } if (!saved) { saveCollapsibles() saved = localStorage.getItem(COLLAPSIBLES_KEY) } let values = JSON.parse(saved) - COLLAPSIBLE_PANELS.forEach(element => { + COLLAPSIBLE_PANELS.forEach((element) => { let value = element.querySelector(".collapsible").className.indexOf("active") !== -1 if (values[element.id] != value) { toggleCollapsible(element) @@ -108,24 +109,24 @@ function createCollapsibles(node) { function tryLoadOldCollapsibles() { const old_map = { - "advancedPanelOpen": "editor-settings", - "modifiersPanelOpen": "editor-modifiers", - "negativePromptPanelOpen": "editor-inputs-prompt" - }; + advancedPanelOpen: "editor-settings", + modifiersPanelOpen: "editor-modifiers", + negativePromptPanelOpen: "editor-inputs-prompt" + } if (localStorage.getItem(Object.keys(old_map)[0])) { - let result = {}; - Object.keys(old_map).forEach(key => { - const value = localStorage.getItem(key); + let result = {} + Object.keys(old_map).forEach((key) => { + const value = localStorage.getItem(key) if (value !== null) { - result[old_map[key]] = (value == true || value == "true") + result[old_map[key]] = value == true || value == "true" localStorage.removeItem(key) } - }); + }) result = JSON.stringify(result) localStorage.setItem(COLLAPSIBLES_KEY, result) return result } - return null; + return null } function permute(arr) { @@ -134,10 +135,12 @@ function permute(arr) { let n_permutations = Math.pow(2, n) for (let i = 0; i < n_permutations; i++) { let perm = [] - let mask = Number(i).toString(2).padStart(n, '0') + let mask = Number(i) + .toString(2) + .padStart(n, "0") for (let idx = 0; idx < mask.length; idx++) { - if (mask[idx] === '1' && arr[idx].trim() !== '') { + if (mask[idx] === "1" && arr[idx].trim() !== "") { perm.push(arr[idx]) } } @@ -152,23 +155,23 @@ function permute(arr) { // https://stackoverflow.com/a/8212878 function millisecondsToStr(milliseconds) { - function numberEnding (number) { - return (number > 1) ? 's' : '' + function numberEnding(number) { + return number > 1 ? "s" : "" } let temp = Math.floor(milliseconds / 1000) let hours = Math.floor((temp %= 86400) / 3600) - let s = '' + let s = "" if (hours) { - s += hours + ' hour' + numberEnding(hours) + ' ' + s += hours + " hour" + numberEnding(hours) + " " } let minutes = Math.floor((temp %= 3600) / 60) if (minutes) { - s += minutes + ' minute' + numberEnding(minutes) + ' ' + s += minutes + " minute" + numberEnding(minutes) + " " } let seconds = temp % 60 if (!hours && minutes < 4 && seconds) { - s += seconds + ' second' + numberEnding(seconds) + s += seconds + " second" + numberEnding(seconds) } return s @@ -176,101 +179,82 @@ function millisecondsToStr(milliseconds) { // https://rosettacode.org/wiki/Brace_expansion#JavaScript function BraceExpander() { - 'use strict' + "use strict" // Index of any closing brace matching the opening // brace at iPosn, // with the indices of any immediately-enclosed commas. function bracePair(tkns, iPosn, iNest, lstCommas) { - if (iPosn >= tkns.length || iPosn < 0) return null; + if (iPosn >= tkns.length || iPosn < 0) return null let t = tkns[iPosn], - n = (t === '{') ? ( - iNest + 1 - ) : (t === '}' ? ( - iNest - 1 - ) : iNest), - lst = (t === ',' && iNest === 1) ? ( - lstCommas.concat(iPosn) - ) : lstCommas; + n = t === "{" ? iNest + 1 : t === "}" ? iNest - 1 : iNest, + lst = t === "," && iNest === 1 ? lstCommas.concat(iPosn) : lstCommas - return n ? bracePair(tkns, iPosn + 1, n, lst) : { - close: iPosn, - commas: lst - }; + return n + ? bracePair(tkns, iPosn + 1, n, lst) + : { + close: iPosn, + commas: lst + } } // Parse of a SYNTAGM subtree function andTree(dctSofar, tkns) { - if (!tkns.length) return [dctSofar, []]; - - let dctParse = dctSofar ? dctSofar : { - fn: and, - args: [] - }, + if (!tkns.length) return [dctSofar, []] + let dctParse = dctSofar + ? dctSofar + : { + fn: and, + args: [] + }, head = tkns[0], tail = head ? tkns.slice(1) : [], + dctBrace = head === "{" ? bracePair(tkns, 0, 0, []) : null, + lstOR = dctBrace && dctBrace.close && dctBrace.commas.length ? splitAt(dctBrace.close + 1, tkns) : null - dctBrace = head === '{' ? bracePair( - tkns, 0, 0, [] - ) : null, - - lstOR = dctBrace && ( - dctBrace.close - ) && dctBrace.commas.length ? ( - splitAt(dctBrace.close + 1, tkns) - ) : null; - - return andTree({ - fn: and, - args: dctParse.args.concat( - lstOR ? ( - orTree(dctParse, lstOR[0], dctBrace.commas) - ) : head - ) - }, lstOR ? ( - lstOR[1] - ) : tail); + return andTree( + { + fn: and, + args: dctParse.args.concat(lstOR ? orTree(dctParse, lstOR[0], dctBrace.commas) : head) + }, + lstOR ? lstOR[1] : tail + ) } // Parse of a PARADIGM subtree function orTree(dctSofar, tkns, lstCommas) { - if (!tkns.length) return [dctSofar, []]; - let iLast = lstCommas.length; + if (!tkns.length) return [dctSofar, []] + let iLast = lstCommas.length return { fn: or, - args: splitsAt( - lstCommas, tkns - ).map(function (x, i) { - let ts = x.slice( - 1, i === iLast ? ( - -1 - ) : void 0 - ); + args: splitsAt(lstCommas, tkns) + .map(function(x, i) { + let ts = x.slice(1, i === iLast ? -1 : void 0) - return ts.length ? ts : ['']; - }).map(function (ts) { - return ts.length > 1 ? ( - andTree(null, ts)[0] - ) : ts[0]; - }) - }; + return ts.length ? ts : [""] + }) + .map(function(ts) { + return ts.length > 1 ? andTree(null, ts)[0] : ts[0] + }) + } } // List of unescaped braces and commas, and remaining strings function tokens(str) { // Filter function excludes empty splitting artefacts - let toS = function (x) { - return x.toString(); - }; + let toS = function(x) { + return x.toString() + } - return str.split(/(\\\\)/).filter(toS).reduce(function (a, s) { - return a.concat(s.charAt(0) === '\\' ? s : s.split( - /(\\*[{,}])/ - ).filter(toS)); - }, []); + return str + .split(/(\\\\)/) + .filter(toS) + .reduce(function(a, s) { + return a.concat(s.charAt(0) === "\\" ? s : s.split(/(\\*[{,}])/).filter(toS)) + }, []) } // PARSE TREE OPERATOR (1 of 2) @@ -278,76 +262,75 @@ function BraceExpander() { function and(args) { let lng = args.length, head = lng ? args[0] : null, - lstHead = "string" === typeof head ? ( - [head] - ) : head; + lstHead = "string" === typeof head ? [head] : head - return lng ? ( - 1 < lng ? lstHead.reduce(function (a, h) { - return a.concat( - and(args.slice(1)).map(function (t) { - return h + t; - }) - ); - }, []) : lstHead - ) : []; + return lng + ? 1 < lng + ? lstHead.reduce(function(a, h) { + return a.concat( + and(args.slice(1)).map(function(t) { + return h + t + }) + ) + }, []) + : lstHead + : [] } // PARSE TREE OPERATOR (2 of 2) // Each option flattened function or(args) { - return args.reduce(function (a, b) { - return a.concat(b); - }, []); + return args.reduce(function(a, b) { + return a.concat(b) + }, []) } // One list split into two (first sublist length n) function splitAt(n, lst) { - return n < lst.length + 1 ? [ - lst.slice(0, n), lst.slice(n) - ] : [lst, []]; + return n < lst.length + 1 ? [lst.slice(0, n), lst.slice(n)] : [lst, []] } // One list split into several (sublist lengths [n]) function splitsAt(lstN, lst) { - return lstN.reduceRight(function (a, x) { - return splitAt(x, a[0]).concat(a.slice(1)); - }, [lst]); + return lstN.reduceRight( + function(a, x) { + return splitAt(x, a[0]).concat(a.slice(1)) + }, + [lst] + ) } // Value of the parse tree function evaluated(e) { - return typeof e === 'string' ? e : - e.fn(e.args.map(evaluated)); + return typeof e === "string" ? e : e.fn(e.args.map(evaluated)) } // JSON prettyprint (for parse tree, token list etc) function pp(e) { - return JSON.stringify(e, function (k, v) { - return typeof v === 'function' ? ( - '[function ' + v.name + ']' - ) : v; - }, 2) + return JSON.stringify( + e, + function(k, v) { + return typeof v === "function" ? "[function " + v.name + "]" : v + }, + 2 + ) } - // ----------------------- MAIN ------------------------ // s -> [s] this.expand = function(s) { // BRACE EXPRESSION PARSED - let dctParse = andTree(null, tokens(s))[0]; + let dctParse = andTree(null, tokens(s))[0] // ABSTRACT SYNTAX TREE LOGGED // console.log(pp(dctParse)); // AST EVALUATED TO LIST OF STRINGS - return evaluated(dctParse); + return evaluated(dctParse) } - } - /** Pause the execution of an async function until timer elapse. * @Returns a promise that will resolve after the specified timeout. */ @@ -360,12 +343,12 @@ function asyncDelay(timeout) { function PromiseSource() { const srcPromise = new Promise((resolve, reject) => { Object.defineProperties(this, { - resolve: { value: resolve, writable: false } - , reject: { value: reject, writable: false } + resolve: { value: resolve, writable: false }, + reject: { value: reject, writable: false } }) }) Object.defineProperties(this, { - promise: {value: makeQuerablePromise(srcPromise), writable: false} + promise: { value: makeQuerablePromise(srcPromise), writable: false } }) } @@ -375,7 +358,7 @@ function PromiseSource() { * If `immediate` is passed, trigger the function on the leading edge, instead of the trailing. * @Returns a promise that will resolve to func return value. */ -function debounce (func, wait, immediate) { +function debounce(func, wait, immediate) { if (typeof wait === "undefined") { wait = 40 } @@ -399,11 +382,11 @@ function debounce (func, wait, immediate) { } return function(...args) { const callNow = Boolean(immediate && !timeout) - const context = this; + const context = this if (timeout) { clearTimeout(timeout) } - timeout = setTimeout(function () { + timeout = setTimeout(function() { if (!immediate) { applyFn(context, args) } @@ -418,14 +401,14 @@ function debounce (func, wait, immediate) { } function preventNonNumericalInput(e) { - e = e || window.event; - let charCode = (typeof e.which == "undefined") ? e.keyCode : e.which; - let charStr = String.fromCharCode(charCode); - let re = e.target.getAttribute('pattern') || '^[0-9]+$' + e = e || window.event + let charCode = typeof e.which == "undefined" ? e.keyCode : e.which + let charStr = String.fromCharCode(charCode) + let re = e.target.getAttribute("pattern") || "^[0-9]+$" re = new RegExp(re) if (!charStr.match(re)) { - e.preventDefault(); + e.preventDefault() } } @@ -434,15 +417,15 @@ function preventNonNumericalInput(e) { * @Notes Allows unit testing and use of the engine outside of a browser. */ function getGlobal() { - if (typeof globalThis === 'object') { + if (typeof globalThis === "object") { return globalThis - } else if (typeof global === 'object') { + } else if (typeof global === "object") { return global - } else if (typeof self === 'object') { + } else if (typeof self === "object") { return self } try { - return Function('return this')() + return Function("return this")() } catch { // If the Function constructor fails, we're in a browser with eval disabled by CSP headers. return window @@ -453,18 +436,18 @@ function getGlobal() { * @Returns true if x is an Array or a TypedArray, false otherwise. */ function isArrayOrTypedArray(x) { - return Boolean(typeof x === 'object' && (Array.isArray(x) || (ArrayBuffer.isView(x) && !(x instanceof DataView)))) + return Boolean(typeof x === "object" && (Array.isArray(x) || (ArrayBuffer.isView(x) && !(x instanceof DataView)))) } function makeQuerablePromise(promise) { - if (typeof promise !== 'object') { - throw new Error('promise is not an object.') + if (typeof promise !== "object") { + throw new Error("promise is not an object.") } if (!(promise instanceof Promise)) { - throw new Error('Argument is not a promise.') + throw new Error("Argument is not a promise.") } // Don't modify a promise that's been already modified. - if ('isResolved' in promise || 'isRejected' in promise || 'isPending' in promise) { + if ("isResolved" in promise || "isRejected" in promise || "isPending" in promise) { return promise } let isPending = true @@ -473,13 +456,13 @@ function makeQuerablePromise(promise) { let isResolved = false let resolvedValue = undefined const qurPro = promise.then( - function(val){ + function(val) { isResolved = true isPending = false resolvedValue = val return val - } - , function(reason) { + }, + function(reason) { rejectReason = reason isRejected = true isPending = false @@ -487,19 +470,19 @@ function makeQuerablePromise(promise) { } ) Object.defineProperties(qurPro, { - 'isResolved': { + isResolved: { get: () => isResolved - } - , 'resolvedValue': { + }, + resolvedValue: { get: () => resolvedValue - } - , 'isPending': { + }, + isPending: { get: () => isPending - } - , 'isRejected': { + }, + isRejected: { get: () => isRejected - } - , 'rejectReason': { + }, + rejectReason: { get: () => rejectReason } }) @@ -508,25 +491,25 @@ function makeQuerablePromise(promise) { /* inserts custom html to allow prettifying of inputs */ function prettifyInputs(root_element) { - root_element.querySelectorAll(`input[type="checkbox"]`).forEach(element => { + root_element.querySelectorAll(`input[type="checkbox"]`).forEach((element) => { if (element.style.display === "none") { return } - var parent = element.parentNode; + var parent = element.parentNode if (!parent.classList.contains("input-toggle")) { - var wrapper = document.createElement("div"); - wrapper.classList.add("input-toggle"); - parent.replaceChild(wrapper, element); - wrapper.appendChild(element); - var label = document.createElement("label"); - label.htmlFor = element.id; - wrapper.appendChild(label); + var wrapper = document.createElement("div") + wrapper.classList.add("input-toggle") + parent.replaceChild(wrapper, element) + wrapper.appendChild(element) + var label = document.createElement("label") + label.htmlFor = element.id + wrapper.appendChild(label) } }) } class GenericEventSource { - #events = {}; + #events = {} #types = [] constructor(...eventsTypes) { if (Array.isArray(eventsTypes) && eventsTypes.length === 1 && Array.isArray(eventsTypes[0])) { @@ -541,7 +524,7 @@ class GenericEventSource { */ addEventListener(name, handler) { if (!this.#types.includes(name)) { - throw new Error('Invalid event name.') + throw new Error("Invalid event name.") } if (this.#events.hasOwnProperty(name)) { this.#events[name].push(handler) @@ -574,13 +557,15 @@ class GenericEventSource { if (evs.length <= 0) { return Promise.resolve() } - return Promise.allSettled(evs.map((callback) => { - try { - return Promise.resolve(callback.apply(SD, args)) - } catch (ex) { - return Promise.reject(ex) - } - })) + return Promise.allSettled( + evs.map((callback) => { + try { + return Promise.resolve(callback.apply(SD, args)) + } catch (ex) { + return Promise.reject(ex) + } + }) + ) } } @@ -590,7 +575,7 @@ class ServiceContainer { constructor(...servicesParams) { servicesParams.forEach(this.register.bind(this)) } - get services () { + get services() { return this.#services } get singletons() { @@ -598,54 +583,52 @@ class ServiceContainer { } register(params) { if (ServiceContainer.isConstructor(params)) { - if (typeof params.name !== 'string') { - throw new Error('params.name is not a string.') + if (typeof params.name !== "string") { + throw new Error("params.name is not a string.") } - params = {name:params.name, definition:params} + params = { name: params.name, definition: params } } - if (typeof params !== 'object') { - throw new Error('params is not an object.') + if (typeof params !== "object") { + throw new Error("params is not an object.") } - [ 'name', - 'definition', - ].forEach((key) => { + ;["name", "definition"].forEach((key) => { if (!(key in params)) { - console.error('Invalid service %o registration.', params) + console.error("Invalid service %o registration.", params) throw new Error(`params.${key} is not defined.`) } }) - const opts = {definition: params.definition} - if ('dependencies' in params) { + const opts = { definition: params.definition } + if ("dependencies" in params) { if (Array.isArray(params.dependencies)) { params.dependencies.forEach((dep) => { - if (typeof dep !== 'string') { - throw new Error('dependency name is not a string.') + if (typeof dep !== "string") { + throw new Error("dependency name is not a string.") } }) opts.dependencies = params.dependencies } else { - throw new Error('params.dependencies is not an array.') + throw new Error("params.dependencies is not an array.") } } if (params.singleton) { opts.singleton = true } this.#services.set(params.name, opts) - return Object.assign({name: params.name}, opts) + return Object.assign({ name: params.name }, opts) } get(name) { const ctorInfos = this.#services.get(name) if (!ctorInfos) { return } - if(!ServiceContainer.isConstructor(ctorInfos.definition)) { + if (!ServiceContainer.isConstructor(ctorInfos.definition)) { return ctorInfos.definition } - if(!ctorInfos.singleton) { + if (!ctorInfos.singleton) { return this._createInstance(ctorInfos) } const singletonInstance = this.#singletons.get(name) - if(singletonInstance) { + if (singletonInstance) { return singletonInstance } const newSingletonInstance = this._createInstance(ctorInfos) @@ -655,7 +638,7 @@ class ServiceContainer { _getResolvedDependencies(service) { let classDependencies = [] - if(service.dependencies) { + if (service.dependencies) { classDependencies = service.dependencies.map(this.get.bind(this)) } return classDependencies @@ -671,10 +654,14 @@ class ServiceContainer { } static isClass(definition) { - return typeof definition === 'function' && Boolean(definition.prototype) && definition.prototype.constructor === definition + return ( + typeof definition === "function" && + Boolean(definition.prototype) && + definition.prototype.constructor === definition + ) } static isConstructor(definition) { - return typeof definition === 'function' + return typeof definition === "function" } } @@ -693,14 +680,14 @@ function createElement(tagName, attributes, classes, textOrElements) { if (value !== undefined && value !== null) { element.setAttribute(key, value) } - }); + }) } if (classes) { - (Array.isArray(classes) ? classes : [classes]).forEach(className => element.classList.add(className)) + ;(Array.isArray(classes) ? classes : [classes]).forEach((className) => element.classList.add(className)) } if (textOrElements) { const children = Array.isArray(textOrElements) ? textOrElements : [textOrElements] - children.forEach(textOrElem => { + children.forEach((textOrElem) => { if (textOrElem instanceof Node) { element.appendChild(textOrElem) } else { @@ -750,33 +737,33 @@ Array.prototype.addEventListener = function(method, callback) { /** * @param {CreateTabRequest} request */ - function createTab(request) { +function createTab(request) { if (!request?.id) { - console.error('createTab() error - id is required', Error().stack) + console.error("createTab() error - id is required", Error().stack) return } if (!request.label) { - console.error('createTab() error - label is required', Error().stack) + console.error("createTab() error - label is required", Error().stack) return } if (!request.icon) { - console.error('createTab() error - icon is required', Error().stack) + console.error("createTab() error - icon is required", Error().stack) return } if (!request.content && !request.onOpen) { - console.error('createTab() error - content or onOpen required', Error().stack) + console.error("createTab() error - content or onOpen required", Error().stack) return } - const tabsContainer = document.querySelector('.tab-container') + const tabsContainer = document.querySelector(".tab-container") if (!tabsContainer) { return } - const tabsContentWrapper = document.querySelector('#tab-content-wrapper') + const tabsContentWrapper = document.querySelector("#tab-content-wrapper") if (!tabsContentWrapper) { return } @@ -784,41 +771,37 @@ Array.prototype.addEventListener = function(method, callback) { // console.debug('creating tab: ', request) if (request.css) { - document.querySelector('body').insertAdjacentElement( - 'beforeend', - createElement('style', { id: `tab-${request.id}-css` }, undefined, request.css), - ) + document + .querySelector("body") + .insertAdjacentElement( + "beforeend", + createElement("style", { id: `tab-${request.id}-css` }, undefined, request.css) + ) } - const label = typeof request.label === 'function' ? request.label() : request.label - const labelElement = label instanceof Node ? label : createElement('span', undefined, undefined, label) + const label = typeof request.label === "function" ? request.label() : request.label + const labelElement = label instanceof Node ? label : createElement("span", undefined, undefined, label) const tab = createElement( - 'span', - { id: `tab-${request.id}`, 'data-times-opened': 0 }, - ['tab'], - createElement( - 'span', - undefined, - undefined, - [ - createElement( - 'i', - { style: 'margin-right: 0.25em' }, - ['fa-solid', `${request.icon.startsWith('fa-') ? '' : 'fa-'}${request.icon}`, 'icon'], - ), - labelElement, - ], - ) + "span", + { id: `tab-${request.id}`, "data-times-opened": 0 }, + ["tab"], + createElement("span", undefined, undefined, [ + createElement("i", { style: "margin-right: 0.25em" }, [ + "fa-solid", + `${request.icon.startsWith("fa-") ? "" : "fa-"}${request.icon}`, + "icon" + ]), + labelElement + ]) ) + tabsContainer.insertAdjacentElement("beforeend", tab) - tabsContainer.insertAdjacentElement('beforeend', tab) + const wrapper = createElement("div", { id: request.id }, ["tab-content-inner"], "Loading..") - const wrapper = createElement('div', { id: request.id }, ['tab-content-inner'], 'Loading..') - - const tabContent = createElement('div', { id: `tab-content-${request.id}` }, ['tab-content'], wrapper) - tabsContentWrapper.insertAdjacentElement('beforeend', tabContent) + const tabContent = createElement("div", { id: `tab-content-${request.id}` }, ["tab-content"], wrapper) + tabsContentWrapper.insertAdjacentElement("beforeend", tabContent) linkTabContents(tab) @@ -826,7 +809,7 @@ Array.prototype.addEventListener = function(method, callback) { if (resultFactory === undefined || resultFactory === null) { return } - const result = typeof resultFactory === 'function' ? resultFactory() : resultFactory + const result = typeof resultFactory === "function" ? resultFactory() : resultFactory if (result instanceof Promise) { result.then(replaceContent) } else if (result instanceof Node) { @@ -838,7 +821,7 @@ Array.prototype.addEventListener = function(method, callback) { replaceContent(request.content) - tab.addEventListener('click', (e) => { + tab.addEventListener("click", (e) => { const timesOpened = +(tab.dataset.timesOpened || 0) + 1 tab.dataset.timesOpened = timesOpened @@ -848,9 +831,9 @@ Array.prototype.addEventListener = function(method, callback) { contentElement: wrapper, labelElement, timesOpened, - firstOpen: timesOpened === 1, + firstOpen: timesOpened === 1 }, - e, + e ) replaceContent(result) diff --git a/ui/plugins/ui/Autoscroll.plugin.js b/ui/plugins/ui/Autoscroll.plugin.js index 088b1457..364e702d 100644 --- a/ui/plugins/ui/Autoscroll.plugin.js +++ b/ui/plugins/ui/Autoscroll.plugin.js @@ -1,28 +1,32 @@ -(function () { +;(function() { "use strict" let autoScroll = document.querySelector("#auto_scroll") // observe for changes in the preview pane - var observer = new MutationObserver(function (mutations) { - mutations.forEach(function (mutation) { - if (mutation.target.className == 'img-batch') { + var observer = new MutationObserver(function(mutations) { + mutations.forEach(function(mutation) { + if (mutation.target.className == "img-batch") { Autoscroll(mutation.target) } }) }) - - observer.observe(document.getElementById('preview'), { - childList: true, - subtree: true + + observer.observe(document.getElementById("preview"), { + childList: true, + subtree: true }) function Autoscroll(target) { if (autoScroll.checked && target !== null) { - const img = target.querySelector('img') - img.addEventListener('load', function() { - img.closest('.imageTaskContainer').scrollIntoView() - }, { once: true }) + const img = target.querySelector("img") + img.addEventListener( + "load", + function() { + img.closest(".imageTaskContainer").scrollIntoView() + }, + { once: true } + ) } } })() diff --git a/ui/plugins/ui/Modifiers-dnd.plugin.js b/ui/plugins/ui/Modifiers-dnd.plugin.js index b0aaaa95..075a073f 100644 --- a/ui/plugins/ui/Modifiers-dnd.plugin.js +++ b/ui/plugins/ui/Modifiers-dnd.plugin.js @@ -1,93 +1,116 @@ -(function () { "use strict" - if (typeof editorModifierTagsList !== 'object') { - console.error('editorModifierTagsList missing...') +;(function() { + "use strict" + if (typeof editorModifierTagsList !== "object") { + console.error("editorModifierTagsList missing...") return } - const styleSheet = document.createElement("style"); + const styleSheet = document.createElement("style") styleSheet.textContent = ` .modifier-card-tiny.drag-sort-active { background: transparent; border: 2px dashed white; opacity:0.2; } - `; - document.head.appendChild(styleSheet); + ` + document.head.appendChild(styleSheet) // observe for changes in tag list - const observer = new MutationObserver(function (mutations) { - // mutations.forEach(function (mutation) { - if (editorModifierTagsList.childNodes.length > 0) { - ModifierDragAndDrop(editorModifierTagsList) - } - // }) + const observer = new MutationObserver(function(mutations) { + // mutations.forEach(function (mutation) { + if (editorModifierTagsList.childNodes.length > 0) { + ModifierDragAndDrop(editorModifierTagsList) + } + // }) }) - + observer.observe(editorModifierTagsList, { - childList: true + childList: true }) let current function ModifierDragAndDrop(target) { - let overlays = document.querySelector('#editor-inputs-tags-list').querySelectorAll('.modifier-card-overlay') - overlays.forEach (i => { - i.parentElement.draggable = true; - + let overlays = document.querySelector("#editor-inputs-tags-list").querySelectorAll(".modifier-card-overlay") + overlays.forEach((i) => { + i.parentElement.draggable = true + i.parentElement.ondragstart = (e) => { current = i - i.parentElement.getElementsByClassName('modifier-card-image-overlay')[0].innerText = '' + i.parentElement.getElementsByClassName("modifier-card-image-overlay")[0].innerText = "" i.parentElement.draggable = true - i.parentElement.classList.add('drag-sort-active') - for(let item of document.querySelector('#editor-inputs-tags-list').getElementsByClassName('modifier-card-image-overlay')) { - if (item.parentElement.parentElement.getElementsByClassName('modifier-card-overlay')[0] != current) { - item.parentElement.parentElement.getElementsByClassName('modifier-card-image-overlay')[0].style.opacity = 0 - if(item.parentElement.getElementsByClassName('modifier-card-image').length > 0) { - item.parentElement.getElementsByClassName('modifier-card-image')[0].style.filter = 'none' + i.parentElement.classList.add("drag-sort-active") + for (let item of document + .querySelector("#editor-inputs-tags-list") + .getElementsByClassName("modifier-card-image-overlay")) { + if ( + item.parentElement.parentElement.getElementsByClassName("modifier-card-overlay")[0] != current + ) { + item.parentElement.parentElement.getElementsByClassName( + "modifier-card-image-overlay" + )[0].style.opacity = 0 + if (item.parentElement.getElementsByClassName("modifier-card-image").length > 0) { + item.parentElement.getElementsByClassName("modifier-card-image")[0].style.filter = "none" } - item.parentElement.parentElement.style.transform = 'none' - item.parentElement.parentElement.style.boxShadow = 'none' + item.parentElement.parentElement.style.transform = "none" + item.parentElement.parentElement.style.boxShadow = "none" } - item.innerText = '' + item.innerText = "" } } - + i.ondragenter = (e) => { e.preventDefault() if (i != current) { - let currentPos = 0, droppedPos = 0; + let currentPos = 0, + droppedPos = 0 for (let it = 0; it < overlays.length; it++) { - if (current == overlays[it]) { currentPos = it; } - if (i == overlays[it]) { droppedPos = it; } + if (current == overlays[it]) { + currentPos = it + } + if (i == overlays[it]) { + droppedPos = it + } } if (i.parentElement != current.parentElement) { - let currentPos = 0, droppedPos = 0 + let currentPos = 0, + droppedPos = 0 for (let it = 0; it < overlays.length; it++) { - if (current == overlays[it]) { currentPos = it } - if (i == overlays[it]) { droppedPos = it } + if (current == overlays[it]) { + currentPos = it + } + if (i == overlays[it]) { + droppedPos = it + } } if (currentPos < droppedPos) { - current = i.parentElement.parentNode.insertBefore(current.parentElement, i.parentElement.nextSibling).getElementsByClassName('modifier-card-overlay')[0] + current = i.parentElement.parentNode + .insertBefore(current.parentElement, i.parentElement.nextSibling) + .getElementsByClassName("modifier-card-overlay")[0] } else { - current = i.parentElement.parentNode.insertBefore(current.parentElement, i.parentElement).getElementsByClassName('modifier-card-overlay')[0] + current = i.parentElement.parentNode + .insertBefore(current.parentElement, i.parentElement) + .getElementsByClassName("modifier-card-overlay")[0] } // update activeTags const tag = activeTags.splice(currentPos, 1) activeTags.splice(droppedPos, 0, tag[0]) - document.dispatchEvent(new Event('refreshImageModifiers')) + document.dispatchEvent(new Event("refreshImageModifiers")) } } - }; + } i.ondragover = (e) => { e.preventDefault() } - + i.parentElement.ondragend = (e) => { - i.parentElement.classList.remove('drag-sort-active') - for(let item of document.querySelector('#editor-inputs-tags-list').getElementsByClassName('modifier-card-image-overlay')) { - item.style.opacity = '' - item.innerText = '-' + i.parentElement.classList.remove("drag-sort-active") + for (let item of document + .querySelector("#editor-inputs-tags-list") + .getElementsByClassName("modifier-card-image-overlay")) { + item.style.opacity = "" + item.innerText = "-" } } }) diff --git a/ui/plugins/ui/Modifiers-wheel.plugin.js b/ui/plugins/ui/Modifiers-wheel.plugin.js index 0967a725..afb65bd0 100644 --- a/ui/plugins/ui/Modifiers-wheel.plugin.js +++ b/ui/plugins/ui/Modifiers-wheel.plugin.js @@ -1,35 +1,37 @@ -(function () { +;(function() { "use strict" const MAX_WEIGHT = 5 - - if (typeof editorModifierTagsList !== 'object') { - console.error('editorModifierTagsList missing...') + + if (typeof editorModifierTagsList !== "object") { + console.error("editorModifierTagsList missing...") return } // observe for changes in tag list - const observer = new MutationObserver(function (mutations) { - // mutations.forEach(function (mutation) { - if (editorModifierTagsList.childNodes.length > 0) { - ModifierMouseWheel(editorModifierTagsList) - } - // }) + const observer = new MutationObserver(function(mutations) { + // mutations.forEach(function (mutation) { + if (editorModifierTagsList.childNodes.length > 0) { + ModifierMouseWheel(editorModifierTagsList) + } + // }) }) - + observer.observe(editorModifierTagsList, { - childList: true + childList: true }) function ModifierMouseWheel(target) { - let overlays = document.querySelector('#editor-inputs-tags-list').querySelectorAll('.modifier-card-overlay') - overlays.forEach (i => { + let overlays = document.querySelector("#editor-inputs-tags-list").querySelectorAll(".modifier-card-overlay") + overlays.forEach((i) => { i.onwheel = (e) => { if (e.ctrlKey == true) { e.preventDefault() - + const delta = Math.sign(event.deltaY) - let s = i.parentElement.getElementsByClassName('modifier-card-label')[0].getElementsByTagName("p")[0].innerText + let s = i.parentElement + .getElementsByClassName("modifier-card-label")[0] + .getElementsByTagName("p")[0].innerText let t // find the corresponding tag for (let it = 0; it < overlays.length; it++) { @@ -38,43 +40,40 @@ break } } - if (s.charAt(0) !== '(' && s.charAt(s.length - 1) !== ')' && s.trim().includes(' ')) { - s = '(' + s + ')' - t = '(' + t + ')' + if (s.charAt(0) !== "(" && s.charAt(s.length - 1) !== ")" && s.trim().includes(" ")) { + s = "(" + s + ")" + t = "(" + t + ")" } if (delta < 0) { // wheel scrolling up - if (s.substring(s.length - 1) == '-') { + if (s.substring(s.length - 1) == "-") { s = s.substring(0, s.length - 1) t = t.substring(0, t.length - 1) - } - else - { - if (s.substring(s.length - MAX_WEIGHT) !== '+'.repeat(MAX_WEIGHT)) { - s = s + '+' - t = t + '+' + } else { + if (s.substring(s.length - MAX_WEIGHT) !== "+".repeat(MAX_WEIGHT)) { + s = s + "+" + t = t + "+" } } - } - else{ + } else { // wheel scrolling down - if (s.substring(s.length - 1) == '+') { + if (s.substring(s.length - 1) == "+") { s = s.substring(0, s.length - 1) t = t.substring(0, t.length - 1) - } - else - { - if (s.substring(s.length - MAX_WEIGHT) !== '-'.repeat(MAX_WEIGHT)) { - s = s + '-' - t = t + '-' + } else { + if (s.substring(s.length - MAX_WEIGHT) !== "-".repeat(MAX_WEIGHT)) { + s = s + "-" + t = t + "-" } } } - if (s.charAt(0) === '(' && s.charAt(s.length - 1) === ')') { + if (s.charAt(0) === "(" && s.charAt(s.length - 1) === ")") { s = s.substring(1, s.length - 1) t = t.substring(1, t.length - 1) } - i.parentElement.getElementsByClassName('modifier-card-label')[0].getElementsByTagName("p")[0].innerText = s + i.parentElement + .getElementsByClassName("modifier-card-label")[0] + .getElementsByTagName("p")[0].innerText = s // update activeTags for (let it = 0; it < overlays.length; it++) { if (i == overlays[it]) { @@ -82,7 +81,7 @@ break } } - document.dispatchEvent(new Event('refreshImageModifiers')) + document.dispatchEvent(new Event("refreshImageModifiers")) } } }) diff --git a/ui/plugins/ui/custom-modifiers.plugin.js b/ui/plugins/ui/custom-modifiers.plugin.js index 68599c63..e30930b6 100644 --- a/ui/plugins/ui/custom-modifiers.plugin.js +++ b/ui/plugins/ui/custom-modifiers.plugin.js @@ -1,25 +1,25 @@ -(function() { - PLUGINS['MODIFIERS_LOAD'].push({ +;(function() { + PLUGINS["MODIFIERS_LOAD"].push({ loader: function() { - let customModifiers = localStorage.getItem(CUSTOM_MODIFIERS_KEY, '') + let customModifiers = localStorage.getItem(CUSTOM_MODIFIERS_KEY, "") customModifiersTextBox.value = customModifiers if (customModifiersGroupElement !== undefined) { customModifiersGroupElement.remove() } - if (customModifiers && customModifiers.trim() !== '') { - customModifiers = customModifiers.split('\n') - customModifiers = customModifiers.filter(m => m.trim() !== '') + if (customModifiers && customModifiers.trim() !== "") { + customModifiers = customModifiers.split("\n") + customModifiers = customModifiers.filter((m) => m.trim() !== "") customModifiers = customModifiers.map(function(m) { return { - "modifier": m + modifier: m } }) let customGroup = { - 'category': 'Custom Modifiers', - 'modifiers': customModifiers + category: "Custom Modifiers", + modifiers: customModifiers } customModifiersGroupElement = createModifierGroup(customGroup, true) diff --git a/ui/plugins/ui/jasmine/boot0.js b/ui/plugins/ui/jasmine/boot0.js index c773ba8e..df131d9e 100644 --- a/ui/plugins/ui/jasmine/boot0.js +++ b/ui/plugins/ui/jasmine/boot0.js @@ -26,39 +26,39 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. after `jasmine.js` and `jasmine_html.js`, but before `boot1.js` or any project source files or spec files are loaded. */ -(function() { - const jasmineRequire = window.jasmineRequire || require('./jasmine.js'); +;(function() { + const jasmineRequire = window.jasmineRequire || require("./jasmine.js") - /** - * ## Require & Instantiate - * - * Require Jasmine's core files. Specifically, this requires and attaches all of Jasmine's code to the `jasmine` reference. - */ - const jasmine = jasmineRequire.core(jasmineRequire), - global = jasmine.getGlobal(); - global.jasmine = jasmine; + /** + * ## Require & Instantiate + * + * Require Jasmine's core files. Specifically, this requires and attaches all of Jasmine's code to the `jasmine` reference. + */ + const jasmine = jasmineRequire.core(jasmineRequire), + global = jasmine.getGlobal() + global.jasmine = jasmine - /** - * Since this is being run in a browser and the results should populate to an HTML page, require the HTML-specific Jasmine code, injecting the same reference. - */ - jasmineRequire.html(jasmine); + /** + * Since this is being run in a browser and the results should populate to an HTML page, require the HTML-specific Jasmine code, injecting the same reference. + */ + jasmineRequire.html(jasmine) - /** - * Create the Jasmine environment. This is used to run all specs in a project. - */ - const env = jasmine.getEnv(); + /** + * Create the Jasmine environment. This is used to run all specs in a project. + */ + const env = jasmine.getEnv() - /** - * ## The Global Interface - * - * Build up the functions that will be exposed as the Jasmine public interface. A project can customize, rename or alias any of these functions as desired, provided the implementation remains unchanged. - */ - const jasmineInterface = jasmineRequire.interface(jasmine, env); + /** + * ## The Global Interface + * + * Build up the functions that will be exposed as the Jasmine public interface. A project can customize, rename or alias any of these functions as desired, provided the implementation remains unchanged. + */ + const jasmineInterface = jasmineRequire.interface(jasmine, env) - /** - * Add all of the Jasmine global/public interface to the global scope, so a project can use the public interface directly. For example, calling `describe` in specs instead of `jasmine.getEnv().describe`. - */ - for (const property in jasmineInterface) { - global[property] = jasmineInterface[property]; - } -})(); + /** + * Add all of the Jasmine global/public interface to the global scope, so a project can use the public interface directly. For example, calling `describe` in specs instead of `jasmine.getEnv().describe`. + */ + for (const property in jasmineInterface) { + global[property] = jasmineInterface[property] + } +})() diff --git a/ui/plugins/ui/jasmine/boot1.js b/ui/plugins/ui/jasmine/boot1.js index 5fe49e41..54ccb7d7 100644 --- a/ui/plugins/ui/jasmine/boot1.js +++ b/ui/plugins/ui/jasmine/boot1.js @@ -33,100 +33,98 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. after `boot0.js` is loaded and before this file is loaded. */ -(function() { - const env = jasmine.getEnv(); +;(function() { + const env = jasmine.getEnv() - /** - * ## Runner Parameters - * - * More browser specific code - wrap the query string in an object and to allow for getting/setting parameters from the runner user interface. - */ + /** + * ## Runner Parameters + * + * More browser specific code - wrap the query string in an object and to allow for getting/setting parameters from the runner user interface. + */ - const queryString = new jasmine.QueryString({ - getWindowLocation: function() { - return window.location; + const queryString = new jasmine.QueryString({ + getWindowLocation: function() { + return window.location + } + }) + + const filterSpecs = !!queryString.getParam("spec") + + const config = { + stopOnSpecFailure: queryString.getParam("stopOnSpecFailure"), + stopSpecOnExpectationFailure: queryString.getParam("stopSpecOnExpectationFailure"), + hideDisabled: queryString.getParam("hideDisabled") } - }); - const filterSpecs = !!queryString.getParam('spec'); + const random = queryString.getParam("random") - const config = { - stopOnSpecFailure: queryString.getParam('stopOnSpecFailure'), - stopSpecOnExpectationFailure: queryString.getParam( - 'stopSpecOnExpectationFailure' - ), - hideDisabled: queryString.getParam('hideDisabled') - }; - - const random = queryString.getParam('random'); - - if (random !== undefined && random !== '') { - config.random = random; - } - - const seed = queryString.getParam('seed'); - if (seed) { - config.seed = seed; - } - - /** - * ## Reporters - * The `HtmlReporter` builds all of the HTML UI for the runner page. This reporter paints the dots, stars, and x's for specs, as well as all spec names and all failures (if any). - */ - const htmlReporter = new jasmine.HtmlReporter({ - env: env, - navigateWithNewParam: function(key, value) { - return queryString.navigateWithNewParam(key, value); - }, - addToExistingQueryString: function(key, value) { - return queryString.fullStringWithNewParam(key, value); - }, - getContainer: function() { - return document.body; - }, - createElement: function() { - return document.createElement.apply(document, arguments); - }, - createTextNode: function() { - return document.createTextNode.apply(document, arguments); - }, - timer: new jasmine.Timer(), - filterSpecs: filterSpecs - }); - - /** - * The `jsApiReporter` also receives spec results, and is used by any environment that needs to extract the results from JavaScript. - */ - env.addReporter(jsApiReporter); - env.addReporter(htmlReporter); - - /** - * Filter which specs will be run by matching the start of the full name against the `spec` query param. - */ - const specFilter = new jasmine.HtmlSpecFilter({ - filterString: function() { - return queryString.getParam('spec'); + if (random !== undefined && random !== "") { + config.random = random } - }); - config.specFilter = function(spec) { - return specFilter.matches(spec.getFullName()); - }; - - env.configure(config); - - /** - * ## Execution - * - * Replace the browser window's `onload`, ensure it's called, and then run all of the loaded specs. This includes initializing the `HtmlReporter` instance and then executing the loaded Jasmine environment. All of this will happen after all of the specs are loaded. - */ - const currentWindowOnload = window.onload; - - window.onload = function() { - if (currentWindowOnload) { - currentWindowOnload(); + const seed = queryString.getParam("seed") + if (seed) { + config.seed = seed } - htmlReporter.initialize(); - env.execute(); - }; -})(); + + /** + * ## Reporters + * The `HtmlReporter` builds all of the HTML UI for the runner page. This reporter paints the dots, stars, and x's for specs, as well as all spec names and all failures (if any). + */ + const htmlReporter = new jasmine.HtmlReporter({ + env: env, + navigateWithNewParam: function(key, value) { + return queryString.navigateWithNewParam(key, value) + }, + addToExistingQueryString: function(key, value) { + return queryString.fullStringWithNewParam(key, value) + }, + getContainer: function() { + return document.body + }, + createElement: function() { + return document.createElement.apply(document, arguments) + }, + createTextNode: function() { + return document.createTextNode.apply(document, arguments) + }, + timer: new jasmine.Timer(), + filterSpecs: filterSpecs + }) + + /** + * The `jsApiReporter` also receives spec results, and is used by any environment that needs to extract the results from JavaScript. + */ + env.addReporter(jsApiReporter) + env.addReporter(htmlReporter) + + /** + * Filter which specs will be run by matching the start of the full name against the `spec` query param. + */ + const specFilter = new jasmine.HtmlSpecFilter({ + filterString: function() { + return queryString.getParam("spec") + } + }) + + config.specFilter = function(spec) { + return specFilter.matches(spec.getFullName()) + } + + env.configure(config) + + /** + * ## Execution + * + * Replace the browser window's `onload`, ensure it's called, and then run all of the loaded specs. This includes initializing the `HtmlReporter` instance and then executing the loaded Jasmine environment. All of this will happen after all of the specs are loaded. + */ + const currentWindowOnload = window.onload + + window.onload = function() { + if (currentWindowOnload) { + currentWindowOnload() + } + htmlReporter.initialize() + env.execute() + } +})() diff --git a/ui/plugins/ui/jasmine/jasmine-html.js b/ui/plugins/ui/jasmine/jasmine-html.js index 2ebc6d0e..24157bd2 100644 --- a/ui/plugins/ui/jasmine/jasmine-html.js +++ b/ui/plugins/ui/jasmine/jasmine-html.js @@ -21,944 +21,804 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ // eslint-disable-next-line no-var -var jasmineRequire = window.jasmineRequire || require('./jasmine.js'); +var jasmineRequire = window.jasmineRequire || require("./jasmine.js") jasmineRequire.html = function(j$) { - j$.ResultsNode = jasmineRequire.ResultsNode(); - j$.HtmlReporter = jasmineRequire.HtmlReporter(j$); - j$.QueryString = jasmineRequire.QueryString(); - j$.HtmlSpecFilter = jasmineRequire.HtmlSpecFilter(); -}; + j$.ResultsNode = jasmineRequire.ResultsNode() + j$.HtmlReporter = jasmineRequire.HtmlReporter(j$) + j$.QueryString = jasmineRequire.QueryString() + j$.HtmlSpecFilter = jasmineRequire.HtmlSpecFilter() +} jasmineRequire.HtmlReporter = function(j$) { - function ResultsStateBuilder() { - this.topResults = new j$.ResultsNode({}, '', null); - this.currentParent = this.topResults; - this.specsExecuted = 0; - this.failureCount = 0; - this.pendingSpecCount = 0; - } - - ResultsStateBuilder.prototype.suiteStarted = function(result) { - this.currentParent.addChild(result, 'suite'); - this.currentParent = this.currentParent.last(); - }; - - ResultsStateBuilder.prototype.suiteDone = function(result) { - this.currentParent.updateResult(result); - if (this.currentParent !== this.topResults) { - this.currentParent = this.currentParent.parent; + function ResultsStateBuilder() { + this.topResults = new j$.ResultsNode({}, "", null) + this.currentParent = this.topResults + this.specsExecuted = 0 + this.failureCount = 0 + this.pendingSpecCount = 0 } - if (result.status === 'failed') { - this.failureCount++; - } - }; - - ResultsStateBuilder.prototype.specStarted = function(result) {}; - - ResultsStateBuilder.prototype.specDone = function(result) { - this.currentParent.addChild(result, 'spec'); - - if (result.status !== 'excluded') { - this.specsExecuted++; + ResultsStateBuilder.prototype.suiteStarted = function(result) { + this.currentParent.addChild(result, "suite") + this.currentParent = this.currentParent.last() } - if (result.status === 'failed') { - this.failureCount++; - } - - if (result.status == 'pending') { - this.pendingSpecCount++; - } - }; - - ResultsStateBuilder.prototype.jasmineDone = function(result) { - if (result.failedExpectations) { - this.failureCount += result.failedExpectations.length; - } - }; - - function HtmlReporter(options) { - function config() { - return (options.env && options.env.configuration()) || {}; - } - - const getContainer = options.getContainer; - const createElement = options.createElement; - const createTextNode = options.createTextNode; - const navigateWithNewParam = options.navigateWithNewParam || function() {}; - const addToExistingQueryString = - options.addToExistingQueryString || defaultQueryString; - const filterSpecs = options.filterSpecs; - let htmlReporterMain; - let symbols; - const deprecationWarnings = []; - const failures = []; - - this.initialize = function() { - clearPrior(); - htmlReporterMain = createDom( - 'div', - { className: 'jasmine_html-reporter' }, - createDom( - 'div', - { className: 'jasmine-banner' }, - createDom('a', { - className: 'jasmine-title', - href: 'http://jasmine.github.io/', - target: '_blank' - }), - createDom('span', { className: 'jasmine-version' }, j$.version) - ), - createDom('ul', { className: 'jasmine-symbol-summary' }), - createDom('div', { className: 'jasmine-alert' }), - createDom( - 'div', - { className: 'jasmine-results' }, - createDom('div', { className: 'jasmine-failures' }) - ) - ); - getContainer().appendChild(htmlReporterMain); - }; - - let totalSpecsDefined; - this.jasmineStarted = function(options) { - totalSpecsDefined = options.totalSpecsDefined || 0; - }; - - const summary = createDom('div', { className: 'jasmine-summary' }); - - const stateBuilder = new ResultsStateBuilder(); - - this.suiteStarted = function(result) { - stateBuilder.suiteStarted(result); - }; - - this.suiteDone = function(result) { - stateBuilder.suiteDone(result); - - if (result.status === 'failed') { - failures.push(failureDom(result)); - } - addDeprecationWarnings(result, 'suite'); - }; - - this.specStarted = function(result) { - stateBuilder.specStarted(result); - }; - - this.specDone = function(result) { - stateBuilder.specDone(result); - - if (noExpectations(result)) { - const noSpecMsg = "Spec '" + result.fullName + "' has no expectations."; - if (result.status === 'failed') { - console.error(noSpecMsg); - } else { - console.warn(noSpecMsg); + ResultsStateBuilder.prototype.suiteDone = function(result) { + this.currentParent.updateResult(result) + if (this.currentParent !== this.topResults) { + this.currentParent = this.currentParent.parent } - } - if (!symbols) { - symbols = find('.jasmine-symbol-summary'); - } + if (result.status === "failed") { + this.failureCount++ + } + } - symbols.appendChild( - createDom('li', { - className: this.displaySpecInCorrectFormat(result), - id: 'spec_' + result.id, - title: result.fullName - }) - ); + ResultsStateBuilder.prototype.specStarted = function(result) {} - if (result.status === 'failed') { - failures.push(failureDom(result)); - } + ResultsStateBuilder.prototype.specDone = function(result) { + this.currentParent.addChild(result, "spec") - addDeprecationWarnings(result, 'spec'); - }; + if (result.status !== "excluded") { + this.specsExecuted++ + } - this.displaySpecInCorrectFormat = function(result) { - return noExpectations(result) && result.status === 'passed' - ? 'jasmine-empty' - : this.resultStatus(result.status); - }; + if (result.status === "failed") { + this.failureCount++ + } - this.resultStatus = function(status) { - if (status === 'excluded') { - return config().hideDisabled - ? 'jasmine-excluded-no-display' - : 'jasmine-excluded'; - } - return 'jasmine-' + status; - }; + if (result.status == "pending") { + this.pendingSpecCount++ + } + } - this.jasmineDone = function(doneResult) { - stateBuilder.jasmineDone(doneResult); - const banner = find('.jasmine-banner'); - const alert = find('.jasmine-alert'); - const order = doneResult && doneResult.order; + ResultsStateBuilder.prototype.jasmineDone = function(result) { + if (result.failedExpectations) { + this.failureCount += result.failedExpectations.length + } + } - alert.appendChild( - createDom( - 'span', - { className: 'jasmine-duration' }, - 'finished in ' + doneResult.totalTime / 1000 + 's' - ) - ); + function HtmlReporter(options) { + function config() { + return (options.env && options.env.configuration()) || {} + } - banner.appendChild(optionsMenu(config())); + const getContainer = options.getContainer + const createElement = options.createElement + const createTextNode = options.createTextNode + const navigateWithNewParam = options.navigateWithNewParam || function() {} + const addToExistingQueryString = options.addToExistingQueryString || defaultQueryString + const filterSpecs = options.filterSpecs + let htmlReporterMain + let symbols + const deprecationWarnings = [] + const failures = [] - if (stateBuilder.specsExecuted < totalSpecsDefined) { - const skippedMessage = - 'Ran ' + - stateBuilder.specsExecuted + - ' of ' + - totalSpecsDefined + - ' specs - run all'; - // include window.location.pathname to fix issue with karma-jasmine-html-reporter in angular: see https://github.com/jasmine/jasmine/issues/1906 - const skippedLink = - (window.location.pathname || '') + - addToExistingQueryString('spec', ''); - alert.appendChild( - createDom( - 'span', - { className: 'jasmine-bar jasmine-skipped' }, - createDom( - 'a', - { href: skippedLink, title: 'Run all specs' }, - skippedMessage + this.initialize = function() { + clearPrior() + htmlReporterMain = createDom( + "div", + { className: "jasmine_html-reporter" }, + createDom( + "div", + { className: "jasmine-banner" }, + createDom("a", { + className: "jasmine-title", + href: "http://jasmine.github.io/", + target: "_blank" + }), + createDom("span", { className: "jasmine-version" }, j$.version) + ), + createDom("ul", { className: "jasmine-symbol-summary" }), + createDom("div", { className: "jasmine-alert" }), + createDom("div", { className: "jasmine-results" }, createDom("div", { className: "jasmine-failures" })) ) - ) - ); - } - let statusBarMessage = ''; - let statusBarClassName = 'jasmine-overall-result jasmine-bar '; - const globalFailures = - (doneResult && doneResult.failedExpectations) || []; - const failed = stateBuilder.failureCount + globalFailures.length > 0; - - if (totalSpecsDefined > 0 || failed) { - statusBarMessage += - pluralize('spec', stateBuilder.specsExecuted) + - ', ' + - pluralize('failure', stateBuilder.failureCount); - if (stateBuilder.pendingSpecCount) { - statusBarMessage += - ', ' + pluralize('pending spec', stateBuilder.pendingSpecCount); - } - } - - if (doneResult.overallStatus === 'passed') { - statusBarClassName += ' jasmine-passed '; - } else if (doneResult.overallStatus === 'incomplete') { - statusBarClassName += ' jasmine-incomplete '; - statusBarMessage = - 'Incomplete: ' + - doneResult.incompleteReason + - ', ' + - statusBarMessage; - } else { - statusBarClassName += ' jasmine-failed '; - } - - let seedBar; - if (order && order.random) { - seedBar = createDom( - 'span', - { className: 'jasmine-seed-bar' }, - ', randomized with seed ', - createDom( - 'a', - { - title: 'randomized with seed ' + order.seed, - href: seedHref(order.seed) - }, - order.seed - ) - ); - } - - alert.appendChild( - createDom( - 'span', - { className: statusBarClassName }, - statusBarMessage, - seedBar - ) - ); - - const errorBarClassName = 'jasmine-bar jasmine-errored'; - const afterAllMessagePrefix = 'AfterAll '; - - for (let i = 0; i < globalFailures.length; i++) { - alert.appendChild( - createDom( - 'span', - { className: errorBarClassName }, - globalFailureMessage(globalFailures[i]) - ) - ); - } - - function globalFailureMessage(failure) { - if (failure.globalErrorType === 'load') { - const prefix = 'Error during loading: ' + failure.message; - - if (failure.filename) { - return ( - prefix + ' in ' + failure.filename + ' line ' + failure.lineno - ); - } else { - return prefix; - } - } else if (failure.globalErrorType === 'afterAll') { - return afterAllMessagePrefix + failure.message; - } else { - return failure.message; - } - } - - addDeprecationWarnings(doneResult); - - for (let i = 0; i < deprecationWarnings.length; i++) { - const children = []; - let context; - - switch (deprecationWarnings[i].runnableType) { - case 'spec': - context = '(in spec: ' + deprecationWarnings[i].runnableName + ')'; - break; - case 'suite': - context = '(in suite: ' + deprecationWarnings[i].runnableName + ')'; - break; - default: - context = ''; + getContainer().appendChild(htmlReporterMain) } - deprecationWarnings[i].message.split('\n').forEach(function(line) { - children.push(line); - children.push(createDom('br')); - }); - - children[0] = 'DEPRECATION: ' + children[0]; - children.push(context); - - if (deprecationWarnings[i].stack) { - children.push(createExpander(deprecationWarnings[i].stack)); + let totalSpecsDefined + this.jasmineStarted = function(options) { + totalSpecsDefined = options.totalSpecsDefined || 0 } - alert.appendChild( - createDom( - 'span', - { className: 'jasmine-bar jasmine-warning' }, - children - ) - ); - } + const summary = createDom("div", { className: "jasmine-summary" }) - const results = find('.jasmine-results'); - results.appendChild(summary); + const stateBuilder = new ResultsStateBuilder() - summaryList(stateBuilder.topResults, summary); + this.suiteStarted = function(result) { + stateBuilder.suiteStarted(result) + } - if (failures.length) { - alert.appendChild( - createDom( - 'span', - { className: 'jasmine-menu jasmine-bar jasmine-spec-list' }, - createDom('span', {}, 'Spec List | '), - createDom( - 'a', - { className: 'jasmine-failures-menu', href: '#' }, - 'Failures' + this.suiteDone = function(result) { + stateBuilder.suiteDone(result) + + if (result.status === "failed") { + failures.push(failureDom(result)) + } + addDeprecationWarnings(result, "suite") + } + + this.specStarted = function(result) { + stateBuilder.specStarted(result) + } + + this.specDone = function(result) { + stateBuilder.specDone(result) + + if (noExpectations(result)) { + const noSpecMsg = "Spec '" + result.fullName + "' has no expectations." + if (result.status === "failed") { + console.error(noSpecMsg) + } else { + console.warn(noSpecMsg) + } + } + + if (!symbols) { + symbols = find(".jasmine-symbol-summary") + } + + symbols.appendChild( + createDom("li", { + className: this.displaySpecInCorrectFormat(result), + id: "spec_" + result.id, + title: result.fullName + }) ) - ) - ); - alert.appendChild( - createDom( - 'span', - { className: 'jasmine-menu jasmine-bar jasmine-failure-list' }, - createDom( - 'a', - { className: 'jasmine-spec-list-menu', href: '#' }, - 'Spec List' - ), - createDom('span', {}, ' | Failures ') - ) - ); - find('.jasmine-failures-menu').onclick = function() { - setMenuModeTo('jasmine-failure-list'); - return false; - }; - find('.jasmine-spec-list-menu').onclick = function() { - setMenuModeTo('jasmine-spec-list'); - return false; - }; + if (result.status === "failed") { + failures.push(failureDom(result)) + } - setMenuModeTo('jasmine-failure-list'); - - const failureNode = find('.jasmine-failures'); - for (let i = 0; i < failures.length; i++) { - failureNode.appendChild(failures[i]); + addDeprecationWarnings(result, "spec") } - } - }; - return this; + this.displaySpecInCorrectFormat = function(result) { + return noExpectations(result) && result.status === "passed" + ? "jasmine-empty" + : this.resultStatus(result.status) + } - function failureDom(result) { - const failure = createDom( - 'div', - { className: 'jasmine-spec-detail jasmine-failed' }, - failureDescription(result, stateBuilder.currentParent), - createDom('div', { className: 'jasmine-messages' }) - ); - const messages = failure.childNodes[1]; + this.resultStatus = function(status) { + if (status === "excluded") { + return config().hideDisabled ? "jasmine-excluded-no-display" : "jasmine-excluded" + } + return "jasmine-" + status + } - for (let i = 0; i < result.failedExpectations.length; i++) { - const expectation = result.failedExpectations[i]; - messages.appendChild( - createDom( - 'div', - { className: 'jasmine-result-message' }, - expectation.message - ) - ); - messages.appendChild( - createDom( - 'div', - { className: 'jasmine-stack-trace' }, - expectation.stack - ) - ); - } + this.jasmineDone = function(doneResult) { + stateBuilder.jasmineDone(doneResult) + const banner = find(".jasmine-banner") + const alert = find(".jasmine-alert") + const order = doneResult && doneResult.order - if (result.failedExpectations.length === 0) { - messages.appendChild( - createDom( - 'div', - { className: 'jasmine-result-message' }, - 'Spec has no expectations' - ) - ); - } - - if (result.debugLogs) { - messages.appendChild(debugLogTable(result.debugLogs)); - } - - return failure; - } - - function debugLogTable(debugLogs) { - const tbody = createDom('tbody'); - - debugLogs.forEach(function(entry) { - tbody.appendChild( - createDom( - 'tr', - {}, - createDom('td', {}, entry.timestamp.toString()), - createDom('td', {}, entry.message) - ) - ); - }); - - return createDom( - 'div', - { className: 'jasmine-debug-log' }, - createDom( - 'div', - { className: 'jasmine-debug-log-header' }, - 'Debug logs' - ), - createDom( - 'table', - {}, - createDom( - 'thead', - {}, - createDom( - 'tr', - {}, - createDom('th', {}, 'Time (ms)'), - createDom('th', {}, 'Message') + alert.appendChild( + createDom("span", { className: "jasmine-duration" }, "finished in " + doneResult.totalTime / 1000 + "s") ) - ), - tbody - ) - ); - } - function summaryList(resultsTree, domParent) { - let specListNode; - for (let i = 0; i < resultsTree.children.length; i++) { - const resultNode = resultsTree.children[i]; - if (filterSpecs && !hasActiveSpec(resultNode)) { - continue; + banner.appendChild(optionsMenu(config())) + + if (stateBuilder.specsExecuted < totalSpecsDefined) { + const skippedMessage = + "Ran " + stateBuilder.specsExecuted + " of " + totalSpecsDefined + " specs - run all" + // include window.location.pathname to fix issue with karma-jasmine-html-reporter in angular: see https://github.com/jasmine/jasmine/issues/1906 + const skippedLink = (window.location.pathname || "") + addToExistingQueryString("spec", "") + alert.appendChild( + createDom( + "span", + { className: "jasmine-bar jasmine-skipped" }, + createDom("a", { href: skippedLink, title: "Run all specs" }, skippedMessage) + ) + ) + } + let statusBarMessage = "" + let statusBarClassName = "jasmine-overall-result jasmine-bar " + const globalFailures = (doneResult && doneResult.failedExpectations) || [] + const failed = stateBuilder.failureCount + globalFailures.length > 0 + + if (totalSpecsDefined > 0 || failed) { + statusBarMessage += + pluralize("spec", stateBuilder.specsExecuted) + + ", " + + pluralize("failure", stateBuilder.failureCount) + if (stateBuilder.pendingSpecCount) { + statusBarMessage += ", " + pluralize("pending spec", stateBuilder.pendingSpecCount) + } + } + + if (doneResult.overallStatus === "passed") { + statusBarClassName += " jasmine-passed " + } else if (doneResult.overallStatus === "incomplete") { + statusBarClassName += " jasmine-incomplete " + statusBarMessage = "Incomplete: " + doneResult.incompleteReason + ", " + statusBarMessage + } else { + statusBarClassName += " jasmine-failed " + } + + let seedBar + if (order && order.random) { + seedBar = createDom( + "span", + { className: "jasmine-seed-bar" }, + ", randomized with seed ", + createDom( + "a", + { + title: "randomized with seed " + order.seed, + href: seedHref(order.seed) + }, + order.seed + ) + ) + } + + alert.appendChild(createDom("span", { className: statusBarClassName }, statusBarMessage, seedBar)) + + const errorBarClassName = "jasmine-bar jasmine-errored" + const afterAllMessagePrefix = "AfterAll " + + for (let i = 0; i < globalFailures.length; i++) { + alert.appendChild( + createDom("span", { className: errorBarClassName }, globalFailureMessage(globalFailures[i])) + ) + } + + function globalFailureMessage(failure) { + if (failure.globalErrorType === "load") { + const prefix = "Error during loading: " + failure.message + + if (failure.filename) { + return prefix + " in " + failure.filename + " line " + failure.lineno + } else { + return prefix + } + } else if (failure.globalErrorType === "afterAll") { + return afterAllMessagePrefix + failure.message + } else { + return failure.message + } + } + + addDeprecationWarnings(doneResult) + + for (let i = 0; i < deprecationWarnings.length; i++) { + const children = [] + let context + + switch (deprecationWarnings[i].runnableType) { + case "spec": + context = "(in spec: " + deprecationWarnings[i].runnableName + ")" + break + case "suite": + context = "(in suite: " + deprecationWarnings[i].runnableName + ")" + break + default: + context = "" + } + + deprecationWarnings[i].message.split("\n").forEach(function(line) { + children.push(line) + children.push(createDom("br")) + }) + + children[0] = "DEPRECATION: " + children[0] + children.push(context) + + if (deprecationWarnings[i].stack) { + children.push(createExpander(deprecationWarnings[i].stack)) + } + + alert.appendChild(createDom("span", { className: "jasmine-bar jasmine-warning" }, children)) + } + + const results = find(".jasmine-results") + results.appendChild(summary) + + summaryList(stateBuilder.topResults, summary) + + if (failures.length) { + alert.appendChild( + createDom( + "span", + { className: "jasmine-menu jasmine-bar jasmine-spec-list" }, + createDom("span", {}, "Spec List | "), + createDom("a", { className: "jasmine-failures-menu", href: "#" }, "Failures") + ) + ) + alert.appendChild( + createDom( + "span", + { className: "jasmine-menu jasmine-bar jasmine-failure-list" }, + createDom("a", { className: "jasmine-spec-list-menu", href: "#" }, "Spec List"), + createDom("span", {}, " | Failures ") + ) + ) + + find(".jasmine-failures-menu").onclick = function() { + setMenuModeTo("jasmine-failure-list") + return false + } + find(".jasmine-spec-list-menu").onclick = function() { + setMenuModeTo("jasmine-spec-list") + return false + } + + setMenuModeTo("jasmine-failure-list") + + const failureNode = find(".jasmine-failures") + for (let i = 0; i < failures.length; i++) { + failureNode.appendChild(failures[i]) + } + } } - if (resultNode.type === 'suite') { - const suiteListNode = createDom( - 'ul', - { className: 'jasmine-suite', id: 'suite-' + resultNode.result.id }, - createDom( - 'li', - { - className: - 'jasmine-suite-detail jasmine-' + resultNode.result.status - }, - createDom( - 'a', - { href: specHref(resultNode.result) }, - resultNode.result.description - ) + + return this + + function failureDom(result) { + const failure = createDom( + "div", + { className: "jasmine-spec-detail jasmine-failed" }, + failureDescription(result, stateBuilder.currentParent), + createDom("div", { className: "jasmine-messages" }) ) - ); + const messages = failure.childNodes[1] - summaryList(resultNode, suiteListNode); - domParent.appendChild(suiteListNode); + for (let i = 0; i < result.failedExpectations.length; i++) { + const expectation = result.failedExpectations[i] + messages.appendChild(createDom("div", { className: "jasmine-result-message" }, expectation.message)) + messages.appendChild(createDom("div", { className: "jasmine-stack-trace" }, expectation.stack)) + } + + if (result.failedExpectations.length === 0) { + messages.appendChild( + createDom("div", { className: "jasmine-result-message" }, "Spec has no expectations") + ) + } + + if (result.debugLogs) { + messages.appendChild(debugLogTable(result.debugLogs)) + } + + return failure } - if (resultNode.type === 'spec') { - if (domParent.getAttribute('class') !== 'jasmine-specs') { - specListNode = createDom('ul', { className: 'jasmine-specs' }); - domParent.appendChild(specListNode); - } - let specDescription = resultNode.result.description; - if (noExpectations(resultNode.result)) { - specDescription = 'SPEC HAS NO EXPECTATIONS ' + specDescription; - } - if ( - resultNode.result.status === 'pending' && - resultNode.result.pendingReason !== '' - ) { - specDescription = - specDescription + - ' PENDING WITH MESSAGE: ' + - resultNode.result.pendingReason; - } - specListNode.appendChild( - createDom( - 'li', - { - className: 'jasmine-' + resultNode.result.status, - id: 'spec-' + resultNode.result.id - }, - createDom( - 'a', - { href: specHref(resultNode.result) }, - specDescription - ) + + function debugLogTable(debugLogs) { + const tbody = createDom("tbody") + + debugLogs.forEach(function(entry) { + tbody.appendChild( + createDom( + "tr", + {}, + createDom("td", {}, entry.timestamp.toString()), + createDom("td", {}, entry.message) + ) + ) + }) + + return createDom( + "div", + { className: "jasmine-debug-log" }, + createDom("div", { className: "jasmine-debug-log-header" }, "Debug logs"), + createDom( + "table", + {}, + createDom( + "thead", + {}, + createDom("tr", {}, createDom("th", {}, "Time (ms)"), createDom("th", {}, "Message")) + ), + tbody + ) ) - ); } - } - } - function optionsMenu(config) { - const optionsMenuDom = createDom( - 'div', - { className: 'jasmine-run-options' }, - createDom('span', { className: 'jasmine-trigger' }, 'Options'), - createDom( - 'div', - { className: 'jasmine-payload' }, - createDom( - 'div', - { className: 'jasmine-stop-on-failure' }, - createDom('input', { - className: 'jasmine-fail-fast', - id: 'jasmine-fail-fast', - type: 'checkbox' - }), - createDom( - 'label', - { className: 'jasmine-label', for: 'jasmine-fail-fast' }, - 'stop execution on spec failure' + function summaryList(resultsTree, domParent) { + let specListNode + for (let i = 0; i < resultsTree.children.length; i++) { + const resultNode = resultsTree.children[i] + if (filterSpecs && !hasActiveSpec(resultNode)) { + continue + } + if (resultNode.type === "suite") { + const suiteListNode = createDom( + "ul", + { className: "jasmine-suite", id: "suite-" + resultNode.result.id }, + createDom( + "li", + { + className: "jasmine-suite-detail jasmine-" + resultNode.result.status + }, + createDom("a", { href: specHref(resultNode.result) }, resultNode.result.description) + ) + ) + + summaryList(resultNode, suiteListNode) + domParent.appendChild(suiteListNode) + } + if (resultNode.type === "spec") { + if (domParent.getAttribute("class") !== "jasmine-specs") { + specListNode = createDom("ul", { className: "jasmine-specs" }) + domParent.appendChild(specListNode) + } + let specDescription = resultNode.result.description + if (noExpectations(resultNode.result)) { + specDescription = "SPEC HAS NO EXPECTATIONS " + specDescription + } + if (resultNode.result.status === "pending" && resultNode.result.pendingReason !== "") { + specDescription = specDescription + " PENDING WITH MESSAGE: " + resultNode.result.pendingReason + } + specListNode.appendChild( + createDom( + "li", + { + className: "jasmine-" + resultNode.result.status, + id: "spec-" + resultNode.result.id + }, + createDom("a", { href: specHref(resultNode.result) }, specDescription) + ) + ) + } + } + } + + function optionsMenu(config) { + const optionsMenuDom = createDom( + "div", + { className: "jasmine-run-options" }, + createDom("span", { className: "jasmine-trigger" }, "Options"), + createDom( + "div", + { className: "jasmine-payload" }, + createDom( + "div", + { className: "jasmine-stop-on-failure" }, + createDom("input", { + className: "jasmine-fail-fast", + id: "jasmine-fail-fast", + type: "checkbox" + }), + createDom( + "label", + { className: "jasmine-label", for: "jasmine-fail-fast" }, + "stop execution on spec failure" + ) + ), + createDom( + "div", + { className: "jasmine-throw-failures" }, + createDom("input", { + className: "jasmine-throw", + id: "jasmine-throw-failures", + type: "checkbox" + }), + createDom( + "label", + { className: "jasmine-label", for: "jasmine-throw-failures" }, + "stop spec on expectation failure" + ) + ), + createDom( + "div", + { className: "jasmine-random-order" }, + createDom("input", { + className: "jasmine-random", + id: "jasmine-random-order", + type: "checkbox" + }), + createDom( + "label", + { className: "jasmine-label", for: "jasmine-random-order" }, + "run tests in random order" + ) + ), + createDom( + "div", + { className: "jasmine-hide-disabled" }, + createDom("input", { + className: "jasmine-disabled", + id: "jasmine-hide-disabled", + type: "checkbox" + }), + createDom( + "label", + { className: "jasmine-label", for: "jasmine-hide-disabled" }, + "hide disabled tests" + ) + ) + ) ) - ), - createDom( - 'div', - { className: 'jasmine-throw-failures' }, - createDom('input', { - className: 'jasmine-throw', - id: 'jasmine-throw-failures', - type: 'checkbox' - }), - createDom( - 'label', - { className: 'jasmine-label', for: 'jasmine-throw-failures' }, - 'stop spec on expectation failure' + + const failFastCheckbox = optionsMenuDom.querySelector("#jasmine-fail-fast") + failFastCheckbox.checked = config.stopOnSpecFailure + failFastCheckbox.onclick = function() { + navigateWithNewParam("stopOnSpecFailure", !config.stopOnSpecFailure) + } + + const throwCheckbox = optionsMenuDom.querySelector("#jasmine-throw-failures") + throwCheckbox.checked = config.stopSpecOnExpectationFailure + throwCheckbox.onclick = function() { + navigateWithNewParam("stopSpecOnExpectationFailure", !config.stopSpecOnExpectationFailure) + } + + const randomCheckbox = optionsMenuDom.querySelector("#jasmine-random-order") + randomCheckbox.checked = config.random + randomCheckbox.onclick = function() { + navigateWithNewParam("random", !config.random) + } + + const hideDisabled = optionsMenuDom.querySelector("#jasmine-hide-disabled") + hideDisabled.checked = config.hideDisabled + hideDisabled.onclick = function() { + navigateWithNewParam("hideDisabled", !config.hideDisabled) + } + + const optionsTrigger = optionsMenuDom.querySelector(".jasmine-trigger"), + optionsPayload = optionsMenuDom.querySelector(".jasmine-payload"), + isOpen = /\bjasmine-open\b/ + + optionsTrigger.onclick = function() { + if (isOpen.test(optionsPayload.className)) { + optionsPayload.className = optionsPayload.className.replace(isOpen, "") + } else { + optionsPayload.className += " jasmine-open" + } + } + + return optionsMenuDom + } + + function failureDescription(result, suite) { + const wrapper = createDom( + "div", + { className: "jasmine-description" }, + createDom("a", { title: result.description, href: specHref(result) }, result.description) ) - ), - createDom( - 'div', - { className: 'jasmine-random-order' }, - createDom('input', { - className: 'jasmine-random', - id: 'jasmine-random-order', - type: 'checkbox' - }), - createDom( - 'label', - { className: 'jasmine-label', for: 'jasmine-random-order' }, - 'run tests in random order' + let suiteLink + + while (suite && suite.parent) { + wrapper.insertBefore(createTextNode(" > "), wrapper.firstChild) + suiteLink = createDom("a", { href: suiteHref(suite) }, suite.result.description) + wrapper.insertBefore(suiteLink, wrapper.firstChild) + + suite = suite.parent + } + + return wrapper + } + + function suiteHref(suite) { + const els = [] + + while (suite && suite.parent) { + els.unshift(suite.result.description) + suite = suite.parent + } + + // include window.location.pathname to fix issue with karma-jasmine-html-reporter in angular: see https://github.com/jasmine/jasmine/issues/1906 + return (window.location.pathname || "") + addToExistingQueryString("spec", els.join(" ")) + } + + function addDeprecationWarnings(result, runnableType) { + if (result && result.deprecationWarnings) { + for (let i = 0; i < result.deprecationWarnings.length; i++) { + const warning = result.deprecationWarnings[i].message + deprecationWarnings.push({ + message: warning, + stack: result.deprecationWarnings[i].stack, + runnableName: result.fullName, + runnableType: runnableType + }) + } + } + } + + function createExpander(stackTrace) { + const expandLink = createDom("a", { href: "#" }, "Show stack trace") + const root = createDom( + "div", + { className: "jasmine-expander" }, + expandLink, + createDom("div", { className: "jasmine-expander-contents jasmine-stack-trace" }, stackTrace) ) - ), - createDom( - 'div', - { className: 'jasmine-hide-disabled' }, - createDom('input', { - className: 'jasmine-disabled', - id: 'jasmine-hide-disabled', - type: 'checkbox' - }), - createDom( - 'label', - { className: 'jasmine-label', for: 'jasmine-hide-disabled' }, - 'hide disabled tests' - ) - ) - ) - ); - const failFastCheckbox = optionsMenuDom.querySelector( - '#jasmine-fail-fast' - ); - failFastCheckbox.checked = config.stopOnSpecFailure; - failFastCheckbox.onclick = function() { - navigateWithNewParam('stopOnSpecFailure', !config.stopOnSpecFailure); - }; + expandLink.addEventListener("click", function(e) { + e.preventDefault() - const throwCheckbox = optionsMenuDom.querySelector( - '#jasmine-throw-failures' - ); - throwCheckbox.checked = config.stopSpecOnExpectationFailure; - throwCheckbox.onclick = function() { - navigateWithNewParam( - 'stopSpecOnExpectationFailure', - !config.stopSpecOnExpectationFailure - ); - }; + if (root.classList.contains("jasmine-expanded")) { + root.classList.remove("jasmine-expanded") + expandLink.textContent = "Show stack trace" + } else { + root.classList.add("jasmine-expanded") + expandLink.textContent = "Hide stack trace" + } + }) - const randomCheckbox = optionsMenuDom.querySelector( - '#jasmine-random-order' - ); - randomCheckbox.checked = config.random; - randomCheckbox.onclick = function() { - navigateWithNewParam('random', !config.random); - }; - - const hideDisabled = optionsMenuDom.querySelector( - '#jasmine-hide-disabled' - ); - hideDisabled.checked = config.hideDisabled; - hideDisabled.onclick = function() { - navigateWithNewParam('hideDisabled', !config.hideDisabled); - }; - - const optionsTrigger = optionsMenuDom.querySelector('.jasmine-trigger'), - optionsPayload = optionsMenuDom.querySelector('.jasmine-payload'), - isOpen = /\bjasmine-open\b/; - - optionsTrigger.onclick = function() { - if (isOpen.test(optionsPayload.className)) { - optionsPayload.className = optionsPayload.className.replace( - isOpen, - '' - ); - } else { - optionsPayload.className += ' jasmine-open'; + return root } - }; - return optionsMenuDom; - } - - function failureDescription(result, suite) { - const wrapper = createDom( - 'div', - { className: 'jasmine-description' }, - createDom( - 'a', - { title: result.description, href: specHref(result) }, - result.description - ) - ); - let suiteLink; - - while (suite && suite.parent) { - wrapper.insertBefore(createTextNode(' > '), wrapper.firstChild); - suiteLink = createDom( - 'a', - { href: suiteHref(suite) }, - suite.result.description - ); - wrapper.insertBefore(suiteLink, wrapper.firstChild); - - suite = suite.parent; - } - - return wrapper; - } - - function suiteHref(suite) { - const els = []; - - while (suite && suite.parent) { - els.unshift(suite.result.description); - suite = suite.parent; - } - - // include window.location.pathname to fix issue with karma-jasmine-html-reporter in angular: see https://github.com/jasmine/jasmine/issues/1906 - return ( - (window.location.pathname || '') + - addToExistingQueryString('spec', els.join(' ')) - ); - } - - function addDeprecationWarnings(result, runnableType) { - if (result && result.deprecationWarnings) { - for (let i = 0; i < result.deprecationWarnings.length; i++) { - const warning = result.deprecationWarnings[i].message; - deprecationWarnings.push({ - message: warning, - stack: result.deprecationWarnings[i].stack, - runnableName: result.fullName, - runnableType: runnableType - }); + function find(selector) { + return getContainer().querySelector(".jasmine_html-reporter " + selector) } - } - } - function createExpander(stackTrace) { - const expandLink = createDom('a', { href: '#' }, 'Show stack trace'); - const root = createDom( - 'div', - { className: 'jasmine-expander' }, - expandLink, - createDom( - 'div', - { className: 'jasmine-expander-contents jasmine-stack-trace' }, - stackTrace - ) - ); + function clearPrior() { + const oldReporter = find("") - expandLink.addEventListener('click', function(e) { - e.preventDefault(); - - if (root.classList.contains('jasmine-expanded')) { - root.classList.remove('jasmine-expanded'); - expandLink.textContent = 'Show stack trace'; - } else { - root.classList.add('jasmine-expanded'); - expandLink.textContent = 'Hide stack trace'; + if (oldReporter) { + getContainer().removeChild(oldReporter) + } } - }); - return root; - } + function createDom(type, attrs, childrenArrayOrVarArgs) { + const el = createElement(type) + let children - function find(selector) { - return getContainer().querySelector('.jasmine_html-reporter ' + selector); - } + if (j$.isArray_(childrenArrayOrVarArgs)) { + children = childrenArrayOrVarArgs + } else { + children = [] - function clearPrior() { - const oldReporter = find(''); + for (let i = 2; i < arguments.length; i++) { + children.push(arguments[i]) + } + } - if (oldReporter) { - getContainer().removeChild(oldReporter); - } - } + for (let i = 0; i < children.length; i++) { + const child = children[i] - function createDom(type, attrs, childrenArrayOrVarArgs) { - const el = createElement(type); - let children; + if (typeof child === "string") { + el.appendChild(createTextNode(child)) + } else { + if (child) { + el.appendChild(child) + } + } + } - if (j$.isArray_(childrenArrayOrVarArgs)) { - children = childrenArrayOrVarArgs; - } else { - children = []; + for (const attr in attrs) { + if (attr == "className") { + el[attr] = attrs[attr] + } else { + el.setAttribute(attr, attrs[attr]) + } + } - for (let i = 2; i < arguments.length; i++) { - children.push(arguments[i]); + return el } - } - for (let i = 0; i < children.length; i++) { - const child = children[i]; + function pluralize(singular, count) { + const word = count == 1 ? singular : singular + "s" - if (typeof child === 'string') { - el.appendChild(createTextNode(child)); - } else { - if (child) { - el.appendChild(child); - } + return "" + count + " " + word } - } - for (const attr in attrs) { - if (attr == 'className') { - el[attr] = attrs[attr]; - } else { - el.setAttribute(attr, attrs[attr]); + function specHref(result) { + // include window.location.pathname to fix issue with karma-jasmine-html-reporter in angular: see https://github.com/jasmine/jasmine/issues/1906 + return (window.location.pathname || "") + addToExistingQueryString("spec", result.fullName) } - } - return el; - } - - function pluralize(singular, count) { - const word = count == 1 ? singular : singular + 's'; - - return '' + count + ' ' + word; - } - - function specHref(result) { - // include window.location.pathname to fix issue with karma-jasmine-html-reporter in angular: see https://github.com/jasmine/jasmine/issues/1906 - return ( - (window.location.pathname || '') + - addToExistingQueryString('spec', result.fullName) - ); - } - - function seedHref(seed) { - // include window.location.pathname to fix issue with karma-jasmine-html-reporter in angular: see https://github.com/jasmine/jasmine/issues/1906 - return ( - (window.location.pathname || '') + - addToExistingQueryString('seed', seed) - ); - } - - function defaultQueryString(key, value) { - return '?' + key + '=' + value; - } - - function setMenuModeTo(mode) { - htmlReporterMain.setAttribute('class', 'jasmine_html-reporter ' + mode); - } - - function noExpectations(result) { - const allExpectations = - result.failedExpectations.length + result.passedExpectations.length; - - return ( - allExpectations === 0 && - (result.status === 'passed' || result.status === 'failed') - ); - } - - function hasActiveSpec(resultNode) { - if (resultNode.type == 'spec' && resultNode.result.status != 'excluded') { - return true; - } - - if (resultNode.type == 'suite') { - for (let i = 0, j = resultNode.children.length; i < j; i++) { - if (hasActiveSpec(resultNode.children[i])) { - return true; - } + function seedHref(seed) { + // include window.location.pathname to fix issue with karma-jasmine-html-reporter in angular: see https://github.com/jasmine/jasmine/issues/1906 + return (window.location.pathname || "") + addToExistingQueryString("seed", seed) } - } - } - } - return HtmlReporter; -}; + function defaultQueryString(key, value) { + return "?" + key + "=" + value + } + + function setMenuModeTo(mode) { + htmlReporterMain.setAttribute("class", "jasmine_html-reporter " + mode) + } + + function noExpectations(result) { + const allExpectations = result.failedExpectations.length + result.passedExpectations.length + + return allExpectations === 0 && (result.status === "passed" || result.status === "failed") + } + + function hasActiveSpec(resultNode) { + if (resultNode.type == "spec" && resultNode.result.status != "excluded") { + return true + } + + if (resultNode.type == "suite") { + for (let i = 0, j = resultNode.children.length; i < j; i++) { + if (hasActiveSpec(resultNode.children[i])) { + return true + } + } + } + } + } + + return HtmlReporter +} jasmineRequire.HtmlSpecFilter = function() { - function HtmlSpecFilter(options) { - const filterString = - options && - options.filterString() && - options.filterString().replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&'); - const filterPattern = new RegExp(filterString); + function HtmlSpecFilter(options) { + const filterString = + options && options.filterString() && options.filterString().replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&") + const filterPattern = new RegExp(filterString) - this.matches = function(specName) { - return filterPattern.test(specName); - }; - } + this.matches = function(specName) { + return filterPattern.test(specName) + } + } - return HtmlSpecFilter; -}; + return HtmlSpecFilter +} jasmineRequire.ResultsNode = function() { - function ResultsNode(result, type, parent) { - this.result = result; - this.type = type; - this.parent = parent; + function ResultsNode(result, type, parent) { + this.result = result + this.type = type + this.parent = parent - this.children = []; + this.children = [] - this.addChild = function(result, type) { - this.children.push(new ResultsNode(result, type, this)); - }; + this.addChild = function(result, type) { + this.children.push(new ResultsNode(result, type, this)) + } - this.last = function() { - return this.children[this.children.length - 1]; - }; + this.last = function() { + return this.children[this.children.length - 1] + } - this.updateResult = function(result) { - this.result = result; - }; - } + this.updateResult = function(result) { + this.result = result + } + } - return ResultsNode; -}; + return ResultsNode +} jasmineRequire.QueryString = function() { - function QueryString(options) { - this.navigateWithNewParam = function(key, value) { - options.getWindowLocation().search = this.fullStringWithNewParam( - key, - value - ); - }; - - this.fullStringWithNewParam = function(key, value) { - const paramMap = queryStringToParamMap(); - paramMap[key] = value; - return toQueryString(paramMap); - }; - - this.getParam = function(key) { - return queryStringToParamMap()[key]; - }; - - return this; - - function toQueryString(paramMap) { - const qStrPairs = []; - for (const prop in paramMap) { - qStrPairs.push( - encodeURIComponent(prop) + '=' + encodeURIComponent(paramMap[prop]) - ); - } - return '?' + qStrPairs.join('&'); - } - - function queryStringToParamMap() { - const paramStr = options.getWindowLocation().search.substring(1); - let params = []; - const paramMap = {}; - - if (paramStr.length > 0) { - params = paramStr.split('&'); - for (let i = 0; i < params.length; i++) { - const p = params[i].split('='); - let value = decodeURIComponent(p[1]); - if (value === 'true' || value === 'false') { - value = JSON.parse(value); - } - paramMap[decodeURIComponent(p[0])] = value; + function QueryString(options) { + this.navigateWithNewParam = function(key, value) { + options.getWindowLocation().search = this.fullStringWithNewParam(key, value) } - } - return paramMap; + this.fullStringWithNewParam = function(key, value) { + const paramMap = queryStringToParamMap() + paramMap[key] = value + return toQueryString(paramMap) + } + + this.getParam = function(key) { + return queryStringToParamMap()[key] + } + + return this + + function toQueryString(paramMap) { + const qStrPairs = [] + for (const prop in paramMap) { + qStrPairs.push(encodeURIComponent(prop) + "=" + encodeURIComponent(paramMap[prop])) + } + return "?" + qStrPairs.join("&") + } + + function queryStringToParamMap() { + const paramStr = options.getWindowLocation().search.substring(1) + let params = [] + const paramMap = {} + + if (paramStr.length > 0) { + params = paramStr.split("&") + for (let i = 0; i < params.length; i++) { + const p = params[i].split("=") + let value = decodeURIComponent(p[1]) + if (value === "true" || value === "false") { + value = JSON.parse(value) + } + paramMap[decodeURIComponent(p[0])] = value + } + } + + return paramMap + } } - } - return QueryString; -}; + return QueryString +} diff --git a/ui/plugins/ui/jasmine/jasmine.js b/ui/plugins/ui/jasmine/jasmine.js index 9160c753..470b7503 100644 --- a/ui/plugins/ui/jasmine/jasmine.js +++ b/ui/plugins/ui/jasmine/jasmine.js @@ -22,5221 +22,4896 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ // eslint-disable-next-line no-unused-vars,no-var var getJasmineRequireObj = (function(jasmineGlobal) { - let jasmineRequire; + let jasmineRequire - if ( - typeof module !== 'undefined' && - module.exports && - typeof exports !== 'undefined' - ) { - if (typeof global !== 'undefined') { - jasmineGlobal = global; + if (typeof module !== "undefined" && module.exports && typeof exports !== "undefined") { + if (typeof global !== "undefined") { + jasmineGlobal = global + } else { + jasmineGlobal = {} + } + jasmineRequire = exports } else { - jasmineGlobal = {}; + if ( + typeof window !== "undefined" && + typeof window.toString === "function" && + window.toString() === "[object GjsGlobal]" + ) { + jasmineGlobal = window + } + jasmineRequire = jasmineGlobal.jasmineRequire = {} } - jasmineRequire = exports; - } else { - if ( - typeof window !== 'undefined' && - typeof window.toString === 'function' && - window.toString() === '[object GjsGlobal]' - ) { - jasmineGlobal = window; + + function getJasmineRequire() { + return jasmineRequire } - jasmineRequire = jasmineGlobal.jasmineRequire = {}; - } - function getJasmineRequire() { - return jasmineRequire; - } + getJasmineRequire().core = function(jRequire) { + const j$ = {} - getJasmineRequire().core = function(jRequire) { - const j$ = {}; + jRequire.base(j$, jasmineGlobal) + j$.util = jRequire.util(j$) + j$.errors = jRequire.errors() + j$.formatErrorMsg = jRequire.formatErrorMsg() + j$.Any = jRequire.Any(j$) + j$.Anything = jRequire.Anything(j$) + j$.CallTracker = jRequire.CallTracker(j$) + j$.MockDate = jRequire.MockDate(j$) + j$.getClearStack = jRequire.clearStack(j$) + j$.Clock = jRequire.Clock() + j$.DelayedFunctionScheduler = jRequire.DelayedFunctionScheduler(j$) + j$.Deprecator = jRequire.Deprecator(j$) + j$.Env = jRequire.Env(j$) + j$.StackTrace = jRequire.StackTrace(j$) + j$.ExceptionFormatter = jRequire.ExceptionFormatter(j$) + j$.ExpectationFilterChain = jRequire.ExpectationFilterChain() + j$.Expector = jRequire.Expector(j$) + j$.Expectation = jRequire.Expectation(j$) + j$.buildExpectationResult = jRequire.buildExpectationResult(j$) + j$.JsApiReporter = jRequire.JsApiReporter(j$) + j$.makePrettyPrinter = jRequire.makePrettyPrinter(j$) + j$.basicPrettyPrinter_ = j$.makePrettyPrinter() + j$.MatchersUtil = jRequire.MatchersUtil(j$) + j$.ObjectContaining = jRequire.ObjectContaining(j$) + j$.ArrayContaining = jRequire.ArrayContaining(j$) + j$.ArrayWithExactContents = jRequire.ArrayWithExactContents(j$) + j$.MapContaining = jRequire.MapContaining(j$) + j$.SetContaining = jRequire.SetContaining(j$) + j$.QueueRunner = jRequire.QueueRunner(j$) + j$.NeverSkipPolicy = jRequire.NeverSkipPolicy(j$) + j$.SkipAfterBeforeAllErrorPolicy = jRequire.SkipAfterBeforeAllErrorPolicy(j$) + j$.CompleteOnFirstErrorSkipPolicy = jRequire.CompleteOnFirstErrorSkipPolicy(j$) + j$.ReportDispatcher = jRequire.ReportDispatcher(j$) + j$.RunableResources = jRequire.RunableResources(j$) + j$.Runner = jRequire.Runner(j$) + j$.Spec = jRequire.Spec(j$) + j$.Spy = jRequire.Spy(j$) + j$.SpyFactory = jRequire.SpyFactory(j$) + j$.SpyRegistry = jRequire.SpyRegistry(j$) + j$.SpyStrategy = jRequire.SpyStrategy(j$) + j$.StringMatching = jRequire.StringMatching(j$) + j$.StringContaining = jRequire.StringContaining(j$) + j$.UserContext = jRequire.UserContext(j$) + j$.Suite = jRequire.Suite(j$) + j$.SuiteBuilder = jRequire.SuiteBuilder(j$) + j$.Timer = jRequire.Timer() + j$.TreeProcessor = jRequire.TreeProcessor() + j$.version = jRequire.version() + j$.Order = jRequire.Order() + j$.DiffBuilder = jRequire.DiffBuilder(j$) + j$.NullDiffBuilder = jRequire.NullDiffBuilder(j$) + j$.ObjectPath = jRequire.ObjectPath(j$) + j$.MismatchTree = jRequire.MismatchTree(j$) + j$.GlobalErrors = jRequire.GlobalErrors(j$) - jRequire.base(j$, jasmineGlobal); - j$.util = jRequire.util(j$); - j$.errors = jRequire.errors(); - j$.formatErrorMsg = jRequire.formatErrorMsg(); - j$.Any = jRequire.Any(j$); - j$.Anything = jRequire.Anything(j$); - j$.CallTracker = jRequire.CallTracker(j$); - j$.MockDate = jRequire.MockDate(j$); - j$.getClearStack = jRequire.clearStack(j$); - j$.Clock = jRequire.Clock(); - j$.DelayedFunctionScheduler = jRequire.DelayedFunctionScheduler(j$); - j$.Deprecator = jRequire.Deprecator(j$); - j$.Env = jRequire.Env(j$); - j$.StackTrace = jRequire.StackTrace(j$); - j$.ExceptionFormatter = jRequire.ExceptionFormatter(j$); - j$.ExpectationFilterChain = jRequire.ExpectationFilterChain(); - j$.Expector = jRequire.Expector(j$); - j$.Expectation = jRequire.Expectation(j$); - j$.buildExpectationResult = jRequire.buildExpectationResult(j$); - j$.JsApiReporter = jRequire.JsApiReporter(j$); - j$.makePrettyPrinter = jRequire.makePrettyPrinter(j$); - j$.basicPrettyPrinter_ = j$.makePrettyPrinter(); - j$.MatchersUtil = jRequire.MatchersUtil(j$); - j$.ObjectContaining = jRequire.ObjectContaining(j$); - j$.ArrayContaining = jRequire.ArrayContaining(j$); - j$.ArrayWithExactContents = jRequire.ArrayWithExactContents(j$); - j$.MapContaining = jRequire.MapContaining(j$); - j$.SetContaining = jRequire.SetContaining(j$); - j$.QueueRunner = jRequire.QueueRunner(j$); - j$.NeverSkipPolicy = jRequire.NeverSkipPolicy(j$); - j$.SkipAfterBeforeAllErrorPolicy = jRequire.SkipAfterBeforeAllErrorPolicy( - j$ - ); - j$.CompleteOnFirstErrorSkipPolicy = jRequire.CompleteOnFirstErrorSkipPolicy( - j$ - ); - j$.ReportDispatcher = jRequire.ReportDispatcher(j$); - j$.RunableResources = jRequire.RunableResources(j$); - j$.Runner = jRequire.Runner(j$); - j$.Spec = jRequire.Spec(j$); - j$.Spy = jRequire.Spy(j$); - j$.SpyFactory = jRequire.SpyFactory(j$); - j$.SpyRegistry = jRequire.SpyRegistry(j$); - j$.SpyStrategy = jRequire.SpyStrategy(j$); - j$.StringMatching = jRequire.StringMatching(j$); - j$.StringContaining = jRequire.StringContaining(j$); - j$.UserContext = jRequire.UserContext(j$); - j$.Suite = jRequire.Suite(j$); - j$.SuiteBuilder = jRequire.SuiteBuilder(j$); - j$.Timer = jRequire.Timer(); - j$.TreeProcessor = jRequire.TreeProcessor(); - j$.version = jRequire.version(); - j$.Order = jRequire.Order(); - j$.DiffBuilder = jRequire.DiffBuilder(j$); - j$.NullDiffBuilder = jRequire.NullDiffBuilder(j$); - j$.ObjectPath = jRequire.ObjectPath(j$); - j$.MismatchTree = jRequire.MismatchTree(j$); - j$.GlobalErrors = jRequire.GlobalErrors(j$); + j$.Truthy = jRequire.Truthy(j$) + j$.Falsy = jRequire.Falsy(j$) + j$.Empty = jRequire.Empty(j$) + j$.NotEmpty = jRequire.NotEmpty(j$) + j$.Is = jRequire.Is(j$) - j$.Truthy = jRequire.Truthy(j$); - j$.Falsy = jRequire.Falsy(j$); - j$.Empty = jRequire.Empty(j$); - j$.NotEmpty = jRequire.NotEmpty(j$); - j$.Is = jRequire.Is(j$); + j$.matchers = jRequire.requireMatchers(jRequire, j$) + j$.asyncMatchers = jRequire.requireAsyncMatchers(jRequire, j$) - j$.matchers = jRequire.requireMatchers(jRequire, j$); - j$.asyncMatchers = jRequire.requireAsyncMatchers(jRequire, j$); + return j$ + } - return j$; - }; - - return getJasmineRequire; -})(this); + return getJasmineRequire +})(this) getJasmineRequireObj().requireMatchers = function(jRequire, j$) { - const availableMatchers = [ - 'nothing', - 'toBe', - 'toBeCloseTo', - 'toBeDefined', - 'toBeInstanceOf', - 'toBeFalse', - 'toBeFalsy', - 'toBeGreaterThan', - 'toBeGreaterThanOrEqual', - 'toBeLessThan', - 'toBeLessThanOrEqual', - 'toBeNaN', - 'toBeNegativeInfinity', - 'toBeNull', - 'toBePositiveInfinity', - 'toBeTrue', - 'toBeTruthy', - 'toBeUndefined', - 'toContain', - 'toEqual', - 'toHaveSize', - 'toHaveBeenCalled', - 'toHaveBeenCalledBefore', - 'toHaveBeenCalledOnceWith', - 'toHaveBeenCalledTimes', - 'toHaveBeenCalledWith', - 'toHaveClass', - 'toHaveSpyInteractions', - 'toMatch', - 'toThrow', - 'toThrowError', - 'toThrowMatching' - ], - matchers = {}; + const availableMatchers = [ + "nothing", + "toBe", + "toBeCloseTo", + "toBeDefined", + "toBeInstanceOf", + "toBeFalse", + "toBeFalsy", + "toBeGreaterThan", + "toBeGreaterThanOrEqual", + "toBeLessThan", + "toBeLessThanOrEqual", + "toBeNaN", + "toBeNegativeInfinity", + "toBeNull", + "toBePositiveInfinity", + "toBeTrue", + "toBeTruthy", + "toBeUndefined", + "toContain", + "toEqual", + "toHaveSize", + "toHaveBeenCalled", + "toHaveBeenCalledBefore", + "toHaveBeenCalledOnceWith", + "toHaveBeenCalledTimes", + "toHaveBeenCalledWith", + "toHaveClass", + "toHaveSpyInteractions", + "toMatch", + "toThrow", + "toThrowError", + "toThrowMatching" + ], + matchers = {} - for (const name of availableMatchers) { - matchers[name] = jRequire[name](j$); - } + for (const name of availableMatchers) { + matchers[name] = jRequire[name](j$) + } - return matchers; -}; + return matchers +} getJasmineRequireObj().base = function(j$, jasmineGlobal) { - /** - * Maximum object depth the pretty printer will print to. - * Set this to a lower value to speed up pretty printing if you have large objects. - * @name jasmine.MAX_PRETTY_PRINT_DEPTH - * @default 8 - * @since 1.3.0 - */ - j$.MAX_PRETTY_PRINT_DEPTH = 8; - /** - * Maximum number of array elements to display when pretty printing objects. - * This will also limit the number of keys and values displayed for an object. - * Elements past this number will be ellipised. - * @name jasmine.MAX_PRETTY_PRINT_ARRAY_LENGTH - * @default 50 - * @since 2.7.0 - */ - j$.MAX_PRETTY_PRINT_ARRAY_LENGTH = 50; - /** - * Maximum number of characters to display when pretty printing objects. - * Characters past this number will be ellipised. - * @name jasmine.MAX_PRETTY_PRINT_CHARS - * @default 100 - * @since 2.9.0 - */ - j$.MAX_PRETTY_PRINT_CHARS = 1000; - /** - * Default number of milliseconds Jasmine will wait for an asynchronous spec, - * before, or after function to complete. This can be overridden on a case by - * case basis by passing a time limit as the third argument to {@link it}, - * {@link beforeEach}, {@link afterEach}, {@link beforeAll}, or - * {@link afterAll}. The value must be no greater than the largest number of - * milliseconds supported by setTimeout, which is usually 2147483647. - * - * While debugging tests, you may want to set this to a large number (or pass - * a large number to one of the functions mentioned above) so that Jasmine - * does not move on to after functions or the next spec while you're debugging. - * @name jasmine.DEFAULT_TIMEOUT_INTERVAL - * @default 5000 - * @since 1.3.0 - */ - let DEFAULT_TIMEOUT_INTERVAL = 5000; - Object.defineProperty(j$, 'DEFAULT_TIMEOUT_INTERVAL', { - get: function() { - return DEFAULT_TIMEOUT_INTERVAL; - }, - set: function(newValue) { - j$.util.validateTimeout(newValue, 'jasmine.DEFAULT_TIMEOUT_INTERVAL'); - DEFAULT_TIMEOUT_INTERVAL = newValue; - } - }); + /** + * Maximum object depth the pretty printer will print to. + * Set this to a lower value to speed up pretty printing if you have large objects. + * @name jasmine.MAX_PRETTY_PRINT_DEPTH + * @default 8 + * @since 1.3.0 + */ + j$.MAX_PRETTY_PRINT_DEPTH = 8 + /** + * Maximum number of array elements to display when pretty printing objects. + * This will also limit the number of keys and values displayed for an object. + * Elements past this number will be ellipised. + * @name jasmine.MAX_PRETTY_PRINT_ARRAY_LENGTH + * @default 50 + * @since 2.7.0 + */ + j$.MAX_PRETTY_PRINT_ARRAY_LENGTH = 50 + /** + * Maximum number of characters to display when pretty printing objects. + * Characters past this number will be ellipised. + * @name jasmine.MAX_PRETTY_PRINT_CHARS + * @default 100 + * @since 2.9.0 + */ + j$.MAX_PRETTY_PRINT_CHARS = 1000 + /** + * Default number of milliseconds Jasmine will wait for an asynchronous spec, + * before, or after function to complete. This can be overridden on a case by + * case basis by passing a time limit as the third argument to {@link it}, + * {@link beforeEach}, {@link afterEach}, {@link beforeAll}, or + * {@link afterAll}. The value must be no greater than the largest number of + * milliseconds supported by setTimeout, which is usually 2147483647. + * + * While debugging tests, you may want to set this to a large number (or pass + * a large number to one of the functions mentioned above) so that Jasmine + * does not move on to after functions or the next spec while you're debugging. + * @name jasmine.DEFAULT_TIMEOUT_INTERVAL + * @default 5000 + * @since 1.3.0 + */ + let DEFAULT_TIMEOUT_INTERVAL = 5000 + Object.defineProperty(j$, "DEFAULT_TIMEOUT_INTERVAL", { + get: function() { + return DEFAULT_TIMEOUT_INTERVAL + }, + set: function(newValue) { + j$.util.validateTimeout(newValue, "jasmine.DEFAULT_TIMEOUT_INTERVAL") + DEFAULT_TIMEOUT_INTERVAL = newValue + } + }) - j$.getGlobal = function() { - return jasmineGlobal; - }; - - /** - * Get the currently booted Jasmine Environment. - * - * @name jasmine.getEnv - * @since 1.3.0 - * @function - * @return {Env} - */ - j$.getEnv = function(options) { - const env = (j$.currentEnv_ = j$.currentEnv_ || new j$.Env(options)); - //jasmine. singletons in here (setTimeout blah blah). - return env; - }; - - j$.isArray_ = function(value) { - return j$.isA_('Array', value); - }; - - j$.isObject_ = function(value) { - return ( - !j$.util.isUndefined(value) && value !== null && j$.isA_('Object', value) - ); - }; - - j$.isString_ = function(value) { - return j$.isA_('String', value); - }; - - j$.isNumber_ = function(value) { - return j$.isA_('Number', value); - }; - - j$.isFunction_ = function(value) { - return j$.isA_('Function', value); - }; - - j$.isAsyncFunction_ = function(value) { - return j$.isA_('AsyncFunction', value); - }; - - j$.isGeneratorFunction_ = function(value) { - return j$.isA_('GeneratorFunction', value); - }; - - j$.isTypedArray_ = function(value) { - return ( - j$.isA_('Float32Array', value) || - j$.isA_('Float64Array', value) || - j$.isA_('Int16Array', value) || - j$.isA_('Int32Array', value) || - j$.isA_('Int8Array', value) || - j$.isA_('Uint16Array', value) || - j$.isA_('Uint32Array', value) || - j$.isA_('Uint8Array', value) || - j$.isA_('Uint8ClampedArray', value) - ); - }; - - j$.isA_ = function(typeName, value) { - return j$.getType_(value) === '[object ' + typeName + ']'; - }; - - j$.isError_ = function(value) { - if (!value) { - return false; + j$.getGlobal = function() { + return jasmineGlobal } - if (value instanceof Error) { - return true; + /** + * Get the currently booted Jasmine Environment. + * + * @name jasmine.getEnv + * @since 1.3.0 + * @function + * @return {Env} + */ + j$.getEnv = function(options) { + const env = (j$.currentEnv_ = j$.currentEnv_ || new j$.Env(options)) + //jasmine. singletons in here (setTimeout blah blah). + return env } - return typeof value.stack === 'string' && typeof value.message === 'string'; - }; - - j$.isAsymmetricEqualityTester_ = function(obj) { - return obj ? j$.isA_('Function', obj.asymmetricMatch) : false; - }; - - j$.getType_ = function(value) { - return Object.prototype.toString.apply(value); - }; - - j$.isDomNode = function(obj) { - // Node is a function, because constructors - return typeof jasmineGlobal.Node !== 'undefined' - ? obj instanceof jasmineGlobal.Node - : obj !== null && - typeof obj === 'object' && - typeof obj.nodeType === 'number' && - typeof obj.nodeName === 'string'; - // return obj.nodeType > 0; - }; - - j$.isMap = function(obj) { - return ( - obj !== null && - typeof obj !== 'undefined' && - obj.constructor === jasmineGlobal.Map - ); - }; - - j$.isSet = function(obj) { - return ( - obj !== null && - typeof obj !== 'undefined' && - obj.constructor === jasmineGlobal.Set - ); - }; - - j$.isWeakMap = function(obj) { - return ( - obj !== null && - typeof obj !== 'undefined' && - obj.constructor === jasmineGlobal.WeakMap - ); - }; - - j$.isURL = function(obj) { - return ( - obj !== null && - typeof obj !== 'undefined' && - obj.constructor === jasmineGlobal.URL - ); - }; - - j$.isIterable_ = function(value) { - return value && !!value[Symbol.iterator]; - }; - - j$.isDataView = function(obj) { - return ( - obj !== null && - typeof obj !== 'undefined' && - obj.constructor === jasmineGlobal.DataView - ); - }; - - j$.isPromise = function(obj) { - return !!obj && obj.constructor === jasmineGlobal.Promise; - }; - - j$.isPromiseLike = function(obj) { - return !!obj && j$.isFunction_(obj.then); - }; - - j$.fnNameFor = function(func) { - if (func.name) { - return func.name; + j$.isArray_ = function(value) { + return j$.isA_("Array", value) } - const matches = - func.toString().match(/^\s*function\s*(\w+)\s*\(/) || - func.toString().match(/^\s*\[object\s*(\w+)Constructor\]/); - - return matches ? matches[1] : '
- * _Note:_ Do not construct this directly. You can obtain the Env instance by - * calling {@link jasmine.getEnv}. - * @hideconstructor - */ - function Env(options) { - options = options || {}; - - const self = this; - const global = options.global || j$.getGlobal(); - - const realSetTimeout = global.setTimeout; - const realClearTimeout = global.clearTimeout; - const clearStack = j$.getClearStack(global); - this.clock = new j$.Clock( - global, - function() { - return new j$.DelayedFunctionScheduler(); - }, - new j$.MockDate(global) - ); - - const globalErrors = new j$.GlobalErrors(); - const installGlobalErrors = (function() { - let installed = false; - return function() { - if (!installed) { - globalErrors.install(); - installed = true; - } - }; - })(); - - const runableResources = new j$.RunableResources({ - getCurrentRunableId: function() { - const r = runner.currentRunable(); - return r ? r.id : null; - }, - globalErrors - }); - - let reporter; - let topSuite; - let runner; - /** - * This represents the available options to configure Jasmine. - * Options that are not provided will use their default values. - * @see Env#configure - * @interface Configuration - * @since 3.3.0 - */ - const config = { - /** - * Whether to randomize spec execution order - * @name Configuration#random - * @since 3.3.0 - * @type Boolean - * @default true - */ - random: true, - /** - * Seed to use as the basis of randomization. - * Null causes the seed to be determined randomly at the start of execution. - * @name Configuration#seed - * @since 3.3.0 - * @type (number|string) - * @default null - */ - seed: null, - /** - * Whether to stop execution of the suite after the first spec failure - * @name Configuration#stopOnSpecFailure - * @since 3.9.0 - * @type Boolean - * @default false - */ - stopOnSpecFailure: false, - /** - * Whether to fail the spec if it ran no expectations. By default - * a spec that ran no expectations is reported as passed. Setting this - * to true will report such spec as a failure. - * @name Configuration#failSpecWithNoExpectations - * @since 3.5.0 - * @type Boolean - * @default false - */ - failSpecWithNoExpectations: false, - /** - * Whether to cause specs to only have one expectation failure. - * @name Configuration#stopSpecOnExpectationFailure - * @since 3.3.0 - * @type Boolean - * @default false - */ - stopSpecOnExpectationFailure: false, - /** - * A function that takes a spec and returns true if it should be executed - * or false if it should be skipped. - * @callback SpecFilter - * @param {Spec} spec - The spec that the filter is being applied to. - * @return boolean - */ - /** - * Function to use to filter specs - * @name Configuration#specFilter - * @since 3.3.0 - * @type SpecFilter - * @default A function that always returns true. - */ - specFilter: function() { - return true; - }, - /** - * Whether or not reporters should hide disabled specs from their output. - * Currently only supported by Jasmine's HTMLReporter - * @name Configuration#hideDisabled - * @since 3.3.0 - * @type Boolean - * @default false - */ - hideDisabled: false, - /** - * Clean closures when a suite is done running (done by clearing the stored function reference). - * This prevents memory leaks, but you won't be able to run jasmine multiple times. - * @name Configuration#autoCleanClosures - * @since 3.10.0 - * @type boolean - * @default true - */ - autoCleanClosures: true, - /** - * Whether or not to issue warnings for certain deprecated functionality - * every time it's used. If not set or set to false, deprecation warnings - * for methods that tend to be called frequently will be issued only once - * or otherwise throttled to to prevent the suite output from being flooded - * with warnings. - * @name Configuration#verboseDeprecations - * @since 3.6.0 - * @type Boolean - * @default false - */ - verboseDeprecations: false - }; - - if (!options.suppressLoadErrors) { - installGlobalErrors(); - globalErrors.pushListener(function loadtimeErrorHandler( - message, - filename, - lineno, - colNo, - err - ) { - topSuite.result.failedExpectations.push({ - passed: false, - globalErrorType: 'load', - message: message, - stack: err && err.stack, - filename: filename, - lineno: lineno - }); - }); - } - - /** - * Configure your jasmine environment - * @name Env#configure - * @since 3.3.0 - * @argument {Configuration} configuration - * @function - */ - this.configure = function(configuration) { - const booleanProps = [ - 'random', - 'failSpecWithNoExpectations', - 'hideDisabled', - 'stopOnSpecFailure', - 'stopSpecOnExpectationFailure', - 'autoCleanClosures' - ]; - - booleanProps.forEach(function(prop) { - if (typeof configuration[prop] !== 'undefined') { - config[prop] = !!configuration[prop]; - } - }); - - if (configuration.specFilter) { - config.specFilter = configuration.specFilter; - } - - if (typeof configuration.seed !== 'undefined') { - config.seed = configuration.seed; - } - - if (configuration.hasOwnProperty('verboseDeprecations')) { - config.verboseDeprecations = configuration.verboseDeprecations; - deprecator.verboseDeprecations(config.verboseDeprecations); - } - }; - - /** - * Get the current configuration for your jasmine environment - * @name Env#configuration - * @since 3.3.0 - * @function - * @returns {Configuration} - */ - this.configuration = function() { - const result = {}; - for (const property in config) { - result[property] = config[property]; - } - return result; - }; - - this.setDefaultSpyStrategy = function(defaultStrategyFn) { - runableResources.setDefaultSpyStrategy(defaultStrategyFn); - }; - - this.addSpyStrategy = function(name, fn) { - runableResources.customSpyStrategies()[name] = fn; - }; - - this.addCustomEqualityTester = function(tester) { - runableResources.customEqualityTesters().push(tester); - }; - - this.addMatchers = function(matchersToAdd) { - runableResources.addCustomMatchers(matchersToAdd); - }; - - this.addAsyncMatchers = function(matchersToAdd) { - runableResources.addCustomAsyncMatchers(matchersToAdd); - }; - - this.addCustomObjectFormatter = function(formatter) { - runableResources.customObjectFormatters().push(formatter); - }; - - j$.Expectation.addCoreMatchers(j$.matchers); - j$.Expectation.addAsyncCoreMatchers(j$.asyncMatchers); - - const expectationFactory = function(actual, spec) { - return j$.Expectation.factory({ - matchersUtil: runableResources.makeMatchersUtil(), - customMatchers: runableResources.customMatchers(), - actual: actual, - addExpectationResult: addExpectationResult - }); - - function addExpectationResult(passed, result) { - return spec.addExpectationResult(passed, result); - } - }; - - // TODO: Unify recordLateError with recordLateExpectation? The extra - // diagnostic info added by the latter is probably useful in most cases. - function recordLateError(error) { - const isExpectationResult = - error.matcherName !== undefined && error.passed !== undefined; - const result = isExpectationResult - ? error - : j$.buildExpectationResult({ - error, - passed: false, - matcherName: '', - expected: '', - actual: '' - }); - routeLateFailure(result); - } - - function recordLateExpectation(runable, runableType, result) { - const delayedExpectationResult = {}; - Object.keys(result).forEach(function(k) { - delayedExpectationResult[k] = result[k]; - }); - delayedExpectationResult.passed = false; - delayedExpectationResult.globalErrorType = 'lateExpectation'; - delayedExpectationResult.message = - runableType + - ' "' + - runable.getFullName() + - '" ran a "' + - result.matcherName + - '" expectation after it finished.\n'; - - if (result.message) { - delayedExpectationResult.message += - 'Message: "' + result.message + '"\n'; - } - - delayedExpectationResult.message += - '1. Did you forget to return or await the result of expectAsync?\n' + - '2. Was done() invoked before an async operation completed?\n' + - '3. Did an expectation follow a call to done()?'; - - topSuite.result.failedExpectations.push(delayedExpectationResult); - } - - function routeLateFailure(expectationResult) { - // Report the result on the nearest ancestor suite that hasn't already - // been reported done. - for (let r = runner.currentRunable(); r; r = r.parentSuite) { - if (!r.reportedDone) { - if (r === topSuite) { - expectationResult.globalErrorType = 'lateError'; - } - - r.result.failedExpectations.push(expectationResult); - return; - } - } - - // If we get here, all results have been reported and there's nothing we - // can do except log the result and hope the user sees it. - console.error('Jasmine received a result after the suite finished:'); - console.error(expectationResult); - } - - const asyncExpectationFactory = function(actual, spec, runableType) { - return j$.Expectation.asyncFactory({ - matchersUtil: runableResources.makeMatchersUtil(), - customAsyncMatchers: runableResources.customAsyncMatchers(), - actual: actual, - addExpectationResult: addExpectationResult - }); - - function addExpectationResult(passed, result) { - if (runner.currentRunable() !== spec) { - recordLateExpectation(spec, runableType, result); - } - return spec.addExpectationResult(passed, result); - } - }; - - /** - * Causes a deprecation warning to be logged to the console and reported to - * reporters. - * - * The optional second parameter is an object that can have either of the - * following properties: - * - * omitStackTrace: Whether to omit the stack trace. Optional. Defaults to - * false. This option is ignored if the deprecation is an Error. Set this - * when the stack trace will not contain anything that helps the user find - * the source of the deprecation. - * - * ignoreRunnable: Whether to log the deprecation on the root suite, ignoring - * the spec or suite that's running when it happens. Optional. Defaults to - * false. - * - * @name Env#deprecated - * @since 2.99 - * @function - * @param {String|Error} deprecation The deprecation message - * @param {Object} [options] Optional extra options, as described above - */ - this.deprecated = function(deprecation, options) { - const runable = runner.currentRunable() || topSuite; - deprecator.addDeprecationWarning(runable, deprecation, options); - }; - - function queueRunnerFactory(options) { - options.clearStack = options.clearStack || clearStack; - options.timeout = { - setTimeout: realSetTimeout, - clearTimeout: realClearTimeout - }; - options.fail = self.fail; - options.globalErrors = globalErrors; - options.onException = - options.onException || - function(e) { - (runner.currentRunable() || topSuite).handleException(e); - }; - options.deprecated = self.deprecated; - - new j$.QueueRunner(options).execute(); - } - - const suiteBuilder = new j$.SuiteBuilder({ - env: this, - expectationFactory, - asyncExpectationFactory, - onLateError: recordLateError, - specResultCallback, - specStarted, - queueRunnerFactory - }); - topSuite = suiteBuilder.topSuite; - const deprecator = new j$.Deprecator(topSuite); - - /** - * Provides the root suite, through which all suites and specs can be - * accessed. - * @function - * @name Env#topSuite - * @return {Suite} the root suite + * @class Env * @since 2.0.0 + * @classdesc The Jasmine environment.
+ * _Note:_ Do not construct this directly. You can obtain the Env instance by + * calling {@link jasmine.getEnv}. + * @hideconstructor */ - this.topSuite = function() { - return topSuite.metadata; - }; + function Env(options) { + options = options || {} + + const self = this + const global = options.global || j$.getGlobal() + + const realSetTimeout = global.setTimeout + const realClearTimeout = global.clearTimeout + const clearStack = j$.getClearStack(global) + this.clock = new j$.Clock( + global, + function() { + return new j$.DelayedFunctionScheduler() + }, + new j$.MockDate(global) + ) + + const globalErrors = new j$.GlobalErrors() + const installGlobalErrors = (function() { + let installed = false + return function() { + if (!installed) { + globalErrors.install() + installed = true + } + } + })() + + const runableResources = new j$.RunableResources({ + getCurrentRunableId: function() { + const r = runner.currentRunable() + return r ? r.id : null + }, + globalErrors + }) + + let reporter + let topSuite + let runner - /** - * This represents the available reporter callback for an object passed to {@link Env#addReporter}. - * @interface Reporter - * @see custom_reporter - */ - reporter = new j$.ReportDispatcher( - [ /** - * `jasmineStarted` is called after all of the specs have been loaded, but just before execution starts. - * @function - * @name Reporter#jasmineStarted - * @param {JasmineStartedInfo} suiteInfo Information about the full Jasmine suite that is being run - * @param {Function} [done] Used to specify to Jasmine that this callback is asynchronous and Jasmine should wait until it has been called before moving on. - * @returns {} Optionally return a Promise instead of using `done` to cause Jasmine to wait for completion. - * @see async + * This represents the available options to configure Jasmine. + * Options that are not provided will use their default values. + * @see Env#configure + * @interface Configuration + * @since 3.3.0 */ - 'jasmineStarted', + const config = { + /** + * Whether to randomize spec execution order + * @name Configuration#random + * @since 3.3.0 + * @type Boolean + * @default true + */ + random: true, + /** + * Seed to use as the basis of randomization. + * Null causes the seed to be determined randomly at the start of execution. + * @name Configuration#seed + * @since 3.3.0 + * @type (number|string) + * @default null + */ + seed: null, + /** + * Whether to stop execution of the suite after the first spec failure + * @name Configuration#stopOnSpecFailure + * @since 3.9.0 + * @type Boolean + * @default false + */ + stopOnSpecFailure: false, + /** + * Whether to fail the spec if it ran no expectations. By default + * a spec that ran no expectations is reported as passed. Setting this + * to true will report such spec as a failure. + * @name Configuration#failSpecWithNoExpectations + * @since 3.5.0 + * @type Boolean + * @default false + */ + failSpecWithNoExpectations: false, + /** + * Whether to cause specs to only have one expectation failure. + * @name Configuration#stopSpecOnExpectationFailure + * @since 3.3.0 + * @type Boolean + * @default false + */ + stopSpecOnExpectationFailure: false, + /** + * A function that takes a spec and returns true if it should be executed + * or false if it should be skipped. + * @callback SpecFilter + * @param {Spec} spec - The spec that the filter is being applied to. + * @return boolean + */ + /** + * Function to use to filter specs + * @name Configuration#specFilter + * @since 3.3.0 + * @type SpecFilter + * @default A function that always returns true. + */ + specFilter: function() { + return true + }, + /** + * Whether or not reporters should hide disabled specs from their output. + * Currently only supported by Jasmine's HTMLReporter + * @name Configuration#hideDisabled + * @since 3.3.0 + * @type Boolean + * @default false + */ + hideDisabled: false, + /** + * Clean closures when a suite is done running (done by clearing the stored function reference). + * This prevents memory leaks, but you won't be able to run jasmine multiple times. + * @name Configuration#autoCleanClosures + * @since 3.10.0 + * @type boolean + * @default true + */ + autoCleanClosures: true, + /** + * Whether or not to issue warnings for certain deprecated functionality + * every time it's used. If not set or set to false, deprecation warnings + * for methods that tend to be called frequently will be issued only once + * or otherwise throttled to to prevent the suite output from being flooded + * with warnings. + * @name Configuration#verboseDeprecations + * @since 3.6.0 + * @type Boolean + * @default false + */ + verboseDeprecations: false + } + + if (!options.suppressLoadErrors) { + installGlobalErrors() + globalErrors.pushListener(function loadtimeErrorHandler(message, filename, lineno, colNo, err) { + topSuite.result.failedExpectations.push({ + passed: false, + globalErrorType: "load", + message: message, + stack: err && err.stack, + filename: filename, + lineno: lineno + }) + }) + } + /** - * When the entire suite has finished execution `jasmineDone` is called + * Configure your jasmine environment + * @name Env#configure + * @since 3.3.0 + * @argument {Configuration} configuration * @function - * @name Reporter#jasmineDone - * @param {JasmineDoneInfo} suiteInfo Information about the full Jasmine suite that just finished running. - * @param {Function} [done] Used to specify to Jasmine that this callback is asynchronous and Jasmine should wait until it has been called before moving on. - * @returns {} Optionally return a Promise instead of using `done` to cause Jasmine to wait for completion. - * @see async */ - 'jasmineDone', + this.configure = function(configuration) { + const booleanProps = [ + "random", + "failSpecWithNoExpectations", + "hideDisabled", + "stopOnSpecFailure", + "stopSpecOnExpectationFailure", + "autoCleanClosures" + ] + + booleanProps.forEach(function(prop) { + if (typeof configuration[prop] !== "undefined") { + config[prop] = !!configuration[prop] + } + }) + + if (configuration.specFilter) { + config.specFilter = configuration.specFilter + } + + if (typeof configuration.seed !== "undefined") { + config.seed = configuration.seed + } + + if (configuration.hasOwnProperty("verboseDeprecations")) { + config.verboseDeprecations = configuration.verboseDeprecations + deprecator.verboseDeprecations(config.verboseDeprecations) + } + } + /** - * `suiteStarted` is invoked when a `describe` starts to run + * Get the current configuration for your jasmine environment + * @name Env#configuration + * @since 3.3.0 * @function - * @name Reporter#suiteStarted - * @param {SuiteResult} result Information about the individual {@link describe} being run - * @param {Function} [done] Used to specify to Jasmine that this callback is asynchronous and Jasmine should wait until it has been called before moving on. - * @returns {} Optionally return a Promise instead of using `done` to cause Jasmine to wait for completion. - * @see async + * @returns {Configuration} */ - 'suiteStarted', + this.configuration = function() { + const result = {} + for (const property in config) { + result[property] = config[property] + } + return result + } + + this.setDefaultSpyStrategy = function(defaultStrategyFn) { + runableResources.setDefaultSpyStrategy(defaultStrategyFn) + } + + this.addSpyStrategy = function(name, fn) { + runableResources.customSpyStrategies()[name] = fn + } + + this.addCustomEqualityTester = function(tester) { + runableResources.customEqualityTesters().push(tester) + } + + this.addMatchers = function(matchersToAdd) { + runableResources.addCustomMatchers(matchersToAdd) + } + + this.addAsyncMatchers = function(matchersToAdd) { + runableResources.addCustomAsyncMatchers(matchersToAdd) + } + + this.addCustomObjectFormatter = function(formatter) { + runableResources.customObjectFormatters().push(formatter) + } + + j$.Expectation.addCoreMatchers(j$.matchers) + j$.Expectation.addAsyncCoreMatchers(j$.asyncMatchers) + + const expectationFactory = function(actual, spec) { + return j$.Expectation.factory({ + matchersUtil: runableResources.makeMatchersUtil(), + customMatchers: runableResources.customMatchers(), + actual: actual, + addExpectationResult: addExpectationResult + }) + + function addExpectationResult(passed, result) { + return spec.addExpectationResult(passed, result) + } + } + + // TODO: Unify recordLateError with recordLateExpectation? The extra + // diagnostic info added by the latter is probably useful in most cases. + function recordLateError(error) { + const isExpectationResult = error.matcherName !== undefined && error.passed !== undefined + const result = isExpectationResult + ? error + : j$.buildExpectationResult({ + error, + passed: false, + matcherName: "", + expected: "", + actual: "" + }) + routeLateFailure(result) + } + + function recordLateExpectation(runable, runableType, result) { + const delayedExpectationResult = {} + Object.keys(result).forEach(function(k) { + delayedExpectationResult[k] = result[k] + }) + delayedExpectationResult.passed = false + delayedExpectationResult.globalErrorType = "lateExpectation" + delayedExpectationResult.message = + runableType + + ' "' + + runable.getFullName() + + '" ran a "' + + result.matcherName + + '" expectation after it finished.\n' + + if (result.message) { + delayedExpectationResult.message += 'Message: "' + result.message + '"\n' + } + + delayedExpectationResult.message += + "1. Did you forget to return or await the result of expectAsync?\n" + + "2. Was done() invoked before an async operation completed?\n" + + "3. Did an expectation follow a call to done()?" + + topSuite.result.failedExpectations.push(delayedExpectationResult) + } + + function routeLateFailure(expectationResult) { + // Report the result on the nearest ancestor suite that hasn't already + // been reported done. + for (let r = runner.currentRunable(); r; r = r.parentSuite) { + if (!r.reportedDone) { + if (r === topSuite) { + expectationResult.globalErrorType = "lateError" + } + + r.result.failedExpectations.push(expectationResult) + return + } + } + + // If we get here, all results have been reported and there's nothing we + // can do except log the result and hope the user sees it. + console.error("Jasmine received a result after the suite finished:") + console.error(expectationResult) + } + + const asyncExpectationFactory = function(actual, spec, runableType) { + return j$.Expectation.asyncFactory({ + matchersUtil: runableResources.makeMatchersUtil(), + customAsyncMatchers: runableResources.customAsyncMatchers(), + actual: actual, + addExpectationResult: addExpectationResult + }) + + function addExpectationResult(passed, result) { + if (runner.currentRunable() !== spec) { + recordLateExpectation(spec, runableType, result) + } + return spec.addExpectationResult(passed, result) + } + } + /** - * `suiteDone` is invoked when all of the child specs and suites for a given suite have been run + * Causes a deprecation warning to be logged to the console and reported to + * reporters. * - * While jasmine doesn't require any specific functions, not defining a `suiteDone` will make it impossible for a reporter to know when a suite has failures in an `afterAll`. - * @function - * @name Reporter#suiteDone - * @param {SuiteResult} result - * @param {Function} [done] Used to specify to Jasmine that this callback is asynchronous and Jasmine should wait until it has been called before moving on. - * @returns {} Optionally return a Promise instead of using `done` to cause Jasmine to wait for completion. - * @see async - */ - 'suiteDone', - /** - * `specStarted` is invoked when an `it` starts to run (including associated `beforeEach` functions) - * @function - * @name Reporter#specStarted - * @param {SpecResult} result Information about the individual {@link it} being run - * @param {Function} [done] Used to specify to Jasmine that this callback is asynchronous and Jasmine should wait until it has been called before moving on. - * @returns {} Optionally return a Promise instead of using `done` to cause Jasmine to wait for completion. - * @see async - */ - 'specStarted', - /** - * `specDone` is invoked when an `it` and its associated `beforeEach` and `afterEach` functions have been run. + * The optional second parameter is an object that can have either of the + * following properties: * - * While jasmine doesn't require any specific functions, not defining a `specDone` will make it impossible for a reporter to know when a spec has failed. + * omitStackTrace: Whether to omit the stack trace. Optional. Defaults to + * false. This option is ignored if the deprecation is an Error. Set this + * when the stack trace will not contain anything that helps the user find + * the source of the deprecation. + * + * ignoreRunnable: Whether to log the deprecation on the root suite, ignoring + * the spec or suite that's running when it happens. Optional. Defaults to + * false. + * + * @name Env#deprecated + * @since 2.99 * @function - * @name Reporter#specDone - * @param {SpecResult} result - * @param {Function} [done] Used to specify to Jasmine that this callback is asynchronous and Jasmine should wait until it has been called before moving on. - * @returns {} Optionally return a Promise instead of using `done` to cause Jasmine to wait for completion. - * @see async + * @param {String|Error} deprecation The deprecation message + * @param {Object} [options] Optional extra options, as described above */ - 'specDone' - ], - function(options) { - options.SkipPolicy = j$.NeverSkipPolicy; - return queueRunnerFactory(options); - }, - recordLateError - ); - - runner = new j$.Runner({ - topSuite, - totalSpecsDefined: () => suiteBuilder.totalSpecsDefined, - focusedRunables: () => suiteBuilder.focusedRunables, - runableResources, - reporter, - queueRunnerFactory, - getConfig: () => config, - reportSpecDone - }); - - /** - * Executes the specs. - * - * If called with no parameters or with a falsy value as the first parameter, - * all specs will be executed except those that are excluded by a - * [spec filter]{@link Configuration#specFilter} or other mechanism. If the - * first parameter is a list of spec/suite IDs, only those specs/suites will - * be run. - * - * Both parameters are optional, but a completion callback is only valid as - * the second parameter. To specify a completion callback but not a list of - * specs/suites to run, pass null or undefined as the first parameter. The - * completion callback is supported for backward compatibility. In most - * cases it will be more convenient to use the returned promise instead. - * - * execute should not be called more than once unless the env has been - * configured with `{autoCleanClosures: false}`. - * - * execute returns a promise. The promise will be resolved to the same - * {@link JasmineDoneInfo|overall result} that's passed to a reporter's - * `jasmineDone` method, even if the suite did not pass. To determine - * whether the suite passed, check the value that the promise resolves to - * or use a {@link Reporter}. - * - * @name Env#execute - * @since 2.0.0 - * @function - * @param {(string[])=} runablesToRun IDs of suites and/or specs to run - * @param {Function=} onComplete Function that will be called after all specs have run - * @return {Promise
- * _Note:_ Do not construct this directly. You can get the current clock with - * {@link jasmine.clock}. - * @hideconstructor - */ - function Clock(global, delayedFunctionSchedulerFactory, mockDate) { - const realTimingFunctions = { - setTimeout: global.setTimeout, - clearTimeout: global.clearTimeout, - setInterval: global.setInterval, - clearInterval: global.clearInterval - }; - const fakeTimingFunctions = { - setTimeout: setTimeout, - clearTimeout: clearTimeout, - setInterval: setInterval, - clearInterval: clearInterval - }; - let installed = false; - let delayedFunctionScheduler; - let timer; - - this.FakeTimeout = FakeTimeout; + /* global process */ + const NODE_JS = typeof process !== "undefined" && process.versions && typeof process.versions.node === "string" /** - * Install the mock clock over the built-in methods. - * @name Clock#install - * @since 2.0.0 - * @function - * @return {Clock} - */ - this.install = function() { - if (!originalTimingFunctionsIntact()) { - throw new Error( - 'Jasmine Clock was unable to install over custom global timer functions. Is the clock already installed?' - ); - } - replace(global, fakeTimingFunctions); - timer = fakeTimingFunctions; - delayedFunctionScheduler = delayedFunctionSchedulerFactory(); - installed = true; - - return this; - }; - - /** - * Uninstall the mock clock, returning the built-in methods to their places. - * @name Clock#uninstall - * @since 2.0.0 - * @function - */ - this.uninstall = function() { - delayedFunctionScheduler = null; - mockDate.uninstall(); - replace(global, realTimingFunctions); - - timer = realTimingFunctions; - installed = false; - }; - - /** - * Execute a function with a mocked Clock - * - * The clock will be {@link Clock#install|install}ed before the function is called and {@link Clock#uninstall|uninstall}ed in a `finally` after the function completes. - * @name Clock#withMock - * @since 2.3.0 - * @function - * @param {Function} closure The function to be called. - */ - this.withMock = function(closure) { - this.install(); - try { - closure(); - } finally { - this.uninstall(); - } - }; - - /** - * Instruct the installed Clock to also mock the date returned by `new Date()` - * @name Clock#mockDate - * @since 2.1.0 - * @function - * @param {Date} [initialDate=now] The `Date` to provide. - */ - this.mockDate = function(initialDate) { - mockDate.install(initialDate); - }; - - this.setTimeout = function(fn, delay, params) { - return Function.prototype.apply.apply(timer.setTimeout, [ - global, - arguments - ]); - }; - - this.setInterval = function(fn, delay, params) { - return Function.prototype.apply.apply(timer.setInterval, [ - global, - arguments - ]); - }; - - this.clearTimeout = function(id) { - return Function.prototype.call.apply(timer.clearTimeout, [global, id]); - }; - - this.clearInterval = function(id) { - return Function.prototype.call.apply(timer.clearInterval, [global, id]); - }; - - /** - * Tick the Clock forward, running any enqueued timeouts along the way - * @name Clock#tick + * @class Clock * @since 1.3.0 - * @function - * @param {int} millis The number of milliseconds to tick. + * @classdesc Jasmine's mock clock is used when testing time dependent code.
+ * _Note:_ Do not construct this directly. You can get the current clock with + * {@link jasmine.clock}. + * @hideconstructor */ - this.tick = function(millis) { - if (installed) { - delayedFunctionScheduler.tick(millis, function(millis) { - mockDate.tick(millis); - }); - } else { - throw new Error( - 'Mock clock is not installed, use jasmine.clock().install()' - ); - } - }; + function Clock(global, delayedFunctionSchedulerFactory, mockDate) { + const realTimingFunctions = { + setTimeout: global.setTimeout, + clearTimeout: global.clearTimeout, + setInterval: global.setInterval, + clearInterval: global.clearInterval + } + const fakeTimingFunctions = { + setTimeout: setTimeout, + clearTimeout: clearTimeout, + setInterval: setInterval, + clearInterval: clearInterval + } + let installed = false + let delayedFunctionScheduler + let timer - return this; + this.FakeTimeout = FakeTimeout - function originalTimingFunctionsIntact() { - return ( - global.setTimeout === realTimingFunctions.setTimeout && - global.clearTimeout === realTimingFunctions.clearTimeout && - global.setInterval === realTimingFunctions.setInterval && - global.clearInterval === realTimingFunctions.clearInterval - ); + /** + * Install the mock clock over the built-in methods. + * @name Clock#install + * @since 2.0.0 + * @function + * @return {Clock} + */ + this.install = function() { + if (!originalTimingFunctionsIntact()) { + throw new Error( + "Jasmine Clock was unable to install over custom global timer functions. Is the clock already installed?" + ) + } + replace(global, fakeTimingFunctions) + timer = fakeTimingFunctions + delayedFunctionScheduler = delayedFunctionSchedulerFactory() + installed = true + + return this + } + + /** + * Uninstall the mock clock, returning the built-in methods to their places. + * @name Clock#uninstall + * @since 2.0.0 + * @function + */ + this.uninstall = function() { + delayedFunctionScheduler = null + mockDate.uninstall() + replace(global, realTimingFunctions) + + timer = realTimingFunctions + installed = false + } + + /** + * Execute a function with a mocked Clock + * + * The clock will be {@link Clock#install|install}ed before the function is called and {@link Clock#uninstall|uninstall}ed in a `finally` after the function completes. + * @name Clock#withMock + * @since 2.3.0 + * @function + * @param {Function} closure The function to be called. + */ + this.withMock = function(closure) { + this.install() + try { + closure() + } finally { + this.uninstall() + } + } + + /** + * Instruct the installed Clock to also mock the date returned by `new Date()` + * @name Clock#mockDate + * @since 2.1.0 + * @function + * @param {Date} [initialDate=now] The `Date` to provide. + */ + this.mockDate = function(initialDate) { + mockDate.install(initialDate) + } + + this.setTimeout = function(fn, delay, params) { + return Function.prototype.apply.apply(timer.setTimeout, [global, arguments]) + } + + this.setInterval = function(fn, delay, params) { + return Function.prototype.apply.apply(timer.setInterval, [global, arguments]) + } + + this.clearTimeout = function(id) { + return Function.prototype.call.apply(timer.clearTimeout, [global, id]) + } + + this.clearInterval = function(id) { + return Function.prototype.call.apply(timer.clearInterval, [global, id]) + } + + /** + * Tick the Clock forward, running any enqueued timeouts along the way + * @name Clock#tick + * @since 1.3.0 + * @function + * @param {int} millis The number of milliseconds to tick. + */ + this.tick = function(millis) { + if (installed) { + delayedFunctionScheduler.tick(millis, function(millis) { + mockDate.tick(millis) + }) + } else { + throw new Error("Mock clock is not installed, use jasmine.clock().install()") + } + } + + return this + + function originalTimingFunctionsIntact() { + return ( + global.setTimeout === realTimingFunctions.setTimeout && + global.clearTimeout === realTimingFunctions.clearTimeout && + global.setInterval === realTimingFunctions.setInterval && + global.clearInterval === realTimingFunctions.clearInterval + ) + } + + function replace(dest, source) { + for (const prop in source) { + dest[prop] = source[prop] + } + } + + function setTimeout(fn, delay) { + if (!NODE_JS) { + return delayedFunctionScheduler.scheduleFunction(fn, delay, argSlice(arguments, 2)) + } + + const timeout = new FakeTimeout() + + delayedFunctionScheduler.scheduleFunction(fn, delay, argSlice(arguments, 2), false, timeout) + + return timeout + } + + function clearTimeout(id) { + return delayedFunctionScheduler.removeFunctionWithId(id) + } + + function setInterval(fn, interval) { + if (!NODE_JS) { + return delayedFunctionScheduler.scheduleFunction(fn, interval, argSlice(arguments, 2), true) + } + + const timeout = new FakeTimeout() + + delayedFunctionScheduler.scheduleFunction(fn, interval, argSlice(arguments, 2), true, timeout) + + return timeout + } + + function clearInterval(id) { + return delayedFunctionScheduler.removeFunctionWithId(id) + } + + function argSlice(argsObj, n) { + return Array.prototype.slice.call(argsObj, n) + } } - function replace(dest, source) { - for (const prop in source) { - dest[prop] = source[prop]; - } + /** + * Mocks Node.js Timeout class + */ + function FakeTimeout() {} + + FakeTimeout.prototype.ref = function() { + return this } - function setTimeout(fn, delay) { - if (!NODE_JS) { - return delayedFunctionScheduler.scheduleFunction( - fn, - delay, - argSlice(arguments, 2) - ); - } - - const timeout = new FakeTimeout(); - - delayedFunctionScheduler.scheduleFunction( - fn, - delay, - argSlice(arguments, 2), - false, - timeout - ); - - return timeout; + FakeTimeout.prototype.unref = function() { + return this } - function clearTimeout(id) { - return delayedFunctionScheduler.removeFunctionWithId(id); - } - - function setInterval(fn, interval) { - if (!NODE_JS) { - return delayedFunctionScheduler.scheduleFunction( - fn, - interval, - argSlice(arguments, 2), - true - ); - } - - const timeout = new FakeTimeout(); - - delayedFunctionScheduler.scheduleFunction( - fn, - interval, - argSlice(arguments, 2), - true, - timeout - ); - - return timeout; - } - - function clearInterval(id) { - return delayedFunctionScheduler.removeFunctionWithId(id); - } - - function argSlice(argsObj, n) { - return Array.prototype.slice.call(argsObj, n); - } - } - - /** - * Mocks Node.js Timeout class - */ - function FakeTimeout() {} - - FakeTimeout.prototype.ref = function() { - return this; - }; - - FakeTimeout.prototype.unref = function() { - return this; - }; - - return Clock; -}; + return Clock +} getJasmineRequireObj().CompleteOnFirstErrorSkipPolicy = function(j$) { - function CompleteOnFirstErrorSkipPolicy(queueableFns) { - this.queueableFns_ = queueableFns; - this.erroredFnIx_ = null; - } - - CompleteOnFirstErrorSkipPolicy.prototype.skipTo = function(lastRanFnIx) { - let i; - - for ( - i = lastRanFnIx + 1; - i < this.queueableFns_.length && this.shouldSkip_(i); - i++ - ) {} - return i; - }; - - CompleteOnFirstErrorSkipPolicy.prototype.fnErrored = function(fnIx) { - this.erroredFnIx_ = fnIx; - }; - - CompleteOnFirstErrorSkipPolicy.prototype.shouldSkip_ = function(fnIx) { - if (this.erroredFnIx_ === null) { - return false; + function CompleteOnFirstErrorSkipPolicy(queueableFns) { + this.queueableFns_ = queueableFns + this.erroredFnIx_ = null } - const fn = this.queueableFns_[fnIx]; - const candidateSuite = fn.suite; - const errorSuite = this.queueableFns_[this.erroredFnIx_].suite; - const wasCleanupFn = - fn.type === 'afterEach' || - fn.type === 'afterAll' || - fn.type === 'specCleanup'; - return ( - !wasCleanupFn || - (candidateSuite && isDescendent(candidateSuite, errorSuite)) - ); - }; + CompleteOnFirstErrorSkipPolicy.prototype.skipTo = function(lastRanFnIx) { + let i - function isDescendent(candidate, ancestor) { - if (!candidate.parentSuite) { - return false; - } else if (candidate.parentSuite === ancestor) { - return true; - } else { - return isDescendent(candidate.parentSuite, ancestor); + for (i = lastRanFnIx + 1; i < this.queueableFns_.length && this.shouldSkip_(i); i++) {} + return i } - } - return CompleteOnFirstErrorSkipPolicy; -}; + CompleteOnFirstErrorSkipPolicy.prototype.fnErrored = function(fnIx) { + this.erroredFnIx_ = fnIx + } + + CompleteOnFirstErrorSkipPolicy.prototype.shouldSkip_ = function(fnIx) { + if (this.erroredFnIx_ === null) { + return false + } + + const fn = this.queueableFns_[fnIx] + const candidateSuite = fn.suite + const errorSuite = this.queueableFns_[this.erroredFnIx_].suite + const wasCleanupFn = fn.type === "afterEach" || fn.type === "afterAll" || fn.type === "specCleanup" + return !wasCleanupFn || (candidateSuite && isDescendent(candidateSuite, errorSuite)) + } + + function isDescendent(candidate, ancestor) { + if (!candidate.parentSuite) { + return false + } else if (candidate.parentSuite === ancestor) { + return true + } else { + return isDescendent(candidate.parentSuite, ancestor) + } + } + + return CompleteOnFirstErrorSkipPolicy +} getJasmineRequireObj().DelayedFunctionScheduler = function(j$) { - function DelayedFunctionScheduler() { - this.scheduledLookup_ = []; - this.scheduledFunctions_ = {}; - this.currentTime_ = 0; - this.delayedFnCount_ = 0; - this.deletedKeys_ = []; + function DelayedFunctionScheduler() { + this.scheduledLookup_ = [] + this.scheduledFunctions_ = {} + this.currentTime_ = 0 + this.delayedFnCount_ = 0 + this.deletedKeys_ = [] - this.tick = function(millis, tickDate) { - millis = millis || 0; - const endTime = this.currentTime_ + millis; + this.tick = function(millis, tickDate) { + millis = millis || 0 + const endTime = this.currentTime_ + millis - this.runScheduledFunctions_(endTime, tickDate); - }; + this.runScheduledFunctions_(endTime, tickDate) + } - this.scheduleFunction = function( - funcToCall, - millis, - params, - recurring, - timeoutKey, - runAtMillis - ) { - let f; - if (typeof funcToCall === 'string') { - f = function() { - // eslint-disable-next-line no-eval - return eval(funcToCall); - }; - } else { - f = funcToCall; - } + this.scheduleFunction = function(funcToCall, millis, params, recurring, timeoutKey, runAtMillis) { + let f + if (typeof funcToCall === "string") { + f = function() { + // eslint-disable-next-line no-eval + return eval(funcToCall) + } + } else { + f = funcToCall + } - millis = millis || 0; - timeoutKey = timeoutKey || ++this.delayedFnCount_; - runAtMillis = runAtMillis || this.currentTime_ + millis; + millis = millis || 0 + timeoutKey = timeoutKey || ++this.delayedFnCount_ + runAtMillis = runAtMillis || this.currentTime_ + millis - const funcToSchedule = { - runAtMillis: runAtMillis, - funcToCall: f, - recurring: recurring, - params: params, - timeoutKey: timeoutKey, - millis: millis - }; + const funcToSchedule = { + runAtMillis: runAtMillis, + funcToCall: f, + recurring: recurring, + params: params, + timeoutKey: timeoutKey, + millis: millis + } - if (runAtMillis in this.scheduledFunctions_) { - this.scheduledFunctions_[runAtMillis].push(funcToSchedule); - } else { - this.scheduledFunctions_[runAtMillis] = [funcToSchedule]; - this.scheduledLookup_.push(runAtMillis); - this.scheduledLookup_.sort(function(a, b) { - return a - b; - }); - } + if (runAtMillis in this.scheduledFunctions_) { + this.scheduledFunctions_[runAtMillis].push(funcToSchedule) + } else { + this.scheduledFunctions_[runAtMillis] = [funcToSchedule] + this.scheduledLookup_.push(runAtMillis) + this.scheduledLookup_.sort(function(a, b) { + return a - b + }) + } - return timeoutKey; - }; + return timeoutKey + } - this.removeFunctionWithId = function(timeoutKey) { - this.deletedKeys_.push(timeoutKey); + this.removeFunctionWithId = function(timeoutKey) { + this.deletedKeys_.push(timeoutKey) - for (const runAtMillis in this.scheduledFunctions_) { - const funcs = this.scheduledFunctions_[runAtMillis]; - const i = indexOfFirstToPass(funcs, function(func) { - return func.timeoutKey === timeoutKey; - }); + for (const runAtMillis in this.scheduledFunctions_) { + const funcs = this.scheduledFunctions_[runAtMillis] + const i = indexOfFirstToPass(funcs, function(func) { + return func.timeoutKey === timeoutKey + }) + + if (i > -1) { + if (funcs.length === 1) { + delete this.scheduledFunctions_[runAtMillis] + this.deleteFromLookup_(runAtMillis) + } else { + funcs.splice(i, 1) + } + + // intervals get rescheduled when executed, so there's never more + // than a single scheduled function with a given timeoutKey + break + } + } + } + + return this + } + + DelayedFunctionScheduler.prototype.runScheduledFunctions_ = function(endTime, tickDate) { + tickDate = tickDate || function() {} + if (this.scheduledLookup_.length === 0 || this.scheduledLookup_[0] > endTime) { + if (endTime >= this.currentTime_) { + tickDate(endTime - this.currentTime_) + this.currentTime_ = endTime + } + return + } + + do { + this.deletedKeys_ = [] + const newCurrentTime = this.scheduledLookup_.shift() + if (newCurrentTime >= this.currentTime_) { + tickDate(newCurrentTime - this.currentTime_) + this.currentTime_ = newCurrentTime + } + + const funcsToRun = this.scheduledFunctions_[this.currentTime_] + + delete this.scheduledFunctions_[this.currentTime_] + + for (const fn of funcsToRun) { + if (fn.recurring) { + this.reschedule_(fn) + } + } + + for (const fn of funcsToRun) { + if (this.deletedKeys_.includes(fn.timeoutKey)) { + // skip a timeoutKey deleted whilst we were running + return + } + fn.funcToCall.apply(null, fn.params || []) + } + this.deletedKeys_ = [] + } while ( + this.scheduledLookup_.length > 0 && + // checking first if we're out of time prevents setTimeout(0) + // scheduled in a funcToRun from forcing an extra iteration + this.currentTime_ !== endTime && + this.scheduledLookup_[0] <= endTime + ) + + // ran out of functions to call, but still time left on the clock + if (endTime >= this.currentTime_) { + tickDate(endTime - this.currentTime_) + this.currentTime_ = endTime + } + } + + DelayedFunctionScheduler.prototype.reschedule_ = function(scheduledFn) { + this.scheduleFunction( + scheduledFn.funcToCall, + scheduledFn.millis, + scheduledFn.params, + true, + scheduledFn.timeoutKey, + scheduledFn.runAtMillis + scheduledFn.millis + ) + } + + DelayedFunctionScheduler.prototype.deleteFromLookup_ = function(key) { + const value = Number(key) + const i = indexOfFirstToPass(this.scheduledLookup_, function(millis) { + return millis === value + }) if (i > -1) { - if (funcs.length === 1) { - delete this.scheduledFunctions_[runAtMillis]; - this.deleteFromLookup_(runAtMillis); - } else { - funcs.splice(i, 1); - } - - // intervals get rescheduled when executed, so there's never more - // than a single scheduled function with a given timeoutKey - break; + this.scheduledLookup_.splice(i, 1) } - } - }; - - return this; - } - - DelayedFunctionScheduler.prototype.runScheduledFunctions_ = function( - endTime, - tickDate - ) { - tickDate = tickDate || function() {}; - if ( - this.scheduledLookup_.length === 0 || - this.scheduledLookup_[0] > endTime - ) { - if (endTime >= this.currentTime_) { - tickDate(endTime - this.currentTime_); - this.currentTime_ = endTime; - } - return; } - do { - this.deletedKeys_ = []; - const newCurrentTime = this.scheduledLookup_.shift(); - if (newCurrentTime >= this.currentTime_) { - tickDate(newCurrentTime - this.currentTime_); - this.currentTime_ = newCurrentTime; - } + function indexOfFirstToPass(array, testFn) { + let index = -1 - const funcsToRun = this.scheduledFunctions_[this.currentTime_]; - - delete this.scheduledFunctions_[this.currentTime_]; - - for (const fn of funcsToRun) { - if (fn.recurring) { - this.reschedule_(fn); + for (let i = 0; i < array.length; ++i) { + if (testFn(array[i])) { + index = i + break + } } - } - for (const fn of funcsToRun) { - if (this.deletedKeys_.includes(fn.timeoutKey)) { - // skip a timeoutKey deleted whilst we were running - return; - } - fn.funcToCall.apply(null, fn.params || []); - } - this.deletedKeys_ = []; - } while ( - this.scheduledLookup_.length > 0 && - // checking first if we're out of time prevents setTimeout(0) - // scheduled in a funcToRun from forcing an extra iteration - this.currentTime_ !== endTime && - this.scheduledLookup_[0] <= endTime - ); - - // ran out of functions to call, but still time left on the clock - if (endTime >= this.currentTime_) { - tickDate(endTime - this.currentTime_); - this.currentTime_ = endTime; - } - }; - - DelayedFunctionScheduler.prototype.reschedule_ = function(scheduledFn) { - this.scheduleFunction( - scheduledFn.funcToCall, - scheduledFn.millis, - scheduledFn.params, - true, - scheduledFn.timeoutKey, - scheduledFn.runAtMillis + scheduledFn.millis - ); - }; - - DelayedFunctionScheduler.prototype.deleteFromLookup_ = function(key) { - const value = Number(key); - const i = indexOfFirstToPass(this.scheduledLookup_, function(millis) { - return millis === value; - }); - - if (i > -1) { - this.scheduledLookup_.splice(i, 1); - } - }; - - function indexOfFirstToPass(array, testFn) { - let index = -1; - - for (let i = 0; i < array.length; ++i) { - if (testFn(array[i])) { - index = i; - break; - } + return index } - return index; - } - - return DelayedFunctionScheduler; -}; + return DelayedFunctionScheduler +} getJasmineRequireObj().Deprecator = function(j$) { - function Deprecator(topSuite) { - this.topSuite_ = topSuite; - this.verbose_ = false; - this.toSuppress_ = []; - } - - const verboseNote = - 'Note: This message will be shown only once. Set the verboseDeprecations ' + - 'config property to true to see every occurrence.'; - - Deprecator.prototype.verboseDeprecations = function(enabled) { - this.verbose_ = enabled; - }; - - // runnable is a spec or a suite. - // deprecation is a string or an Error. - // See Env#deprecated for a description of the options argument. - Deprecator.prototype.addDeprecationWarning = function( - runnable, - deprecation, - options - ) { - options = options || {}; - - if (!this.verbose_ && !j$.isError_(deprecation)) { - if (this.toSuppress_.indexOf(deprecation) !== -1) { - return; - } - this.toSuppress_.push(deprecation); + function Deprecator(topSuite) { + this.topSuite_ = topSuite + this.verbose_ = false + this.toSuppress_ = [] } - this.log_(runnable, deprecation, options); - this.report_(runnable, deprecation, options); - }; + const verboseNote = + "Note: This message will be shown only once. Set the verboseDeprecations " + + "config property to true to see every occurrence." - Deprecator.prototype.log_ = function(runnable, deprecation, options) { - if (j$.isError_(deprecation)) { - console.error(deprecation); - return; + Deprecator.prototype.verboseDeprecations = function(enabled) { + this.verbose_ = enabled } - let context; + // runnable is a spec or a suite. + // deprecation is a string or an Error. + // See Env#deprecated for a description of the options argument. + Deprecator.prototype.addDeprecationWarning = function(runnable, deprecation, options) { + options = options || {} - if (runnable === this.topSuite_ || options.ignoreRunnable) { - context = ''; - } else if (runnable.children) { - context = ' (in suite: ' + runnable.getFullName() + ')'; - } else { - context = ' (in spec: ' + runnable.getFullName() + ')'; + if (!this.verbose_ && !j$.isError_(deprecation)) { + if (this.toSuppress_.indexOf(deprecation) !== -1) { + return + } + this.toSuppress_.push(deprecation) + } + + this.log_(runnable, deprecation, options) + this.report_(runnable, deprecation, options) } - if (!options.omitStackTrace) { - context += '\n' + this.stackTrace_(); + Deprecator.prototype.log_ = function(runnable, deprecation, options) { + if (j$.isError_(deprecation)) { + console.error(deprecation) + return + } + + let context + + if (runnable === this.topSuite_ || options.ignoreRunnable) { + context = "" + } else if (runnable.children) { + context = " (in suite: " + runnable.getFullName() + ")" + } else { + context = " (in spec: " + runnable.getFullName() + ")" + } + + if (!options.omitStackTrace) { + context += "\n" + this.stackTrace_() + } + + if (!this.verbose_) { + context += "\n" + verboseNote + } + + console.error("DEPRECATION: " + deprecation + context) } - if (!this.verbose_) { - context += '\n' + verboseNote; + Deprecator.prototype.stackTrace_ = function() { + const formatter = new j$.ExceptionFormatter() + return formatter.stack(j$.util.errorWithStack()).replace(/^Error\n/m, "") } - console.error('DEPRECATION: ' + deprecation + context); - }; + Deprecator.prototype.report_ = function(runnable, deprecation, options) { + if (options.ignoreRunnable) { + runnable = this.topSuite_ + } - Deprecator.prototype.stackTrace_ = function() { - const formatter = new j$.ExceptionFormatter(); - return formatter.stack(j$.util.errorWithStack()).replace(/^Error\n/m, ''); - }; + if (j$.isError_(deprecation)) { + runnable.addDeprecationWarning(deprecation) + return + } - Deprecator.prototype.report_ = function(runnable, deprecation, options) { - if (options.ignoreRunnable) { - runnable = this.topSuite_; + if (!this.verbose_) { + deprecation += "\n" + verboseNote + } + + runnable.addDeprecationWarning({ + message: deprecation, + omitStackTrace: options.omitStackTrace || false + }) } - if (j$.isError_(deprecation)) { - runnable.addDeprecationWarning(deprecation); - return; - } - - if (!this.verbose_) { - deprecation += '\n' + verboseNote; - } - - runnable.addDeprecationWarning({ - message: deprecation, - omitStackTrace: options.omitStackTrace || false - }); - }; - - return Deprecator; -}; + return Deprecator +} getJasmineRequireObj().errors = function() { - function ExpectationFailed() {} + function ExpectationFailed() {} - ExpectationFailed.prototype = new Error(); - ExpectationFailed.prototype.constructor = ExpectationFailed; + ExpectationFailed.prototype = new Error() + ExpectationFailed.prototype.constructor = ExpectationFailed - return { - ExpectationFailed: ExpectationFailed - }; -}; + return { + ExpectationFailed: ExpectationFailed + } +} getJasmineRequireObj().ExceptionFormatter = function(j$) { - const ignoredProperties = [ - 'name', - 'message', - 'stack', - 'fileName', - 'sourceURL', - 'line', - 'lineNumber', - 'column', - 'description', - 'jasmineMessage' - ]; + const ignoredProperties = [ + "name", + "message", + "stack", + "fileName", + "sourceURL", + "line", + "lineNumber", + "column", + "description", + "jasmineMessage" + ] - function ExceptionFormatter(options) { - const jasmineFile = - (options && options.jasmineFile) || j$.util.jasmineFile(); - this.message = function(error) { - let message = ''; + function ExceptionFormatter(options) { + const jasmineFile = (options && options.jasmineFile) || j$.util.jasmineFile() + this.message = function(error) { + let message = "" - if (error.jasmineMessage) { - message += error.jasmineMessage; - } else if (error.name && error.message) { - message += error.name + ': ' + error.message; - } else if (error.message) { - message += error.message; - } else { - message += error.toString() + ' thrown'; - } + if (error.jasmineMessage) { + message += error.jasmineMessage + } else if (error.name && error.message) { + message += error.name + ": " + error.message + } else if (error.message) { + message += error.message + } else { + message += error.toString() + " thrown" + } - if (error.fileName || error.sourceURL) { - message += ' in ' + (error.fileName || error.sourceURL); - } + if (error.fileName || error.sourceURL) { + message += " in " + (error.fileName || error.sourceURL) + } - if (error.line || error.lineNumber) { - message += ' (line ' + (error.line || error.lineNumber) + ')'; - } + if (error.line || error.lineNumber) { + message += " (line " + (error.line || error.lineNumber) + ")" + } - return message; - }; - - this.stack = function(error, { omitMessage } = {}) { - if (!error || !error.stack) { - return null; - } - - const lines = this.stack_(error, { - messageHandling: omitMessage ? 'omit' : undefined - }); - return lines.join('\n'); - }; - - // messageHandling can be falsy (unspecified), 'omit', or 'require' - this.stack_ = function(error, { messageHandling }) { - let lines = formatProperties(error).split('\n'); - - if (lines[lines.length - 1] === '') { - lines.pop(); - } - - const stackTrace = new j$.StackTrace(error); - lines = lines.concat(filterJasmine(stackTrace)); - - if (messageHandling === 'require') { - lines.unshift(stackTrace.message || 'Error: ' + error.message); - } else if (messageHandling !== 'omit' && stackTrace.message) { - lines.unshift(stackTrace.message); - } - - if (error.cause) { - const substack = this.stack_(error.cause, { - messageHandling: 'require' - }); - substack[0] = 'Caused by: ' + substack[0]; - lines = lines.concat(substack); - } - - return lines; - }; - - function filterJasmine(stackTrace) { - const result = []; - const jasmineMarker = - stackTrace.style === 'webkit' ? '
- * _Note:_ Do not construct this directly. Jasmine will construct one and - * pass it to matchers and asymmetric equality testers. - * @hideconstructor - */ - function MatchersUtil(options) { - options = options || {}; - this.customTesters_ = options.customTesters || []; /** - * Formats a value for use in matcher failure messages and similar contexts, - * taking into account the current set of custom value formatters. - * @function - * @name MatchersUtil#pp - * @since 3.6.0 - * @param {*} value The value to pretty-print - * @return {string} The pretty-printed value + * @class MatchersUtil + * @classdesc Utilities for use in implementing matchers.
+ * _Note:_ Do not construct this directly. Jasmine will construct one and + * pass it to matchers and asymmetric equality testers. + * @hideconstructor */ - this.pp = options.pp || function() {}; - } - - /** - * Determines whether `haystack` contains `needle`, using the same comparison - * logic as {@link MatchersUtil#equals}. - * @function - * @name MatchersUtil#contains - * @since 2.0.0 - * @param {*} haystack The collection to search - * @param {*} needle The value to search for - * @returns {boolean} True if `needle` was found in `haystack` - */ - MatchersUtil.prototype.contains = function(haystack, needle) { - if (!haystack) { - return false; + function MatchersUtil(options) { + options = options || {} + this.customTesters_ = options.customTesters || [] + /** + * Formats a value for use in matcher failure messages and similar contexts, + * taking into account the current set of custom value formatters. + * @function + * @name MatchersUtil#pp + * @since 3.6.0 + * @param {*} value The value to pretty-print + * @return {string} The pretty-printed value + */ + this.pp = options.pp || function() {} } - if (j$.isSet(haystack)) { - // Try .has() first. It should be faster in cases where - // needle === something in haystack. Fall back to .equals() comparison - // if that fails. - if (haystack.has(needle)) { - return true; - } - } - - if (j$.isIterable_(haystack) && !j$.isString_(haystack)) { - // Arrays, Sets, etc. - for (const candidate of haystack) { - if (this.equals(candidate, needle)) { - return true; + /** + * Determines whether `haystack` contains `needle`, using the same comparison + * logic as {@link MatchersUtil#equals}. + * @function + * @name MatchersUtil#contains + * @since 2.0.0 + * @param {*} haystack The collection to search + * @param {*} needle The value to search for + * @returns {boolean} True if `needle` was found in `haystack` + */ + MatchersUtil.prototype.contains = function(haystack, needle) { + if (!haystack) { + return false } - } - return false; - } - - if (haystack.indexOf) { - // Mainly strings - return haystack.indexOf(needle) >= 0; - } - - if (j$.isNumber_(haystack.length)) { - // Objects that are shaped like arrays but aren't iterable - for (let i = 0; i < haystack.length; i++) { - if (this.equals(haystack[i], needle)) { - return true; - } - } - } - - return false; - }; - - MatchersUtil.prototype.buildFailureMessage = function() { - const args = Array.prototype.slice.call(arguments, 0), - matcherName = args[0], - isNot = args[1], - actual = args[2], - expected = args.slice(3), - englishyPredicate = matcherName.replace(/[A-Z]/g, function(s) { - return ' ' + s.toLowerCase(); - }); - - let message = - 'Expected ' + - this.pp(actual) + - (isNot ? ' not ' : ' ') + - englishyPredicate; - - if (expected.length > 0) { - for (let i = 0; i < expected.length; i++) { - if (i > 0) { - message += ','; - } - message += ' ' + this.pp(expected[i]); - } - } - - return message + '.'; - }; - - MatchersUtil.prototype.asymmetricDiff_ = function( - a, - b, - aStack, - bStack, - diffBuilder - ) { - if (j$.isFunction_(b.valuesForDiff_)) { - const values = b.valuesForDiff_(a, this.pp); - this.eq_(values.other, values.self, aStack, bStack, diffBuilder); - } else { - diffBuilder.recordMismatch(); - } - }; - - MatchersUtil.prototype.asymmetricMatch_ = function( - a, - b, - aStack, - bStack, - diffBuilder - ) { - const asymmetricA = j$.isAsymmetricEqualityTester_(a); - const asymmetricB = j$.isAsymmetricEqualityTester_(b); - - if (asymmetricA === asymmetricB) { - return undefined; - } - - let result; - - if (asymmetricA) { - result = a.asymmetricMatch(b, this); - if (!result) { - diffBuilder.recordMismatch(); - } - return result; - } - - if (asymmetricB) { - result = b.asymmetricMatch(a, this); - if (!result) { - this.asymmetricDiff_(a, b, aStack, bStack, diffBuilder); - } - return result; - } - }; - - /** - * Determines whether two values are deeply equal to each other. - * @function - * @name MatchersUtil#equals - * @since 2.0.0 - * @param {*} a The first value to compare - * @param {*} b The second value to compare - * @returns {boolean} True if the values are equal - */ - MatchersUtil.prototype.equals = function(a, b, diffBuilder) { - diffBuilder = diffBuilder || j$.NullDiffBuilder(); - diffBuilder.setRoots(a, b); - - return this.eq_(a, b, [], [], diffBuilder); - }; - - // Equality function lovingly adapted from isEqual in - // [Underscore](http://underscorejs.org) - MatchersUtil.prototype.eq_ = function(a, b, aStack, bStack, diffBuilder) { - let result = true; - - const asymmetricResult = this.asymmetricMatch_( - a, - b, - aStack, - bStack, - diffBuilder - ); - if (!j$.util.isUndefined(asymmetricResult)) { - return asymmetricResult; - } - - for (const tester of this.customTesters_) { - const customTesterResult = tester(a, b); - if (!j$.util.isUndefined(customTesterResult)) { - if (!customTesterResult) { - diffBuilder.recordMismatch(); - } - return customTesterResult; - } - } - - if (a instanceof Error && b instanceof Error) { - result = a.message == b.message; - if (!result) { - diffBuilder.recordMismatch(); - } - return result; - } - - // Identical objects are equal. `0 === -0`, but they aren't identical. - // See the [Harmony `egal` proposal](http://wiki.ecmascript.org/doku.php?id=harmony:egal). - if (a === b) { - result = a !== 0 || 1 / a == 1 / b; - if (!result) { - diffBuilder.recordMismatch(); - } - return result; - } - // A strict comparison is necessary because `null == undefined`. - if (a === null || b === null) { - result = a === b; - if (!result) { - diffBuilder.recordMismatch(); - } - return result; - } - const className = Object.prototype.toString.call(a); - if (className != Object.prototype.toString.call(b)) { - diffBuilder.recordMismatch(); - return false; - } - switch (className) { - // Strings, numbers, dates, and booleans are compared by value. - case '[object String]': - // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is - // equivalent to `new String("5")`. - result = a == String(b); - if (!result) { - diffBuilder.recordMismatch(); - } - return result; - case '[object Number]': - // `NaN`s are equivalent, but non-reflexive. An `egal` comparison is performed for - // other numeric values. - result = - a != +a ? b != +b : a === 0 && b === 0 ? 1 / a == 1 / b : a == +b; - if (!result) { - diffBuilder.recordMismatch(); - } - return result; - case '[object Date]': - case '[object Boolean]': - // Coerce dates and booleans to numeric primitive values. Dates are compared by their - // millisecond representations. Note that invalid dates with millisecond representations - // of `NaN` are not equivalent. - result = +a == +b; - if (!result) { - diffBuilder.recordMismatch(); - } - return result; - case '[object ArrayBuffer]': - // If we have an instance of ArrayBuffer the Uint8Array ctor - // will be defined as well - return this.eq_( - new Uint8Array(a), - new Uint8Array(b), - aStack, - bStack, - diffBuilder - ); - // RegExps are compared by their source patterns and flags. - case '[object RegExp]': - return ( - a.source == b.source && - a.global == b.global && - a.multiline == b.multiline && - a.ignoreCase == b.ignoreCase - ); - } - if (typeof a != 'object' || typeof b != 'object') { - diffBuilder.recordMismatch(); - return false; - } - - const aIsDomNode = j$.isDomNode(a); - const bIsDomNode = j$.isDomNode(b); - if (aIsDomNode && bIsDomNode) { - // At first try to use DOM3 method isEqualNode - result = a.isEqualNode(b); - if (!result) { - diffBuilder.recordMismatch(); - } - return result; - } - if (aIsDomNode || bIsDomNode) { - diffBuilder.recordMismatch(); - return false; - } - - const aIsPromise = j$.isPromise(a); - const bIsPromise = j$.isPromise(b); - if (aIsPromise && bIsPromise) { - return a === b; - } - - // Assume equality for cyclic structures. The algorithm for detecting cyclic - // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`. - let length = aStack.length; - while (length--) { - // Linear search. Performance is inversely proportional to the number of - // unique nested structures. - if (aStack[length] == a) { - return bStack[length] == b; - } - } - // Add the first object to the stack of traversed objects. - aStack.push(a); - bStack.push(b); - let size = 0; - // Recursively compare objects and arrays. - // Compare array lengths to determine if a deep comparison is necessary. - if (className == '[object Array]') { - const aLength = a.length; - const bLength = b.length; - - diffBuilder.withPath('length', function() { - if (aLength !== bLength) { - diffBuilder.recordMismatch(); - result = false; - } - }); - - for (let i = 0; i < aLength || i < bLength; i++) { - diffBuilder.withPath(i, () => { - if (i >= bLength) { - diffBuilder.recordMismatch( - actualArrayIsLongerFormatter.bind(null, this.pp) - ); - result = false; - } else { - result = - this.eq_( - i < aLength ? a[i] : void 0, - i < bLength ? b[i] : void 0, - aStack, - bStack, - diffBuilder - ) && result; - } - }); - } - if (!result) { - return false; - } - } else if (j$.isMap(a) && j$.isMap(b)) { - if (a.size != b.size) { - diffBuilder.recordMismatch(); - return false; - } - - const keysA = []; - const keysB = []; - a.forEach(function(valueA, keyA) { - keysA.push(keyA); - }); - b.forEach(function(valueB, keyB) { - keysB.push(keyB); - }); - - // For both sets of keys, check they map to equal values in both maps. - // Keep track of corresponding keys (in insertion order) in order to handle asymmetric obj keys. - const mapKeys = [keysA, keysB]; - const cmpKeys = [keysB, keysA]; - for (let i = 0; result && i < mapKeys.length; i++) { - const mapIter = mapKeys[i]; - const cmpIter = cmpKeys[i]; - - for (let j = 0; result && j < mapIter.length; j++) { - const mapKey = mapIter[j]; - const cmpKey = cmpIter[j]; - const mapValueA = a.get(mapKey); - let mapValueB; - - // Only use the cmpKey when one of the keys is asymmetric and the corresponding key matches, - // otherwise explicitly look up the mapKey in the other Map since we want keys with unique - // obj identity (that are otherwise equal) to not match. - if ( - j$.isAsymmetricEqualityTester_(mapKey) || - (j$.isAsymmetricEqualityTester_(cmpKey) && - this.eq_(mapKey, cmpKey, aStack, bStack, j$.NullDiffBuilder())) - ) { - mapValueB = b.get(cmpKey); - } else { - mapValueB = b.get(mapKey); - } - result = this.eq_( - mapValueA, - mapValueB, - aStack, - bStack, - j$.NullDiffBuilder() - ); - } - } - - if (!result) { - diffBuilder.recordMismatch(); - return false; - } - } else if (j$.isSet(a) && j$.isSet(b)) { - if (a.size != b.size) { - diffBuilder.recordMismatch(); - return false; - } - - const valuesA = []; - a.forEach(function(valueA) { - valuesA.push(valueA); - }); - const valuesB = []; - b.forEach(function(valueB) { - valuesB.push(valueB); - }); - - // For both sets, check they are all contained in the other set - const setPairs = [[valuesA, valuesB], [valuesB, valuesA]]; - const stackPairs = [[aStack, bStack], [bStack, aStack]]; - for (let i = 0; result && i < setPairs.length; i++) { - const baseValues = setPairs[i][0]; - const otherValues = setPairs[i][1]; - const baseStack = stackPairs[i][0]; - const otherStack = stackPairs[i][1]; - // For each value in the base set... - for (const baseValue of baseValues) { - let found = false; - // ... test that it is present in the other set - for (let j = 0; !found && j < otherValues.length; j++) { - const otherValue = otherValues[j]; - const prevStackSize = baseStack.length; - // compare by value equality - found = this.eq_( - baseValue, - otherValue, - baseStack, - otherStack, - j$.NullDiffBuilder() - ); - if (!found && prevStackSize !== baseStack.length) { - baseStack.splice(prevStackSize); - otherStack.splice(prevStackSize); + if (j$.isSet(haystack)) { + // Try .has() first. It should be faster in cases where + // needle === something in haystack. Fall back to .equals() comparison + // if that fails. + if (haystack.has(needle)) { + return true } - } - result = result && found; } - } - if (!result) { - diffBuilder.recordMismatch(); - return false; - } - } else if (j$.isURL(a) && j$.isURL(b)) { - // URLs have no enumrable properties, so the default object comparison - // would consider any two URLs to be equal. - return a.toString() === b.toString(); - } else { - // Objects with different constructors are not equivalent, but `Object`s - // or `Array`s from different frames are. - const aCtor = a.constructor, - bCtor = b.constructor; - if ( - aCtor !== bCtor && - isFunction(aCtor) && - isFunction(bCtor) && - a instanceof aCtor && - b instanceof bCtor && - !(aCtor instanceof aCtor && bCtor instanceof bCtor) - ) { - diffBuilder.recordMismatch( - constructorsAreDifferentFormatter.bind(null, this.pp) - ); - return false; - } - } + if (j$.isIterable_(haystack) && !j$.isString_(haystack)) { + // Arrays, Sets, etc. + for (const candidate of haystack) { + if (this.equals(candidate, needle)) { + return true + } + } - // Deep compare objects. - const aKeys = MatchersUtil.keys(a, className == '[object Array]'); - size = aKeys.length; - - // Ensure that both objects contain the same number of properties before comparing deep equality. - if (MatchersUtil.keys(b, className == '[object Array]').length !== size) { - diffBuilder.recordMismatch( - objectKeysAreDifferentFormatter.bind(null, this.pp) - ); - return false; - } - - for (const key of aKeys) { - // Deep compare each member - if (!j$.util.has(b, key)) { - diffBuilder.recordMismatch( - objectKeysAreDifferentFormatter.bind(null, this.pp) - ); - result = false; - continue; - } - - diffBuilder.withPath(key, () => { - if (!this.eq_(a[key], b[key], aStack, bStack, diffBuilder)) { - result = false; + return false } - }); - } - if (!result) { - return false; - } - - // Remove the first object from the stack of traversed objects. - aStack.pop(); - bStack.pop(); - - return result; - }; - - MatchersUtil.keys = function(obj, isArray) { - const allKeys = (function(o) { - const keys = []; - for (const key in o) { - if (j$.util.has(o, key)) { - keys.push(key); + if (haystack.indexOf) { + // Mainly strings + return haystack.indexOf(needle) >= 0 } - } - const symbols = Object.getOwnPropertySymbols(o); - for (const sym of symbols) { - if (o.propertyIsEnumerable(sym)) { - keys.push(sym); + if (j$.isNumber_(haystack.length)) { + // Objects that are shaped like arrays but aren't iterable + for (let i = 0; i < haystack.length; i++) { + if (this.equals(haystack[i], needle)) { + return true + } + } } - } - return keys; - })(obj); - - if (!isArray) { - return allKeys; + return false } - if (allKeys.length === 0) { - return allKeys; + MatchersUtil.prototype.buildFailureMessage = function() { + const args = Array.prototype.slice.call(arguments, 0), + matcherName = args[0], + isNot = args[1], + actual = args[2], + expected = args.slice(3), + englishyPredicate = matcherName.replace(/[A-Z]/g, function(s) { + return " " + s.toLowerCase() + }) + + let message = "Expected " + this.pp(actual) + (isNot ? " not " : " ") + englishyPredicate + + if (expected.length > 0) { + for (let i = 0; i < expected.length; i++) { + if (i > 0) { + message += "," + } + message += " " + this.pp(expected[i]) + } + } + + return message + "." } - const extraKeys = []; - for (const k of allKeys) { - if (typeof k === 'symbol' || !/^[0-9]+$/.test(k)) { - extraKeys.push(k); - } + MatchersUtil.prototype.asymmetricDiff_ = function(a, b, aStack, bStack, diffBuilder) { + if (j$.isFunction_(b.valuesForDiff_)) { + const values = b.valuesForDiff_(a, this.pp) + this.eq_(values.other, values.self, aStack, bStack, diffBuilder) + } else { + diffBuilder.recordMismatch() + } } - return extraKeys; - }; + MatchersUtil.prototype.asymmetricMatch_ = function(a, b, aStack, bStack, diffBuilder) { + const asymmetricA = j$.isAsymmetricEqualityTester_(a) + const asymmetricB = j$.isAsymmetricEqualityTester_(b) - function isFunction(obj) { - return typeof obj === 'function'; - } + if (asymmetricA === asymmetricB) { + return undefined + } - // Returns an array of [k, v] pairs for eacch property that's in objA - // and not in objB. - function extraKeysAndValues(objA, objB) { - return MatchersUtil.keys(objA) - .filter(key => !j$.util.has(objB, key)) - .map(key => [key, objA[key]]); - } + let result - function objectKeysAreDifferentFormatter(pp, actual, expected, path) { - const missingProperties = extraKeysAndValues(expected, actual), - extraProperties = extraKeysAndValues(actual, expected), - missingPropertiesMessage = formatKeyValuePairs(pp, missingProperties), - extraPropertiesMessage = formatKeyValuePairs(pp, extraProperties), - messages = []; + if (asymmetricA) { + result = a.asymmetricMatch(b, this) + if (!result) { + diffBuilder.recordMismatch() + } + return result + } - if (!path.depth()) { - path = 'object'; + if (asymmetricB) { + result = b.asymmetricMatch(a, this) + if (!result) { + this.asymmetricDiff_(a, b, aStack, bStack, diffBuilder) + } + return result + } } - if (missingPropertiesMessage.length) { - messages.push( - 'Expected ' + path + ' to have properties' + missingPropertiesMessage - ); + /** + * Determines whether two values are deeply equal to each other. + * @function + * @name MatchersUtil#equals + * @since 2.0.0 + * @param {*} a The first value to compare + * @param {*} b The second value to compare + * @returns {boolean} True if the values are equal + */ + MatchersUtil.prototype.equals = function(a, b, diffBuilder) { + diffBuilder = diffBuilder || j$.NullDiffBuilder() + diffBuilder.setRoots(a, b) + + return this.eq_(a, b, [], [], diffBuilder) } - if (extraPropertiesMessage.length) { - messages.push( - 'Expected ' + path + ' not to have properties' + extraPropertiesMessage - ); + // Equality function lovingly adapted from isEqual in + // [Underscore](http://underscorejs.org) + MatchersUtil.prototype.eq_ = function(a, b, aStack, bStack, diffBuilder) { + let result = true + + const asymmetricResult = this.asymmetricMatch_(a, b, aStack, bStack, diffBuilder) + if (!j$.util.isUndefined(asymmetricResult)) { + return asymmetricResult + } + + for (const tester of this.customTesters_) { + const customTesterResult = tester(a, b) + if (!j$.util.isUndefined(customTesterResult)) { + if (!customTesterResult) { + diffBuilder.recordMismatch() + } + return customTesterResult + } + } + + if (a instanceof Error && b instanceof Error) { + result = a.message == b.message + if (!result) { + diffBuilder.recordMismatch() + } + return result + } + + // Identical objects are equal. `0 === -0`, but they aren't identical. + // See the [Harmony `egal` proposal](http://wiki.ecmascript.org/doku.php?id=harmony:egal). + if (a === b) { + result = a !== 0 || 1 / a == 1 / b + if (!result) { + diffBuilder.recordMismatch() + } + return result + } + // A strict comparison is necessary because `null == undefined`. + if (a === null || b === null) { + result = a === b + if (!result) { + diffBuilder.recordMismatch() + } + return result + } + const className = Object.prototype.toString.call(a) + if (className != Object.prototype.toString.call(b)) { + diffBuilder.recordMismatch() + return false + } + switch (className) { + // Strings, numbers, dates, and booleans are compared by value. + case "[object String]": + // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is + // equivalent to `new String("5")`. + result = a == String(b) + if (!result) { + diffBuilder.recordMismatch() + } + return result + case "[object Number]": + // `NaN`s are equivalent, but non-reflexive. An `egal` comparison is performed for + // other numeric values. + result = a != +a ? b != +b : a === 0 && b === 0 ? 1 / a == 1 / b : a == +b + if (!result) { + diffBuilder.recordMismatch() + } + return result + case "[object Date]": + case "[object Boolean]": + // Coerce dates and booleans to numeric primitive values. Dates are compared by their + // millisecond representations. Note that invalid dates with millisecond representations + // of `NaN` are not equivalent. + result = +a == +b + if (!result) { + diffBuilder.recordMismatch() + } + return result + case "[object ArrayBuffer]": + // If we have an instance of ArrayBuffer the Uint8Array ctor + // will be defined as well + return this.eq_(new Uint8Array(a), new Uint8Array(b), aStack, bStack, diffBuilder) + // RegExps are compared by their source patterns and flags. + case "[object RegExp]": + return ( + a.source == b.source && + a.global == b.global && + a.multiline == b.multiline && + a.ignoreCase == b.ignoreCase + ) + } + if (typeof a != "object" || typeof b != "object") { + diffBuilder.recordMismatch() + return false + } + + const aIsDomNode = j$.isDomNode(a) + const bIsDomNode = j$.isDomNode(b) + if (aIsDomNode && bIsDomNode) { + // At first try to use DOM3 method isEqualNode + result = a.isEqualNode(b) + if (!result) { + diffBuilder.recordMismatch() + } + return result + } + if (aIsDomNode || bIsDomNode) { + diffBuilder.recordMismatch() + return false + } + + const aIsPromise = j$.isPromise(a) + const bIsPromise = j$.isPromise(b) + if (aIsPromise && bIsPromise) { + return a === b + } + + // Assume equality for cyclic structures. The algorithm for detecting cyclic + // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`. + let length = aStack.length + while (length--) { + // Linear search. Performance is inversely proportional to the number of + // unique nested structures. + if (aStack[length] == a) { + return bStack[length] == b + } + } + // Add the first object to the stack of traversed objects. + aStack.push(a) + bStack.push(b) + let size = 0 + // Recursively compare objects and arrays. + // Compare array lengths to determine if a deep comparison is necessary. + if (className == "[object Array]") { + const aLength = a.length + const bLength = b.length + + diffBuilder.withPath("length", function() { + if (aLength !== bLength) { + diffBuilder.recordMismatch() + result = false + } + }) + + for (let i = 0; i < aLength || i < bLength; i++) { + diffBuilder.withPath(i, () => { + if (i >= bLength) { + diffBuilder.recordMismatch(actualArrayIsLongerFormatter.bind(null, this.pp)) + result = false + } else { + result = + this.eq_( + i < aLength ? a[i] : void 0, + i < bLength ? b[i] : void 0, + aStack, + bStack, + diffBuilder + ) && result + } + }) + } + if (!result) { + return false + } + } else if (j$.isMap(a) && j$.isMap(b)) { + if (a.size != b.size) { + diffBuilder.recordMismatch() + return false + } + + const keysA = [] + const keysB = [] + a.forEach(function(valueA, keyA) { + keysA.push(keyA) + }) + b.forEach(function(valueB, keyB) { + keysB.push(keyB) + }) + + // For both sets of keys, check they map to equal values in both maps. + // Keep track of corresponding keys (in insertion order) in order to handle asymmetric obj keys. + const mapKeys = [keysA, keysB] + const cmpKeys = [keysB, keysA] + for (let i = 0; result && i < mapKeys.length; i++) { + const mapIter = mapKeys[i] + const cmpIter = cmpKeys[i] + + for (let j = 0; result && j < mapIter.length; j++) { + const mapKey = mapIter[j] + const cmpKey = cmpIter[j] + const mapValueA = a.get(mapKey) + let mapValueB + + // Only use the cmpKey when one of the keys is asymmetric and the corresponding key matches, + // otherwise explicitly look up the mapKey in the other Map since we want keys with unique + // obj identity (that are otherwise equal) to not match. + if ( + j$.isAsymmetricEqualityTester_(mapKey) || + (j$.isAsymmetricEqualityTester_(cmpKey) && + this.eq_(mapKey, cmpKey, aStack, bStack, j$.NullDiffBuilder())) + ) { + mapValueB = b.get(cmpKey) + } else { + mapValueB = b.get(mapKey) + } + result = this.eq_(mapValueA, mapValueB, aStack, bStack, j$.NullDiffBuilder()) + } + } + + if (!result) { + diffBuilder.recordMismatch() + return false + } + } else if (j$.isSet(a) && j$.isSet(b)) { + if (a.size != b.size) { + diffBuilder.recordMismatch() + return false + } + + const valuesA = [] + a.forEach(function(valueA) { + valuesA.push(valueA) + }) + const valuesB = [] + b.forEach(function(valueB) { + valuesB.push(valueB) + }) + + // For both sets, check they are all contained in the other set + const setPairs = [ + [valuesA, valuesB], + [valuesB, valuesA] + ] + const stackPairs = [ + [aStack, bStack], + [bStack, aStack] + ] + for (let i = 0; result && i < setPairs.length; i++) { + const baseValues = setPairs[i][0] + const otherValues = setPairs[i][1] + const baseStack = stackPairs[i][0] + const otherStack = stackPairs[i][1] + // For each value in the base set... + for (const baseValue of baseValues) { + let found = false + // ... test that it is present in the other set + for (let j = 0; !found && j < otherValues.length; j++) { + const otherValue = otherValues[j] + const prevStackSize = baseStack.length + // compare by value equality + found = this.eq_(baseValue, otherValue, baseStack, otherStack, j$.NullDiffBuilder()) + if (!found && prevStackSize !== baseStack.length) { + baseStack.splice(prevStackSize) + otherStack.splice(prevStackSize) + } + } + result = result && found + } + } + + if (!result) { + diffBuilder.recordMismatch() + return false + } + } else if (j$.isURL(a) && j$.isURL(b)) { + // URLs have no enumrable properties, so the default object comparison + // would consider any two URLs to be equal. + return a.toString() === b.toString() + } else { + // Objects with different constructors are not equivalent, but `Object`s + // or `Array`s from different frames are. + const aCtor = a.constructor, + bCtor = b.constructor + if ( + aCtor !== bCtor && + isFunction(aCtor) && + isFunction(bCtor) && + a instanceof aCtor && + b instanceof bCtor && + !(aCtor instanceof aCtor && bCtor instanceof bCtor) + ) { + diffBuilder.recordMismatch(constructorsAreDifferentFormatter.bind(null, this.pp)) + return false + } + } + + // Deep compare objects. + const aKeys = MatchersUtil.keys(a, className == "[object Array]") + size = aKeys.length + + // Ensure that both objects contain the same number of properties before comparing deep equality. + if (MatchersUtil.keys(b, className == "[object Array]").length !== size) { + diffBuilder.recordMismatch(objectKeysAreDifferentFormatter.bind(null, this.pp)) + return false + } + + for (const key of aKeys) { + // Deep compare each member + if (!j$.util.has(b, key)) { + diffBuilder.recordMismatch(objectKeysAreDifferentFormatter.bind(null, this.pp)) + result = false + continue + } + + diffBuilder.withPath(key, () => { + if (!this.eq_(a[key], b[key], aStack, bStack, diffBuilder)) { + result = false + } + }) + } + + if (!result) { + return false + } + + // Remove the first object from the stack of traversed objects. + aStack.pop() + bStack.pop() + + return result } - return messages.join('\n'); - } + MatchersUtil.keys = function(obj, isArray) { + const allKeys = (function(o) { + const keys = [] + for (const key in o) { + if (j$.util.has(o, key)) { + keys.push(key) + } + } - function constructorsAreDifferentFormatter(pp, actual, expected, path) { - if (!path.depth()) { - path = 'object'; + const symbols = Object.getOwnPropertySymbols(o) + for (const sym of symbols) { + if (o.propertyIsEnumerable(sym)) { + keys.push(sym) + } + } + + return keys + })(obj) + + if (!isArray) { + return allKeys + } + + if (allKeys.length === 0) { + return allKeys + } + + const extraKeys = [] + for (const k of allKeys) { + if (typeof k === "symbol" || !/^[0-9]+$/.test(k)) { + extraKeys.push(k) + } + } + + return extraKeys } - return ( - 'Expected ' + - path + - ' to be a kind of ' + - j$.fnNameFor(expected.constructor) + - ', but was ' + - pp(actual) + - '.' - ); - } - - function actualArrayIsLongerFormatter(pp, actual, expected, path) { - return ( - 'Unexpected ' + - path + - (path.depth() ? ' = ' : '') + - pp(actual) + - ' in array.' - ); - } - - function formatKeyValuePairs(pp, keyValuePairs) { - let formatted = ''; - - for (const [key, value] of keyValuePairs) { - formatted += '\n ' + key.toString() + ': ' + pp(value); + function isFunction(obj) { + return typeof obj === "function" } - return formatted; - } + // Returns an array of [k, v] pairs for eacch property that's in objA + // and not in objB. + function extraKeysAndValues(objA, objB) { + return MatchersUtil.keys(objA) + .filter((key) => !j$.util.has(objB, key)) + .map((key) => [key, objA[key]]) + } - return MatchersUtil; -}; + function objectKeysAreDifferentFormatter(pp, actual, expected, path) { + const missingProperties = extraKeysAndValues(expected, actual), + extraProperties = extraKeysAndValues(actual, expected), + missingPropertiesMessage = formatKeyValuePairs(pp, missingProperties), + extraPropertiesMessage = formatKeyValuePairs(pp, extraProperties), + messages = [] + + if (!path.depth()) { + path = "object" + } + + if (missingPropertiesMessage.length) { + messages.push("Expected " + path + " to have properties" + missingPropertiesMessage) + } + + if (extraPropertiesMessage.length) { + messages.push("Expected " + path + " not to have properties" + extraPropertiesMessage) + } + + return messages.join("\n") + } + + function constructorsAreDifferentFormatter(pp, actual, expected, path) { + if (!path.depth()) { + path = "object" + } + + return ( + "Expected " + + path + + " to be a kind of " + + j$.fnNameFor(expected.constructor) + + ", but was " + + pp(actual) + + "." + ) + } + + function actualArrayIsLongerFormatter(pp, actual, expected, path) { + return "Unexpected " + path + (path.depth() ? " = " : "") + pp(actual) + " in array." + } + + function formatKeyValuePairs(pp, keyValuePairs) { + let formatted = "" + + for (const [key, value] of keyValuePairs) { + formatted += "\n " + key.toString() + ": " + pp(value) + } + + return formatted + } + + return MatchersUtil +} /** * @interface AsymmetricEqualityTester @@ -5288,5181 +4963,4872 @@ getJasmineRequireObj().MatchersUtil = function(j$) { */ getJasmineRequireObj().MismatchTree = function(j$) { - /* + /* To be able to apply custom object formatters at all possible levels of an object graph, DiffBuilder needs to be able to know not just where the mismatch occurred but also all ancestors of the mismatched value in both the expected and actual object graphs. MismatchTree maintains that context and provides it via the traverse method. */ - class MismatchTree { - constructor(path) { - this.path = path || new j$.ObjectPath([]); - this.formatter = undefined; - this.children = []; - this.isMismatch = false; - } - - add(path, formatter) { - if (path.depth() === 0) { - this.formatter = formatter; - this.isMismatch = true; - } else { - const key = path.components[0]; - path = path.shift(); - let child = this.child(key); - - if (!child) { - child = new MismatchTree(this.path.add(key)); - this.children.push(child); + class MismatchTree { + constructor(path) { + this.path = path || new j$.ObjectPath([]) + this.formatter = undefined + this.children = [] + this.isMismatch = false } - child.add(path, formatter); - } - } + add(path, formatter) { + if (path.depth() === 0) { + this.formatter = formatter + this.isMismatch = true + } else { + const key = path.components[0] + path = path.shift() + let child = this.child(key) - traverse(visit) { - const hasChildren = this.children.length > 0; + if (!child) { + child = new MismatchTree(this.path.add(key)) + this.children.push(child) + } - if (this.isMismatch || hasChildren) { - if (visit(this.path, !hasChildren, this.formatter)) { - for (const child of this.children) { - child.traverse(visit); - } + child.add(path, formatter) + } + } + + traverse(visit) { + const hasChildren = this.children.length > 0 + + if (this.isMismatch || hasChildren) { + if (visit(this.path, !hasChildren, this.formatter)) { + for (const child of this.children) { + child.traverse(visit) + } + } + } + } + + child(key) { + return this.children.find((child) => { + const pathEls = child.path.components + return pathEls[pathEls.length - 1] === key + }) } - } } - child(key) { - return this.children.find(child => { - const pathEls = child.path.components; - return pathEls[pathEls.length - 1] === key; - }); - } - } - - return MismatchTree; -}; + return MismatchTree +} getJasmineRequireObj().nothing = function() { - /** - * {@link expect} nothing explicitly. - * @function - * @name matchers#nothing - * @since 2.8.0 - * @example - * expect().nothing(); - */ - function nothing() { - return { - compare: function() { + /** + * {@link expect} nothing explicitly. + * @function + * @name matchers#nothing + * @since 2.8.0 + * @example + * expect().nothing(); + */ + function nothing() { return { - pass: true - }; - } - }; - } + compare: function() { + return { + pass: true + } + } + } + } - return nothing; -}; + return nothing +} getJasmineRequireObj().NullDiffBuilder = function(j$) { - return function() { - return { - withPath: function(_, block) { - block(); - }, - setRoots: function() {}, - recordMismatch: function() {} - }; - }; -}; + return function() { + return { + withPath: function(_, block) { + block() + }, + setRoots: function() {}, + recordMismatch: function() {} + } + } +} getJasmineRequireObj().ObjectPath = function(j$) { - class ObjectPath { - constructor(components) { - this.components = components || []; + class ObjectPath { + constructor(components) { + this.components = components || [] + } + + toString() { + if (this.components.length) { + return "$" + this.components.map(formatPropertyAccess).join("") + } else { + return "" + } + } + + add(component) { + return new ObjectPath(this.components.concat([component])) + } + + shift() { + return new ObjectPath(this.components.slice(1)) + } + + depth() { + return this.components.length + } } - toString() { - if (this.components.length) { - return '$' + this.components.map(formatPropertyAccess).join(''); - } else { - return ''; - } + function formatPropertyAccess(prop) { + if (typeof prop === "number" || typeof prop === "symbol") { + return "[" + prop.toString() + "]" + } + + if (isValidIdentifier(prop)) { + return "." + prop + } + + return `['${prop}']` } - add(component) { - return new ObjectPath(this.components.concat([component])); + function isValidIdentifier(string) { + return /^[A-Za-z\$_][A-Za-z0-9\$_]*$/.test(string) } - shift() { - return new ObjectPath(this.components.slice(1)); - } - - depth() { - return this.components.length; - } - } - - function formatPropertyAccess(prop) { - if (typeof prop === 'number' || typeof prop === 'symbol') { - return '[' + prop.toString() + ']'; - } - - if (isValidIdentifier(prop)) { - return '.' + prop; - } - - return `['${prop}']`; - } - - function isValidIdentifier(string) { - return /^[A-Za-z\$_][A-Za-z0-9\$_]*$/.test(string); - } - - return ObjectPath; -}; + return ObjectPath +} getJasmineRequireObj().requireAsyncMatchers = function(jRequire, j$) { - const availableMatchers = [ - 'toBePending', - 'toBeResolved', - 'toBeRejected', - 'toBeResolvedTo', - 'toBeRejectedWith', - 'toBeRejectedWithError' - ], - matchers = {}; + const availableMatchers = [ + "toBePending", + "toBeResolved", + "toBeRejected", + "toBeResolvedTo", + "toBeRejectedWith", + "toBeRejectedWithError" + ], + matchers = {} - for (const name of availableMatchers) { - matchers[name] = jRequire[name](j$); - } + for (const name of availableMatchers) { + matchers[name] = jRequire[name](j$) + } - return matchers; -}; + return matchers +} getJasmineRequireObj().toBe = function(j$) { - /** - * {@link expect} the actual value to be `===` to the expected value. - * @function - * @name matchers#toBe - * @since 1.3.0 - * @param {Object} expected - The expected value to compare against. - * @example - * expect(thing).toBe(realThing); - */ - function toBe(matchersUtil) { - const tip = - ' Tip: To check for deep equality, use .toEqual() instead of .toBe().'; + /** + * {@link expect} the actual value to be `===` to the expected value. + * @function + * @name matchers#toBe + * @since 1.3.0 + * @param {Object} expected - The expected value to compare against. + * @example + * expect(thing).toBe(realThing); + */ + function toBe(matchersUtil) { + const tip = " Tip: To check for deep equality, use .toEqual() instead of .toBe()." - return { - compare: function(actual, expected) { - const result = { - pass: actual === expected - }; + return { + compare: function(actual, expected) { + const result = { + pass: actual === expected + } - if (typeof expected === 'object') { - result.message = - matchersUtil.buildFailureMessage( - 'toBe', - result.pass, - actual, - expected - ) + tip; + if (typeof expected === "object") { + result.message = matchersUtil.buildFailureMessage("toBe", result.pass, actual, expected) + tip + } + + return result + } } + } - return result; - } - }; - } - - return toBe; -}; + return toBe +} getJasmineRequireObj().toBeCloseTo = function() { - /** - * {@link expect} the actual value to be within a specified precision of the expected value. - * @function - * @name matchers#toBeCloseTo - * @since 1.3.0 - * @param {Object} expected - The expected value to compare against. - * @param {Number} [precision=2] - The number of decimal points to check. - * @example - * expect(number).toBeCloseTo(42.2, 3); - */ - function toBeCloseTo() { - return { - compare: function(actual, expected, precision) { - if (precision !== 0) { - precision = precision || 2; - } - - if (expected === null || actual === null) { - throw new Error( - 'Cannot use toBeCloseTo with null. Arguments evaluated to: ' + - 'expect(' + - actual + - ').toBeCloseTo(' + - expected + - ').' - ); - } - - // Infinity is close to Infinity and -Infinity is close to -Infinity, - // regardless of the precision. - if (expected === Infinity || expected === -Infinity) { - return { - pass: actual === expected - }; - } - - const pow = Math.pow(10, precision + 1); - const delta = Math.abs(expected - actual); - const maxDelta = Math.pow(10, -precision) / 2; - + /** + * {@link expect} the actual value to be within a specified precision of the expected value. + * @function + * @name matchers#toBeCloseTo + * @since 1.3.0 + * @param {Object} expected - The expected value to compare against. + * @param {Number} [precision=2] - The number of decimal points to check. + * @example + * expect(number).toBeCloseTo(42.2, 3); + */ + function toBeCloseTo() { return { - pass: Math.round(delta * pow) <= maxDelta * pow - }; - } - }; - } + compare: function(actual, expected, precision) { + if (precision !== 0) { + precision = precision || 2 + } - return toBeCloseTo; -}; + if (expected === null || actual === null) { + throw new Error( + "Cannot use toBeCloseTo with null. Arguments evaluated to: " + + "expect(" + + actual + + ").toBeCloseTo(" + + expected + + ")." + ) + } + + // Infinity is close to Infinity and -Infinity is close to -Infinity, + // regardless of the precision. + if (expected === Infinity || expected === -Infinity) { + return { + pass: actual === expected + } + } + + const pow = Math.pow(10, precision + 1) + const delta = Math.abs(expected - actual) + const maxDelta = Math.pow(10, -precision) / 2 + + return { + pass: Math.round(delta * pow) <= maxDelta * pow + } + } + } + } + + return toBeCloseTo +} getJasmineRequireObj().toBeDefined = function() { - /** - * {@link expect} the actual value to be defined. (Not `undefined`) - * @function - * @name matchers#toBeDefined - * @since 1.3.0 - * @example - * expect(result).toBeDefined(); - */ - function toBeDefined() { - return { - compare: function(actual) { + /** + * {@link expect} the actual value to be defined. (Not `undefined`) + * @function + * @name matchers#toBeDefined + * @since 1.3.0 + * @example + * expect(result).toBeDefined(); + */ + function toBeDefined() { return { - pass: void 0 !== actual - }; - } - }; - } + compare: function(actual) { + return { + pass: void 0 !== actual + } + } + } + } - return toBeDefined; -}; + return toBeDefined +} getJasmineRequireObj().toBeFalse = function() { - /** - * {@link expect} the actual value to be `false`. - * @function - * @name matchers#toBeFalse - * @since 3.5.0 - * @example - * expect(result).toBeFalse(); - */ - function toBeFalse() { - return { - compare: function(actual) { + /** + * {@link expect} the actual value to be `false`. + * @function + * @name matchers#toBeFalse + * @since 3.5.0 + * @example + * expect(result).toBeFalse(); + */ + function toBeFalse() { return { - pass: actual === false - }; - } - }; - } + compare: function(actual) { + return { + pass: actual === false + } + } + } + } - return toBeFalse; -}; + return toBeFalse +} getJasmineRequireObj().toBeFalsy = function() { - /** - * {@link expect} the actual value to be falsy - * @function - * @name matchers#toBeFalsy - * @since 2.0.0 - * @example - * expect(result).toBeFalsy(); - */ - function toBeFalsy() { - return { - compare: function(actual) { + /** + * {@link expect} the actual value to be falsy + * @function + * @name matchers#toBeFalsy + * @since 2.0.0 + * @example + * expect(result).toBeFalsy(); + */ + function toBeFalsy() { return { - pass: !actual - }; - } - }; - } + compare: function(actual) { + return { + pass: !actual + } + } + } + } - return toBeFalsy; -}; + return toBeFalsy +} getJasmineRequireObj().toBeGreaterThan = function() { - /** - * {@link expect} the actual value to be greater than the expected value. - * @function - * @name matchers#toBeGreaterThan - * @since 2.0.0 - * @param {Number} expected - The value to compare against. - * @example - * expect(result).toBeGreaterThan(3); - */ - function toBeGreaterThan() { - return { - compare: function(actual, expected) { + /** + * {@link expect} the actual value to be greater than the expected value. + * @function + * @name matchers#toBeGreaterThan + * @since 2.0.0 + * @param {Number} expected - The value to compare against. + * @example + * expect(result).toBeGreaterThan(3); + */ + function toBeGreaterThan() { return { - pass: actual > expected - }; - } - }; - } + compare: function(actual, expected) { + return { + pass: actual > expected + } + } + } + } - return toBeGreaterThan; -}; + return toBeGreaterThan +} getJasmineRequireObj().toBeGreaterThanOrEqual = function() { - /** - * {@link expect} the actual value to be greater than or equal to the expected value. - * @function - * @name matchers#toBeGreaterThanOrEqual - * @since 2.0.0 - * @param {Number} expected - The expected value to compare against. - * @example - * expect(result).toBeGreaterThanOrEqual(25); - */ - function toBeGreaterThanOrEqual() { - return { - compare: function(actual, expected) { + /** + * {@link expect} the actual value to be greater than or equal to the expected value. + * @function + * @name matchers#toBeGreaterThanOrEqual + * @since 2.0.0 + * @param {Number} expected - The expected value to compare against. + * @example + * expect(result).toBeGreaterThanOrEqual(25); + */ + function toBeGreaterThanOrEqual() { return { - pass: actual >= expected - }; - } - }; - } + compare: function(actual, expected) { + return { + pass: actual >= expected + } + } + } + } - return toBeGreaterThanOrEqual; -}; + return toBeGreaterThanOrEqual +} getJasmineRequireObj().toBeInstanceOf = function(j$) { - const usageError = j$.formatErrorMsg( - '