tungsten 0.4.10 → 0.4.12

package/dist/Servers/ProdServer.js

@@ -4,23 +4,23 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 import express from 'express';
 import { join } from 'path';
 import { existsSync } from 'fs';
-import { staticFolder, assetsFolder, packageNameCapitalized, publicFolder, componentCssFolder, frameworkCssFolder } from "../settings.js";
-import { rootToHtml as renderRootToHtml } from "../render/rootToHtml.js";
-import { contentToHtml as renderContentToHtml } from "../render/contentToHtml.js";
-import { Instance } from "../Instance/Instance.js";
-import { cliOut, cliWarn, cliLog, cliNews, cliDebug } from "../cliOutput.js"; // eslint-disable-line @typescript-eslint/no-unused-vars
-import { TungstenError } from "../TungstenError.js";
-import { makeInstanceConfigFromFrameworkConfig } from "../makeInstanceConfigFromFrameworkConfig.js";
+import { staticFolder, assetsFolder, packageNameCapitalized, publicFolder, componentCssFolder, frameworkCssFolder } from '../settings.js';
+import { rootToHtml as renderRootToHtml } from '../render/rootToHtml.js';
+import { contentToHtml as renderContentToHtml } from '../render/contentToHtml.js';
+import { Instance } from '../Instance/Instance.js';
+import { cliOut, cliWarn, cliLog, cliNews, cliDebug } from '../cliOutput.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { TungstenError } from '../TungstenError.js';
+import { makeInstanceConfigFromFrameworkConfig } from '../makeInstanceConfigFromFrameworkConfig.js';
 //import { addRequireResolveHooks } from '../reRouting/addRequireResolveHooks.js'
-import { standardizeWebPath } from "../standardizeWebPath.js";
-import { throwError } from "../throwError.js";
-import { serveStatic } from "./serveStatic.js";
+import { standardizeWebPath } from '../standardizeWebPath.js';
+import { throwError } from '../throwError.js';
+import { serveStatic } from './serveStatic.js';
 import { routing } from "./routing.js";
-import { globalDataFunc } from "../routing/registerGlobalData.js";
+import { globalDataFunc } from '../routing/registerGlobalData.js';
 import { TungstenServer } from "./TungstenServer.js";
-import { portError } from "./portError.js";
-import { initStores } from "./initStores.js";
-import { makeTungstenErrorInfo } from "../routing/TungstenErrorInfo.js";
+import { portError } from './portError.js';
+import { initStores } from './initStores.js';
+import { makeTungstenErrorInfo } from '../routing/TungstenErrorInfo.js';
 function debug(...texts) {
   // console.log(...texts)
 }

package/dist/Servers/StaticSiteServer.js

@@ -2,10 +2,10 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import express from 'express';
-import { serveStatic } from "./serveStatic.js";
+import { serveStatic } from './serveStatic.js';
 import { join } from 'path';
-import { staticSiteFolder } from "../settings.js";
-import { cliNews } from "../cliOutput.js";
+import { staticSiteFolder } from '../settings.js';
+import { cliNews } from '../cliOutput.js';
 export class StaticSiteServer {
   // to do
   constructor(config) {

package/dist/Servers/TungstenServer.js

@@ -1,10 +1,10 @@
-import { ContentNodeIsClassComponent } from "../ContentNode.js";
-import { RoutingRedirect } from "../routing/RoutingRedirect.js";
-import { cliTodo } from "../cliOutput.js";
+import { ContentNodeIsClassComponent } from '../ContentNode.js';
+import { RoutingRedirect } from '../routing/RoutingRedirect.js';
+import { cliTodo } from '../cliOutput.js';
 import { RouteRedirectComponent } from "../components/RouteRedirectComponent.js";
 import { WebRedirectComponent } from "../components/WebRedirectComponent.js";
-import { $props, $type } from "../contentNodeSymbols.js";
-import { WebRedirect } from "../routing/WebRedirect.js";
+import { $props, $type } from '../contentNodeSymbols.js';
+import { WebRedirect } from '../routing/WebRedirect.js';
 function debug(...texts) {
   // console.log(...texts)
 }

package/dist/Servers/devErrorPageAutoRetry.js

@@ -8,7 +8,7 @@
 // still, in fact, a self-resolving situation. If the error that reached the error page still
 // looks like that same transient shape, embed a tiny script that auto-reloads a few times before
 // giving up - capped via sessionStorage so a genuine, permanent error doesn't loop forever.
-import { isTransientDevModuleError } from "../importDevModuleWithRetry.js";
+import { isTransientDevModuleError } from '../importDevModuleWithRetry.js';
 const sessionStorageKey = 'tungstenDevErrorRetryCount';
 export const maxAutoRetryAttempts = 8;
 const retryDelayMs = 500;

package/dist/Servers/hono/TungstenServerHono.js

@@ -1,10 +1,10 @@
-import { ContentNodeIsClassComponent } from "../../ContentNode.js";
-import { RoutingRedirect } from "../../routing/RoutingRedirect.js";
-import { cliTodo } from "../../cliOutput.js";
+import { ContentNodeIsClassComponent } from '../../ContentNode.js';
+import { RoutingRedirect } from '../../routing/RoutingRedirect.js';
+import { cliTodo } from '../../cliOutput.js';
 import { RouteRedirectComponent } from "../../components/RouteRedirectComponent.js";
 import { WebRedirectComponent } from "../../components/WebRedirectComponent.js";
-import { $props, $type } from "../../contentNodeSymbols.js";
-import { WebRedirect } from "../../routing/WebRedirect.js";
+import { $props, $type } from '../../contentNodeSymbols.js';
+import { WebRedirect } from '../../routing/WebRedirect.js';
 export class TungstenServerHono {
   // Hono's c.redirect() builds a Response but doesn't send it - unlike Express's res.redirect()
   // (which sends immediately), the caller here must return the Response itself for Hono to

package/dist/Servers/initStores.js

@@ -1,6 +1,6 @@
-import { InternalStoreSchema } from "../Store/InternalStoreSchema.js";
-import { makeStore } from "../Store/makeStore.js";
-import { createStores } from "../Store/createStores.js";
+import { InternalStoreSchema } from '../Store/InternalStoreSchema.js';
+import { makeStore } from '../Store/makeStore.js';
+import { createStores } from '../Store/createStores.js';
 export function initStores(location, reqResOrNull, globalData, matchedRouteInfo, serverDataLoading = null) {
   const storeSubscriptions = new Map();
   const internalStoreSubscribedElements = new Map();

package/dist/Servers/loadEnvsDev.js

@@ -1,14 +1,14 @@
 import { join } from 'path';
 import { readFile as readFilePromise, access as accessPromise } from 'fs/promises';
 import { remap as objectRemap, filter as objectFilter } from 'sxy-lib/objects.js';
-import { getEnvSchemasDev } from "../env/getEnvSchemas.js";
+import { getEnvSchemasDev } from '../env/getEnvSchemas.js';
 import dotenv from 'dotenv';
-import { cliLog, cliOut } from "../cliOutput.js";
-import { addToEnv } from "../env/addToEnv.js";
+import { cliLog, cliOut } from '../cliOutput.js';
+import { addToEnv } from '../env/addToEnv.js';
 import { throwError } from 'tungsten/throwError.js';
-import { tungstenCorePrivateEnvSchema } from "./tungstenCorePrivateEnvSchema.js";
-import { tungstenCorePublicEnvSchema } from "./tungstenCorePublicEnvSchema.js";
-import { checkIsObject, validate } from "../standardSchema.js";
+import { tungstenCorePrivateEnvSchema } from './tungstenCorePrivateEnvSchema.js';
+import { tungstenCorePublicEnvSchema } from './tungstenCorePublicEnvSchema.js';
+import { checkIsObject, validate } from '../standardSchema.js';
 export async function loadEnvsDev(config,
 //load: Load,
 iteration, initialProcessEnv, _firstLoad, useTestEnvFiles = false) {

package/dist/Servers/routing.js

@@ -1,7 +1,7 @@
 import { Default404 } from "../routing/Default404.js";
-import { matchPath } from "../routing/matchPath.js";
-import { makeTungstenErrorInfo } from "../routing/TungstenErrorInfo.js";
-import { jsx as _jsx } from "tungsten/jsxRuntime.js";
+import { matchPath } from '../routing/matchPath.js';
+import { makeTungstenErrorInfo } from '../routing/TungstenErrorInfo.js';
+import { jsx as _jsx } from "tungsten/jsx-runtime";
 export async function routing(location, routes, serverDataLoading = null) {
   let defaultRoute, _404Route, errorRoute;
   // try the current path against each defined route

package/dist/Store/createStores.js

@@ -1,5 +1,5 @@
-import { makeStore } from "./makeStore.js";
-import { storeSchemas } from "./storeCreators.js";
+import { makeStore } from './makeStore.js';
+import { storeSchemas } from './storeCreators.js';
 export function createStores(reqRes, matchedRouteInfo, globalData, storeSubscriptionsMap, serverDataLoading = null) {
   const stores = storeSchemas.map(Schema => {
     const subscribedElements = new Map();

package/dist/Store/makeStore.js

@@ -6,8 +6,8 @@ function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("C
 function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
 function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
-import { objectMap } from "../objectMap.js";
-import { isBrowser } from "../isBrowser.js";
+import { objectMap } from '../objectMap.js';
+import { isBrowser } from '../isBrowser.js';
 var _key = /*#__PURE__*/new WeakMap();
 var _value = /*#__PURE__*/new WeakMap();
 var _subscribedElements = /*#__PURE__*/new WeakMap();

package/dist/Store/registerStore.js

@@ -1,5 +1,5 @@
-import { storeSchemas } from "./storeCreators.js";
-import { Instance } from "../Instance/Instance.js";
+import { storeSchemas } from './storeCreators.js';
+import { Instance } from '../Instance/Instance.js';
 export function registerStore(StoreSchema) {
   //console.log('registering store', StoreSchema.name)
   const position = 0;

package/dist/TungstenApp.js

@@ -2,9 +2,9 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 /// WIP
-import { cliLog } from "./cliOutput.js";
-import { Framework } from "./Framework.js";
-import { throwError } from "./throwError.js";
+import { cliLog } from './cliOutput.js';
+import { Framework } from './Framework.js';
+import { throwError } from './throwError.js';
 export class TungstenApp {
   constructor(options) {
     _defineProperty(this, "rootComponent", void 0);

package/dist/TungstenStyleObject.js

@@ -1 +1 @@
-export { CssNames as TungstenStyleObject } from "./CssNames.js";
+export { CssNames as TungstenStyleObject } from './CssNames.js';

package/dist/__deproxy.js

@@ -1,5 +1,5 @@
-import { $original } from "./componentProxyHandlers.js";
-import { NoDeproxy } from "./NoDeproxy.js";
+import { $original } from './componentProxyHandlers.js';
+import { NoDeproxy } from './NoDeproxy.js';
 // doesn't this need to be deep?
 export function __deproxy(possibleProxy) {
   console.log('__deproxy called, this function may not be adequate');

package/dist/_client/client.js

@@ -1,7 +1,7 @@
 //import { helpers } from './cjsHelpers.js'
 import { hydrate } from 'tungsten';
 // @ts-ignore -- ignore module not found, will be generated later
-import instanceConfig from "../.tungsten.config.js";
+import instanceConfig from '../.tungsten.config.js';
 // wrap the async code in an async IIFE to help rollup
 const clientPromise = (async () => {
   //const isProd = window.__tungsten_prod__ = appConfig.prod
@@ -11,11 +11,11 @@ const clientPromise = (async () => {
   // is this causing a slowdown?
   // need to change this to static imports via build steps
   let routes;
-  const promises = [import("./routes.js").then(mod => routes = mod.routes)];
+  const promises = [import('./routes.js').then(mod => routes = mod.routes)];
   let RootComponent = null;
   if (instanceConfig.useRootComponent) {
     // rollup is failing to handle this when useRootComponent is false
-    promises.push(import("./RootComponent.js").then(({
+    promises.push(import('./RootComponent.js').then(({
       module,
       filename
     }) => RootComponent = 'default' in module ? module.default : module[filename]) // could probably do with better error handling/reporting

package/dist/alive.js

@@ -1,4 +1,4 @@
-import { NoDeproxy } from "./NoDeproxy.js";
+import { NoDeproxy } from './NoDeproxy.js';
 export function alive(v) {
   return new NoDeproxy(v);
 }

package/dist/api/getApiRoutes.js

@@ -1,7 +1,7 @@
 import { join } from 'path';
-import { TungstenError } from "../TungstenError.js";
-import { getExportDev } from "./getExportDev.js";
-import { getExport } from "./getExport.js";
+import { TungstenError } from '../TungstenError.js';
+import { getExportDev } from './getExportDev.js';
+import { getExport } from './getExport.js';
 export async function getApiRoutes(config, compilationInfo, mode) {
   if (typeof config.apiRoutes !== 'string') {
     throw new TungstenError(`getApiRoutes() error - config.apiRoutes is not valid`);

package/dist/api/getApiRoutesHono.js

@@ -1,7 +1,7 @@
 import { join } from 'path';
-import { TungstenError } from "../TungstenError.js";
-import { getExportDev } from "./getExportDev.js";
-import { getExport } from "./getExport.js";
+import { TungstenError } from '../TungstenError.js';
+import { getExportDev } from './getExportDev.js';
+import { getExport } from './getExport.js';
 export async function getApiRoutesHono(config, compilationInfo, mode) {
   if (typeof config.apiRoutes !== 'string') {
     throw new TungstenError(`getApiRoutes() error - config.apiRoutes is not valid`);

package/dist/api/getExport.js

@@ -1,8 +1,8 @@
 import { basename } from 'path';
-import { fixExtension } from "../fixExtension.js";
-import { TungstenError } from "../TungstenError.js";
-import { iterationQueryString } from "../iterationQueryString.js";
-import { importDevModuleWithRetry } from "../importDevModuleWithRetry.js";
+import { fixExtension } from '../fixExtension.js';
+import { TungstenError } from '../TungstenError.js';
+import { iterationQueryString } from '../iterationQueryString.js';
+import { importDevModuleWithRetry } from '../importDevModuleWithRetry.js';
 //let load //// !! future improvement
 let exportIteration = 0;
 export async function getExport(filePath, relFile, mode = 'prod') {

package/dist/api/getExportDev.js

@@ -1,4 +1,4 @@
-import { getExport } from "./getExport.js";
+import { getExport } from './getExport.js';
 export function getExportDev(filePathFull, relFile) {
   return getExport(filePathFull, relFile, 'dev');
 }

package/dist/appOutput.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import { isClient } from "./isClient.js";
+import { isClient } from './isClient.js';
 export function log(...texts) {
   console.log(...texts);
 }

package/dist/auth/index.js

@@ -1,2 +1,2 @@
-export * from "./hashPassword.js";
-export * from "./checkPassword.js";
+export * from './hashPassword.js';
+export * from './checkPassword.js';

package/dist/babelPlugins/BabelAddDevCacheBust.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BabelAddDevCacheBust.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelAddDevCacheBust.ts"],"names":[],"mappings":"AAkCA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACtD,OAAO,KAAK,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AAuBnG,wBAAgB,wBAAwB;;eAKjB,SAAS;;gCAKQ,QAAQ,CAAC,iBAAiB,CAAC;qCAItB,QAAQ,CAAC,sBAAsB,CAAC;mCAIlC,QAAQ,CAAC,oBAAoB,CAAC;;EAOxE"}
+{"version":3,"file":"BabelAddDevCacheBust.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelAddDevCacheBust.ts"],"names":[],"mappings":"AAkCA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACtD,OAAO,KAAK,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AA2BnG,wBAAgB,wBAAwB;;eAKjB,SAAS;;gCAKQ,QAAQ,CAAC,iBAAiB,CAAC;qCAItB,QAAQ,CAAC,sBAAsB,CAAC;mCAIlC,QAAQ,CAAC,oBAAoB,CAAC;;EAOxE"}

package/dist/babelPlugins/BabelAddDevCacheBust.js

@@ -1,5 +1,5 @@
 // RS: this is unsuitable for test
-// and dubious during dev. Removing it for now
+// and dubious during dev. Removing it from test for now
 // will have to revisit HMR
 // BabelAddDevCacheBust
 // exports MakeBabelAddDevCacheBust (function)
@@ -29,9 +29,11 @@
 // plugins actually end up running in.
 import { dirname, join } from 'path';
 import fs from 'fs';
+// a `.js` specifier names the compiled file; on disk in codeLocation it may be .js, .jsx, or with
+// typescript: true, .ts/.tsx
 function resolveOnDiskMtime(fromDir, specifier) {
   if (!specifier.startsWith('.')) return undefined;
-  const candidates = specifier.endsWith('.jsx') ? [specifier, specifier.slice(0, -1)] : specifier.endsWith('.js') ? [specifier, `${specifier.slice(0, -3)}.jsx`] : [];
+  const candidates = specifier.endsWith('.jsx') ? [specifier, specifier.slice(0, -1)] : specifier.endsWith('.js') ? ['.js', '.jsx', '.ts', '.tsx'].map(extension => `${specifier.slice(0, -3)}${extension}`) : specifier.endsWith('.ts') || specifier.endsWith('.tsx') ? [specifier] : [];
   for (const candidate of candidates) {
     const abs = join(fromDir, candidate);
     if (fs.existsSync(abs)) return fs.statSync(abs).mtimeMs;

package/dist/babelPlugins/BabelTransformBindDirect.js

@@ -1,6 +1,6 @@
 //import { T } from '@babel/core'
-import { TungstenError } from "../TungstenError.js";
-import { throwError } from "../throwError.js";
+import { TungstenError } from '../TungstenError.js';
+import { throwError } from '../throwError.js';
 // BabelTransformBind
 // exports MakeBabelTransformBind (function)
 //

package/dist/babelPlugins/BabelTransformBindVar.js

@@ -1,7 +1,7 @@
 //import { T } from '@babel/core'
-import { TungstenError } from "../TungstenError.js";
-import { bindableHtmlElements } from "../components/bindable/bindableHtmlElements.js";
-import { throwError } from "../throwError.js";
+import { TungstenError } from '../TungstenError.js';
+import { bindableHtmlElements } from '../components/bindable/bindableHtmlElements.js';
+import { throwError } from '../throwError.js';
 // BabelTransformBind
 // exports MakeBabelTransformBind (function)
 //

package/dist/babelPlugins/BabelTransformCjsToEsm.js

@@ -2,7 +2,7 @@
 import { readFileSync } from 'fs';
 import { createRequire } from 'module';
 import { init as lexerInit, parse as lexerParse } from 'cjs-module-lexer';
-import { throwError } from "../throwError.js";
+import { throwError } from '../throwError.js';
 lexerInit();
 const filenameAndDirnameCode = `import { fileURLToPath } from 'url';
 import { dirname } from 'path';

package/dist/babelPlugins/BabelTransformComponentState.js

@@ -3,8 +3,8 @@
 //
 // currently not used
 // proxy and deproxy solution seems preferable
-import { arrayMutatingFunctions } from "../mutatingFunctions.js";
-import { throwError } from "../throwError.js";
+import { arrayMutatingFunctions } from '../mutatingFunctions.js';
+import { throwError } from '../throwError.js';
 export function MakeBabelTransformComponentState(/*opts: Opts*/
 ) {
   return function BabelTransformComponentState(babel) {

package/dist/babelPlugins/BabelTransformComponentStyles.d.ts

@@ -10,6 +10,8 @@ type Opts = {
     functionNames?: string[];
     modulePrefix?: string;
     watch?: boolean;
+    cacheDir?: string | undefined;
+    freshCache?: boolean;
 };
 export declare function MakeBabelTransformComponentStyles(opts: Opts): (babel: Babel) => {
     name: string;

package/dist/babelPlugins/BabelTransformComponentStyles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BabelTransformComponentStyles.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformComponentStyles.ts"],"names":[],"mappings":"AAwCA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAc,MAAM,iBAAiB,CAAA;AAa7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAA;AA0QvD,KAAK,IAAI,GAAG;IACR,iBAAiB,EAAE,MAAM,CAAA;IACzB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,wBAAwB,EAAE,MAAM,CAAA;IAChC,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;IAKxB,YAAY,CAAC,EAAE,MAAM,CAAA;IAIrB,KAAK,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAID,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,IAAI,IAqMV,OAAO,KAAK;;;;6BAMjC,MAAM;;mBAIZ,MAAM;;;uCAkBkB,QAAQ,CAAC,wBAAwB,CAAC;sBAf3D,MAAM;kBACV;gBACF,IAAI;qCATS,MAAM;kBASL;aACjB;+BACkB,MAAM;;;EA4JpC"}
+{"version":3,"file":"BabelTransformComponentStyles.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformComponentStyles.ts"],"names":[],"mappings":"AAwCA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAc,MAAM,iBAAiB,CAAA;AAa7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAA;AAiRvD,KAAK,IAAI,GAAG;IACR,iBAAiB,EAAE,MAAM,CAAA;IACzB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,wBAAwB,EAAE,MAAM,CAAA;IAChC,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;IAKxB,YAAY,CAAC,EAAE,MAAM,CAAA;IAIrB,KAAK,CAAC,EAAE,OAAO,CAAA;IAEf,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAE7B,UAAU,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAID,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,IAAI,IAsMV,OAAO,KAAK;;;;6BAMjC,MAAM;;mBAIZ,MAAM;;;uCAkBkB,QAAQ,CAAC,wBAAwB,CAAC;sBAf3D,MAAM;kBACV;gBACF,IAAI;qCATS,MAAM;kBASL;aACjB;+BACkB,MAAM;;;EAsKpC"}

package/dist/babelPlugins/BabelTransformComponentStyles.js

@@ -9,20 +9,22 @@ import fs from 'fs';
 import { join, dirname, basename, relative } from 'path';
 import * as sass from 'sass';
 import postcss from 'postcss';
+import url from 'url';
 import { mapToArray as objectMapToArray } from 'sxy-lib/objects.js';
-import { TransformCssNames } from "../postcssPlugins/TransformCssNames.js";
-import { CssNames } from "../CssNames.js";
+import { TransformCssNames } from '../postcssPlugins/TransformCssNames.js';
+import { CssNames } from '../CssNames.js';
 //const CSSModulesSync = require('postcss-modules-sync').default
-import { watch } from "../watch.js";
+import { watch } from '../watch.js';
 import slash from 'slash';
 import { resolveSassImport } from 'tungsten/build/resolveSassScssImports.js';
 import { sassImportParser } from 'tungsten/build/sassImportParser.js';
 import { modifySassImports } from 'tungsten/build/modifySassImports.js';
 import { scssImportParserChatgpt } from 'tungsten/build/scssImportParserChatgpt.js';
 import { errorOut } from 'tungsten';
-import { fixImportsInSassErrorMessage } from "./fixImportsInSassErrorMessage.js";
-import { throwError } from "../throwError.js";
-import { tally } from "../timeProfiler.js";
+import { fixImportsInSassErrorMessage } from './fixImportsInSassErrorMessage.js';
+import { throwError } from '../throwError.js';
+import { tallied } from '../timeProfiler.js';
+import { makeComponentStylesCache } from '../build/componentStylesCache.js';
 class StyleAssistant {
   static toCss(data, fullFile, fullSourceFile, importBase) {
     return {
@@ -72,13 +74,14 @@ class Css extends StyleAssistant {
 function sassScssToCss(data, fullFile, fullSourceFile, importBase, syntax) {
   //console.log(`Component SCSS in ${fullSourceFile} to css`)
   const dependencies = new Set();
+  // the parser only rewrites imports to tungsten's resolution; the dependencies come from what
+  // sass then actually loaded (below), which includes the partials' own imports
   const imports = syntax === 'indented' ? sassImportParser(data) : scssImportParserChatgpt(data);
   const importsMap = [];
   //if (sassImportResolution === 'js') {
   for (const i of imports) {
     const resolved = resolveSassImport(i.target, fullSourceFile, importBase);
     //console.log('relative', fullSourceFile, resolved, slash(relative(dirname(fullSourceFile), resolved)))
-    dependencies.add(resolved);
     importsMap.push({
       ...i,
       to: slash(relative(dirname(fullSourceFile), resolved)) // should we use absolute or relative?
@@ -96,9 +99,7 @@ function sassScssToCss(data, fullFile, fullSourceFile, importBase, syntax) {
   };
   let compileResult;
   try {
-    const sassStart = performance.now();
-    compileResult = sass.compileString(data, compileOptions);
-    tally('component sass compile', performance.now() - sassStart);
+    compileResult = tallied('component sass compile', () => sass.compileString(data, compileOptions));
   } catch (e) {
     if (typeof e !== 'object' || e === null || !('message' in e) || typeof e.message !== 'string') {
       throwError('BabelTransformComponentStyles', `the Sass compiler threw a value without a string message: ${String(e)}`);
@@ -114,6 +115,12 @@ function sassScssToCss(data, fullFile, fullSourceFile, importBase, syntax) {
   const {
     css
   } = compileResult;
+  // loadedUrls lists the entry itself too
+  const entry = slash(fullSourceFile);
+  for (const loaded of compileResult.loadedUrls) {
+    const file = slash(url.fileURLToPath(loaded));
+    if (file !== entry) dependencies.add(file);
+  }
   return {
     // seem to accept a file location, which is needed for imports
     css,
@@ -216,6 +223,7 @@ export function MakeBabelTransformComponentStyles(opts) {
     fs.writeFileSync(opts.cssOutputFile, '');
   }
   const styleDependers = {};
+  const stylesCache = makeComponentStylesCache(opts.cacheDir, opts.freshCache === true);
   // start watching for changes to sass files
   if (watchStyles) {
     watch({
@@ -375,10 +383,18 @@ export function MakeBabelTransformComponentStyles(opts) {
             const moduleName = getModuleName(relFilePath, state.file.opts.stylesheetIndex);
             //console.log('transforming to css')
             // transform the CSS and find it's dependncies (if using a pre-processor)
+            // plain Css has no compile stage worth caching
+            const cached = tagName === 'Css' ? undefined : tallied('component styles cache lookup', () => stylesCache.lookup(moduleName, tagName, rawStyles));
             const {
               css,
               dependencies
-            } = Assistant.toCss(rawStyles, fullFilePath, fullSourceFilePath, opts.projectAbsStyleImportDir);
+            } = cached ?? Assistant.toCss(rawStyles, fullFilePath, fullSourceFilePath, opts.projectAbsStyleImportDir);
+            if (cached === undefined && tagName !== 'Css') {
+              stylesCache.store(moduleName, tagName, rawStyles, {
+                css,
+                dependencies
+              });
+            }
             //console.log('result,', css)
             //////////////////// deps
             //console.log(index, 'watchStyles', watchStyles)

package/dist/babelPlugins/BabelTransformCssImports.js

@@ -14,7 +14,7 @@ import slash from 'slash';
 import { cliError } from 'tungsten/cliOutput.js';
 import { throwError } from 'tungsten/throwError.js';
 import { existsSync } from 'fs';
-import { isBareImport } from "./isBareImport.js";
+import { isBareImport } from './isBareImport.js';
 export function MakeBabelTransformCssImports(opts) {
   return function BabelTransformCssImports(babel) {
     const t = babel.types;

package/dist/babelPlugins/BabelTransformDeproxyState.js

@@ -5,7 +5,7 @@
 // without its proxy wrapper in certain situations -
 // perhaps when passing the state to external functions,
 // not sure
-import { throwError } from "../throwError.js";
+import { throwError } from '../throwError.js';
 function ExpressionIsMemberExpression(expression) {
   return expression.type === 'MemberExpression';
 }

package/dist/babelPlugins/BabelTransformJsxExtensionsToJs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BabelTransformJsxExtensionsToJs.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformJsxExtensionsToJs.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAGrD,wBAAgB,mCAAmC;;;kCAMA,QAAQ,CAAC,iBAAiB,CAAC;;EAS7E"}
+{"version":3,"file":"BabelTransformJsxExtensionsToJs.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformJsxExtensionsToJs.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAGrD,wBAAgB,mCAAmC;;;kCAMA,QAAQ,CAAC,iBAAiB,CAAC;;EAa7E"}

package/dist/babelPlugins/BabelTransformJsxExtensionsToJs.js

@@ -1,8 +1,8 @@
 // BabelTransformJsxExtensionsToJs
 // exports MakeBabelTransformJsxExtensionsToJs (function)
 //
-// Converts any imports of .jsx files to .js, as our compiled
-// files will all be .js
+// Converts any imports of .jsx (and, with typescript: true, .ts/.tsx) files to .js, as our
+// compiled files will all be .js
 export function MakeBabelTransformJsxExtensionsToJs(/*opts: Opts*/
 ) {
   return function BabelTransformJsxExtensionsToJs(/*babel*/
@@ -15,6 +15,10 @@ export function MakeBabelTransformJsxExtensionsToJs(/*opts: Opts*/
           const location = path.node.source.value;
           if (location.endsWith('.jsx')) {
             path.node.source.value = location.slice(0, -1);
+          } else if (location.endsWith('.tsx')) {
+            path.node.source.value = `${location.slice(0, -3)}js`;
+          } else if (location.endsWith('.ts')) {
+            path.node.source.value = `${location.slice(0, -2)}js`;
           }
         }
       }

package/dist/babelPlugins/BabelTransformPackageImports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BabelTransformPackageImports.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformPackageImports.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BabelTransformPackageImports.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformPackageImports.ts"],"names":[],"mappings":"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"}