tungsten 0.4.11 → 0.4.13

package/dist/env/Env.js

@@ -1,7 +1,7 @@
 // const globalObj = (typeof window !== 'undefined') ? window : global
 export {};
 // console.log('providing env')
-// // eslint-disable-next-line no-type-assertion/no-type-assertion
+// // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 // export const tungstenPrivateEnv = globalObj.tungstenPrivateEnv as TungstenPrivateEnv
-// // eslint-disable-next-line no-type-assertion/no-type-assertion
+// // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 // export const tungstenPublicEnv = globalObj.tungstenPublicEnv as TungstenPublicEnv

package/dist/env/addToEnv.js

@@ -1,4 +1,4 @@
-import { cliWarn } from "../cliOutput.js";
+import { cliWarn } from '../cliOutput.js';
 export function addToEnv(newEnv, env = process.env, prefix = '',
 // the real (OS/shell) environment as it was before any .env file was loaded - these values
 // always win over .env files, they're never overwritten, only warned about on conflict

package/dist/env/funcs.js

@@ -1,4 +1,4 @@
-export * from "./privateEnv.js";
-export * from "./privateEnvOrThrow.js";
-export * from "./publicEnv.js";
-export * from "./publicEnvOrThrow.js";
+export * from './privateEnv.js';
+export * from './privateEnvOrThrow.js';
+export * from './publicEnv.js';
+export * from './publicEnvOrThrow.js';

package/dist/env/getEnvSchemas.d.ts

@@ -5,7 +5,7 @@ export type EnvSchemas = {
     privateEnvSchema?: StandardSchema<TungstenEnv & TungstenPrivateEnv>;
     publicEnvSchema?: StandardSchema<TungstenEnv & TungstenPublicEnv>;
 };
-export declare function getEnvSchemas(config: FrameworkConfigComplete, iteration: number, dev: 'dev'): Promise<EnvSchemas>;
+export declare function getEnvSchemas(config: FrameworkConfigComplete, iteration: number, dev: 'dev', buildCodeFolder?: string): Promise<EnvSchemas>;
 export declare function getEnvSchemas(config: FrameworkConfigComplete, iteration?: null, dev?: 'prod'): Promise<EnvSchemas>;
-export declare function getEnvSchemasDev(config: FrameworkConfigComplete, iteration: number): Promise<EnvSchemas>;
+export declare function getEnvSchemasDev(config: FrameworkConfigComplete, iteration: number, buildCodeFolder?: string): Promise<EnvSchemas>;
 //# sourceMappingURL=getEnvSchemas.d.ts.map

package/dist/env/getEnvSchemas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getEnvSchemas.d.ts","sourceRoot":"","sources":["../../src/env/getEnvSchemas.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAEpE,OAAO,EAAyB,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAKjF,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAGxC,MAAM,MAAM,UAAU,GAAG;IACrB,gBAAgB,CAAC,EAAE,cAAc,CAAC,WAAW,GAAG,kBAAkB,CAAC,CAAC;IACpE,eAAe,CAAC,EAAE,cAAc,CAAC,WAAW,GAAG,iBAAiB,CAAC,CAAC;CACrE,CAAA;AAKD,wBAAsB,aAAa,CAAC,MAAM,EAAE,uBAAuB,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,GAChG,OAAO,CAAC,UAAU,CAAC,CAAA;AACrB,wBAAsB,aAAa,CAAC,MAAM,EAAE,uBAAuB,EAAE,SAAS,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,MAAM,GACjG,OAAO,CAAC,UAAU,CAAC,CAAA;AAmDrB,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,uBAAuB,EAAE,SAAS,EAAE,MAAM,uBAGlF"}
+{"version":3,"file":"getEnvSchemas.d.ts","sourceRoot":"","sources":["../../src/env/getEnvSchemas.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAEpE,OAAO,EAAyB,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAMjF,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAGxC,MAAM,MAAM,UAAU,GAAG;IACrB,gBAAgB,CAAC,EAAE,cAAc,CAAC,WAAW,GAAG,kBAAkB,CAAC,CAAC;IACpE,eAAe,CAAC,EAAE,cAAc,CAAC,WAAW,GAAG,iBAAiB,CAAC,CAAC;CACrE,CAAA;AAKD,wBAAsB,aAAa,CAC/B,MAAM,EAAE,uBAAuB,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,eAAe,CAAC,EAAE,MAAM,GACzF,OAAO,CAAC,UAAU,CAAC,CAAA;AACtB,wBAAsB,aAAa,CAAC,MAAM,EAAE,uBAAuB,EAAE,SAAS,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,MAAM,GACjG,OAAO,CAAC,UAAU,CAAC,CAAA;AAwDrB,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,uBAAuB,EAAE,SAAS,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,MAAM,uBAG5G"}

package/dist/env/getEnvSchemas.js

@@ -1,17 +1,23 @@
 import { join } from 'path';
-import { checkIsStandardSchema } from "../standardSchema.js";
-import { fixExtension } from "../fixExtension.js";
-import { throwError } from "../throwError.js";
-import { iterationQueryString } from "../iterationQueryString.js";
-import { importDevModuleWithRetry } from "../importDevModuleWithRetry.js";
-export async function getEnvSchemas(config, iteration = null, mode = 'prod') {
+import { checkIsStandardSchema } from '../standardSchema.js';
+import { fixExtension } from '../fixExtension.js';
+import { devBuildFolder, prodBuildCodeFolder } from '../settings.js';
+import { throwError } from '../throwError.js';
+import { iterationQueryString } from '../iterationQueryString.js';
+import { importDevModuleWithRetry } from '../importDevModuleWithRetry.js';
+export async function getEnvSchemas(config, iteration = null, mode = 'prod',
+// a compiled tree other than the mode's own - a test run's `compile --output`
+buildCodeFolderOverride) {
   const {
     envSchemasLocation
   } = config;
   //if (envSchemasLocation === undefined) return {} // I think we're validating configs now, so don't need this
-  //console.log('envSchemasLocation', envSchemasLocation) 
+  //console.log('envSchemasLocation', envSchemasLocation)
   const projectDir = process.cwd();
-  const fullFilePath = 'file://' + join(projectDir, config.codeDir, fixExtension(envSchemasLocation));
+  // the compiled copy in the build, like every other module the server runs - codeDir may hold
+  // typescript (config.typescript) that node cannot import
+  const buildCodeFolder = buildCodeFolderOverride ?? (mode === 'dev' ? devBuildFolder : prodBuildCodeFolder);
+  const fullFilePath = 'file://' + join(projectDir, buildCodeFolder, fixExtension(envSchemasLocation));
   let module;
   try {
     if (mode === 'dev') {
@@ -40,7 +46,7 @@ export async function getEnvSchemas(config, iteration = null, mode = 'prod') {
   }
 }
 //export function getEnvSchemasDev(config: FrameworkConfigComplete, load: Load) {
-export function getEnvSchemasDev(config, iteration) {
+export function getEnvSchemasDev(config, iteration, buildCodeFolder) {
   //return getEnvSchemas(config, load, true)
-  return getEnvSchemas(config, iteration, 'dev');
+  return getEnvSchemas(config, iteration, 'dev', buildCodeFolder);
 }

package/dist/env/privateEnv.js

@@ -1,5 +1,5 @@
-import { isClient } from "../isClient.js";
-import { throwError } from "../throwError.js";
+import { isClient } from '../isClient.js';
+import { throwError } from '../throwError.js';
 export function privateEnv(key) {
   if (isClient) throw new Error('Error, tried to access privateEnv from client');
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition

package/dist/env/privateEnvOrThrow.js

@@ -1,4 +1,4 @@
-import { privateEnv } from "./privateEnv.js";
+import { privateEnv } from './privateEnv.js';
 export function privateEnvOrThrow(key) {
   const v = privateEnv(key);
   if (v === undefined) throw new Error(`${String(key)} is missing from .env.private`);

package/dist/env/publicEnv.js

@@ -1,4 +1,4 @@
-import { throwError } from "../throwError.js";
+import { throwError } from '../throwError.js';
 export function publicEnv(key) {
   if (tungstenPublicEnv === undefined) {
     // eslint-disable-line @typescript-eslint/no-unnecessary-condition

package/dist/env/publicEnvOrThrow.js

@@ -1,4 +1,4 @@
-import { publicEnv } from "./publicEnv.js";
+import { publicEnv } from './publicEnv.js';
 export function publicEnvOrThrow(key) {
   const v = publicEnv(key);
   if (v === undefined) throw new Error(`${String(key)} is missing from .env.public`);

package/dist/env/windowGlobalEnvStatement.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"windowGlobalEnvStatement.d.ts","sourceRoot":"","sources":["../../src/env/windowGlobalEnvStatement.ts"],"names":[],"mappings":"AAGA,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7E"}
+{"version":3,"file":"windowGlobalEnvStatement.d.ts","sourceRoot":"","sources":["../../src/env/windowGlobalEnvStatement.ts"],"names":[],"mappings":"AAEA,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7E"}

package/dist/filePathFromUrl.js

@@ -1,4 +1,4 @@
-import { TungstenError } from "./TungstenError.js";
+import { TungstenError } from './TungstenError.js';
 export function filePathFromUrl(url) {
   const prefix = 'file://';
   if (url.slice(0, prefix.length) !== prefix) {

package/dist/findProjectDir.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findProjectDir.d.ts","sourceRoot":"","sources":["../src/findProjectDir.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,qBAAqB,GAAG;IAIhC,WAAW,CAAC,EAAE,OAAO,CAAA;CACxB,CAAA;AAED,wBAAgB,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,GAAE,qBAA0B,UAkBxF"}
+{"version":3,"file":"findProjectDir.d.ts","sourceRoot":"","sources":["../src/findProjectDir.ts"],"names":[],"mappings":"AAkBA,MAAM,MAAM,qBAAqB,GAAG;IAIhC,WAAW,CAAC,EAAE,OAAO,CAAA;CACxB,CAAA;AAED,wBAAgB,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,GAAE,qBAA0B,UAkBxF"}

package/dist/findProjectDir.js

@@ -1,13 +1,27 @@
-import { dirname } from 'path';
+import { dirname, join } from 'path';
+import { existsSync, readFileSync } from 'fs';
 import { fileURLToPath } from 'url';
-import packageJsonFinder from 'find-package-json';
-import { TungstenError } from "./TungstenError.js";
+import { TungstenError } from './TungstenError.js';
+// find-package-json in-house: every package.json from startLocation up to the root
+function* packageJsonFinder(startLocation) {
+  let dir = startLocation;
+  for (;;) {
+    const filename = join(dir, 'package.json');
+    if (existsSync(filename)) yield {
+      filename,
+      value: JSON.parse(readFileSync(filename, 'utf8'))
+    };
+    const parent = dirname(dir);
+    if (parent === dir) return;
+    dir = parent;
+  }
+}
 export function findProjectDir(startLocation, options = {}) {
   if (startLocation.startsWith('file:')) startLocation = fileURLToPath(startLocation);
   const finder = packageJsonFinder(startLocation);
   let packageJson = finder.next();
   if (options.requireName) {
-    while (!packageJson.done && !hasName(packageJson.value)) {
+    while (!packageJson.done && !hasName(packageJson.value.value)) {
       packageJson = finder.next();
     }
     if (packageJson.done) {
@@ -18,7 +32,7 @@ export function findProjectDir(startLocation, options = {}) {
     // couldn't find a package.json
     throw new TungstenError(`findProjectDir() error - could not find the package.json is the project directory`);
   }
-  return dirname(packageJson.filename);
+  return dirname(packageJson.value.filename);
 }
 function hasName(packageJson) {
   return typeof packageJson === 'object' && packageJson !== null && 'name' in packageJson && typeof packageJson.name === 'string' && packageJson.name !== '';

package/dist/findUserConfig.js

@@ -1,13 +1,13 @@
 import fs from 'fs';
-import slash from 'slash';
-import { loadPackageDotJsonFromDir } from "./loadPackageDotJsonFromDir.js";
-import { configName } from "./packageSettings.js";
-import { cliNote, cliWarn } from "./cliOutput.js";
-import { TungstenError } from "./TungstenError.js";
-import { packageNameCapitalized } from "./settings.js";
+import slash from './slash.js';
+import { loadPackageDotJsonFromDir } from './loadPackageDotJsonFromDir.js';
+import { configName } from './packageSettings.js';
+import { cliNote, cliWarn } from './cliOutput.js';
+import { TungstenError } from './TungstenError.js';
+import { packageNameCapitalized } from './settings.js';
 //import { throwError } from './throwError.js' 
 export async function findUserConfig(projectDir, volume = 'noisy') {
-  const packageConfig = await loadPackageDotJsonFromDir(projectDir); // eslint-disable-line no-type-assertion/no-type-assertion
+  const packageConfig = await loadPackageDotJsonFromDir(projectDir); // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
   if (packageConfig === null) {
     throw new TungstenError(`findUserConfig() error: Could not find project tungsten config`);
   }

package/dist/fixExtension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fixExtension.d.ts","sourceRoot":"","sources":["../src/fixExtension.ts"],"names":[],"mappings":"AACA,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKrD"}
+{"version":3,"file":"fixExtension.d.ts","sourceRoot":"","sources":["../src/fixExtension.ts"],"names":[],"mappings":"AAGA,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKrD"}

package/dist/fixExtension.js

@@ -1,6 +1,8 @@
+// a configured source path (Root.jsx, Root.tsx, env.ts) to its name in the build, where
+// everything compiled is .js
 export function fixExtension(filePath) {
-  if (filePath.endsWith('.jsx')) {
-    return filePath.slice(0, -1);
-  }
+  if (filePath.endsWith('.jsx')) return filePath.slice(0, -1);
+  if (filePath.endsWith('.tsx')) return `${filePath.slice(0, -3)}js`;
+  if (filePath.endsWith('.ts')) return `${filePath.slice(0, -2)}js`;
   return filePath;
 }

package/dist/foreach.js

@@ -4,6 +4,7 @@ export function foreach(list, callback) {
   if (Array.isArray(list)) {
     return list.map(callback);
   } else if (typeof list === 'object' && list !== null) {
+    // eslint-disable-line @typescript-eslint/no-unnecessary-condition -- runtime callers may pass anything
     //return Object.entries(list).map(([key, value]) => (callback as ObjectCallback<L, R>)(value, key, list))
     const result = [];
     for (const key in list) {

package/dist/frameworkConfigSchema.d.ts

@@ -11,6 +11,7 @@ export declare const frameworkConfigValidator: v.VariantSchema<"useRootComponent
     readonly exclude: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;
     readonly copyExclude: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;
     readonly sourceDir: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;
+    readonly typescript: v.ExactOptionalSchema<v.BooleanSchema<undefined>, undefined>;
     readonly publicDir: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;
     readonly assetsDir: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;
     readonly styleImportBase: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;
@@ -25,9 +26,16 @@ export declare const frameworkConfigValidator: v.VariantSchema<"useRootComponent
     readonly packageSystem: v.ExactOptionalSchema<v.PicklistSchema<["rewrites", "aliases"], undefined>, undefined>;
     readonly ignoreDirs: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
     readonly ignorePatterns: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
+    readonly clientDirs: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
+    readonly clientPatterns: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
+    readonly rawDirs: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
+    readonly rawPatterns: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
     readonly testDirs: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
     readonly testPatterns: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
     readonly skipPackageCompilation: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
+    readonly build: v.ExactOptionalSchema<v.ObjectSchema<{
+        readonly targets: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
+    }, undefined>, undefined>;
     readonly serverMiddleware: v.ExactOptionalSchema<v.TupleSchema<[v.StringSchema<undefined>, v.StringSchema<undefined>, v.StringSchema<undefined>], undefined>, undefined>;
     readonly apiRoutes: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;
     readonly apiPath: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;
@@ -39,6 +47,7 @@ export declare const frameworkConfigValidator: v.VariantSchema<"useRootComponent
     readonly exclude: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;
     readonly copyExclude: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;
     readonly sourceDir: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;
+    readonly typescript: v.ExactOptionalSchema<v.BooleanSchema<undefined>, undefined>;
     readonly publicDir: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;
     readonly assetsDir: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;
     readonly styleImportBase: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;
@@ -53,9 +62,16 @@ export declare const frameworkConfigValidator: v.VariantSchema<"useRootComponent
     readonly packageSystem: v.ExactOptionalSchema<v.PicklistSchema<["rewrites", "aliases"], undefined>, undefined>;
     readonly ignoreDirs: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
     readonly ignorePatterns: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
+    readonly clientDirs: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
+    readonly clientPatterns: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
+    readonly rawDirs: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
+    readonly rawPatterns: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
     readonly testDirs: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
     readonly testPatterns: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
     readonly skipPackageCompilation: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
+    readonly build: v.ExactOptionalSchema<v.ObjectSchema<{
+        readonly targets: v.ExactOptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>, undefined>;
+    }, undefined>, undefined>;
     readonly serverMiddleware: v.ExactOptionalSchema<v.TupleSchema<[v.StringSchema<undefined>, v.StringSchema<undefined>, v.StringSchema<undefined>], undefined>, undefined>;
     readonly apiRoutes: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;
     readonly apiPath: v.ExactOptionalSchema<v.StringSchema<undefined>, undefined>;

package/dist/frameworkConfigSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"frameworkConfigSchema.d.ts","sourceRoot":"","sources":["../src/frameworkConfigSchema.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,IAAI,kBAAkB,EAAE,MAAM,eAAe,CAAA;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAGnD,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;AAI5B,MAAM,WAAW,YAAa,SAAQ,kBAAkB;CAAG;AA4D3D,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BAGnC,CAAA;AAEF,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,wBAAwB,CAAC,CAAA"}
+{"version":3,"file":"frameworkConfigSchema.d.ts","sourceRoot":"","sources":["../src/frameworkConfigSchema.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,IAAI,kBAAkB,EAAE,MAAM,eAAe,CAAA;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAGnD,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;AAI5B,MAAM,WAAW,YAAa,SAAQ,kBAAkB;CAAG;AAwE3D,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BAGnC,CAAA;AAEF,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,wBAAwB,CAAC,CAAA"}

package/dist/frameworkConfigSchema.js

@@ -3,7 +3,7 @@
 import * as v from 'valibot';
 // shape only - babel validates its own options, and a hand-copied key list just drifts from theirs
 const babelParserOptionsSchema = v.pipe(v.looseObject({}),
-// eslint-disable-next-line no-type-assertion/no-type-assertion -- see above
+// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- see above
 v.transform(options => options));
 const stringOrStrings = v.union([v.string(), v.array(v.string())]);
 const frameworkConfigBaseEntries = {
@@ -12,12 +12,14 @@ const frameworkConfigBaseEntries = {
   exclude: v.exactOptional(v.string()),
   copyExclude: v.exactOptional(v.string()),
   sourceDir: v.exactOptional(v.string()),
+  // compile .ts/.tsx in codeDir directly (babel strips types); the app keeps only a type checker
+  typescript: v.exactOptional(v.boolean()),
   publicDir: v.exactOptional(v.string()),
   assetsDir: v.exactOptional(v.string()),
   styleImportBase: v.exactOptional(v.string()),
   // valibot has no template-literal schema, so the regex proves what the cast then states
   siteBasePath: v.exactOptional(v.pipe(v.union([v.literal(''), v.pipe(v.string(), v.regex(/^\/.*$/))]),
-  // eslint-disable-next-line no-type-assertion/no-type-assertion -- see above
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- see above
   v.transform(path => path))),
   clientSideNav: v.exactOptional(v.boolean()),
   staticSite: v.exactOptional(v.boolean()),
@@ -31,10 +33,20 @@ const frameworkConfigBaseEntries = {
   // rename to ignoreFolders?
   ignorePatterns: v.exactOptional(stringOrStrings),
   // test files: left out of every compile unless `tungsten compile --tests` asks for them -
+  // which sources each pipeline compiles (see FrameworkConfig.ts): unset, client is everything
+  // and raw is nothing
+  clientDirs: v.exactOptional(stringOrStrings),
+  clientPatterns: v.exactOptional(stringOrStrings),
+  rawDirs: v.exactOptional(stringOrStrings),
+  rawPatterns: v.exactOptional(stringOrStrings),
   // the same two shapes as ignoreDirs/ignorePatterns
   testDirs: v.exactOptional(stringOrStrings),
   testPatterns: v.exactOptional(stringOrStrings),
   skipPackageCompilation: v.exactOptional(stringOrStrings),
+  build: v.exactOptional(v.object({
+    // browserslist query the production bundle is lowered to; unset = the framework default
+    targets: v.exactOptional(stringOrStrings)
+  })),
   serverMiddleware: v.exactOptional(v.tuple([v.string(), v.string(), v.string()])),
   apiRoutes: v.exactOptional(v.string()),
   apiPath: v.exactOptional(v.string()),

package/dist/getComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getComponent.d.ts","sourceRoot":"","sources":["../src/getComponent.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAG7D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAOhC,wBAAsB,YAAY,CAC9B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAEhB,SAAS,GAAE,MAAM,GAAG,IAAW,EAC/B,IAAI,GAAE,IAAa,GACpB,OAAO,CAAC,gBAAgB,CAAC,CA6B3B"}
+{"version":3,"file":"getComponent.d.ts","sourceRoot":"","sources":["../src/getComponent.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAG7D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAOhC,wBAAsB,YAAY,CAC9B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAEhB,SAAS,GAAE,MAAM,GAAG,IAAW,EAC/B,IAAI,GAAE,IAAa,GACpB,OAAO,CAAC,gBAAgB,CAAC,CA6B3B"}

package/dist/getComponent.js

@@ -1,8 +1,8 @@
-import { fixExtension } from "./fixExtension.js";
-import { TungstenError } from "./TungstenError.js";
-import { throwError } from "./throwError.js";
-import { iterationQueryString } from "./iterationQueryString.js";
-import { importDevModuleWithRetry } from "./importDevModuleWithRetry.js";
+import { fixExtension } from './fixExtension.js';
+import { TungstenError } from './TungstenError.js';
+import { throwError } from './throwError.js';
+import { iterationQueryString } from './iterationQueryString.js';
+import { importDevModuleWithRetry } from './importDevModuleWithRetry.js';
 //let load //// !! future improvement
 export async function getComponent(filePath, filename,
 //load: Load | null = null,

package/dist/getComponentDev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getComponentDev.d.ts","sourceRoot":"","sources":["../src/getComponentDev.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAI7D,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAGhH"}
+{"version":3,"file":"getComponentDev.d.ts","sourceRoot":"","sources":["../src/getComponentDev.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAI7D,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAGhH"}

package/dist/getComponentDev.js

@@ -1,4 +1,4 @@
-import { getComponent } from "./getComponent.js";
+import { getComponent } from './getComponent.js';
 //export function getComponentDev(filePath: string, filename: string, load: Load): Promise<AnyComponentType> {
 export function getComponentDev(filePath, filename, iteration) {
   //return getComponent(filePath, filename, load, true)

package/dist/getFrameworkDir.js

@@ -1,4 +1,4 @@
-import { findProjectDir } from "./findProjectDir.js";
+import { findProjectDir } from './findProjectDir.js';
 let frameworkDir;
 export function getFrameworkDir() {
   if (!frameworkDir) frameworkDir = findProjectDir(import.meta.url);

package/dist/getRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getRoutes.d.ts","sourceRoot":"","sources":["../src/getRoutes.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AACvD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAGrC,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAM5D,wBAAsB,SAAS,CAC3B,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,uBAAuB,EAE/B,SAAS,GAAE,MAAM,GAAG,IAAW,EAC/B,IAAI,GAAE,IAAa,GACnB,OAAO,CAAC,SAAS,CAAC,CAmCrB"}
+{"version":3,"file":"getRoutes.d.ts","sourceRoot":"","sources":["../src/getRoutes.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AACvD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAGrC,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAM5D,wBAAsB,SAAS,CAC3B,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,uBAAuB,EAE/B,SAAS,GAAE,MAAM,GAAG,IAAW,EAC/B,IAAI,GAAE,IAAa,GACnB,OAAO,CAAC,SAAS,CAAC,CA0BrB"}

package/dist/getRoutes.js

@@ -1,36 +1,27 @@
 import { join } from 'path';
-import { fixExtension } from "./fixExtension.js";
-import { TungstenError } from "./TungstenError.js";
-import { iterationQueryString } from "./iterationQueryString.js";
-import { throwError } from "./throwError.js";
-import { importDevModuleWithRetry } from "./importDevModuleWithRetry.js";
+import { fixExtension } from './fixExtension.js';
+import { TungstenError } from './TungstenError.js';
+import { iterationQueryString } from './iterationQueryString.js';
+import { throwError } from './throwError.js';
+import { importDevModuleWithRetry } from './importDevModuleWithRetry.js';
 export async function getRoutes(compilationInfo, config,
 //load: Load | null = null,
 iteration = null, mode = 'prod') {
   //console.log('config.routesLocation', config.routesLocation)
   //console.log('config.routesLocation', config.routesLocation)
-  const routesLocation = config.routesLocation;
-  if (routesLocation === null) {
-    return routesLocation;
+  const [routesFile, routeExport] = config.routesLocation;
+  const filePath = 'file://' + fixExtension(join(compilationInfo.buildCodeLocation, routesFile));
+  let module;
+  if (mode === 'dev') {
+    if (iteration === null) throwError('getComponent()', 'iteration is null in dev mode');
+    // can we share load across the render?
+    module = await importDevModuleWithRetry(iterationQueryString(filePath, iteration));
   } else {
-    const [routesFile, routeExport] = routesLocation;
-    //console.log(join(compilationInfo.location, routesFile))
-    //console.log(fixExtension( join(compilationInfo.location, routesFile) ))
-    const filePath = 'file://' + fixExtension(join(compilationInfo.buildCodeLocation, routesFile));
-    let module;
-    if (mode === 'dev') {
-      if (iteration === null) throwError('getComponent()', 'iteration is null in dev mode');
-      // can we share load across the render?
-      //const load = await createLoad(import.meta.url, sxyLoaderConfig)
-      //module = await load(filePath)
-      module = await importDevModuleWithRetry(iterationQueryString(filePath, iteration));
-    } else {
-      module = await import(filePath); // import the module
-    }
-    // use the config to determine the export name
-    if (!(routeExport in module)) {
-      throw new TungstenError(`Could not find an export named ${routeExport} in routes file ${routesFile}.` + ` These settings are set in config.routesLocation.`);
-    }
-    return module[routeExport];
+    module = await import(filePath); // import the module
   }
+  // use the config to determine the export name
+  if (!(routeExport in module)) {
+    throw new TungstenError(`Could not find an export named ${routeExport} in routes file ${routesFile}.` + ` These settings are set in config.routesLocation.`);
+  }
+  return module[routeExport];
 }

package/dist/getRoutesDevs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getRoutesDevs.d.ts","sourceRoot":"","sources":["../src/getRoutesDevs.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAKjE,wBAAgB,YAAY,CAAC,eAAe,EAAE,eAAe,EAAE,MAAM,EAAE,uBAAuB,EAAE,SAAS,EAAE,MAAM,uDAGhH"}
+{"version":3,"file":"getRoutesDevs.d.ts","sourceRoot":"","sources":["../src/getRoutesDevs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAKjE,wBAAgB,YAAY,CAAC,eAAe,EAAE,eAAe,EAAE,MAAM,EAAE,uBAAuB,EAAE,SAAS,EAAE,MAAM,uDAGhH"}

package/dist/getRoutesDevs.js

@@ -1,4 +1,4 @@
-import { getRoutes } from "./getRoutes.js";
+import { getRoutes } from './getRoutes.js';
 // async
 //export function getRoutesDev(compilationInfo: CompilationInfo, config: FrameworkConfigComplete, load: Load) {
 export function getRoutesDev(compilationInfo, config, iteration) {

package/dist/getStackTrace.js

@@ -1,5 +1,5 @@
 export function getStackTrace() {
   const obj = {};
   Error.captureStackTrace(obj, getStackTrace);
-  return obj.stack; // eslint-disable-line no-type-assertion/no-type-assertion
+  return obj.stack; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
 }

package/dist/getUserConfig.js

@@ -1,10 +1,10 @@
-import { defaultConfig } from "./defaultConfig.js";
-import { findUserConfig } from "./findUserConfig.js";
-import { frameworkConfigValidator } from "./frameworkConfigSchema.js";
-import { makeFinalConfig } from "./makeFinalConfig.js";
-import { throwError } from "./throwError.js";
-import { cliOut } from "./cliOutput.js";
-import { validate } from "./standardSchema.js";
+import { defaultConfig } from './defaultConfig.js';
+import { findUserConfig } from './findUserConfig.js';
+import { frameworkConfigValidator } from './frameworkConfigSchema.js';
+import { makeFinalConfig } from './makeFinalConfig.js';
+import { throwError } from './throwError.js';
+import { cliOut } from './cliOutput.js';
+import { validate } from './standardSchema.js';
 export async function getUserConfig(overrides = null, volume = 'noisy') {
   const userConfigOrNull = await findUserConfig(process.cwd(), volume);
   //frameworkCon

package/dist/glob.d.ts

@@ -0,0 +1,5 @@
+export declare function globToRegExp(pattern: string): RegExp;
+export declare function glob(patterns: string | string[], options?: {
+    cwd?: string;
+}): Promise<string[]>;
+//# sourceMappingURL=glob.d.ts.map

package/dist/glob.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"glob.d.ts","sourceRoot":"","sources":["../src/glob.ts"],"names":[],"mappings":"AA8CA,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEpD;AAyBD,wBAAsB,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,GAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAyBzG"}

package/dist/glob.js

@@ -0,0 +1,103 @@
+import { readdirSync } from 'fs';
+import { isAbsolute } from 'path';
+import slash from './slash.js';
+// globby's job for the patterns tungsten uses (`**`, `*`, `?`, `{a,b}`, `[…]`, `!` excludes):
+// a sync walk from each pattern's static prefix, matched with precompiled regexes. Results are
+// absolute forward-slash paths. Dot segments are skipped, node_modules is not - both as globby
+// did. Sync on purpose: node's fs.glob and a promise-per-directory walk both sat behind the
+// sync sass compile at startup (35ms standalone, ~380ms in dev), a sync walk cannot.
+const globChars = /[*?{[]/;
+function escapeRegExp(text) {
+  return text.replace(/[.+^$()|\\]/g, '\\$&');
+}
+// glob source -> regex source, no anchors
+function convert(pattern) {
+  let out = '';
+  for (let i = 0; i < pattern.length; i++) {
+    const char = pattern[i];
+    if (char === '*') {
+      if (pattern[i + 1] === '*') {
+        if (pattern[i + 2] === '/') {
+          out += '(?:[^/]*/)*';
+          i += 2;
+        } // any depth, including none
+        else {
+          out += '.*';
+          i += 1;
+        }
+      } else out += '[^/]*';
+    } else if (char === '?') {
+      out += '[^/]';
+    } else if (char === '{') {
+      const end = pattern.indexOf('}', i);
+      if (end === -1) {
+        out += '\\{';
+        continue;
+      }
+      out += `(?:${pattern.slice(i + 1, end).split(',').map(convert).join('|')})`;
+      i = end;
+    } else if (char === '[') {
+      const end = pattern.indexOf(']', i);
+      if (end === -1) {
+        out += '\\[';
+        continue;
+      }
+      const body = pattern.slice(i + 1, end);
+      out += `[${body.startsWith('!') ? '^' + body.slice(1) : body}]`;
+      i = end;
+    } else {
+      out += escapeRegExp(char ?? '');
+    }
+  }
+  return out;
+}
+export function globToRegExp(pattern) {
+  return new RegExp(`^${convert(pattern)}$`);
+}
+// the directory to walk: the segments before the first one holding a glob character
+function staticPrefix(pattern) {
+  const segments = pattern.split('/');
+  const firstGlob = segments.findIndex(segment => globChars.test(segment));
+  return (firstGlob === -1 ? segments.slice(0, -1) : segments.slice(0, firstGlob)).join('/');
+}
+function walk(dir, files = []) {
+  let entries;
+  try {
+    entries = readdirSync(dir, {
+      withFileTypes: true
+    });
+  } catch (error) {
+    if (error.code === 'ENOENT') return files; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- fs errors carry a code
+    throw error;
+  }
+  for (const entry of entries) {
+    if (entry.name.startsWith('.')) continue;
+    if (entry.isDirectory()) walk(`${dir}/${entry.name}`, files);else if (entry.isFile()) files.push(`${dir}/${entry.name}`);
+  }
+  return files;
+}
+export async function glob(patterns, options = {}) {
+  const cwd = slash(options.cwd ?? process.cwd());
+  const full = pattern => {
+    const normalised = slash(pattern);
+    return isAbsolute(normalised) ? normalised : `${cwd}/${normalised}`;
+  };
+  const list = (Array.isArray(patterns) ? patterns : [patterns]).map(slash);
+  const includes = list.filter(pattern => !pattern.startsWith('!')).map(full);
+  const excludes = list.filter(pattern => pattern.startsWith('!')).map(pattern => globToRegExp(full(pattern.slice(1))));
+  // one walk per distinct base, every include tested against each of its files
+  const byBase = new Map();
+  for (const pattern of includes) {
+    const base = staticPrefix(pattern);
+    byBase.set(base, [...(byBase.get(base) ?? []), globToRegExp(pattern)]);
+  }
+  const found = new Set();
+  for (const [base, matchers] of byBase) {
+    for (const file of walk(base)) {
+      if (!matchers.some(matcher => matcher.test(file))) continue;
+      if (excludes.some(matcher => matcher.test(file))) continue;
+      found.add(file);
+    }
+  }
+  return [...found];
+}

package/dist/hasValidKey.js

@@ -1,4 +1,4 @@
-import { $key } from "./contentNodeSymbols.js";
+import { $key } from './contentNodeSymbols.js';
 export function hasValidKey(node) {
   return node[$key] !== undefined && node[$key] !== null;
 }

package/dist/helpers/getFetchCompatibleHeaders.js

@@ -11,10 +11,10 @@ export function getFetchCompatibleHeaders(req) {
     ...restHeaders
   } = req.headers;
   const headers = block(
-  // eslint-disable-line no-type-assertion/no-type-assertion -- this refers to the typecast at the end of this block: recast it as a record to avoid difficulty getting required values of partials
+  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- this refers to the typecast at the end of this block: recast it as a record to avoid difficulty getting required values of partials
   // Headers will all be strings, except for set-cookie, so we will override the types from @types/node here
   restHeaders,
-  // eslint-disable-line no-type-assertion/no-type-assertion -- countering bad typing in @types/node for 'http' incoming headers
+  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- countering bad typing in @types/node for 'http' incoming headers
   header => header === undefined);
   return new Headers({
     ...headers