tungsten 0.4.3 → 0.4.5

package/dist/.build-complete

@@ -1 +1 @@
-1788299975003
+1788306927004

package/dist/Framework.d.ts

@@ -14,6 +14,7 @@ export declare class Framework {
     devServer?: DevServer;
     prodServer?: ProdServer;
     profiler: TimeProfiler;
+    quiet: boolean;
     init(): Promise<FrameworkConfigComplete>;
     build(mode: Mode): Promise<void>;
     clean(mode?: Mode | 'staticSite'): Promise<void>;

package/dist/Framework.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Framework.d.ts","sourceRoot":"","sources":["../src/Framework.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAKrC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEpD,OAAO,EAA+B,qBAAqB,EAAE,MAAM,mCAAmC,CAAA;AAEtG,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AA8BxD,OAAO,EAAsB,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAIzE,qBAAa,SAAS;IAClB,MAAM,CAAC,EAAE,uBAAuB,CAAA;IAChC,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,gBAAgB,CAAC,EAAE,qBAAqB,CAAA;IACxC,mBAAmB,CAAC,EAAE,aAAa,CAAA;IACnC,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,UAAU,CAAC,EAAE,UAAU,CAAA;IAIvB,QAAQ,EAAE,YAAY,CAA4B;IAE5C,IAAI,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAQxC,KAAK,CAAC,IAAI,EAAE,IAAI;IAqBhB,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,YAAY;IA0BhC,SAAS;YAID,aAAa;YAab,cAAc;YASd,mBAAmB;YAcnB,MAAM;IAcd,eAAe,IAAI,OAAO,CAAC,SAAS,CAAC;IA0BrC,aAAa,CAAC,MAAM,EAAE,uBAAuB;IAgI7C,gBAAgB,IAAI,OAAO,CAAC,UAAU,CAAC;CA+DhD"}
+{"version":3,"file":"Framework.d.ts","sourceRoot":"","sources":["../src/Framework.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAKrC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEpD,OAAO,EAA+B,qBAAqB,EAAE,MAAM,mCAAmC,CAAA;AAEtG,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AA8BxD,OAAO,EAAsB,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAIzE,qBAAa,SAAS;IAClB,MAAM,CAAC,EAAE,uBAAuB,CAAA;IAChC,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,gBAAgB,CAAC,EAAE,qBAAqB,CAAA;IACxC,mBAAmB,CAAC,EAAE,aAAa,CAAA;IACnC,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,UAAU,CAAC,EAAE,UAAU,CAAA;IAIvB,QAAQ,EAAE,YAAY,CAA4B;IAElD,KAAK,UAAQ;IAEP,IAAI,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAQxC,KAAK,CAAC,IAAI,EAAE,IAAI;IAsBhB,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,YAAY;IA0BhC,SAAS;YAID,aAAa;YAab,cAAc;YASd,mBAAmB;YAcnB,MAAM;IAcd,eAAe,IAAI,OAAO,CAAC,SAAS,CAAC;IA2BrC,aAAa,CAAC,MAAM,EAAE,uBAAuB;IAiI7C,gBAAgB,IAAI,OAAO,CAAC,UAAU,CAAC;CA+DhD"}

package/dist/Framework.js

@@ -47,6 +47,8 @@ export class Framework {
     // timeProfiler.ts. Public so those commands can also profile their own top-level phases
     // (createDevServer, devServer.start) with the same instance.
     _defineProperty(this, "profiler", createTimeProfiler(false));
+    // tungsten build --quiet: drop progress messages, keep warnings and errors
+    _defineProperty(this, "quiet", false);
   }
   async init() {
     // const configOrUndefined = await this.getUserConfig()
@@ -62,7 +64,8 @@ export class Framework {
         const proms = [this.profiler.timeProfileAsync('compile user app', () => this.compileUserApp('dev')), this.profiler.timeProfileAsync('copy framework assets', () => this.copyFrameworkAssets('dev'))];
         await Promise.all(proms);
         //await devBundle()
-        cliNews(`Build complete`);
+        // dev branch: only tungsten build sets quiet, so this check cannot fire yet
+        if (!this.quiet) cliNews(`Build complete`);
       } else {
         const proms = [this.profiler.timeProfileAsync('compile user app', () => this.compileUserApp('prod')), this.profiler.timeProfileAsync('copy framework assets', () => this.copyFrameworkAssets('prod'))];
         await Promise.all(proms);
@@ -102,7 +105,7 @@ export class Framework {
     await this.profiler.timeProfileAsync('static gen', () => staticGen(this));
   }
   async getUserConfig() {
-    return this.config = await getUserConfig();
+    return this.config = await getUserConfig(null, this.quiet ? 'silent' : 'noisy');
     // const userConfigOrNull = await findUserConfig(process.cwd())
     // if (userConfigOrNull !== null) {
     //     const userConfig = userConfigOrNull
@@ -117,7 +120,7 @@ export class Framework {
       throw new TungstenError(`SxyFramework.compileUserApp() error: config is undefined`);
     }
     const projectDir = process.cwd();
-    const compilationInfo = await compileUserApp(projectDir, this.config, mode, this.profiler);
+    const compilationInfo = await compileUserApp(projectDir, this.config, mode, this.profiler, this.quiet);
     this.compilationInfo = compilationInfo;
     return compilationInfo;
   }
@@ -125,17 +128,17 @@ export class Framework {
     if (this.config === undefined) {
       throw new TungstenError(`SxyFramework.copyFrameworkAssets() error: config is undefined`);
     }
-    cliOut(`Getting framework modules`);
+    if (!this.quiet) cliOut(`Getting framework modules`);
     this.frameworkModules = getAllTungstenClientModules();
-    cliOut(`Getting framework client aliases`);
+    if (!this.quiet) cliOut(`Getting framework client aliases`);
     this.clientImportAliases = getTungstenClientPackageAliases();
-    cliOut(`Creating app files`);
+    if (!this.quiet) cliOut(`Creating app files`);
     await Promise.all([createInstanceConfigFile(this.config, mode), createClientFiles(this.config, mode)]);
   }
   async bundle() {
     const projectDir = process.cwd();
     if (this.config === undefined) throw new TungstenError(`SxyFramework.bundle() error, this.config is undefined`);
-    await bundle(projectDir);
+    await bundle(projectDir, this.quiet);
     // rollup extracts the framework component css in its own process, so the manifest only
     // exists once bundling has finished
     if (this.compilationInfo !== undefined) {
@@ -148,7 +151,8 @@ export class Framework {
   }
   async createDevServer() {
     return this.profiler.timeProfileAsync('create dev server', async () => {
-      cliOut(`Creating dev server`);
+      // dev only: only tungsten build sets quiet, so this check cannot fire yet
+      if (!this.quiet) cliOut(`Creating dev server`);
       // TS define requires a var to exist or not, so we will initialize it to undefined to satisfy this expectation
       global.tungstenPublicEnv = {};
       // should we default the debug value? we'd have issues if they set DEBUG to undef
@@ -194,10 +198,11 @@ export class Framework {
       ...process.env
     };
     //const envsLoadedMessages: string[] = []
+    const quiet = this.quiet;
     function loadEnv(fileName, filePath, prefix = '') {
       const env = dotenv.parse(readFileSync(filePath, 'utf-8'));
       someEnvLoaded = true;
-      cliOut(`${fileName} loaded from ${filePath}`);
+      if (!quiet) cliOut(`${fileName} loaded from ${filePath}`);
       addToEnv(env, process.env, prefix, trueEnv, config.suppressEnvOverwriteWarnings);
       //console.log('process.env after injecting ' + fileName, process.env)
     }
@@ -224,7 +229,7 @@ export class Framework {
     if (publicEnvExists) {
       await loadEnv('.env.public', publicEnvLocation, 'TUNGSTEN_PUBLIC_');
     }
-    if (!someEnvLoaded) cliOut('No env files were loaded');
+    if (!someEnvLoaded && !this.quiet) cliOut('No env files were loaded');
     // If there are env schemas, load the relevant env and parse with schemas
     if ('privateEnvSchema' in envSchemas) {
       // parse process.env
@@ -237,7 +242,7 @@ export class Framework {
       // is set to alter data
       const withCorePrivateEnv = tungstenCorePrivateEnvSchema.parse(privateEnv);
       global.tungstenPrivateEnv = withCorePrivateEnv;
-      cliOut('tungsten private env loaded and passed schema validation'); // save this so that we can show all messages about loading .env files first
+      if (!this.quiet) cliOut('tungsten private env loaded and passed schema validation'); // save this so that we can show all messages about loading .env files first
     }
     if ('publicEnvSchema' in envSchemas) {
       // const filteredEnv = objectMap(
@@ -258,7 +263,7 @@ export class Framework {
       writeFileSync(clientWithEnvHandle, publicEnvContent);
       writeFileSync(clientWithEnvHandle, clientContents);
       closeSync(clientWithEnvHandle);
-      cliOut('tungsten public env loaded and passed schema validation'); // save this so that we can show all messages about loading .env files first
+      if (!this.quiet) cliOut('tungsten public env loaded and passed schema validation'); // save this so that we can show all messages about loading .env files first
     } else {
       //cliOut('copy client to clientWithEnv.js')
       copyFileSync(join(projectDir, bundleFolder, 'client.js'), join(projectDir, bundleFolder, 'clientWithEnv.js'));

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

package/dist/bin/commands/build.js

@@ -4,14 +4,17 @@ import { Framework } from "../../Framework.js";
 import { cliOut, cliNews, cliWarn } from "../../cliOutput.js";
 import { staticSiteFolder } from "../../settings.js";
 import { createTimeProfiler } from "../../timeProfiler.js";
-const profile = process.argv.slice(3).includes('--profile');
+const args = process.argv.slice(3);
+const profile = args.includes('--profile');
+const quiet = args.includes('--quiet');
 //// prep the app
 const sxyFramework = new Framework();
 sxyFramework.profiler = createTimeProfiler(profile);
+sxyFramework.quiet = quiet;
 await sxyFramework.init();
-cliOut('Removing old builds');
+if (!quiet) cliOut('Removing old builds');
 await sxyFramework.clean('prod');
-cliOut('Building');
+if (!quiet) cliOut('Building');
 await sxyFramework.build('prod');
 // //// dev
 // import { prodBuildFolder } from '../../settings.js'
@@ -22,11 +25,11 @@ await sxyFramework.build('prod');
 // //// end dev
 if (sxyFramework.config.staticSite) {
   // eslint-disable-line @typescript-eslint/no-non-null-assertion, no-type-assertion/no-type-assertion -- config better be set
-  cliOut(`Building static site`);
+  if (!quiet) cliOut(`Building static site`);
   await sxyFramework.clean('staticSite');
   await sxyFramework.staticGen();
-  cliNews(`Static site generation complete. Your site is in ${staticSiteFolder}.` + ` View it with ${chalk.brightblue('npx tungsten static')}` + ` or add ${chalk.brightblue('"static": "tungsten static"')} to your package.json scripts` + ` and run ${chalk.brightblue('pnpm static')}`);
-} else {
+  if (!quiet) cliNews(`Static site generation complete. Your site is in ${staticSiteFolder}.` + ` View it with ${chalk.brightblue('npx tungsten static')}` + ` or add ${chalk.brightblue('"static": "tungsten static"')} to your package.json scripts` + ` and run ${chalk.brightblue('pnpm static')}`);
+} else if (!quiet) {
   cliNews(`Production build complete`);
 }
 // The build no longer holds anything open, so it ends by draining the event loop - hard-exiting

package/dist/bin/commands/buildHelp.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=buildHelp.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"buildHelp.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/buildHelp.ts"],"names":[],"mappings":""}

package/dist/bin/commands/buildHelp.js

@@ -0,0 +1,7 @@
+// 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]
+
+Options:
+  --profile   report the time taken by each build phase
+  --quiet     suppress progress output; warnings and errors still print`);

package/dist/bin/commands/help.js

@@ -5,7 +5,7 @@ cliOut(`Usage: tungsten <command> [options]
 Commands:
   dev                   Start dev mode [--no-boot] [--profile]
   devmon                Dev mode, auto-restarts on framework rebuilds (same options as dev)
-  build                 Production build [--profile]
+  build                 Production build [--profile] [--quiet]
   start                 Start production server
   static                Preview a static site build
   clean                 Delete build assets

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

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

package/dist/bin/index.js

@@ -29,7 +29,12 @@ switch (command) {
     }
   case 'build':
     {
-      cliOut(`Starting Tungsten production build`);
+      if (args.includes('--help') || args.includes('-h')) {
+        await import("./commands/buildHelp.js");
+        break;
+      }
+      // announce before the import: resolving the build's dependencies is a long silent wait
+      if (!args.includes('--quiet')) cliOut(`Starting Tungsten production build`);
       process.env.__TUNGSTEN_ENV = 'production';
       process.env.__TUNGSTEN_DEBUG = 'true';
       await import("./commands/build.js");

package/dist/build/bundle.d.ts

@@ -1,2 +1,2 @@
-export declare function bundle(projectDir: string): Promise<unknown>;
+export declare function bundle(projectDir: string, quiet?: boolean): Promise<unknown>;
 //# sourceMappingURL=bundle.d.ts.map

package/dist/build/bundle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../src/build/bundle.ts"],"names":[],"mappings":"AAUA,wBAAsB,MAAM,CAAC,UAAU,EAAE,MAAM,oBAyC9C"}
+{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../src/build/bundle.ts"],"names":[],"mappings":"AAUA,wBAAsB,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,UAAQ,oBAyC7D"}

package/dist/build/bundle.js

@@ -5,9 +5,9 @@ import { spawnShellCommand } from "../spawnShellCommand.js";
 import { prodBuildFolder, bundleFolder, frameworkDistFolder, clientFolder } from "../settings.js";
 import { errorOut } from "../output.js";
 import { cliLog, cliOut } from "../cliOutput.js";
-export async function bundle(projectDir /*, appConfig: FrameworkConfigComplete*/) {
+export async function bundle(projectDir, quiet = false /*, appConfig: FrameworkConfigComplete*/) {
   return new Promise((resolve, reject) => {
-    cliOut('Bundling application');
+    if (!quiet) cliOut('Bundling application');
     const frameworkDir = findProjectDir(import.meta.url);
     // if (appConfig.useRootComponent) {
     //     let rootComponent = appConfig.rootComponent as string
@@ -17,11 +17,13 @@ export async function bundle(projectDir /*, appConfig: FrameworkConfigComplete*/
       //'node-fetch'
     ];
     const command = `cd ${frameworkDir} && npx rollup` + ` --input "${join(projectDir, prodBuildFolder, clientFolder, 'client.js')}"` + ` --file "${join(projectDir, bundleFolder, 'client.js')}"` + ` --config "${join(frameworkDir, frameworkDistFolder, 'build/rollup.user.prod.config.js')}"` + (externalModules.length > 0 ? ` --external ${externalModules.join(',')}` : ``) + ` --inlineDynamicImports --format iife`;
-    cliLog('bundle command:', command);
+    if (!quiet) cliLog('bundle command:', command);
     const subProcess = spawnShellCommand(command, {
       cwd: frameworkDir /*cwd: projectDir*/ /*, stdio: 'inherit'*/
     });
-    subProcess.on('data', data => cliLog(data));
+    subProcess.on('data', data => {
+      if (!quiet) cliLog(data);
+    });
     subProcess.on('close', (code, message) => {
       if (code === 0) resolve(null);else {
         // can we show teh error message? Only getting err code now I think

package/dist/build/compileJavascript.js

@@ -14,7 +14,7 @@ import { getFrameworkDir } from "../getFrameworkDir.js";
 ///// needs work to work in prod mode
 ///// see babel config
 export async function compileJavascript(projectDir, appConfig, codeLocation, sourceLocation, styleImportBase, buildLocation, buildCodeLocation, mode, watch = true, options = {}) {
-  cliOut(`Compiling app code`);
+  if (options.quiet !== true) cliOut(`Compiling app code`);
   let dependencyGraphDir = '';
   let dependencyGraphLocation = '';
   let oldDependencyGraph = {};

package/dist/build/compileStyles.d.ts

@@ -1,3 +1,3 @@
 import type { FrameworkConfigComplete } from '../FrameworkConfig.js';
-export declare function compileStyles(projectDir: string, config: FrameworkConfigComplete, styleImportBase: string, buildLocation: string, watch?: boolean, onChange?: () => void): Promise<unknown>;
+export declare function compileStyles(projectDir: string, config: FrameworkConfigComplete, styleImportBase: string, buildLocation: string, watch?: boolean, onChange?: () => void, quiet?: boolean): Promise<unknown>;
 //# sourceMappingURL=compileStyles.d.ts.map

package/dist/build/compileStyles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compileStyles.d.ts","sourceRoot":"","sources":["../../src/build/compileStyles.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAgOpE,wBAAsB,aAAa,CAC/B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,uBAAuB,EAC/B,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,EACrB,KAAK,UAAO,EACZ,QAAQ,CAAC,EAAE,MAAM,IAAI,oBAiGxB"}
+{"version":3,"file":"compileStyles.d.ts","sourceRoot":"","sources":["../../src/build/compileStyles.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAgOpE,wBAAsB,aAAa,CAC/B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,uBAAuB,EAC/B,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,EACrB,KAAK,UAAO,EACZ,QAAQ,CAAC,EAAE,MAAM,IAAI,EACrB,KAAK,UAAQ,oBAiGhB"}

package/dist/build/compileStyles.js

@@ -183,8 +183,8 @@ async function processAndCopyFile(sourceLocation, targetLocation, filePathFull,
   }
   cssFiles[targetRelFile] = relFile;
 }
-export async function compileStyles(projectDir, config, styleImportBase, buildLocation, watch = true, onChange) {
-  cliOut(`Compiling app stylesheets`);
+export async function compileStyles(projectDir, config, styleImportBase, buildLocation, watch = true, onChange, quiet = false) {
+  if (!quiet) cliOut(`Compiling app stylesheets`);
   // we need to create and maintain a dependency tree for correct updating
   // we are going to save the dependencies of each file
   const cssDependencies = {};

package/dist/build/compileUserApp.d.ts

@@ -2,5 +2,5 @@ import type { CompilationInfo } from './CompilationInfo.js';
 import type { FrameworkConfigComplete } from '../FrameworkConfig.js';
 import type { Mode } from '../Mode.js';
 import { type TimeProfiler } from '../timeProfiler.js';
-export declare function compileUserApp(projectDir: string, appConfig: FrameworkConfigComplete, mode: Mode, profiler?: TimeProfiler): Promise<CompilationInfo>;
+export declare function compileUserApp(projectDir: string, appConfig: FrameworkConfigComplete, mode: Mode, profiler?: TimeProfiler, quiet?: boolean): Promise<CompilationInfo>;
 //# sourceMappingURL=compileUserApp.d.ts.map

package/dist/build/compileUserApp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compileUserApp.d.ts","sourceRoot":"","sources":["../../src/build/compileUserApp.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AACpE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAWtC,OAAO,EAAsB,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAI1E,wBAAsB,cAAc,CAChC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,uBAAuB,EAAE,IAAI,EAAE,IAAI,EAClE,QAAQ,GAAE,YAAwC,GACnD,OAAO,CAAC,eAAe,CAAC,CAyE1B"}
+{"version":3,"file":"compileUserApp.d.ts","sourceRoot":"","sources":["../../src/build/compileUserApp.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AACpE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAWtC,OAAO,EAAsB,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAI1E,wBAAsB,cAAc,CAChC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,uBAAuB,EAAE,IAAI,EAAE,IAAI,EAClE,QAAQ,GAAE,YAAwC,EAAE,KAAK,UAAQ,GAClE,OAAO,CAAC,eAAe,CAAC,CA2E1B"}

package/dist/build/compileUserApp.js

@@ -9,7 +9,7 @@ import { writeFrameworkCss } from "./frameworkStylesheets.js";
 import { emitReloadEvent } from "../hmr/liveReloadHub.js";
 import { createTimeProfiler } from "../timeProfiler.js";
 //import { compileEnv } from './compileEnv.js'
-export async function compileUserApp(projectDir, appConfig, mode, profiler = createTimeProfiler(false)) {
+export async function compileUserApp(projectDir, appConfig, mode, profiler = createTimeProfiler(false), quiet = false) {
   const codeLocation = join(projectDir, appConfig.codeDir);
   const relSourceDir = appConfig.sourceDir !== undefined && appConfig.sourceDir !== '' ? appConfig.sourceDir : appConfig.codeDir;
   const sourceLocation = join(projectDir, relSourceDir);
@@ -21,15 +21,18 @@ export async function compileUserApp(projectDir, appConfig, mode, profiler = cre
   // open, so the command could only ever end by hard-exiting
   const watch = mode === 'dev';
   const compileJavascriptPromise = profiler.timeProfileAsync('compile javascript', () => compileJavascript(projectDir, appConfig, codeLocation, sourceLocation, styleImportBase, buildLocation, buildCodeLocation, mode, watch, mode === 'dev' ? {
+    quiet,
     hmr: appConfig.hmr === true,
     onCycleComplete: cycle => {
       if (cycle.success) emitReloadEvent('js', cycle.file);
     }
-  } : {}));
+  } : {
+    quiet
+  }));
   //const compileEnvPromise = compileEnv(projectDir, appConfig, codeLocation, buildLocation, mode)
-  const compileStylesPromise = profiler.timeProfileAsync('compile styles', () => compileStyles(projectDir, appConfig, styleImportBase, buildLocation, watch, mode === 'dev' ? () => emitReloadEvent('css') : undefined));
-  const copyAssetsPromise = profiler.timeProfileAsync('copy assets', () => copyAssets(projectDir, appConfig, buildLocation, watch));
-  const copyPublicFilesPromise = profiler.timeProfileAsync('copy public files', () => copyPublicFiles(projectDir, appConfig, buildLocation, watch));
+  const compileStylesPromise = profiler.timeProfileAsync('compile styles', () => compileStyles(projectDir, appConfig, styleImportBase, buildLocation, watch, mode === 'dev' ? () => emitReloadEvent('css') : undefined, quiet));
+  const copyAssetsPromise = profiler.timeProfileAsync('copy assets', () => copyAssets(projectDir, appConfig, buildLocation, watch, quiet));
+  const copyPublicFilesPromise = profiler.timeProfileAsync('copy public files', () => copyPublicFiles(projectDir, appConfig, buildLocation, watch, quiet));
   const {
     importAliases
   } = await compileJavascriptPromise;

package/dist/build/copyAssets.d.ts

@@ -1,3 +1,3 @@
 import type { FrameworkConfigComplete } from '../FrameworkConfig.js';
-export declare function copyAssets(projectDir: string, config: FrameworkConfigComplete, buildLocation: string, watch?: boolean): Promise<unknown>;
+export declare function copyAssets(projectDir: string, config: FrameworkConfigComplete, buildLocation: string, watch?: boolean, quiet?: boolean): Promise<unknown>;
 //# sourceMappingURL=copyAssets.d.ts.map

package/dist/build/copyAssets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"copyAssets.d.ts","sourceRoot":"","sources":["../../src/build/copyAssets.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAiBpE,wBAAsB,UAAU,CAC5B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,uBAAuB,EAC/B,aAAa,EAAE,MAAM,EACrB,KAAK,UAAO,oBA2Df"}
+{"version":3,"file":"copyAssets.d.ts","sourceRoot":"","sources":["../../src/build/copyAssets.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAiBpE,wBAAsB,UAAU,CAC5B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,uBAAuB,EAC/B,aAAa,EAAE,MAAM,EACrB,KAAK,UAAO,EACZ,KAAK,UAAQ,oBA2DhB"}

package/dist/build/copyAssets.js

@@ -14,9 +14,9 @@ async function copyFile(assetsLocation, targetLocation, filePathFull, event) {
   });
   return fsPromises.copyFile(filePathFull, target);
 }
-export async function copyAssets(projectDir, config, buildLocation, watch = true) {
+export async function copyAssets(projectDir, config, buildLocation, watch = true, quiet = false) {
   if (config.assetsDir !== undefined) {
-    cliOut(`Copying assets`);
+    if (!quiet) cliOut(`Copying assets`);
     const assetsLocation = join(projectDir, config.assetsDir);
     const targetLocation = join(buildLocation, '.assets' /*, config.assetsDir*/);
     //console.log('copy assets from', assetsLocation, 'to', targetLocation)

package/dist/build/copyPublicFiles.d.ts

@@ -1,3 +1,3 @@
 import type { FrameworkConfigComplete } from '../FrameworkConfig.js';
-export declare function copyPublicFiles(projectDir: string, config: FrameworkConfigComplete, buildLocation: string, watch?: boolean): Promise<unknown>;
+export declare function copyPublicFiles(projectDir: string, config: FrameworkConfigComplete, buildLocation: string, watch?: boolean, quiet?: boolean): Promise<unknown>;
 //# sourceMappingURL=copyPublicFiles.d.ts.map

package/dist/build/copyPublicFiles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"copyPublicFiles.d.ts","sourceRoot":"","sources":["../../src/build/copyPublicFiles.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAiBpE,wBAAsB,eAAe,CACjC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,uBAAuB,EAC/B,aAAa,EAAE,MAAM,EACrB,KAAK,UAAO,oBA4Df"}
+{"version":3,"file":"copyPublicFiles.d.ts","sourceRoot":"","sources":["../../src/build/copyPublicFiles.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAiBpE,wBAAsB,eAAe,CACjC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,uBAAuB,EAC/B,aAAa,EAAE,MAAM,EACrB,KAAK,UAAO,EACZ,KAAK,UAAQ,oBA4DhB"}

package/dist/build/copyPublicFiles.js

@@ -14,9 +14,9 @@ async function copyFile(assetsLocation, targetLocation, filePathFull, event) {
   });
   return fsPromises.copyFile(filePathFull, target);
 }
-export async function copyPublicFiles(projectDir, config, buildLocation, watch = true) {
+export async function copyPublicFiles(projectDir, config, buildLocation, watch = true, quiet = false) {
   //if ( config.publicDir !== undefined ) {
-  cliOut(`Copying public files`);
+  if (!quiet) cliOut(`Copying public files`);
   const publicLocation = config.publicDir !== undefined ? join(projectDir, config.publicDir) : join(projectDir, 'public');
   //const targetLocation = buildLocation // to segregate or not to segregate?
   const targetLocation = join(buildLocation, '.public');

package/dist/spawnShellCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spawnShellCommand.d.ts","sourceRoot":"","sources":["../src/spawnShellCommand.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,wBAAwB,EAAE,MAAM,eAAe,CAAA;AAG/D,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,wBAAwB,0DAUlF"}
+{"version":3,"file":"spawnShellCommand.d.ts","sourceRoot":"","sources":["../src/spawnShellCommand.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,wBAAwB,EAAE,MAAM,eAAe,CAAA;AAU/D,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,wBAAwB,0DAalF"}

package/dist/spawnShellCommand.js

@@ -1,12 +1,19 @@
 import { spawn } from 'child_process';
+// Two routes to the same shell command line - flip this to fall back.
+// 'whole-command' hands the string straight to the shell, which is what node wants: an args array
+// alongside shell: true is deprecated (DEP0190) because the args are concatenated unescaped.
+// 'split-args' is the original - splitting on spaces cuts quoted paths in half, and they only
+// survive because the shell re-parses the string it rejoins.
+const route = 'whole-command';
 export function spawnShellCommand(command, extras) {
-  const parts = command.split(' '); // eslint-disable-line no-type-assertion/no-type-assertion -- split returns an array of length at least 1
-  // if (process.platform === 'win32') {
-  //     parts[0] += '.cmd'
-  // }
   const options = {
     shell: true,
     ...extras
   };
+  if (route === 'whole-command') return spawn(command, options);
+  const parts = command.split(' '); // eslint-disable-line no-type-assertion/no-type-assertion -- split returns an array of length at least 1
+  // if (process.platform === 'win32') {
+  //     parts[0] += '.cmd'
+  // }
   return spawn(parts[0], parts.slice(1), options);
 }

package/dist/staticGen/getAppRoutes.d.ts

@@ -1,5 +1,5 @@
 import { FrameworkConfigComplete } from '../FrameworkConfig.js';
 import type { CompilationInfo } from '../build/CompilationInfo.js';
 import { AppRoutes } from 'tungsten/routing/AppRoutes.js';
-export declare function getAppRoutes(compilationInfo: CompilationInfo, config: FrameworkConfigComplete): Promise<AppRoutes>;
+export declare function getAppRoutes(compilationInfo: CompilationInfo, config: FrameworkConfigComplete, quiet?: boolean): Promise<AppRoutes>;
 //# sourceMappingURL=getAppRoutes.d.ts.map

package/dist/staticGen/getAppRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getAppRoutes.d.ts","sourceRoot":"","sources":["../../src/staticGen/getAppRoutes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAGlE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAA;AAMzD,wBAAsB,YAAY,CAAC,eAAe,EAAE,eAAe,EAAE,MAAM,EAAE,uBAAuB,GAC9F,OAAO,CAAC,SAAS,CAAC,CA+BvB"}
+{"version":3,"file":"getAppRoutes.d.ts","sourceRoot":"","sources":["../../src/staticGen/getAppRoutes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAGlE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAA;AAOzD,wBAAsB,YAAY,CAC9B,eAAe,EAAE,eAAe,EAAE,MAAM,EAAE,uBAAuB,EAAE,KAAK,UAAQ,GACjF,OAAO,CAAC,SAAS,CAAC,CAiCpB"}

package/dist/staticGen/getAppRoutes.js

@@ -1,26 +1,29 @@
 import { join } from 'path';
 import { fixExtension } from "../fixExtension.js";
 import { TungstenError } from "../TungstenError.js";
+import { cliLog } from "../cliOutput.js";
 // prod: const appRoutes: AppRoutes = await getRoutes(this.compilationInfo, this.config)
 // this file is outdated and may not work correctly
 // should compare this to the functions used by Servers
-export async function getAppRoutes(compilationInfo, config) {
+export async function getAppRoutes(compilationInfo, config, quiet = false) {
   //const fullBuildLocation = 'file://' + compilationInfo.location
   const routesLocation = config.routesLocation;
   //if (routesLocation === null) return routesLocation // hopefully we are validating
   try {
     if (Array.isArray(routesLocation)) {
       const routesFile = fixExtension(join(compilationInfo.buildCodeLocation, routesLocation[0]));
-      console.log('[1] fullBuildLocation', compilationInfo.location);
-      console.log('[1] routesLocation[0]', routesLocation[0]);
-      console.log('joined', join(compilationInfo.location, routesLocation[0]));
-      console.log('[1] routesFile', routesFile);
+      if (!quiet) {
+        cliLog('[1] fullBuildLocation', compilationInfo.location);
+        cliLog('[1] routesLocation[0]', routesLocation[0]);
+        cliLog('joined', join(compilationInfo.location, routesLocation[0]));
+        cliLog('[1] routesFile', routesFile);
+      }
       const target = 'file://' + routesFile;
-      console.log('[1] target', target);
+      if (!quiet) cliLog('[1] target', target);
       return (await import(target))[routesLocation[1]];
     } else {
       const target = 'file://' + join(compilationInfo.buildCodeLocation, routesLocation);
-      console.log('[2] location', target);
+      if (!quiet) cliLog('[2] location', target);
       const module = await import(target);
       if ('routes' in module) return module.routes;else if ('default' in module) return module.default;else throw new TungstenError(`Err, no 'routes' or 'default' export found in routes file ${routesLocation}`);
     }

package/dist/staticGen/staticGen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"staticGen.d.ts","sourceRoot":"","sources":["../../src/staticGen/staticGen.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAiBhD,wBAAsB,SAAS,CAAC,SAAS,EAAE,SAAS,iBA6MnD"}
+{"version":3,"file":"staticGen.d.ts","sourceRoot":"","sources":["../../src/staticGen/staticGen.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAiBhD,wBAAsB,SAAS,CAAC,SAAS,EAAE,SAAS,iBA+MnD"}

package/dist/staticGen/staticGen.js

@@ -4,7 +4,7 @@ import fsExtra from 'fs-extra';
 //import type { SxyFrameworkConfigComplete } from '../FrameworkConfig.js'
 import { staticSiteFolder, staticFolder, assetsFolder, publicFolder, bundleFolder, componentCssFolder, frameworkCssFolder } from "../settings.js";
 import { getAppRoutes } from "./getAppRoutes.js";
-import { cliError, cliWarn } from "../cliOutput.js";
+import { cliError, cliLog, cliWarn } from "../cliOutput.js";
 import { matchPath } from "../routing/matchPath.js";
 import { throwError } from "../throwError.js";
 import { RouteKeyIsPath, StringIsPath } from "../routing/RouteTypes.js";
@@ -18,11 +18,12 @@ export async function staticGen(framework) {
   if (config === undefined) {
     throwError('staticGen()', `expected framework.config to be set: ${framework.config}`);
   }
+  const quiet = framework.quiet;
   const siteBasePath = config.siteBasePath;
-  console.log('siteBasePath', siteBasePath);
+  if (!quiet) cliLog('siteBasePath', siteBasePath);
   const projectDir = process.cwd();
   //let appRoutes: RouteDefinition[] | Record<RouteKey, RouteDefinition> = await getAppRoutes(framework.compilationInfo, config)
-  const getRoutes = await getAppRoutes(framework.compilationInfo, config);
+  const getRoutes = await getAppRoutes(framework.compilationInfo, config, quiet);
   // ! unsure about this
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
   const appRoutes = getRoutes === null ? {
@@ -89,7 +90,7 @@ export async function staticGen(framework) {
       const url = serverLocation + path;
       let links;
       try {
-        console.log('get URL', url);
+        if (!quiet) cliLog('get URL', url);
         const response = await fetch(url);
         // fetch, unlike axios, resolves on non-2xx - so check explicitly, or we'd
         // write error pages out as static HTML
@@ -145,7 +146,7 @@ export async function staticGen(framework) {
     for (const [path, route] of Object.entries(finalRoutes)) {
       await renderPath(path, siteBasePath);
     }
-    console.log('rewriteMap', rewriteMap);
+    if (!quiet) cliLog('rewriteMap', rewriteMap);
     const copyPromises = [fsExtra.copy(join(buildLocation, staticFolder), join(projectDir, staticSiteFolder)),
     // assets folder
     existsSync(join(buildLocation, assetsFolder)) ? fsExtra.copy(join(buildLocation, assetsFolder), join(projectDir, staticSiteFolder, 'assets')) : null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tungsten",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "",
   "type": "module",
   "bin": {