tungsten 0.4.10 → 0.4.12

package/dist/babelPlugins/BabelTransformPackageImports.js

@@ -11,7 +11,6 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 import { join, dirname, relative } from 'path';
 import slash from 'slash';
 import precinct from 'precinct';
-//import sxyPrecinct from 'sxy-precinct'
 import { existsSync, mkdirSync, promises as fsPromises, readFileSync, writeFileSync } from 'fs';
 import { createRequire } from 'module';
 import { transformFileSync as babelTransformFileSync, transformSync as babelTransformSync } from '@babel/core';
@@ -20,24 +19,34 @@ import { arrays } from 'sxy-lib';
 const babelPluginSyntaxImportAssertions = babelPluginSyntaxImportAssertionsModule.default;
 import { init as lexerInit, parse as lexerParse } from 'cjs-module-lexer';
 lexerInit();
-import { MakeBabelTransformCjsToFunction } from "./BabelTransformCjsToFunction.js";
-import { MakeBabelExtractComponentStylesheet } from "./BabelExtractComponentStylesheet.js";
-import { recordFrameworkStylesheet } from "../build/frameworkStylesheets.js";
-import { MakeBabelTransformDependencyImportsEsm } from "./transformPackageImports/BabelTransformDependencyImportsEsm.js";
-import { MakeBabelTransformDependencyImportsCjs } from "./transformPackageImports/BabelTransformDependencyImportsCjs.js";
-import { frameworkDistFolder, packageName as frameworkPackageName, packageName, packagesFolder /*, packagesCacheInfoName*/ } from "../settings.js";
-import { findProjectDir } from "../findProjectDir.js";
-import { cliError, cliWarn, cliNote, cliInfo, cliNews } from "../cliOutput.js";
-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 { MakeBabelTransformCjsToFunction } from './BabelTransformCjsToFunction.js';
+import { MakeBabelExtractComponentStylesheet } from './BabelExtractComponentStylesheet.js';
+import { recordFrameworkStylesheet } from '../build/frameworkStylesheets.js';
+import { MakeBabelTransformDependencyImportsEsm } from './transformPackageImports/BabelTransformDependencyImportsEsm.js';
+import { MakeBabelTransformDependencyImportsCjs } from './transformPackageImports/BabelTransformDependencyImportsCjs.js';
+import { frameworkDistFolder, packageName as frameworkPackageName, packageName, packagesFolder /*, packagesCacheInfoName*/ } from '../settings.js';
+import { findProjectDir } from '../findProjectDir.js';
+import { cliError, cliWarn, cliNote, cliInfo, cliNews } from '../cliOutput.js';
+import { isBareImport } from './isBareImport.js';
+import { resolveBareImport } from './transformPackageImports/resolveBareImport.js';
+import { TungstenError } from '../TungstenError.js';
+import { throwError } from '../throwError.js';
+import { isProfiling, tallied } from '../timeProfiler.js';
 //import { copyPackageModulesToPackagesFolder } from '../build/copyPackageModulesToPackagesFolder.js'
 const require = createRequire(import.meta.url);
 function debug(...texts) {
   //console.log(...texts)
 }
+// '@scope/name@1.2.3/dist/index.js' -> its package identifier and the file's path within the package
+function breakFileIdentifier(fileIdentifier) {
+  // a scoped name starts with @, so the version's @ is the next one
+  const atPos = fileIdentifier.indexOf('@', fileIdentifier.startsWith('@') ? 1 : 0);
+  const startOfInternal = fileIdentifier.indexOf('/', atPos);
+  return {
+    packageIdentifier: fileIdentifier.slice(0, startOfInternal),
+    relFile: fileIdentifier.slice(startOfInternal + 1)
+  };
+}
 class UnsupportedCompiledDependencyError extends TungstenError {
   constructor(dependency, importedFrom, importHistory, options) {
     super(`Could not resolve ${dependency} from ${importedFrom}`);
@@ -210,11 +219,9 @@ export function MakeBabelTransformPackageImports(opts) {
     const {
       file
     } = fileInfo;
-    const precinctStart = performance.now();
-    const precinctResults = precinct.paperwork(file, {
+    const precinctResults = tallied('precinct.paperwork', () => 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;
@@ -348,9 +355,7 @@ export function MakeBabelTransformPackageImports(opts) {
   async function babelFileEsm(file /*, packageInfo*/, nonEsmDeps, 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);
+    const result = tallied('babel transform (packages)', () => babelTransformFileSync(file, makeModifyImportsEsmBabelOptions(nonEsmDeps.map(d => d.webLocation), onStylesheet)));
     if (result === null) {
       throw new TungstenError(`BabelTransformPackageImports error: sub file babel transform (1) returned null: ${file}`);
     }
@@ -384,9 +389,7 @@ 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);
-    const cjsStart = performance.now();
-    let result = babelTransformFileSync(file, makeCjsToEsmBabelOptions(nonEsmDepsWebPath));
-    tally('babel transform (packages)', performance.now() - cjsStart);
+    let result = tallied('babel transform (packages)', () => babelTransformFileSync(file, makeCjsToEsmBabelOptions(nonEsmDepsWebPath)));
     if (result === null) {
       throw new TungstenError(`BabelTransformPackageImports error: sub file babel transform (2) returned null: ${file}`);
     }
@@ -399,12 +402,11 @@ export function MakeBabelTransformPackageImports(opts) {
     });
     //console.log('writing file', intermedCacheLocation)
     await fsPromises.writeFile(intermedCacheLocation, result.code); // rel contains the slash at start
-    const cjsImportsStart = performance.now();
-    result = babelTransformSync(result.code, {
+    const code = result.code;
+    result = tallied('babel transform (packages)', () => babelTransformSync(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}
                 `);
@@ -538,6 +540,11 @@ export function MakeBabelTransformPackageImports(opts) {
       recursive: true
     });
     await fsPromises.copyFile(cacheNode.cacheLocation, cacheNode.finalLocation);
+    // the esm wrapper a cjs file gets when an esm package imports it is made while processing the
+    // importer (getExternalImportFinalImportLocation), which a hit skips, and it is never cached
+    if (cacheNode.type !== 'esm') {
+      makeCjsEntryFile(cacheNode.originalLocation, `/${slash(relative(buildLocation, cacheNode.finalLocation))}`);
+    }
     if (cacheNode.dependencies) {
       await processCacheDependencies(cacheNode.dependencies);
     }
@@ -562,6 +569,24 @@ export function MakeBabelTransformPackageImports(opts) {
   // 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.
+  // Existence is checked per package directory, not per file. An installed package at a version
+  // has all its files, and the graph is written only once a run has completed, so a cache
+  // directory a node names is whole unless deleted by hand - `--fresh` covers that. Two stats per
+  // node were ~85ms of a full-hit start on 327 nodes; a recursive readdirSync of the cache was
+  // 68ms, so it was not taken either.
+  const dirsKnown = new Map();
+  function dirExists(dir) {
+    let known = dirsKnown.get(dir);
+    if (known === undefined) dirsKnown.set(dir, known = existsSync(dir));
+    return known;
+  }
+  function packageDirsExist(fileIdentifier, node) {
+    // both locations end in the file's path within its package; what precedes it is the package
+    const {
+      relFile
+    } = breakFileIdentifier(fileIdentifier);
+    return dirExists(node.originalLocation.slice(0, -relFile.length)) && dirExists(node.cacheLocation.slice(0, -relFile.length));
+  }
   const subtreeUsable = new Map();
   function cachedSubtreeIsUsable(fileIdentifier, visiting) {
     const settled = subtreeUsable.get(fileIdentifier);
@@ -574,7 +599,7 @@ export function MakeBabelTransformPackageImports(opts) {
     // 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));
+    const usable = node !== undefined && (isProfiling() || cacheKeyIdentifiesContent(node.originalLocation)) && tallied('package dirs exist', () => packageDirsExist(fileIdentifier, node)) && (node.dependencies ?? []).every(dep => cachedSubtreeIsUsable(dep, visiting));
     visiting.delete(fileIdentifier);
     subtreeUsable.set(fileIdentifier, usable);
     return usable;
@@ -595,7 +620,7 @@ export function MakeBabelTransformPackageImports(opts) {
     } else {
       processedFilesCache[file] = fileInfo.packageInfo;
       const cacheNode = opts.oldDependencyGraph[fileInfo.fileIdentifier];
-      if (cacheNode !== undefined && cachedSubtreeIsUsable(fileInfo.fileIdentifier, new Set())) {
+      if (cacheNode !== undefined && tallied('cached subtree check', () => cachedSubtreeIsUsable(fileInfo.fileIdentifier, new Set()))) {
         await copyFileFromCache(fileInfo.fileIdentifier, cacheNode);
       } else {
         await doProcessFile(fileInfo, sourceFilename, history);
@@ -655,8 +680,10 @@ export function MakeBabelTransformPackageImports(opts) {
     if (cachedFileInfo) {
       return cachedFileInfo;
     } else {
-      const fileInfo = resolveFile(file);
-      opts.promises.push(processFile(fileInfo, sourceFilename, [sourceFilename]).catch(error => {
+      const fileInfo = tallied('resolve file', () => resolveFile(file));
+      // async: the tally covers its synchronous prefix, up to the first await
+      const processing = tallied('start processing file', () => processFile(fileInfo, sourceFilename, [sourceFilename]));
+      opts.promises.push(processing.catch(error => {
         if (error instanceof UnsupportedCompiledDependencyError) {
           cliError(formatUnsupportedDependencyError(error));
         } else {
@@ -770,18 +797,18 @@ 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.
+    // Resolution is this visitor's whole cost - ~2ms of node_modules walking per bare import.
+    // Every importer is under the one code dir, so they all walk the same node_modules chain
+    // and a specifier resolves identically wherever it is imported from (tungsten/jsx-runtime,
+    // from every component): one resolution per specifier, not per importer directory. A
+    // node_modules nested inside the code dir would break that; none is expected. Lives as long
+    // as the plugin, like importedPackageFiles, so a package changed in place is stale in both.
     const resolvedImports = new Map();
     function resolveImportTarget(location, fromDir, requireFrom) {
-      const key = `${fromDir}\0${location}`;
-      const known = resolvedImports.get(key);
+      const known = resolvedImports.get(location);
       if (known !== undefined) return known;
       const target = resolveBareImport(location, [fromDir]) ?? requireFrom.resolve(location);
-      resolvedImports.set(key, target);
+      resolvedImports.set(location, target);
       return target;
     }
     return {
@@ -805,7 +832,7 @@ export function MakeBabelTransformPackageImports(opts) {
         ImportDeclaration: function (path) {
           if (skipPackageCompilationForFile) return;
           try {
-            let location = path.node.source.value;
+            const location = path.node.source.value;
             //console.log('BabelTransformPackageImports', 'ImportDeclaration', location)
             // see if it is a bare import
             if (isBareImport(location)) {
@@ -818,15 +845,10 @@ export function MakeBabelTransformPackageImports(opts) {
               //     throwError('BabelTransformPackageImports', 'Found an import to a node package in user code.')
               // }
               //console.log('*', filename, 'processing bare import', location)
-              // hacky alias
-              if (location === 'tungsten/jsx-runtime') {
-                //console.log(chalk.orange`We did the hacky jsx runtime alias in BabelTransformPackageImports`)
-                location = 'tungsten/jsxRuntime.js';
-              }
               // 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 = resolveImportTarget(location, dirname(filename), require);
+              const importTarget = tallied('resolve import target', () => resolveImportTarget(location, dirname(filename), require));
               // Should do some checking here to show helpful errors about bad imports
               if (importTarget === location) {
                 //console.log()
@@ -842,7 +864,7 @@ export function MakeBabelTransformPackageImports(opts) {
                 return;
               }
               //console.log('** importTarget', importTarget)
-              const fileInfo = processPackageFile(importTarget, filename);
+              const fileInfo = tallied('process package file', () => processPackageFile(importTarget, filename));
               const {
                 file: sourceFile,
                 finalDest,
@@ -863,7 +885,7 @@ export function MakeBabelTransformPackageImports(opts) {
                   addImportAlias(location, webLocation);
                   //console.log('add alias for', location)
                 } else {
-                  const entryFile = makeCjsEntryFile(sourceFile, webLocation);
+                  const entryFile = tallied('make cjs entry file', () => makeCjsEntryFile(sourceFile, webLocation));
                   addImportAlias(location, entryFile);
                   //console.log('add alias for', location)
                 }

package/dist/babelPlugins/BabelTransformReactive.js

@@ -2,7 +2,7 @@
 // exports MakeBabelTransformBind (function)
 //
 // 
-import { throwError } from "../throwError.js";
+import { throwError } from '../throwError.js';
 /////////////////////////////////////////////////
 // Is this WIP?
 /////////////////////////////////////////////////

package/dist/babelPlugins/BabelTransformReactiveSvelteStyle.js

@@ -2,7 +2,7 @@
 // exports MakeBabelTransformBind (function)
 //
 // 
-import { throwError } from "../throwError.js";
+import { throwError } from '../throwError.js';
 const reactiveFunctionName = 'reactive';
 // type VariablePart = {
 //     property: any, // something in babel

package/dist/babelPlugins/BabelTransformSxyFrameworkImports.js

@@ -4,7 +4,7 @@
 // Seems to convert imports of 'tungsten' to import from the 
 // compiled tungsten packages in <buildLocation>/<packagesFolder>
 // but not sure this is working/in use
-import { packagesFolder } from "../settings.js";
+import { packagesFolder } from '../settings.js';
 // type Opts = {
 // }
 export function MakeBabelTransformTungstenFrameworkImports(/*opts: Opts*/

package/dist/babelPlugins/BabelTransformUniqueComponents.js

@@ -1,4 +1,4 @@
-import { TungstenError } from "../TungstenError.js";
+import { TungstenError } from '../TungstenError.js';
 const uidKey = '__u';
 function AttributeIsJSXAttribute(attribute) {
   return attribute.type === 'JSXAttribute';

package/dist/babelPlugins/fixImportsInSassErrorMessage.js

@@ -1,4 +1,4 @@
-import { throwError } from "../throwError.js";
+import { throwError } from '../throwError.js';
 // RegEx: @use or @import, 0 or spaces or tabs, followed by an import target in single or double quotes
 const useOrImportRegex = /@(?:use|import)[ \t]*(?:'([^']+)'|"([^']+)")/g;
 // the line optionally starts with digits, spaces then pipe |, and after has 1 or more ^, and to the left and the right is only spaces or more carets

package/dist/babelPlugins/test.js

@@ -1,4 +1,4 @@
-import { fixImportsInSassErrorMessage } from "./fixImportsInSassErrorMessage.js";
+import { fixImportsInSassErrorMessage } from './fixImportsInSassErrorMessage.js';
 const input = `
   @import '../foo'
   ^^^^^^^^^^^^^^^^

package/dist/babelPlugins/transformPackageImports/BabelTransformDependencyImportsCjs.js

@@ -9,9 +9,9 @@
 // }
 import { dirname, relative } from 'path';
 import slash from 'slash';
-import { isBareImport } from "../isBareImport.js";
-import { cliWarn } from "../../cliOutput.js";
-import { warn } from "../../output.js";
+import { isBareImport } from '../isBareImport.js';
+import { cliWarn } from '../../cliOutput.js';
+import { warn } from '../../output.js';
 import { TungstenError } from 'tungsten/TungstenError.js';
 export function MakeBabelTransformDependencyImportsCjs(opts, funcs) {
   return function BabelTransformDependencyImportsCjs(babel) {

package/dist/babelPlugins/transformPackageImports/BabelTransformDependencyImportsEsm.js

@@ -9,7 +9,7 @@
 // }
 import { dirname, relative } from 'path';
 import slash from 'slash';
-import { isBareImport } from "../isBareImport.js";
+import { isBareImport } from '../isBareImport.js';
 import { throwError } from 'tungsten/throwError.js';
 import { cliError, cliOut } from 'tungsten/cliOutput.js';
 export function MakeBabelTransformDependencyImportsEsm(opts, funcs) {

package/dist/babelPlugins/transformPackageImports/getWebLocationOfPackageFile.js

@@ -1,6 +1,6 @@
 import { dirname } from 'path';
-import { TungstenError } from "../../TungstenError.js";
-import { findProjectDir } from "../../findProjectDir.js";
+import { TungstenError } from '../../TungstenError.js';
+import { findProjectDir } from '../../findProjectDir.js';
 const getPackageDirForDirCache = {};
 function getPackageDirForDir(dir) {
   if (dir in getPackageDirForDirCache) {

package/dist/bin/args.js

@@ -1,4 +1,4 @@
-import { cliError, cliOut } from "../cliOutput.js";
+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);

package/dist/bin/commands/build.js

@@ -1,10 +1,10 @@
 // build
 import chalk from 'chalk-extensions';
-import { Framework } from "../../Framework.js";
-import { cliOut, cliNews, cliWarn } from "../../cliOutput.js";
-import { staticSiteFolder } from "../../settings.js";
-import { createTimeProfiler, reportRunTotal, reportStartupPhase } from "../../timeProfiler.js";
-import { cliArgs } from "../args.js";
+import { Framework } from '../../Framework.js';
+import { cliOut, cliNews, cliWarn } from '../../cliOutput.js';
+import { staticSiteFolder } from '../../settings.js';
+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

package/dist/bin/commands/buildHelp.js

@@ -1,5 +1,5 @@
 // kept out of build.ts so --help does not pay for resolving the build's import tree
-import { cliOut } from "../../cliOutput.js";
+import { cliOut } from '../../cliOutput.js';
 cliOut(`Usage: tungsten build [--profile] [--profile-modules] [--quiet]
 
 Options:

package/dist/bin/commands/clean.js

@@ -1,9 +1,9 @@
 // build
 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";
+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();

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":"AAoRA,OAAO,EAAE,CAAA"}
+{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/compile.ts"],"names":[],"mappings":"AAoSA,OAAO,EAAE,CAAA"}

package/dist/bin/commands/compile.js

@@ -1,18 +1,18 @@
 import { dirname, join, resolve } from 'path';
 import { promises as fsPromises } from 'fs';
-import { removeRecursive } from "../../removeRecursive.js";
-import { compileJavascript } from "../../build/compileJavascript.js";
-import { compileStyles } from "../../build/compileStyles.js";
-import { writeFrameworkCss } from "../../build/frameworkStylesheets.js";
-import { copyAssets } from "../../build/copyAssets.js";
-import { copyPublicFiles } from "../../build/copyPublicFiles.js";
-import { createClientFiles } from "../../build/createClientFiles.js";
-import { createInstanceConfigFile } from "../../build/createInstanceConfigFile.js";
-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";
-import { createTimeProfiler, reportRunTotal, reportStartupPhase } from "../../timeProfiler.js";
-import { cliArgs } from "../args.js";
+import { removeRecursive } from '../../removeRecursive.js';
+import { compileJavascript } from '../../build/compileJavascript.js';
+import { compileStyles } from '../../build/compileStyles.js';
+import { writeFrameworkCss } from '../../build/frameworkStylesheets.js';
+import { copyAssets } from '../../build/copyAssets.js';
+import { copyPublicFiles } from '../../build/copyPublicFiles.js';
+import { createClientFiles } from '../../build/createClientFiles.js';
+import { createInstanceConfigFile } from '../../build/createInstanceConfigFile.js';
+import { getUserConfig } from '../../getUserConfig.js';
+import { buildCodeSubPath, assetsFolder, clientFolder, componentCssFolder, devBuildOuterFolder, devRawBuildFolder, frameworkCssFolder, packagesCacheFolder, stylesCacheFolder, packagesFolder, publicFolder, staticFolder } from '../../settings.js';
+import { cliError, cliNews, cliOut } from '../../cliOutput.js';
+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 {
@@ -31,7 +31,8 @@ const {
   readyFile: readyFileOption,
   ignoreDirs,
   ignorePatterns,
-  tests
+  tests,
+  fresh
 } = cliArgs({
   js: '--js',
   css: '--css',
@@ -48,10 +49,11 @@ const {
   readyFile: '--ready-file <file>',
   ignoreDirs: '--ignore-dirs <dir>...',
   ignorePatterns: '--ignore-patterns <pattern>...',
-  tests: '--tests'
+  tests: '--tests',
+  fresh: '--fresh'
 }, {
   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.']
+  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.', '  --fresh compiles everything from source, ignoring the packages and styles caches.', '    Both are rewritten, so the next compile starts from a cache this one made.']
 });
 const allTargets = ['js', 'css', 'client', 'assets', 'public'];
 const targetGiven = {
@@ -92,6 +94,8 @@ const styleImportBase = config.styleImportBase !== undefined ? join(sourceLocati
 const buildLocation = outputOption !== undefined ? resolve(projectDir, outputOption) : join(projectDir, devBuildOuterFolder);
 const buildCodeLocation = join(buildLocation, buildCodeSubPath);
 const packagesCacheLocation = outputOption !== undefined ? join(buildLocation, '.packagesCache') : join(projectDir, packagesCacheFolder);
+const stylesCacheLocation = outputOption !== undefined ? join(buildLocation, '.stylesCache') : join(projectDir, stylesCacheFolder);
+const rawBuildLocation = outputOption !== undefined ? `${buildLocation}-raw` : join(projectDir, devRawBuildFolder);
 const readyFileLocation = readyFileOption !== undefined ? resolve(projectDir, readyFileOption) : undefined;
 if (buildLocation.toLowerCase() === resolve(projectDir).toLowerCase()) {
   cliError('Compile output cannot be the project root');
@@ -120,7 +124,7 @@ const cleanTasks = [];
 if (clean && targets.has('js')) {
   cleanTasks.push(removeRecursive(buildCodeLocation), removeRecursive(join(buildLocation, componentCssFolder)),
   // else a component the app no longer imports keeps its stale stylesheet linked
-  removeRecursive(join(buildLocation, frameworkCssFolder)), removeRecursive(join(buildLocation, packagesFolder)), removeRecursive(packagesCacheLocation));
+  removeRecursive(join(buildLocation, frameworkCssFolder)), removeRecursive(join(buildLocation, packagesFolder)), removeRecursive(packagesCacheLocation), removeRecursive(stylesCacheLocation), removeRecursive(rawBuildLocation));
 }
 if (clean && targets.has('css')) {
   cleanTasks.push(removeRecursive(join(buildLocation, staticFolder)));
@@ -141,7 +145,10 @@ if (targets.has('js')) {
     quiet,
     packages,
     tests,
+    fresh,
     packagesCacheLocation,
+    stylesCacheLocation,
+    rawBuildLocation,
     onCycleComplete: watch ? async cycle => {
       if (cycle.success) {
         await markReady();

package/dist/bin/commands/compileSimplePackage.js

@@ -1,5 +1,5 @@
-import { findProjectDir } from "../../findProjectDir.js";
-import { cliInfo, cliLog } from "../../cliOutput.js";
+import { findProjectDir } from '../../findProjectDir.js';
+import { cliInfo, cliLog } from '../../cliOutput.js';
 cliInfo('tungsten compile-simple-package is not ready yet');
 process.exit(2);
 const projectDir = process.cwd();

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":"AAuEA,OAAO,EAAE,CAAA"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/dev.ts"],"names":[],"mappings":"AA4EA,OAAO,EAAE,CAAA"}

package/dist/bin/commands/dev.js

@@ -1,9 +1,9 @@
 import open from 'open';
-import { cliOut } from "../../cliOutput.js";
-import { Framework } from "../../Framework.js";
-import { warnOnFrameworkChange } from "../../warnOnFrameworkChange.js";
-import { createTimeProfiler, reportRunTotal, reportStartupPhase } from "../../timeProfiler.js";
-import { cliArgs } from "../args.js";
+import { cliOut } from '../../cliOutput.js';
+import { Framework } from '../../Framework.js';
+import { warnOnFrameworkChange } from '../../warnOnFrameworkChange.js';
+import { createTimeProfiler, reportRunTotal, reportStartupPhase } from '../../timeProfiler.js';
+import { cliArgs } from '../args.js';
 //import dotenv from 'dotenv'
 //dotenv.config({ path: '.private.env' })
 // first statement in the body, so it closes off the import evaluation above
@@ -11,12 +11,18 @@ reportStartupPhase('load dev modules');
 const {
   boot,
   profile,
-  tests
+  tests,
+  fresh,
+  clean
 } = cliArgs({
   boot: '--no-boot',
   profile: '--profile',
+  // also delete the packages and styles caches, not only the dev build
+  clean: '--clean',
   // also compile the files config.testDirs/testPatterns match - normally only a test compile does
-  tests: '--tests'
+  tests: '--tests',
+  // compile everything from source, ignoring the packages and styles caches (they are rewritten)
+  fresh: '--fresh'
 }, {
   handledElsewhere: ['--profile-modules']
 });
@@ -24,11 +30,12 @@ const {
 const sxyFramework = new Framework();
 sxyFramework.profiler = createTimeProfiler(profile);
 sxyFramework.tests = tests;
+sxyFramework.fresh = fresh;
 const config = await sxyFramework.init();
 //console.log('framework ready')
 // build for dev
-cliOut('Removing old builds');
-await sxyFramework.clean('dev');
+cliOut(clean ? 'Removing the dev build and its caches' : 'Removing old builds');
+await sxyFramework.clean(clean ? 'dev-full' : 'dev');
 //cliOut('cleaned')
 cliOut('Building');
 await sxyFramework.build('dev');

package/dist/bin/commands/devmon.js

@@ -5,12 +5,12 @@ import { spawn } from 'node:child_process';
 import { join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import chokidar from 'chokidar';
-import { cliError } from "../../cliOutput.js";
-import { getFrameworkDir } from "../../getFrameworkDir.js";
-import { cliArgs } from "../args.js";
+import { cliError } from '../../cliOutput.js';
+import { getFrameworkDir } from '../../getFrameworkDir.js';
+import { cliArgs } from '../args.js';
 // devmon reads none of its arguments itself - it passes them straight through to the dev child
 cliArgs({}, {
-  handledElsewhere: ['--no-boot', '--profile', '--profile-modules']
+  handledElsewhere: ['--no-boot', '--clean', '--fresh', '--tests', '--profile', '--profile-modules']
 });
 const initialArgs = process.argv.slice(3);
 // a restart must not reopen the browser tab, so it always carries --no-boot

package/dist/bin/commands/help.js

@@ -1,9 +1,9 @@
-import { cliOut } from "../../cliOutput.js";
+import { cliOut } from '../../cliOutput.js';
 const command = process.argv[2];
 cliOut(`Usage: tungsten <command> [options]
 
 Commands:
-  dev                   Start dev mode [--no-boot] [--profile] [--profile-modules]
+  dev                   Start dev mode [--no-boot] [--clean] [--fresh] [--tests] [--profile] [--profile-modules]
   devmon                Dev mode, auto-restarts on framework rebuilds (same options as dev)
   build                 Production build [--profile] [--profile-modules] [--quiet]
   start                 Start production server

package/dist/bin/commands/start.js

@@ -1,5 +1,5 @@
-import { Framework } from "../../Framework.js";
-import { cliArgs } from "../args.js";
+import { Framework } from '../../Framework.js';
+import { cliArgs } from '../args.js';
 //import dotenv from 'dotenv'
 //dotenv.config({ path: '.private.env' })
 cliArgs({}); // accepts nothing but --help

package/dist/bin/commands/static.js

@@ -1,7 +1,7 @@
 import open from 'open';
-import { getUserConfig } from "../../getUserConfig.js";
-import { StaticSiteServer } from "../../Servers/StaticSiteServer.js";
-import { cliArgs } from "../args.js";
+import { getUserConfig } from '../../getUserConfig.js';
+import { StaticSiteServer } from '../../Servers/StaticSiteServer.js';
+import { cliArgs } from '../args.js';
 cliArgs({}); // accepts nothing but --help
 const staticServer = new StaticSiteServer(await getUserConfig());
 const staticServerLocation = await staticServer.start();