@rindo/core 2.17.0 → 2.17.1

package/compiler/rindo.js

@@ -1,5 +1,5 @@
 /*!
- Rindo Compiler v2.17.0 | MIT Licensed | https://rindojs.web.app
+ Rindo Compiler v2.17.1 | MIT Licensed | https://rindojs.web.app
  */
 (function(exports) {
 'use strict';
@@ -727,12 +727,27 @@ const trimFalsy = (data) => {
   return arr;
 };
 
-const toLowerCase = (str) => str.toLowerCase();
-const toDashCase = (str) => toLowerCase(str
-  .replace(/([A-Z0-9])/g, (g) => ' ' + g[0])
+/**
+ * Convert a string from PascalCase to dash-case
+ *
+ * @param str the string to convert
+ * @returns a converted string
+ */
+const toDashCase = (str) => str
+  .replace(/([A-Z0-9])/g, (match) => ` ${match[0]}`)
   .trim()
-  .replace(/ /g, '-'));
-const dashToPascalCase$1 = (str) => toLowerCase(str)
+  .split(' ')
+  .join('-')
+  .toLowerCase();
+/**
+ * Convert a string from dash-case / kebab-case to PascalCase (or CamelCase,
+ * or whatever you call it!)
+ *
+ * @param str a string to convert
+ * @returns a converted string
+ */
+const dashToPascalCase$1 = (str) => str
+  .toLowerCase()
   .split('-')
   .map((segment) => segment.charAt(0).toUpperCase() + segment.slice(1))
   .join('');
@@ -789,8 +804,8 @@ const pluck = (obj, keys) => {
     return final;
   }, {});
 };
-const isBoolean$1 = (v) => typeof v === 'boolean';
 const isDefined = (v) => v !== null && v !== undefined;
+const isBoolean$1 = (v) => typeof v === 'boolean';
 const isFunction = (v) => typeof v === 'function';
 const isNumber$1 = (v) => typeof v === 'number';
 const isObject$4 = (val) => val != null && typeof val === 'object' && Array.isArray(val) === false;
@@ -1631,7 +1646,7 @@ const isDtsFile$1 = (filePath) => {
 /**
  * Generate the preamble to be placed atop the main file of the build
  * @param config the Rindo configuration file
- * @return the generated preamble
+ * @returns the generated preamble
  */
 const generatePreamble = (config) => {
   const { preamble } = config;
@@ -2026,10 +2041,14 @@ const buildEvents = () => {
   };
 };
 
+/**
+ * Creates an instance of a logger
+ * @returns the new logger instance
+ */
 const createLogger = () => {
   let useColors = IS_BROWSER_ENV;
   let level = 'info';
-  const logger = {
+  return {
     enableColors: (uc) => (useColors = uc),
     getLevel: () => level,
     setLevel: (l) => (level = l),
@@ -2056,7 +2075,6 @@ const createLogger = () => {
       diagnostics.forEach((diagnostic) => logDiagnostic(diagnostic, useColors));
     },
   };
-  return logger;
 };
 const logDiagnostic = (diagnostic, useColors) => {
   let color = BLUE;
@@ -2346,8 +2364,16 @@ const getPackageDirPath = (p, moduleId) => {
   return null;
 };
 
+/**
+ * A fetch wrapper which dispatches to `sys.fetch` if present, and otherwise
+ * uses `global.fetch`.
+ *
+ * @param sys a compiler system object
+ * @param input a `RequestInfo` object
+ * @param init an optional `RequestInit` object
+ * @returns a Promise wrapping a response
+ */
 const httpFetch = (sys, input, init) => {
-  console.trace(input);
   if (sys && isFunction(sys.fetch)) {
     return sys.fetch(input, init);
   }
@@ -2355,10 +2381,16 @@ const httpFetch = (sys, input, init) => {
 };
 const packageVersions = new Map();
 const known404Urls = new Set();
-const getRindoRootUrl = (compilerExe) => new URL('../', compilerExe).href;
-const getRindoModuleUrl = (compilerExe, p) => {
-  p = normalizePath$1(p);
-  let parts = p.split('/');
+/**
+ * Get the URL for a Rindo module given the path to the compiler
+ *
+ * @param compilerExe the path to the compiler executable
+ * @param path the path to the module or file in question
+ * @returns a URL for the file of interest
+ */
+const getRindoModuleUrl = (compilerExe, path) => {
+  path = normalizePath$1(path);
+  let parts = path.split('/');
   const nmIndex = parts.lastIndexOf('node_modules');
   if (nmIndex > -1 && nmIndex < parts.length - 1) {
     parts = parts.slice(nmIndex + 1);
@@ -2368,9 +2400,10 @@ const getRindoModuleUrl = (compilerExe, p) => {
     else {
       parts = parts.slice(1);
     }
-    p = parts.join('/');
+    path = parts.join('/');
   }
-  return new URL('./' + p, getRindoRootUrl(compilerExe)).href;
+  const rindoRootUrl = new URL('../', compilerExe).href;
+  return new URL('./' + path, rindoRootUrl).href;
 };
 const getCommonDirUrl = (sys, pkgVersions, dirPath, fileName) => getNodeModuleFetchUrl(sys, pkgVersions, dirPath) + '/' + fileName;
 const getNodeModuleFetchUrl = (sys, pkgVersions, filePath) => {
@@ -4542,7 +4575,7 @@ const createCustomResolverAsync = (sys, inMemoryFs, exts) => {
   };
 };
 
-const buildId = '20220812090622';
+const buildId = '20230111074933';
 const minfyJsId = 'terser5.6.1_7';
 const optimizeCssId = 'autoprefixer10.2.5_postcss8.4.16_7';
 const parse5Version = '6.0.1';
@@ -4550,8 +4583,8 @@ const rollupVersion = '2.42.3';
 const sizzleVersion = '2.42.3';
 const terserVersion = '5.6.1';
 const typescriptVersion = '4.5.4';
-const vermoji = '🏉';
-const version$3 = '2.17.0';
+const vermoji = '🍏';
+const version$3 = '2.17.1';
 const versions = {
   rindo: version$3,
   parse5: parse5Version,
@@ -5100,6 +5133,17 @@ const createSystem = (c) => {
 };
 
 let cssProcessor;
+/**
+ * Autoprefix a CSS string, adding vendor prefixes to make sure that what
+ * is written in the CSS will render correctly in our range of supported browsers.
+ * This function uses PostCSS in compbination with the Autoprefix plugin to
+ * automatically add vendor prefixes based on a list of browsers which we want
+ * to support.
+ *
+ * @param cssText the text to be prefixed
+ * @param opts an optional param with options for Autoprefixer
+ * @returns a Promise wrapping some prefixed CSS as well as diagnostics
+ */
 const autoprefixCss = async (cssText, opts) => {
   const output = {
     output: cssText,
@@ -5109,7 +5153,7 @@ const autoprefixCss = async (cssText, opts) => {
     return output;
   }
   try {
-    const autoprefixerOpts = opts != null && typeof opts === 'object' ? opts : DEFAULT_AUTOPREFIX_LEGACY;
+    const autoprefixerOpts = opts != null && typeof opts === 'object' ? opts : DEFAULT_AUTOPREFIX_OPTIONS;
     const processor = getProcessor(autoprefixerOpts);
     const result = await processor.process(cssText, { map: null });
     result.warnings().forEach((warning) => {
@@ -5165,6 +5209,12 @@ const autoprefixCss = async (cssText, opts) => {
   }
   return output;
 };
+/**
+ * Get the processor for PostCSS and the Autoprefixer plugin
+ *
+ * @param autoprefixerOpts Options for Autoprefixer
+ * @returns postCSS with the Autoprefixer plugin applied
+ */
 const getProcessor = (autoprefixerOpts) => {
   const { postcss, autoprefixer } = requireFunc('../sys/node/autoprefixer.js');
   if (!cssProcessor) {
@@ -5172,7 +5222,19 @@ const getProcessor = (autoprefixerOpts) => {
   }
   return cssProcessor;
 };
-const DEFAULT_AUTOPREFIX_LEGACY = {
+/**
+ * Default options for the Autoprefixer PostCSS plugin. See the documentation:
+ * https://github.com/postcss/autoprefixer#options for a complete list.
+ *
+ * This default option set will:
+ *
+ * - override the default browser list (`overrideBrowserslist`)
+ * - turn off the visual cascade (`cascade`)
+ * - disable auto-removing outdated prefixes (`remove`)
+ * - set `flexbox` to `"no-2009"`, which limits prefixing for flexbox to the
+ *   final and IE 10 versions of the specification
+ */
+const DEFAULT_AUTOPREFIX_OPTIONS = {
   overrideBrowserslist: ['last 2 versions', 'iOS >= 9', 'Android >= 4.4', 'Explorer >= 11', 'ExplorerMobile >= 11'],
   cascade: false,
   remove: false,
@@ -5968,6 +6030,13 @@ const resolveStylesheetUrl = async (nodes, resolveUrl, resolved) => {
   }
 };
 
+/**
+ * Optimize a CSS file, optionally running an autoprefixer and a minifier
+ * depending on the options set on the input options argument.
+ *
+ * @param inputOpts input CSS options
+ * @returns a promise wrapping the optimized output
+ */
 const optimizeCss$1 = async (inputOpts) => {
   let result = {
     output: inputOpts.input,
@@ -12026,6 +12095,12 @@ const parseImportPath = (importPath) => {
   return parsedPath;
 };
 
+/**
+ * Strip out comments from some CSS
+ *
+ * @param input the string we'd like to de-comment
+ * @returns de-commented CSS!
+ */
 const stripCssComments = (input) => {
   let isInsideString = null;
   let currentCharacter = '';
@@ -19350,48 +19425,88 @@ const emptyOutputTargets = async (config, compilerCtx, buildCtx) => {
   timeSpan.finish('cleaning dirs finished');
 };
 
+/**
+ * Parse CSS imports into an object which contains a manifest of imports and a
+ * stylesheet with all imports resolved and concatenated.
+ *
+ * @param config the current config
+ * @param compilerCtx the compiler context (we need filesystem access)
+ * @param buildCtx the build context, we'll need access to diagnostics
+ * @param srcFilePath the source filepath
+ * @param resolvedFilePath the resolved filepath
+ * @param styleText style text we start with
+ * @param styleDocs optional array of style document objects
+ * @returns an object with concatenated styleText and imports
+ */
 const parseCssImports = async (config, compilerCtx, buildCtx, srcFilePath, resolvedFilePath, styleText, styleDocs) => {
   const isCssEntry = resolvedFilePath.toLowerCase().endsWith('.css');
   const allCssImports = [];
-  const concatStyleText = await updateCssImports(config, compilerCtx, buildCtx, isCssEntry, srcFilePath, resolvedFilePath, styleText, allCssImports, new Set(), styleDocs);
+  // a Set of previously-resolved file paths that we add to as we traverse the
+  // import tree (to avoid a possible circular dependency and infinite loop)
+  const resolvedFilePaths = new Set();
+  const concatStyleText = await resolveAndFlattenImports(srcFilePath, resolvedFilePath, styleText);
   return {
     imports: allCssImports,
     styleText: concatStyleText,
   };
-};
-const updateCssImports = async (config, compilerCtx, buildCtx, isCssEntry, srcFilePath, resolvedFilePath, styleText, allCssImports, noLoop, styleDocs) => {
-  if (noLoop.has(resolvedFilePath)) {
-    return styleText;
-  }
-  noLoop.add(resolvedFilePath);
-  if (styleDocs != null) {
-    parseStyleDocs(styleDocs, styleText);
-  }
-  const cssImports = await getCssImports(config, compilerCtx, buildCtx, resolvedFilePath, styleText);
-  if (cssImports.length === 0) {
-    return styleText;
-  }
-  for (const cssImport of cssImports) {
-    if (!allCssImports.includes(cssImport.filePath)) {
-      allCssImports.push(cssImport.filePath);
+  /**
+   * Resolve and flatten all imports for a given CSS file, recursively crawling
+   * the tree of imports to resolve them all and produce a concatenated
+   * stylesheet. We declare this function here, within `parseCssImports`, in order
+   * to get access to `compilerCtx`, `buildCtx`, and more without having to pass
+   * a whole bunch of arguments.
+   *
+   * @param srcFilePath the source filepath
+   * @param resolvedFilePath the resolved filepath
+   * @param styleText style text we start with*
+   * @returns concatenated styles assembled from the various imported stylesheets
+   */
+  async function resolveAndFlattenImports(srcFilePath, resolvedFilePath, styleText) {
+    // if we've seen this path before we early return
+    if (resolvedFilePaths.has(resolvedFilePath)) {
+      return styleText;
+    }
+    resolvedFilePaths.add(resolvedFilePath);
+    if (styleDocs != null) {
+      parseStyleDocs(styleDocs, styleText);
+    }
+    const cssImports = await getCssImports(config, compilerCtx, buildCtx, resolvedFilePath, styleText);
+    if (cssImports.length === 0) {
+      return styleText;
+    }
+    // add any newly-found imports to the 'global' list
+    for (const cssImport of cssImports) {
+      if (!allCssImports.includes(cssImport.filePath)) {
+        allCssImports.push(cssImport.filePath);
+      }
     }
-  }
-  await Promise.all(cssImports.map(async (cssImportData) => {
-    await concatCssImport(config, compilerCtx, buildCtx, isCssEntry, srcFilePath, cssImportData, allCssImports, noLoop, styleDocs);
-  }));
-  return replaceImportDeclarations(styleText, cssImports, isCssEntry);
-};
-const concatCssImport = async (config, compilerCtx, buildCtx, isCssEntry, srcFilePath, cssImportData, allCssImports, noLoop, styleDocs) => {
-  cssImportData.styleText = await loadStyleText(compilerCtx, cssImportData);
-  if (typeof cssImportData.styleText === 'string') {
-    cssImportData.styleText = await updateCssImports(config, compilerCtx, buildCtx, isCssEntry, cssImportData.filePath, cssImportData.filePath, cssImportData.styleText, allCssImports, noLoop, styleDocs);
-  }
-  else {
-    const err = buildError(buildCtx.diagnostics);
-    err.messageText = `Unable to read css import: ${cssImportData.srcImport}`;
-    err.absFilePath = srcFilePath;
+    // Recur down the tree of CSS imports, resolving all the imports in
+    // the children of the current file (and, by extension, in their children
+    // and so on)
+    await Promise.all(cssImports.map(async (cssImportData) => {
+      cssImportData.styleText = await loadStyleText(compilerCtx, cssImportData);
+      if (typeof cssImportData.styleText === 'string') {
+        cssImportData.styleText = await resolveAndFlattenImports(cssImportData.filePath, cssImportData.filePath, cssImportData.styleText);
+      }
+      else {
+        // we had some error loading the file from disk, so write a diagnostic
+        const err = buildError(buildCtx.diagnostics);
+        err.messageText = `Unable to read css import: ${cssImportData.srcImport}`;
+        err.absFilePath = srcFilePath;
+      }
+    }));
+    // replace import statements with the actual CSS code in children modules
+    return replaceImportDeclarations(styleText, cssImports, isCssEntry);
   }
 };
+/**
+ * Load the style text for a CSS file from disk, based on the filepaths set in
+ * our import data.
+ *
+ * @param compilerCtx the compiler context
+ * @param cssImportData the import data for the file we want to read
+ * @returns the contents of the file, if it can be read without error
+ */
 const loadStyleText = async (compilerCtx, cssImportData) => {
   let styleText = null;
   try {
@@ -19407,7 +19522,18 @@ const loadStyleText = async (compilerCtx, cssImportData) => {
   }
   return styleText;
 };
+/**
+ * Get a manifest of all the CSS imports in a given CSS file
+ *
+ * @param config the current config
+ * @param compilerCtx the compiler context (we need the filesystem)
+ * @param buildCtx the build context, in case we need to set a diagnostic
+ * @param filePath the filepath we're working with
+ * @param styleText the CSS for which we want to retrieve import data
+ * @returns a Promise wrapping a list of CSS import data objects
+ */
 const getCssImports = async (config, compilerCtx, buildCtx, filePath, styleText) => {
+  var _a;
   const imports = [];
   if (!styleText.includes('@import')) {
     // no @import at all, so don't bother
@@ -19415,13 +19541,14 @@ const getCssImports = async (config, compilerCtx, buildCtx, filePath, styleText)
   }
   styleText = stripCssComments(styleText);
   const dir = dirname(filePath);
-  const importeeExt = filePath.split('.').pop().toLowerCase();
+  const importeeExt = ((_a = filePath.split('.').pop()) !== null && _a !== void 0 ? _a : '').toLowerCase();
   let r;
   const IMPORT_RE = /(@import)\s+(url\()?\s?(.*?)\s?\)?([^;]*);?/gi;
   while ((r = IMPORT_RE.exec(styleText))) {
     const cssImportData = {
       srcImport: r[0],
       url: r[4].replace(/[\"\'\)]/g, ''),
+      filePath: '',
     };
     if (!isLocalCssImport(cssImportData.srcImport)) {
       // do nothing for @import url(http://external.css)
@@ -19448,7 +19575,10 @@ const getCssImports = async (config, compilerCtx, buildCtx, filePath, styleText)
         cssImportData.altFilePath = normalizePath$1(join(dirPath, fileName));
       }
     }
-    if (typeof cssImportData.filePath === 'string') {
+    // we set `filePath` to `""` when the object is created above, so if it
+    // hasn't been changed in the intervening conditionals then we didn't resolve
+    // a filepath for it.
+    if (cssImportData.filePath !== '') {
       imports.push(cssImportData);
     }
   }
@@ -19490,6 +19620,16 @@ const isLocalCssImport = (srcImport) => {
   }
   return true;
 };
+/**
+ * Replace import declarations (like '@import "foobar";') with the actual CSS
+ * written in the imported module, allowing us to produce a single file from a
+ * tree of stylesheets.
+ *
+ * @param styleText the text within which we want to replace @import statements
+ * @param cssImports information about imported modules
+ * @param isCssEntry whether we're dealing with a CSS file
+ * @returns an updated string with the requisite substitutions
+ */
 const replaceImportDeclarations = (styleText, cssImports, isCssEntry) => {
   for (const cssImport of cssImports) {
     if (isCssEntry) {
@@ -42299,7 +42439,7 @@ const createCustomResolverSync = (sys, inMemoryFs, exts) => {
  * https://github.com/DefinitelyTyped/DefinitelyTyped/blob/d121716ed123957f6a86f8985eb013fcaddab345/types/node/globals.d.ts#L183-L188
  * in mind.
  * @param err the entity to check the type of
- * @return true if the provided value is an instance of `ErrnoException`, `false` otherwise
+ * @returns true if the provided value is an instance of `ErrnoException`, `false` otherwise
  */
 function isErrnoException(err) {
   return err instanceof Error && err.hasOwnProperty('code');
@@ -58336,6 +58476,16 @@ const lazyComponentTransform = (compilerCtx, transformOpts) => {
   };
 };
 
+/**
+ * Generate rollup output based on a rollup build and a series of options.
+ *
+ * @param build a rollup build
+ * @param options output options for rollup
+ * @param config a user-supplied configuration object
+ * @param entryModules a list of entry modules, for checking which chunks
+ * contain components
+ * @returns a Promise wrapping either build results or `null`
+ */
 const generateRollupOutput = async (build, options, config, entryModules) => {
   if (build == null) {
     return null;
@@ -58343,7 +58493,7 @@ const generateRollupOutput = async (build, options, config, entryModules) => {
   const { output } = await build.generate(options);
   return output.map((chunk) => {
     if (chunk.type === 'chunk') {
-      const isCore = Object.keys(chunk.modules).some((m) => m.includes('@rindo/core'));
+      const isCore = Object.keys(chunk.modules).some((m) => m.includes(RINDO_CORE_ID));
       return {
         type: 'chunk',
         fileName: chunk.fileName,
@@ -58842,7 +58992,8 @@ const getSystemLoader = async (config, compilerCtx, corePath, includePolyfills)
 
   var resourcesUrl = scriptElm ? scriptElm.getAttribute('data-resources-url') || scriptElm.src : '';
   var start = function() {
-    var url = new URL('${corePath}', new URL(resourcesUrl, window.location.origin));
+    // if src is not present then origin is "null", and new URL() throws TypeError: Failed to construct 'URL': Invalid base URL
+    var url = new URL('${corePath}', new URL(resourcesUrl, window.location.origin !== 'null' ? window.location.origin : undefined));
     System.import(url.href);
   };
 
@@ -64767,15 +64918,14 @@ const updateCompilerCtxCache = (config, compilerCtx, path, kind) => {
 };
 
 const getConfig = (userConfig) => {
-  const config = { ...userConfig };
-  if (!config.logger) {
-    config.logger = createLogger();
-  }
+  var _a, _b;
+  const flags = (_a = userConfig.flags) !== null && _a !== void 0 ? _a : {};
+  const logger = (_b = userConfig.logger) !== null && _b !== void 0 ? _b : createLogger();
+  const config = { ...userConfig, flags, logger };
   if (!config.sys) {
     config.sys = createSystem({ logger: config.logger });
   }
   setPlatformPath(config.sys.platformPath);
-  config.flags = config.flags || {};
   if (config.flags.debug || config.flags.verbose) {
     config.logLevel = 'debug';
   }
@@ -64796,14 +64946,15 @@ const patchFs = (userSys) => {
 
 /**
  * Generate a Rindo compiler instance
- * @param config a Rindo configuration to apply to the compiler instance
+ * @param userConfig a user-provided a Rindo configuration to apply to the compiler instance
  * @returns a new instance of a Rindo compiler
+ * @public
  */
-const createCompiler = async (config) => {
+const createCompiler = async (userConfig) => {
   // actual compiler code
   // could be in a web worker on the browser
   // or the main thread in node
-  config = getConfig(config);
+  const config = getConfig(userConfig);
   const diagnostics = [];
   const sys = config.sys;
   const compilerCtx = new CompilerContext();
@@ -65479,7 +65630,7 @@ const getComponentPathContent = (componentGraph, outputTarget) => {
 const dependencies = [
 	{
 		name: "@rindo/core",
-		version: "2.17.0",
+		version: "2.17.1",
 		main: "compiler/rindo.js",
 		resources: [
 			"package.json",
@@ -65651,11 +65802,11 @@ const getUserConfigName = (config, correctConfigName) => {
 };
 
 const validateDevServer = (config, diagnostics) => {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e;
   if ((config.devServer === null || config.devServer) === false) {
     return undefined;
   }
-  const flags = (_a = config.flags) !== null && _a !== void 0 ? _a : {};
+  const { flags } = config;
   const devServer = { ...config.devServer };
   if (flags.address && isString$1(flags.address)) {
     devServer.address = flags.address;
@@ -65713,14 +65864,14 @@ const validateDevServer = (config, diagnostics) => {
   if (!isBoolean$1(devServer.websocket)) {
     devServer.websocket = true;
   }
-  if ((_b = config === null || config === void 0 ? void 0 : config.flags) === null || _b === void 0 ? void 0 : _b.ssr) {
+  if (flags.ssr) {
     devServer.ssr = true;
   }
   else {
     devServer.ssr = !!devServer.ssr;
   }
   if (devServer.ssr) {
-    const wwwOutput = ((_c = config.outputTargets) !== null && _c !== void 0 ? _c : []).find(isOutputTargetWww);
+    const wwwOutput = ((_a = config.outputTargets) !== null && _a !== void 0 ? _a : []).find(isOutputTargetWww);
     devServer.prerenderConfig = wwwOutput === null || wwwOutput === void 0 ? void 0 : wwwOutput.prerenderConfig;
   }
   if (isString$1(config.srcIndexHtml)) {
@@ -65746,15 +65897,15 @@ const validateDevServer = (config, diagnostics) => {
   }
   let serveDir;
   let basePath;
-  const wwwOutputTarget = ((_d = config.outputTargets) !== null && _d !== void 0 ? _d : []).find(isOutputTargetWww);
+  const wwwOutputTarget = ((_b = config.outputTargets) !== null && _b !== void 0 ? _b : []).find(isOutputTargetWww);
   if (wwwOutputTarget) {
-    const baseUrl = new URL((_e = wwwOutputTarget.baseUrl) !== null && _e !== void 0 ? _e : '', 'http://config-rindojs.web.app');
+    const baseUrl = new URL((_c = wwwOutputTarget.baseUrl) !== null && _c !== void 0 ? _c : '', 'http://config-rindojs.web.app');
     basePath = baseUrl.pathname;
-    serveDir = (_f = wwwOutputTarget.appDir) !== null && _f !== void 0 ? _f : '';
+    serveDir = (_d = wwwOutputTarget.appDir) !== null && _d !== void 0 ? _d : '';
   }
   else {
     basePath = '';
-    serveDir = (_g = config.rootDir) !== null && _g !== void 0 ? _g : '';
+    serveDir = (_e = config.rootDir) !== null && _e !== void 0 ? _e : '';
   }
   if (!isString$1(basePath) || basePath.trim() === '') {
     basePath = `/`;
@@ -65888,11 +66039,19 @@ const validateHydrated = (config) => {
   return hydratedFlag;
 };
 
+/**
+ * Validate and return DIST_COLLECTION output targets, ensuring that the `dir`
+ * property is set on them.
+ *
+ * @param config the user-supplied configuration object
+ * @param userOutputs an array of output targets
+ * @returns an array of validated DIST_COLLECTION output targets
+ */
 const validateCollection = (config, userOutputs) => {
-  return userOutputs.filter(isOutputTargetDistCollection).map((o) => {
+  return userOutputs.filter(isOutputTargetDistCollection).map((outputTarget) => {
     return {
-      ...o,
-      dir: getAbsolutePath(config, o.dir || 'dist/collection'),
+      ...outputTarget,
+      dir: getAbsolutePath(config, outputTarget.dir || 'dist/collection'),
     };
   });
 };
@@ -66226,7 +66385,7 @@ const validateHydrateScript = (config, userOutputs) => {
     // we don't already have a hydrate output target
     // let's still see if we require one because of other output targets
     const hasWwwOutput = userOutputs.filter(isOutputTargetWww).some((o) => isString$1(o.indexHtml));
-    const shouldBuildHydrate = (config === null || config === void 0 ? void 0 : config.flags.prerender) || (config === null || config === void 0 ? void 0 : config.flags.ssr);
+    const shouldBuildHydrate = config.flags.prerender || config.flags.ssr;
     if (hasWwwOutput && shouldBuildHydrate) {
       // we're prerendering a www output target, so we'll need a hydrate app
       let hydrateDir;
@@ -66302,7 +66461,7 @@ const validateStats = (userConfig, userOutputs) => {
 };
 
 const validatePrerender = (config, diagnostics, outputTarget) => {
-  if (!config.flags || (!config.flags.ssr && !config.flags.prerender && config.flags.task !== 'prerender')) {
+  if (!config.flags.ssr && !config.flags.prerender && config.flags.task !== 'prerender') {
     return;
   }
   outputTarget.baseUrl = normalizePath$1(outputTarget.baseUrl);
@@ -66327,8 +66486,6 @@ const validatePrerender = (config, diagnostics, outputTarget) => {
   }
 };
 
-const HOST_CONFIG_FILENAME = 'host.config.json';
-
 const validateServiceWorker = (config, outputTarget) => {
   if (outputTarget.serviceWorker === false) {
     return;
@@ -66381,14 +66538,15 @@ const validateServiceWorker = (config, outputTarget) => {
   }
 };
 const addGlobIgnores = (config, globIgnores) => {
-  globIgnores.push(`**/${HOST_CONFIG_FILENAME}`, `**/*.system.entry.js`, `**/*.system.js`, `**/${config.fsNamespace}.js`, `**/${config.fsNamespace}.esm.js`, `**/${config.fsNamespace}.css`);
+  globIgnores.push(`**/host.config.json`, // the filename of the host configuration
+  `**/*.system.entry.js`, `**/*.system.js`, `**/${config.fsNamespace}.js`, `**/${config.fsNamespace}.esm.js`, `**/${config.fsNamespace}.css`);
 };
 const DEFAULT_GLOB_PATTERNS = ['*.html', '**/*.{js,css,json}'];
 const DEFAULT_FILENAME = 'sw.js';
 
 const validateWww = (config, diagnostics, userOutputs) => {
   const hasOutputTargets = userOutputs.length > 0;
-  const hasE2eTests = !!(config.flags && config.flags.e2e);
+  const hasE2eTests = !!config.flags.e2e;
   const userWwwOutputs = userOutputs.filter(isOutputTargetWww);
   if (!hasOutputTargets ||
     (hasE2eTests && !userOutputs.some(isOutputTargetWww) && !userOutputs.some(isOutputTargetDist))) {
@@ -66642,7 +66800,7 @@ const DEFAULT_ROLLUP_CONFIG = {
 const validateTesting = (config, diagnostics) => {
   var _a;
   const testing = (config.testing = Object.assign({}, config.testing || {}));
-  if (!config.flags || (!config.flags.e2e && !config.flags.spec)) {
+  if (!config.flags.e2e && !config.flags.spec) {
     return;
   }
   let configPathDir = config.configPath;
@@ -66680,7 +66838,7 @@ const validateTesting = (config, diagnostics) => {
   else {
     testing.rootDir = config.rootDir;
   }
-  if (config.flags && typeof config.flags.screenshotConnector === 'string') {
+  if (typeof config.flags.screenshotConnector === 'string') {
     testing.screenshotConnector = config.flags.screenshotConnector;
   }
   if (typeof testing.screenshotConnector === 'string') {
@@ -66802,13 +66960,11 @@ const validateWorkers = (config) => {
   if (typeof config.maxConcurrentWorkers !== 'number') {
     config.maxConcurrentWorkers = 8;
   }
-  if (config.flags) {
-    if (typeof config.flags.maxWorkers === 'number') {
-      config.maxConcurrentWorkers = config.flags.maxWorkers;
-    }
-    else if (config.flags.ci) {
-      config.maxConcurrentWorkers = 4;
-    }
+  if (typeof config.flags.maxWorkers === 'number') {
+    config.maxConcurrentWorkers = config.flags.maxWorkers;
+  }
+  else if (config.flags.ci) {
+    config.maxConcurrentWorkers = 4;
   }
   config.maxConcurrentWorkers = Math.max(Math.min(config.maxConcurrentWorkers, 16), 0);
   if (config.devServer) {
@@ -66822,111 +66978,119 @@ const validateWorkers = (config) => {
  * `UnvalidatedConfig` to a `Config`.
  *
  * @param userConfig an unvalidated config that we've gotten from a user
+ * @param bootstrapConfig the initial configuration provided by the user (or generated by Rindo) used to bootstrap
+ * configuration loading and validation
  * @returns an object with config and diagnostics props
  */
-const validateConfig = (userConfig = {}) => {
+const validateConfig = (userConfig = {}, bootstrapConfig) => {
   const config = Object.assign({}, userConfig || {}); // not positive it's json safe
   const diagnostics = [];
-  // copy flags (we know it'll be json safe)
-  config.flags = JSON.parse(JSON.stringify(config.flags || {}));
+  const logger = bootstrapConfig.logger || config.logger || createLogger();
+  const validatedConfig = {
+    ...config,
+    // flags _should_ be JSON safe
+    flags: JSON.parse(JSON.stringify(config.flags || {})),
+    logger,
+  };
   // default devMode false
-  if (config.flags.prod) {
-    config.devMode = false;
-  }
-  else if (config.flags.dev) {
-    config.devMode = true;
-  }
-  else if (!isBoolean$1(config.devMode)) {
-    config.devMode = DEFAULT_DEV_MODE;
-  }
-  config.extras = config.extras || {};
-  config.extras.appendChildSlotFix = !!config.extras.appendChildSlotFix;
-  config.extras.cloneNodeFix = !!config.extras.cloneNodeFix;
-  config.extras.cssVarsShim = !!config.extras.cssVarsShim;
-  config.extras.dynamicImportShim = !!config.extras.dynamicImportShim;
-  config.extras.lifecycleDOMEvents = !!config.extras.lifecycleDOMEvents;
-  config.extras.safari10 = !!config.extras.safari10;
-  config.extras.scriptDataOpts = !!config.extras.scriptDataOpts;
-  config.extras.shadowDomShim = !!config.extras.shadowDomShim;
-  config.extras.slotChildNodesFix = !!config.extras.slotChildNodesFix;
-  config.extras.initializeNextTick = !!config.extras.initializeNextTick;
-  config.extras.tagNameTransform = !!config.extras.tagNameTransform;
-  config.buildEs5 = config.buildEs5 === true || (!config.devMode && config.buildEs5 === 'prod');
-  setBooleanConfig(config, 'minifyCss', null, !config.devMode);
-  setBooleanConfig(config, 'minifyJs', null, !config.devMode);
-  setBooleanConfig(config, 'sourceMap', null, typeof config.sourceMap === 'undefined' ? false : config.sourceMap);
-  setBooleanConfig(config, 'watch', 'watch', false);
-  setBooleanConfig(config, 'buildDocs', 'docs', !config.devMode);
-  setBooleanConfig(config, 'buildDist', 'esm', !config.devMode || config.buildEs5);
-  setBooleanConfig(config, 'profile', 'profile', config.devMode);
-  setBooleanConfig(config, 'writeLog', 'log', false);
-  setBooleanConfig(config, 'buildAppCore', null, true);
-  setBooleanConfig(config, 'autoprefixCss', null, config.buildEs5);
-  setBooleanConfig(config, 'validateTypes', null, !config._isTesting);
-  setBooleanConfig(config, 'allowInlineScripts', null, true);
-  if (!isString$1(config.taskQueue)) {
-    config.taskQueue = 'async';
+  if (validatedConfig.flags.prod) {
+    validatedConfig.devMode = false;
+  }
+  else if (validatedConfig.flags.dev) {
+    validatedConfig.devMode = true;
+  }
+  else if (!isBoolean$1(validatedConfig.devMode)) {
+    validatedConfig.devMode = DEFAULT_DEV_MODE;
+  }
+  validatedConfig.extras = validatedConfig.extras || {};
+  validatedConfig.extras.appendChildSlotFix = !!validatedConfig.extras.appendChildSlotFix;
+  validatedConfig.extras.cloneNodeFix = !!validatedConfig.extras.cloneNodeFix;
+  validatedConfig.extras.cssVarsShim = !!validatedConfig.extras.cssVarsShim;
+  validatedConfig.extras.dynamicImportShim = !!validatedConfig.extras.dynamicImportShim;
+  validatedConfig.extras.lifecycleDOMEvents = !!validatedConfig.extras.lifecycleDOMEvents;
+  validatedConfig.extras.safari10 = !!validatedConfig.extras.safari10;
+  validatedConfig.extras.scriptDataOpts = !!validatedConfig.extras.scriptDataOpts;
+  validatedConfig.extras.shadowDomShim = !!validatedConfig.extras.shadowDomShim;
+  validatedConfig.extras.slotChildNodesFix = !!validatedConfig.extras.slotChildNodesFix;
+  validatedConfig.extras.initializeNextTick = !!validatedConfig.extras.initializeNextTick;
+  validatedConfig.extras.tagNameTransform = !!validatedConfig.extras.tagNameTransform;
+  validatedConfig.buildEs5 =
+    validatedConfig.buildEs5 === true || (!validatedConfig.devMode && validatedConfig.buildEs5 === 'prod');
+  setBooleanConfig(validatedConfig, 'minifyCss', null, !validatedConfig.devMode);
+  setBooleanConfig(validatedConfig, 'minifyJs', null, !validatedConfig.devMode);
+  setBooleanConfig(validatedConfig, 'sourceMap', null, typeof validatedConfig.sourceMap === 'undefined' ? false : validatedConfig.sourceMap);
+  setBooleanConfig(validatedConfig, 'watch', 'watch', false);
+  setBooleanConfig(validatedConfig, 'buildDocs', 'docs', !validatedConfig.devMode);
+  setBooleanConfig(validatedConfig, 'buildDist', 'esm', !validatedConfig.devMode || validatedConfig.buildEs5);
+  setBooleanConfig(validatedConfig, 'profile', 'profile', validatedConfig.devMode);
+  setBooleanConfig(validatedConfig, 'writeLog', 'log', false);
+  setBooleanConfig(validatedConfig, 'buildAppCore', null, true);
+  setBooleanConfig(validatedConfig, 'autoprefixCss', null, validatedConfig.buildEs5);
+  setBooleanConfig(validatedConfig, 'validateTypes', null, !validatedConfig._isTesting);
+  setBooleanConfig(validatedConfig, 'allowInlineScripts', null, true);
+  if (!isString$1(validatedConfig.taskQueue)) {
+    validatedConfig.taskQueue = 'async';
   }
   // hash file names
-  if (!isBoolean$1(config.hashFileNames)) {
-    config.hashFileNames = !config.devMode;
+  if (!isBoolean$1(validatedConfig.hashFileNames)) {
+    validatedConfig.hashFileNames = !validatedConfig.devMode;
   }
-  if (!isNumber$1(config.hashedFileNameLength)) {
-    config.hashedFileNameLength = DEFAULT_HASHED_FILENAME_LENTH;
+  if (!isNumber$1(validatedConfig.hashedFileNameLength)) {
+    validatedConfig.hashedFileNameLength = DEFAULT_HASHED_FILENAME_LENTH;
   }
-  if (config.hashedFileNameLength < MIN_HASHED_FILENAME_LENTH) {
+  if (validatedConfig.hashedFileNameLength < MIN_HASHED_FILENAME_LENTH) {
     const err = buildError(diagnostics);
-    err.messageText = `config.hashedFileNameLength must be at least ${MIN_HASHED_FILENAME_LENTH} characters`;
+    err.messageText = `validatedConfig.hashedFileNameLength must be at least ${MIN_HASHED_FILENAME_LENTH} characters`;
   }
-  if (config.hashedFileNameLength > MAX_HASHED_FILENAME_LENTH) {
+  if (validatedConfig.hashedFileNameLength > MAX_HASHED_FILENAME_LENTH) {
     const err = buildError(diagnostics);
-    err.messageText = `config.hashedFileNameLength cannot be more than ${MAX_HASHED_FILENAME_LENTH} characters`;
+    err.messageText = `validatedConfig.hashedFileNameLength cannot be more than ${MAX_HASHED_FILENAME_LENTH} characters`;
   }
-  if (!config.env) {
-    config.env = {};
+  if (!validatedConfig.env) {
+    validatedConfig.env = {};
   }
   // get a good namespace
-  validateNamespace(config, diagnostics);
+  validateNamespace(validatedConfig, diagnostics);
   // figure out all of the config paths and absolute paths
-  validatePaths(config);
+  validatePaths(validatedConfig);
   // outputTargets
-  validateOutputTargets(config, diagnostics);
+  validateOutputTargets(validatedConfig, diagnostics);
   // plugins
-  validatePlugins(config, diagnostics);
+  validatePlugins(validatedConfig, diagnostics);
   // rollup config
-  validateRollupConfig(config);
+  validateRollupConfig(validatedConfig);
   // dev server
-  config.devServer = validateDevServer(config, diagnostics);
+  validatedConfig.devServer = validateDevServer(validatedConfig, diagnostics);
   // testing
-  validateTesting(config, diagnostics);
+  validateTesting(validatedConfig, diagnostics);
   // hydrate flag
-  config.hydratedFlag = validateHydrated(config);
+  validatedConfig.hydratedFlag = validateHydrated(validatedConfig);
   // bundles
-  if (Array.isArray(config.bundles)) {
-    config.bundles = sortBy(config.bundles, (a) => a.components.length);
+  if (Array.isArray(validatedConfig.bundles)) {
+    validatedConfig.bundles = sortBy(validatedConfig.bundles, (a) => a.components.length);
   }
   else {
-    config.bundles = [];
+    validatedConfig.bundles = [];
   }
   // validate how many workers we can use
-  validateWorkers(config);
+  validateWorkers(validatedConfig);
   // default devInspector to whatever devMode is
-  setBooleanConfig(config, 'devInspector', null, config.devMode);
-  if (!config._isTesting) {
-    validateDistNamespace(config, diagnostics);
+  setBooleanConfig(validatedConfig, 'devInspector', null, validatedConfig.devMode);
+  if (!validatedConfig._isTesting) {
+    validateDistNamespace(validatedConfig, diagnostics);
   }
-  setBooleanConfig(config, 'enableCache', 'cache', true);
-  if (!Array.isArray(config.watchIgnoredRegex) && config.watchIgnoredRegex != null) {
-    config.watchIgnoredRegex = [config.watchIgnoredRegex];
+  setBooleanConfig(validatedConfig, 'enableCache', 'cache', true);
+  if (!Array.isArray(validatedConfig.watchIgnoredRegex) && validatedConfig.watchIgnoredRegex != null) {
+    validatedConfig.watchIgnoredRegex = [validatedConfig.watchIgnoredRegex];
   }
-  config.watchIgnoredRegex = (config.watchIgnoredRegex || []).reduce((arr, reg) => {
+  validatedConfig.watchIgnoredRegex = (validatedConfig.watchIgnoredRegex || []).reduce((arr, reg) => {
     if (reg instanceof RegExp) {
       arr.push(reg);
     }
     return arr;
   }, []);
   return {
-    config,
+    config: validatedConfig,
     diagnostics,
   };
 };
@@ -67105,6 +67269,7 @@ const loadConfig = async (init = {}) => {
       extends: null,
     },
   };
+  const unknownConfig = {};
   try {
     const sys = init.sys || createSystem();
     const config = init.config || {};
@@ -67113,22 +67278,22 @@ const loadConfig = async (init = {}) => {
     if (hasError(results.diagnostics)) {
       return results;
     }
-    if (loadedConfigFile != null) {
+    if (loadedConfigFile !== null) {
       // merge the user's config object into their loaded config file
       configPath = loadedConfigFile.configPath;
-      results.config = { ...loadedConfigFile, ...config };
-      results.config.configPath = configPath;
-      results.config.rootDir = normalizePath$1(dirname(configPath));
+      unknownConfig.config = { ...loadedConfigFile, ...config };
+      unknownConfig.config.configPath = configPath;
+      unknownConfig.config.rootDir = normalizePath$1(dirname(configPath));
     }
     else {
       // no rindo.config.ts or .js file, which is fine
       // #0CJS ¯\_(ツ)_/¯
-      results.config = { ...config };
-      results.config.configPath = null;
-      results.config.rootDir = normalizePath$1(sys.getCurrentDirectory());
+      unknownConfig.config = { ...config };
+      unknownConfig.config.configPath = null;
+      unknownConfig.config.rootDir = normalizePath$1(sys.getCurrentDirectory());
     }
-    results.config.sys = sys;
-    const validated = validateConfig(results.config);
+    unknownConfig.config.sys = sys;
+    const validated = validateConfig(unknownConfig.config, init);
     results.diagnostics.push(...validated.diagnostics);
     if (hasError(results.diagnostics)) {
       return results;
@@ -67143,7 +67308,6 @@ const loadConfig = async (init = {}) => {
     else if (typeof results.config.logLevel !== 'string') {
       results.config.logLevel = 'info';
     }
-    results.config.logger = init.logger || results.config.logger || createLogger();
     results.config.logger.setLevel(results.config.logLevel);
     if (!hasError(results.diagnostics)) {
       const tsConfigResults = await validateTsConfig(results.config, sys, init);