tungsten 0.4.9 → 0.4.10

package/dist/babelPlugins/BabelTransformPackageImports.js

@@ -14,7 +14,7 @@ import precinct from 'precinct';
 //import sxyPrecinct from 'sxy-precinct'
 import { existsSync, mkdirSync, promises as fsPromises, readFileSync, writeFileSync } from 'fs';
 import { createRequire } from 'module';
-import { transformFileAsync as babelTransformFileAsync, transformAsync as babelTransformAsync } from '@babel/core';
+import { transformFileSync as babelTransformFileSync, transformSync as babelTransformSync } from '@babel/core';
 import babelPluginSyntaxImportAssertionsModule from '@babel/plugin-syntax-import-assertions';
 import { arrays } from 'sxy-lib';
 const babelPluginSyntaxImportAssertions = babelPluginSyntaxImportAssertionsModule.default;
@@ -32,6 +32,7 @@ import { isBareImport } from "./isBareImport.js";
 import { resolveBareImport } from "./transformPackageImports/resolveBareImport.js";
 import { TungstenError } from "../TungstenError.js";
 import { throwError } from "../throwError.js";
+import { isProfiling, tally } from "../timeProfiler.js";
 //import { copyPackageModulesToPackagesFolder } from '../build/copyPackageModulesToPackagesFolder.js'
 const require = createRequire(import.meta.url);
 function debug(...texts) {
@@ -209,9 +210,11 @@ export function MakeBabelTransformPackageImports(opts) {
     const {
       file
     } = fileInfo;
+    const precinctStart = performance.now();
     const precinctResults = precinct.paperwork(file, {
       includeCore: false
     });
+    tally('precinct.paperwork', performance.now() - precinctStart);
     const deps = precinctResults.map(d => {
       //console.log('getFileDependencies', 'd', d)
       return isBareImport(d) ? applyImportAliases(d, fileInfo.type) : d;
@@ -343,7 +346,11 @@ export function MakeBabelTransformPackageImports(opts) {
     };
   }
   async function babelFileEsm(file /*, packageInfo*/, nonEsmDeps, onStylesheet) {
-    const result = await babelTransformFileAsync(file, makeModifyImportsEsmBabelOptions(nonEsmDeps.map(d => d.webLocation), onStylesheet));
+    // Sync, so it can be tallied: these run concurrently in the deferred package work, where a
+    // wall clock around an async call would count the same time once per file in flight.
+    const esmStart = performance.now();
+    const result = babelTransformFileSync(file, makeModifyImportsEsmBabelOptions(nonEsmDeps.map(d => d.webLocation), onStylesheet));
+    tally('babel transform (packages)', performance.now() - esmStart);
     if (result === null) {
       throw new TungstenError(`BabelTransformPackageImports error: sub file babel transform (1) returned null: ${file}`);
     }
@@ -377,7 +384,9 @@ export function MakeBabelTransformPackageImports(opts) {
   async function babelFileCjs(file, cacheDest, finalDest, packageInfo, nonEsmDeps) {
     //console.log(chalk.yellow`cjs file ${file}`)
     const nonEsmDepsWebPath = nonEsmDeps.map(fi => fi.webLocation);
-    let result = await babelTransformFileAsync(file, makeCjsToEsmBabelOptions(nonEsmDepsWebPath));
+    const cjsStart = performance.now();
+    let result = babelTransformFileSync(file, makeCjsToEsmBabelOptions(nonEsmDepsWebPath));
+    tally('babel transform (packages)', performance.now() - cjsStart);
     if (result === null) {
       throw new TungstenError(`BabelTransformPackageImports error: sub file babel transform (2) returned null: ${file}`);
     }
@@ -390,10 +399,12 @@ export function MakeBabelTransformPackageImports(opts) {
     });
     //console.log('writing file', intermedCacheLocation)
     await fsPromises.writeFile(intermedCacheLocation, result.code); // rel contains the slash at start
-    result = await babelTransformAsync(result.code, {
+    const cjsImportsStart = performance.now();
+    result = babelTransformSync(result.code, {
       filename: file,
       ...makeModifyImportsCjsBabelOptions(nonEsmDepsWebPath)
     });
+    tally('babel transform (packages)', performance.now() - cjsImportsStart);
     if (result === null) {
       throw new TungstenError(`BabelTransformPackageImports error: sub file babel transform (3) returned null: ${file}
                 `);
@@ -516,35 +527,64 @@ export function MakeBabelTransformPackageImports(opts) {
     //     throw error
     // }
   }
+  // Guarded like processFile's processedFilesCache, and for the same reason: the walk below
+  // follows dependencies, which form cycles and diamonds. Without this a cycle never terminates
+  // and a shared dependency is copied once per path that reaches it.
+  const copiedFromCache = new Set();
   async function copyFileFromCache(fileIdentifier, cacheNode) {
-    //
+    if (copiedFromCache.has(fileIdentifier)) return;
+    copiedFromCache.add(fileIdentifier);
     await fsPromises.mkdir(dirname(cacheNode.finalLocation), {
       recursive: true
     });
     await fsPromises.copyFile(cacheNode.cacheLocation, cacheNode.finalLocation);
     if (cacheNode.dependencies) {
-      processCacheDependencies(cacheNode.dependencies);
+      await processCacheDependencies(cacheNode.dependencies);
     }
     addToDependencyGraphFromCacheNode(fileIdentifier, cacheNode, cacheNode.dependencies);
   }
+  // Only reached for a subtree cachedSubtreeIsUsable() already accepted, so both failures below
+  // mean the cache changed during the build. Recompiling from here is not possible - an identifier
+  // cannot be resolved back to a source file - and a half-copied package is worse than stopping.
   async function processCacheDependencies(dependencies) {
     for (const dep of dependencies) {
       const cacheNode = opts.oldDependencyGraph[dep];
       if (cacheNode === undefined) {
-        throw new TungstenError(`processCacheDependencies() Error: ${dep} not found in existing dependency graph`);
+        throw new TungstenError(`processCacheDependencies() Error: ${dep} left the package cache mid-build.` + ` Delete ${packagesCacheLocation} and run again`);
       }
-      //const cacheNode = opts.oldDependencyGraph[dep]
       if (existsSync(cacheNode.originalLocation)) {
         await copyFileFromCache(dep, cacheNode);
       } else {
-        throw new TungstenError(`processCacheDependencies() Error: source file ${cacheNode.originalLocation}` + ` for ${dep} does not exist.` + ` Perhaps the package version was increased, and we need to process anew`);
-        // find the import/require specification
-        // resolve with sxy-filing-cabinet
-        // resolveFile
-        // processFile
+        throw new TungstenError(`processCacheDependencies() Error: source file ${cacheNode.originalLocation}` + ` for ${dep} was removed mid-build.` + ` Delete ${packagesCacheLocation} and run again`);
       }
     }
   }
+  // A cached file is only reusable if its whole dependency closure is too: processCacheDependencies
+  // walks that closure from identifiers alone and has no way to resolve one back to a source file
+  // to compile instead, so the entire subtree is checked before any of it is used.
+  const subtreeUsable = new Map();
+  function cachedSubtreeIsUsable(fileIdentifier, visiting) {
+    const settled = subtreeUsable.get(fileIdentifier);
+    if (settled !== undefined) return settled;
+    // a cycle is taken as usable here, so the rest of the walk decides the subtree
+    if (visiting.has(fileIdentifier)) return true;
+    const node = opts.oldDependencyGraph[fileIdentifier];
+    visiting.add(fileIdentifier);
+    // Profiling serves linked packages from the cache too, so a run measures what a real app
+    // pays rather than recompiling a linked framework's every file. The cache key is the
+    // version, which a linked package changes underneath, so a profiled run can compile stale
+    // code after that package is rebuilt until the packages cache is deleted - it warns.
+    const usable = node !== undefined && (isProfiling() || cacheKeyIdentifiesContent(node.originalLocation)) && existsSync(node.originalLocation) && existsSync(node.cacheLocation) && (node.dependencies ?? []).every(dep => cachedSubtreeIsUsable(dep, visiting));
+    visiting.delete(fileIdentifier);
+    subtreeUsable.set(fileIdentifier, usable);
+    return usable;
+  }
+  // The cache key carries the package version, which is only a fingerprint of the content for
+  // something installed. A linked package changes underneath an unchanged version, and the graph
+  // records no mtime or hash to catch that, so those are always compiled afresh.
+  function cacheKeyIdentifiesContent(originalLocation) {
+    return slash(originalLocation).includes('/node_modules/');
+  }
   const processedFilesCache = {};
   async function processFile(fileInfo, sourceFilename, history) {
     const {
@@ -554,7 +594,12 @@ export function MakeBabelTransformPackageImports(opts) {
       return processedFilesCache[file];
     } else {
       processedFilesCache[file] = fileInfo.packageInfo;
-      await doProcessFile(fileInfo, sourceFilename, history);
+      const cacheNode = opts.oldDependencyGraph[fileInfo.fileIdentifier];
+      if (cacheNode !== undefined && cachedSubtreeIsUsable(fileInfo.fileIdentifier, new Set())) {
+        await copyFileFromCache(fileInfo.fileIdentifier, cacheNode);
+      } else {
+        await doProcessFile(fileInfo, sourceFilename, history);
+      }
       return processedFilesCache[file];
     }
   }
@@ -725,7 +770,22 @@ export function MakeBabelTransformPackageImports(opts) {
     //         const location = source.value
     //     }
     // }
+    // Resolution is this visitor's whole cost - ~2ms of node_modules walking per bare import -
+    // and the same specifier from the same directory resolves identically within a run
+    // (tungsten/jsx-runtime, from every component). Keyed on the importer's directory because
+    // both resolvers start their walk there. Lives as long as the plugin, like
+    // importedPackageFiles, so a package changed in place mid-session is stale in both.
+    const resolvedImports = new Map();
+    function resolveImportTarget(location, fromDir, requireFrom) {
+      const key = `${fromDir}\0${location}`;
+      const known = resolvedImports.get(key);
+      if (known !== undefined) return known;
+      const target = resolveBareImport(location, [fromDir]) ?? requireFrom.resolve(location);
+      resolvedImports.set(key, target);
+      return target;
+    }
     return {
+      name: 'BabelTransformPackageImports',
       pre(state) {
         const stateFilename = state.opts.filename;
         if (typeof stateFilename !== 'string') {
@@ -766,7 +826,7 @@ export function MakeBabelTransformPackageImports(opts) {
               // the real file location of the file being imported.
               // User code is served as ESM, so it resolves with the 'import'
               // condition - see resolvePrecinctDependencies()
-              const importTarget = resolveBareImport(location, [dirname(filename)]) ?? require.resolve(location);
+              const importTarget = resolveImportTarget(location, dirname(filename), require);
               // Should do some checking here to show helpful errors about bad imports
               if (importTarget === location) {
                 //console.log()

package/dist/bin/args.d.ts

@@ -0,0 +1,11 @@
+type Value<Spec> = Spec extends `${string} ${string}...` ? string[] | undefined : Spec extends `${string} ${string}` ? string | undefined : boolean;
+type Values<Specs> = {
+    [Name in keyof Specs]: Value<Specs[Name]>;
+};
+type Options = {
+    handledElsewhere?: readonly string[];
+    help?: readonly string[];
+};
+export declare function cliArgs<const Specs extends Record<string, string>>(specs: Specs, options?: Options): Values<Specs>;
+export {};
+//# sourceMappingURL=args.d.ts.map

package/dist/bin/args.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"args.d.ts","sourceRoot":"","sources":["../../src/bin/args.ts"],"names":[],"mappings":"AAQA,KAAK,KAAK,CAAC,IAAI,IACX,IAAI,SAAS,GAAG,MAAM,IAAI,MAAM,KAAK,GAAG,MAAM,EAAE,GAAG,SAAS,GACtD,IAAI,SAAS,GAAG,MAAM,IAAI,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,GACnD,OAAO,CAAA;AAErB,KAAK,MAAM,CAAC,KAAK,IAAI;KAAG,IAAI,IAAI,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;CAAE,CAAA;AAElE,KAAK,OAAO,GAAG;IACX,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACpC,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAC3B,CAAA;AAED,wBAAgB,OAAO,CAAC,KAAK,CAAC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9D,KAAK,EAAE,KAAK,EACZ,OAAO,GAAE,OAAY,GACtB,MAAM,CAAC,KAAK,CAAC,CA6Df"}

package/dist/bin/args.js

@@ -0,0 +1,77 @@
+import { cliError, cliOut } from "../cliOutput.js";
+export function cliArgs(specs, options = {}) {
+  // after node and the script come the command word and its arguments
+  const [command = '', ...given] = process.argv.slice(2);
+  const {
+    handledElsewhere = [],
+    help = []
+  } = options;
+  const accepted = [...Object.values(specs), ...handledElsewhere];
+  const usage = `Usage: tungsten ${command}` + accepted.map(part => ` [${part}]`).join('');
+  if (given.includes('--help') || given.includes('-h')) {
+    cliOut([usage, ...help].join('\n'));
+    process.exit(0);
+  }
+  // a declaration rather than an arrow, so the checks below narrow past its never return
+  function fail(message) {
+    cliError(`tungsten ${command}: ${message}`);
+    cliOut(usage);
+    process.exit(1);
+  }
+  const shapes = Object.values(specs).map(shapeOf);
+  const shapeByFlag = new Map(shapes.map(shape => [shape.flag, shape]));
+  const flagsGiven = new Set();
+  const valuesGiven = new Map();
+  const unknown = [];
+  const remaining = given.values();
+  for (const arg of remaining) {
+    const [flag, inlineValue] = splitInlineValue(arg);
+    const shape = shapeByFlag.get(flag);
+    if (shape === undefined) {
+      if (!handledElsewhere.includes(flag)) unknown.push(arg);
+      continue;
+    }
+    if (!shape.takesValue) {
+      if (inlineValue !== undefined) fail(`${flag} takes no value`);
+      flagsGiven.add(flag);
+      continue;
+    }
+    // "--output dist" takes its value from the same iteration, so the loop never sees it as a flag
+    const value = inlineValue ?? remaining.next().value;
+    // "--output --watch" is a value left out, not a value named --watch
+    if (value === undefined || value.startsWith('--')) fail(`${flag} requires a value`);
+    valuesGiven.set(flag, [...(valuesGiven.get(flag) ?? []), value]);
+  }
+  if (unknown.length > 0) fail(`unknown argument${unknown.length === 1 ? '' : 's'}: ${unknown.join(', ')}`);
+  const parsed = {};
+  for (const [name, spec] of Object.entries(specs)) {
+    const {
+      flag,
+      takesValue,
+      repeats
+    } = shapeOf(spec);
+    if (takesValue) {
+      const values = valuesGiven.get(flag);
+      parsed[name] = repeats ? values : values?.at(-1);
+    } else {
+      // --no-clean names what it turns off, so it reads true until given
+      const on = flagsGiven.has(flag);
+      parsed[name] = flag.startsWith('--no-') ? !on : on;
+    }
+  }
+  return parsed; // eslint-disable-line no-type-assertion/no-type-assertion -- built from specs' own keys
+}
+// '--ignore-dirs <dir>...' -> its flag, that it takes a value, and that it may be given more than once
+function shapeOf(spec) {
+  const space = spec.indexOf(' ');
+  return {
+    flag: space === -1 ? spec : spec.slice(0, space),
+    takesValue: space !== -1,
+    repeats: spec.endsWith('...')
+  };
+}
+// '--output=dist' -> ['--output', 'dist'], '--quiet' -> ['--quiet', undefined]
+function splitInlineValue(arg) {
+  const equals = arg.indexOf('=');
+  return equals === -1 ? [arg, undefined] : [arg.slice(0, equals), arg.slice(equals + 1)];
+}

package/dist/bin/commands/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/build.ts"],"names":[],"mappings":"AA2DA,OAAO,EAAE,CAAA"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/build.ts"],"names":[],"mappings":"AAqEA,OAAO,EAAE,CAAA"}

package/dist/bin/commands/build.js

@@ -3,10 +3,20 @@ import chalk from 'chalk-extensions';
 import { Framework } from "../../Framework.js";
 import { cliOut, cliNews, cliWarn } from "../../cliOutput.js";
 import { staticSiteFolder } from "../../settings.js";
-import { createTimeProfiler } from "../../timeProfiler.js";
-const args = process.argv.slice(3);
-const profile = args.includes('--profile');
-const quiet = args.includes('--quiet');
+import { createTimeProfiler, reportRunTotal, reportStartupPhase } from "../../timeProfiler.js";
+import { cliArgs } from "../args.js";
+// first statement in the body, so it closes off the import evaluation above
+reportStartupPhase('load build modules');
+// --help never reaches here - bin/index.ts routes it to buildHelp.ts before this module loads
+const {
+  profile,
+  quiet
+} = cliArgs({
+  profile: '--profile',
+  quiet: '--quiet'
+}, {
+  handledElsewhere: ['--profile-modules']
+});
 //// prep the app
 const sxyFramework = new Framework();
 sxyFramework.profiler = createTimeProfiler(profile);
@@ -32,6 +42,7 @@ if (sxyFramework.config.staticSite) {
 } else if (!quiet) {
   cliNews(`Production build complete`);
 }
+reportRunTotal('total (build)');
 // The build no longer holds anything open, so it ends by draining the event loop - hard-exiting
 // here used to abort the process outright when an fs-extra copy still had a chmod in flight
 // (libuv `!(handle->flags & UV_HANDLE_CLOSING)`). Safety net only, in case a future change

package/dist/bin/commands/buildHelp.js

@@ -1,7 +1,10 @@
 // kept out of build.ts so --help does not pay for resolving the build's import tree
 import { cliOut } from "../../cliOutput.js";
-cliOut(`Usage: tungsten build [--profile] [--quiet]
+cliOut(`Usage: tungsten build [--profile] [--profile-modules] [--quiet]
 
 Options:
   --profile   report the time taken by each build phase
+  --profile-modules[=<path substring>]
+              report where module load time goes, splitting each import into what
+              only it needs and what it shares with its siblings
   --quiet     suppress progress output; warnings and errors still print`);

package/dist/bin/commands/clean.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clean.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/clean.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,CAAA"}
+{"version":3,"file":"clean.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/clean.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,CAAA"}

package/dist/bin/commands/clean.js

@@ -3,6 +3,8 @@ import chalk from 'chalk-extensions';
 import { Framework } from "../../Framework.js";
 import { cliOut } from "../../cliOutput.js";
 import { packageNameCapitalized } from "../../settings.js";
+import { cliArgs } from "../args.js";
+cliArgs({}); // accepts nothing but --help
 //// prep the app
 const sxyFramework = new Framework();
 await sxyFramework.init();

package/dist/bin/commands/compile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/compile.ts"],"names":[],"mappings":"AAkSA,OAAO,EAAE,CAAA"}
+{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/compile.ts"],"names":[],"mappings":"AAoRA,OAAO,EAAE,CAAA"}

package/dist/bin/commands/compile.js

@@ -11,92 +11,80 @@ import { createInstanceConfigFile } from "../../build/createInstanceConfigFile.j
 import { getUserConfig } from "../../getUserConfig.js";
 import { buildCodeSubPath, assetsFolder, clientFolder, componentCssFolder, devBuildOuterFolder, frameworkCssFolder, packagesCacheFolder, packagesFolder, publicFolder, staticFolder } from "../../settings.js";
 import { cliError, cliNews, cliOut } from "../../cliOutput.js";
-const targetOptions = {
-  '--js': 'js',
-  '--css': 'css',
-  '--client': 'client',
-  '--assets': 'assets',
-  '--public': 'public'
+import { createTimeProfiler, reportRunTotal, reportStartupPhase } from "../../timeProfiler.js";
+import { cliArgs } from "../args.js";
+// first statement in the body, so it closes off the import evaluation above
+reportStartupPhase('load compile modules');
+const {
+  js,
+  css,
+  client,
+  assets,
+  publicFiles,
+  all,
+  watch,
+  clean,
+  quiet,
+  packages,
+  profile,
+  output: outputOption,
+  readyFile: readyFileOption,
+  ignoreDirs,
+  ignorePatterns,
+  tests
+} = cliArgs({
+  js: '--js',
+  css: '--css',
+  client: '--client',
+  assets: '--assets',
+  publicFiles: '--public',
+  all: '--all',
+  watch: '--watch',
+  clean: '--no-clean',
+  quiet: '--quiet',
+  packages: '--packages',
+  profile: '--profile',
+  output: '--output <dir>',
+  readyFile: '--ready-file <file>',
+  ignoreDirs: '--ignore-dirs <dir>...',
+  ignorePatterns: '--ignore-patterns <pattern>...',
+  tests: '--tests'
+}, {
+  handledElsewhere: ['--profile-modules'],
+  help: ['With no target option (--js, --css, --client, --assets, --public), all targets are compiled.', '  --profile reports the time taken by each compile phase', '  --profile-modules[=<path substring>] reports where module load time goes,', '    splitting each import into what only it needs and what it shares', '  --packages compiles imported packages into the build\'s .packages tree', '    for the dev server to serve. Off by default: compiled code left to', '    node\'s own resolution, as tests use, needs none of it.', '  --ignore-dirs and --ignore-patterns override the config entries of the same name.', '    Repeat either to give several values, or pass an empty value to ignore nothing.', '  --tests also compiles the files the config\'s testPatterns match, which every', '    other compile leaves out.']
+});
+const allTargets = ['js', 'css', 'client', 'assets', 'public'];
+const targetGiven = {
+  js,
+  css,
+  client,
+  assets,
+  public: publicFiles
 };
-const args = process.argv.slice(3);
-const usage = 'Usage: tungsten compile [targets] [--all] [--watch] [--no-clean] [--packages]' + ' [--output <dir>] [--ready-file <file>] [--quiet]' + ' [--ignore-dirs <dir>] [--ignore-patterns <pattern>]';
-if (args.includes('--help') || args.includes('-h')) {
-  cliOut(usage);
-  cliOut('Targets: --js, --css, --client, --assets, --public');
-  cliOut('With no target options, all targets are compiled.');
-  cliOut('Options: --output <dir>, --ready-file <file>, --quiet');
-  cliOut('         --packages compiles imported packages into the build\'s .packages tree');
-  cliOut('           for the dev server to serve. Off by default: compiled code left to');
-  cliOut('           node\'s own resolution, as tests use, needs none of it.');
-  cliOut('         --ignore-dirs <dir>, --ignore-patterns <pattern>');
-  cliOut('           override the config entries of the same name. Repeat the option to');
-  cliOut('           give several values, or pass an empty value to ignore nothing.');
-  process.exit(0);
-}
-const commandOptions = new Set(['--all', '--watch', '--no-clean', '--quiet', '--packages']);
-const valueOptions = new Set(['--output', '--ready-file', '--ignore-dirs', '--ignore-patterns']);
-// values are collected per option so that the list options can be repeated
-const givenOptionValues = new Map();
-const unknownOptions = [];
-let consumedPosition = -1;
-for (const [position, arg] of args.entries()) {
-  if (position === consumedPosition) continue; // already taken as an option value
-  if (arg in targetOptions || commandOptions.has(arg)) continue;
-  if (valueOptions.has(arg)) {
-    const value = args[position + 1];
-    if (value === undefined || value.startsWith('--')) {
-      cliError(`${arg} requires a value`);
-      process.exit(1);
-    }
-    const values = givenOptionValues.get(arg);
-    if (values === undefined) givenOptionValues.set(arg, [value]);else values.push(value);
-    consumedPosition = position + 1;
-  } else {
-    unknownOptions.push(arg);
-  }
-}
-if (unknownOptions.length > 0) {
-  cliError(`Unknown compile option${unknownOptions.length === 1 ? '' : 's'}: ${unknownOptions.join(', ')}`);
-  cliOut(usage);
-  process.exit(1);
-}
-function optionValue(option) {
-  return givenOptionValues.get(option)?.at(-1);
-}
+const requestedTargets = allTargets.filter(target => targetGiven[target]);
+const targets = new Set(all || requestedTargets.length === 0 ? allTargets : requestedTargets);
 // undefined leaves the config entry alone, '' clears it
-function listOptionValue(option) {
-  const values = givenOptionValues.get(option);
+function configOverride(values) {
   if (values === undefined) return undefined;
   const entries = values.filter(value => value !== '');
   return entries.length === 0 ? '' : entries;
 }
-const outputOption = optionValue('--output');
-const readyFileOption = optionValue('--ready-file');
-const ignoreDirsOption = listOptionValue('--ignore-dirs');
-const ignorePatternsOption = listOptionValue('--ignore-patterns');
-const requestedTargets = new Set();
-for (const arg of args) {
-  const target = targetOptions[arg];
-  if (target !== undefined) requestedTargets.add(target);
-}
-const targets = requestedTargets.size === 0 || args.includes('--all') ? new Set(['js', 'css', 'client', 'assets', 'public']) : requestedTargets;
-const watch = args.includes('--watch');
-const clean = !args.includes('--no-clean');
-const quiet = args.includes('--quiet');
-const compilePackages = args.includes('--packages');
-if (compilePackages && !targets.has('js')) {
+const ignoreDirsOption = configOverride(ignoreDirs);
+const ignorePatternsOption = configOverride(ignorePatterns);
+const profiler = createTimeProfiler(profile);
+if (packages && !targets.has('js')) {
   cliError('--packages applies to the js target, which is not being compiled');
   process.exit(1);
 }
 const projectDir = process.cwd();
-const config = await getUserConfig({
+const config = await profiler.timeProfileAsync('init', () => getUserConfig({
   ...(ignoreDirsOption !== undefined ? {
     ignoreDirs: ignoreDirsOption
   } : {}),
   ...(ignorePatternsOption !== undefined ? {
     ignorePatterns: ignorePatternsOption
   } : {})
-});
+}));
 const codeLocation = join(projectDir, config.codeDir);
 const relSourceDir = config.sourceDir !== undefined && config.sourceDir !== '' ? config.sourceDir : config.codeDir;
 const sourceLocation = join(projectDir, relSourceDir);
@@ -144,14 +132,15 @@ if (clean) {
   if (targets.has('assets')) cleanTasks.push(removeRecursive(join(buildLocation, assetsFolder)));
   if (targets.has('public')) cleanTasks.push(removeRecursive(join(buildLocation, publicFolder)));
   cliOut(`Cleaning compile output: ${[...targets].join(', ')}`);
-  await Promise.all(cleanTasks);
+  await profiler.timeProfileAsync('clean', () => Promise.all(cleanTasks));
 }
 const compilationTasks = [];
 let javascriptInitialSuccess = true;
 if (targets.has('js')) {
-  const javascriptTask = compileJavascript(projectDir, config, codeLocation, sourceLocation, styleImportBase, buildLocation, buildCodeLocation, 'dev', watch, {
+  const javascriptTask = profiler.timeProfileAsync('compile javascript', () => compileJavascript(projectDir, config, codeLocation, sourceLocation, styleImportBase, buildLocation, buildCodeLocation, 'dev', watch, {
     quiet,
-    packages: compilePackages,
+    packages,
+    tests,
     packagesCacheLocation,
     onCycleComplete: watch ? async cycle => {
       if (cycle.success) {
@@ -162,29 +151,31 @@ if (targets.has('js')) {
         cliError(`Compile cycle failed: js${cycle.file !== undefined ? ` (${cycle.file})` : ''}`);
       }
     } : undefined
-  });
+  }));
   compilationTasks.push(javascriptTask.then(result => {
     javascriptInitialSuccess = result.initialSuccess;
     return result;
   }));
 }
 if (targets.has('css')) {
-  compilationTasks.push(compileStyles(projectDir, config, styleImportBase, buildLocation, watch));
+  compilationTasks.push(profiler.timeProfileAsync('compile styles', () => compileStyles(projectDir, config, styleImportBase, buildLocation, watch)));
 }
 if (targets.has('client')) {
-  compilationTasks.push(createInstanceConfigFile(config, 'dev', buildLocation));
-  compilationTasks.push(createClientFiles(config, 'dev', buildLocation));
+  compilationTasks.push(profiler.timeProfileAsync('create instance config', () => createInstanceConfigFile(config, 'dev', buildLocation)));
+  compilationTasks.push(profiler.timeProfileAsync('create client files', () => createClientFiles(config, 'dev', buildLocation)));
 }
 if (targets.has('assets')) {
   // copyAssets resolves to undefined when there is no assets dir - nothing to skip here
-  compilationTasks.push(copyAssets(projectDir, config, buildLocation, watch));
+  compilationTasks.push(profiler.timeProfileAsync('copy assets', () => copyAssets(projectDir, config, buildLocation, watch)));
 }
 if (targets.has('public')) {
-  compilationTasks.push(copyPublicFiles(projectDir, config, buildLocation, watch));
+  compilationTasks.push(profiler.timeProfileAsync('copy public files', () => copyPublicFiles(projectDir, config, buildLocation, watch)));
 }
-const compilationResults = await Promise.allSettled(compilationTasks);
+const compilationResults = await profiler.timeProfileAsync('compile targets', () => Promise.allSettled(compilationTasks));
 // after the js task: the package walk that records the stylesheets runs inside it
-if (targets.has('js')) await writeFrameworkCss(buildLocation);
+if (targets.has('js')) {
+  await profiler.timeProfileAsync('write framework css', () => writeFrameworkCss(buildLocation));
+}
 const failures = compilationResults.filter(result => result.status === 'rejected').map(result => result.reason);
 const initialSuccess = failures.length === 0 && javascriptInitialSuccess;
 if (initialSuccess) {
@@ -194,6 +185,7 @@ if (initialSuccess) {
   await clearReadyFile();
   cliError(`Compile failed: ${[...targets].join(', ')}`);
 }
+reportRunTotal('total (compile)');
 if (!watch && !initialSuccess) {
   throw new AggregateError(failures, 'Compilation failed');
 }

package/dist/bin/commands/dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/dev.ts"],"names":[],"mappings":"AAsDA,OAAO,EAAE,CAAA"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/dev.ts"],"names":[],"mappings":"AAuEA,OAAO,EAAE,CAAA"}

package/dist/bin/commands/dev.js

@@ -2,16 +2,29 @@ import open from 'open';
 import { cliOut } from "../../cliOutput.js";
 import { Framework } from "../../Framework.js";
 import { warnOnFrameworkChange } from "../../warnOnFrameworkChange.js";
-import { createTimeProfiler } from "../../timeProfiler.js";
+import { createTimeProfiler, reportRunTotal, reportStartupPhase } from "../../timeProfiler.js";
+import { cliArgs } from "../args.js";
 //import dotenv from 'dotenv'
 //dotenv.config({ path: '.private.env' })
-const args = process.argv.slice(3);
-const boot = !args.includes('--no-boot');
-const profile = args.includes('--profile');
+// first statement in the body, so it closes off the import evaluation above
+reportStartupPhase('load dev modules');
+const {
+  boot,
+  profile,
+  tests
+} = cliArgs({
+  boot: '--no-boot',
+  profile: '--profile',
+  // also compile the files config.testDirs/testPatterns match - normally only a test compile does
+  tests: '--tests'
+}, {
+  handledElsewhere: ['--profile-modules']
+});
 //// prep the app
 const sxyFramework = new Framework();
 sxyFramework.profiler = createTimeProfiler(profile);
-await sxyFramework.init();
+sxyFramework.tests = tests;
+const config = await sxyFramework.init();
 //console.log('framework ready')
 // build for dev
 cliOut('Removing old builds');
@@ -26,12 +39,14 @@ const devServer = await sxyFramework.createDevServer();
 const devServerLocation = await sxyFramework.profiler.timeProfileAsync('start dev server', () => devServer.start());
 // devmon already restarts this process itself on a framework rebuild, so the warning
 // (which just tells you to restart manually) would be redundant noise under it - see devmon.ts.
-if (sxyFramework.config?.warnOnFrameworkChange && process.env.__TUNGSTEN_DEVMON !== 'true') {
+if (config.warnOnFrameworkChange && process.env.__TUNGSTEN_DEVMON !== 'true') {
   warnOnFrameworkChange();
 }
 // do a dummy request to trigger any error immediately during dev
 //axios.get(sxyFramework.devServer.location)
 if (boot) {
   cliOut('Booting to the dev site in your browser');
-  open(devServerLocation);
-}
+  // awaited only so it can be timed - open resolves once the browser process is spawned
+  await sxyFramework.profiler.timeProfileAsync('boot browser', () => open(devServerLocation));
+}
+reportRunTotal('total (dev startup)');

package/dist/bin/commands/devmon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"devmon.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/devmon.ts"],"names":[],"mappings":"AAqEA,OAAO,EAAE,CAAA"}
+{"version":3,"file":"devmon.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/devmon.ts"],"names":[],"mappings":"AAiEA,OAAO,EAAE,CAAA"}