tungsten 0.4.11 → 0.4.13

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)
 //
@@ -147,6 +147,7 @@ export function MakeBabelTransformBindDirect(/*opts: Opts*/
             let setFieldExpression;
             if (stateBased) {
               if (stateSettingMode === 'assignment') {
+                // eslint-disable-line @typescript-eslint/no-unnecessary-condition -- other modes kept switchable
                 stateAssignmentExpression = make.expressionStatement(make.assignmentExpression('=', originalVariable, make.identifier('value')));
               } else {
                 //// unused
@@ -185,6 +186,7 @@ export function MakeBabelTransformBindDirect(/*opts: Opts*/
             else functionBodyExpressions.push(assignToValueVarExpression);
             if (stateBased) {
               if (stateSettingMode === 'assignment') {
+                // eslint-disable-line @typescript-eslint/no-unnecessary-condition -- other modes kept switchable
                 if (stateAssignmentExpression === undefined) {
                   throwError('BabelTransformBindDirect', 'failed to create the state assignment expression');
                 }

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

@@ -1 +1 @@
-{"version":3,"file":"BabelTransformBindVar.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformBindVar.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAS,MAAM,aAAa,CAAA;AA0FhE,wBAAgB,yBAAyB,KACC,OAAO,SAAS;;;2BAKvB,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,UAAU;;EAgRjF"}
+{"version":3,"file":"BabelTransformBindVar.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformBindVar.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AA0FzD,wBAAgB,yBAAyB,KACC,OAAO,SAAS;;;2BAKvB,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,UAAU;;EAgRjF"}

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.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BabelTransformComponentState.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformComponentState.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAQ,QAAQ,EAAS,MAAM,aAAa,CAAA;AAExD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EACH,oBAAoB,EAAE,cAAc,EAAE,WAAW,EAAE,aAAa,EAChE,sBAAsB,EAAoB,gBAAgB,EAAE,mBAAmB,EAClF,MAAM,cAAc,CAAA;AAGrB,wBAAgB,gCAAgC,KACC,OAAO,SAAS;;;;wBAuFzC,QAAQ,CAAC,WAAW,GAAG,aAAa,CAAC;uBAOtC,QAAQ,CAAC,WAAW,GAAG,aAAa,CAAC;;;wBAPpC,QAAQ,CAAC,WAAW,GAAG,aAAa,CAAC;uBAOtC,QAAQ,CAAC,WAAW,GAAG,aAAa,CAAC;;mCAgBjB,QAAQ,CAAC,oBAAoB,CAAC;+BA0BlC,QAAQ,CAAC,gBAAgB,CAAC;6BAU5B,QAAQ,CAAC,cAAc,CAAC;kCAqCnB,QAAQ,CAAC,mBAAmB,CAAC;qCAgB1B,QAAQ,CAAC,sBAAsB,CAAC;;EA0B5E"}
+{"version":3,"file":"BabelTransformComponentState.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformComponentState.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAQ,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEjD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EACH,oBAAoB,EAAE,cAAc,EAAE,WAAW,EAAE,aAAa,EAChE,sBAAsB,EAAoB,gBAAgB,EAAE,mBAAmB,EAClF,MAAM,cAAc,CAAA;AAGrB,wBAAgB,gCAAgC,KACC,OAAO,SAAS;;;;wBAuFzC,QAAQ,CAAC,WAAW,GAAG,aAAa,CAAC;uBAOtC,QAAQ,CAAC,WAAW,GAAG,aAAa,CAAC;;;wBAPpC,QAAQ,CAAC,WAAW,GAAG,aAAa,CAAC;uBAOtC,QAAQ,CAAC,WAAW,GAAG,aAAa,CAAC;;mCAgBjB,QAAQ,CAAC,oBAAoB,CAAC;+BA0BlC,QAAQ,CAAC,gBAAgB,CAAC;6BAU5B,QAAQ,CAAC,cAAc,CAAC;kCAqCnB,QAAQ,CAAC,mBAAmB,CAAC;qCAgB1B,QAAQ,CAAC,sBAAsB,CAAC;;EA0B5E"}

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,EAAE,MAAM,iBAAiB,CAAA;AAYjD,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 slash from 'slash';
+import { watch } from '../watch.js';
+import slash from '../slash.js';
 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({
@@ -301,6 +309,7 @@ export function MakeBabelTransformComponentStyles(opts) {
     if (typeof opts.cssOutputFile === 'string' && opts.cssOutputFile !== '') {
       //console.log('css:', css)
       if (mode === 'new') {
+        // eslint-disable-line @typescript-eslint/no-unnecessary-condition -- 'old' kept switchable
         // write a bunch of @import statements
         fs.writeFileSync(opts.cssOutputFile, Object.values(stylesheets).map(file => `@import "${individualFolderName}/${file}";`).join('\n'));
       } else {
@@ -353,7 +362,7 @@ export function MakeBabelTransformComponentStyles(opts) {
           const tag = tte.tag;
           if (tag.type === 'Identifier' && tag.name in languages) {
             //if ( opts.functionNames.includes(tag.name) ) {
-            const tagName = tag.name; // eslint-disable-line no-type-assertion/no-type-assertion -- fine, TS narrowing from the 'in' check above isn't working here
+            const tagName = tag.name; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- fine, TS narrowing from the 'in' check above isn't working here
             //console.log('found stylesheet', tag.name)
             const Assistant = languages[tagName];
             const template = tte.quasi.quasis[0];
@@ -375,10 +384,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)
@@ -421,13 +438,13 @@ export function MakeBabelTransformComponentStyles(opts) {
             const {
               names,
               transformedCss
-            } = tagName === 'ReactZoneScss' ? cssToReactZoneStyles(css, fullFilePath, moduleName) : cssToLocalClassNames(css, fullFilePath, moduleName);
+            } = tallied('component css names (postcss)', () => tagName === 'ReactZoneScss' ? cssToReactZoneStyles(css, fullFilePath, moduleName) : cssToLocalClassNames(css, fullFilePath, moduleName));
             // `#` is a fragment delimiter in the `@import "i/….css"`
             // the manifest is built from, so it cannot survive into
             // a filename. The prefix's trailing `-` keeps the result
             // readable and distinct.
             stylesheets[moduleName] = moduleName.replaceAll('#', '') + '.css';
-            writeOutIfNeeded(transformedCss, names, opts);
+            tallied('component css write', () => writeOutIfNeeded(transformedCss, names, opts));
             // Kept out of the style object, which ships to the browser: a separate
             // static the build can extract and then erase.
             const classBody = path.findParent(parent => parent.isClassBody());

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

@@ -1 +1 @@
-{"version":3,"file":"BabelTransformCssImports.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformCssImports.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAc,MAAM,iBAAiB,CAAA;AAE7D,OAAO,EAAQ,KAAK,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAQjD,KAAK,IAAI,GAAG;IACR,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAA;CACrB,CAAA;AACD,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,IAAI,IACV,OAAO,KAAK;;iBAOvB,UAAU;;kCAUO,QAAQ,CAAC,iBAAiB,CAAC;;EAiJ7E"}
+{"version":3,"file":"BabelTransformCssImports.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformCssImports.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAEjD,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,cAAc,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAQjD,KAAK,IAAI,GAAG;IACR,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAA;CACrB,CAAA;AACD,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,IAAI,IACV,OAAO,KAAK;;iBAOvB,UAAU;;kCAUO,QAAQ,CAAC,iBAAiB,CAAC;;EAiJ7E"}

package/dist/babelPlugins/BabelTransformCssImports.js

@@ -10,11 +10,11 @@
 // that stylesheet
 import { createRequire } from 'module';
 import { dirname } from 'path';
-import slash from 'slash';
+import slash from '../slash.js';
 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;
@@ -41,7 +41,7 @@ export function MakeBabelTransformCssImports(opts) {
             //console.log('found a css import in', filename)
             //console.log('absCodeDir', opts.absCodeDir)
             //console.log('found stylesheet import', location)
-            let bare = false;
+            const bare = false;
             if (isBareImport(location)) {
               //bare = true
               // cliAlert('Bare CSS import:', location)

package/dist/babelPlugins/BabelTransformDependencyImportsOld.js

@@ -12,7 +12,7 @@
 // to relative imports e.g. '../../axios', pointing to local (and transpiled?)
 // copies of that package
 import { dirname, relative } from 'path';
-import slash from 'slash';
+import slash from '../slash.js';
 import { createRequire } from 'module';
 export function MakeBabelTransformDependencyImports(opts) {
   return function BabelTransformDependencyImports(babel) {

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

@@ -1 +1 @@
-{"version":3,"file":"BabelTransformDeproxyState.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformDeproxyState.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,KAAK,EAAE,SAAS,EAAQ,QAAQ,EAAE,MAAM,aAAa,CAAA;AAC5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,cAAc,EAAc,sBAAsB,EAAoB,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAanJ,wBAAgB,8BAA8B,KACC,OAAO,SAAS;;;mCAiDpB,QAAQ,CAAC,oBAAoB,CAAC;6BASpC,QAAQ,CAAC,cAAc,CAAC;kCAgBnB,QAAQ,CAAC,mBAAmB,CAAC;qCAW1B,QAAQ,CAAC,sBAAsB,CAAC;;gBAWrD,SAAS;EAgBhC"}
+{"version":3,"file":"BabelTransformDeproxyState.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformDeproxyState.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtD,OAAO,KAAK,EAAE,oBAAoB,EAAE,cAAc,EAAc,sBAAsB,EAAoB,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAanJ,wBAAgB,8BAA8B,KACC,OAAO,SAAS;;;mCAiDpB,QAAQ,CAAC,oBAAoB,CAAC;6BASpC,QAAQ,CAAC,cAAc,CAAC;kCAgBnB,QAAQ,CAAC,mBAAmB,CAAC;qCAW1B,QAAQ,CAAC,sBAAsB,CAAC;;gBAWrD,SAAS;EAgBhC"}

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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"}

package/dist/babelPlugins/BabelTransformPackageImports.js

@@ -9,35 +9,49 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 // The end of the page ('index.js') is determining through import
 // resolution
 import { join, dirname, relative } from 'path';
-import slash from 'slash';
-import precinct from 'precinct';
-//import sxyPrecinct from 'sxy-precinct'
+import slash from '../slash.js';
 import { existsSync, mkdirSync, promises as fsPromises, readFileSync, writeFileSync } from 'fs';
 import { createRequire } from 'module';
 import { transformFileSync as babelTransformFileSync, transformSync as babelTransformSync } from '@babel/core';
 import babelPluginSyntaxImportAssertionsModule from '@babel/plugin-syntax-import-assertions';
-import { arrays } from 'sxy-lib';
+import { mapToObject } from 'sxy-lib/arrays.js';
 const babelPluginSyntaxImportAssertions = babelPluginSyntaxImportAssertionsModule.default;
 import { init as lexerInit, parse as lexerParse } from 'cjs-module-lexer';
 lexerInit();
-import { MakeBabelTransformCjsToFunction } from "./BabelTransformCjsToFunction.js";
-import { MakeBabelExtractComponentStylesheet } from "./BabelExtractComponentStylesheet.js";
-import { recordFrameworkStylesheet } from "../build/frameworkStylesheets.js";
-import { MakeBabelTransformDependencyImportsEsm } from "./transformPackageImports/BabelTransformDependencyImportsEsm.js";
-import { MakeBabelTransformDependencyImportsCjs } from "./transformPackageImports/BabelTransformDependencyImportsCjs.js";
-import { frameworkDistFolder, packageName as frameworkPackageName, packageName, packagesFolder /*, packagesCacheInfoName*/ } from "../settings.js";
-import { findProjectDir } from "../findProjectDir.js";
-import { cliError, cliWarn, cliNote, cliInfo, cliNews } from "../cliOutput.js";
-import { isBareImport } from "./isBareImport.js";
-import { resolveBareImport } from "./transformPackageImports/resolveBareImport.js";
-import { TungstenError } from "../TungstenError.js";
-import { throwError } from "../throwError.js";
-import { isProfiling, tally } from "../timeProfiler.js";
+import { MakeBabelTransformCjsToFunction } from './BabelTransformCjsToFunction.js';
+import { MakeBabelExtractComponentStylesheet } from './BabelExtractComponentStylesheet.js';
+import { recordFrameworkStylesheet } from '../build/frameworkStylesheets.js';
+import { MakeBabelTransformDependencyImportsEsm } from './transformPackageImports/BabelTransformDependencyImportsEsm.js';
+import { MakeBabelTransformDependencyImportsCjs } from './transformPackageImports/BabelTransformDependencyImportsCjs.js';
+import { frameworkDistFolder, packageName as frameworkPackageName, packageName, packagesFolder /*, packagesCacheInfoName*/ } from '../settings.js';
+import { findProjectDir } from '../findProjectDir.js';
+import { cliError, cliWarn, cliNote, cliInfo, cliNews } from '../cliOutput.js';
+import { isBareImport } from './isBareImport.js';
+import { resolveBareImport } from './transformPackageImports/resolveBareImport.js';
+import { TungstenError } from '../TungstenError.js';
+import { throwError } from '../throwError.js';
+import { isProfiling, tallied } from '../timeProfiler.js';
 //import { copyPackageModulesToPackagesFolder } from '../build/copyPackageModulesToPackagesFolder.js'
 const require = createRequire(import.meta.url);
+// precinct drags in typescript and the typescript-eslint parser (~250 modules), so it is only
+// paid for on a packages-cache miss
+let precinctLoaded;
+function precinct() {
+  return precinctLoaded ??= require('precinct'); // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- require() is untyped
+}
 function debug(...texts) {
   //console.log(...texts)
 }
+// '@scope/name@1.2.3/dist/index.js' -> its package identifier and the file's path within the package
+function breakFileIdentifier(fileIdentifier) {
+  // a scoped name starts with @, so the version's @ is the next one
+  const atPos = fileIdentifier.indexOf('@', fileIdentifier.startsWith('@') ? 1 : 0);
+  const startOfInternal = fileIdentifier.indexOf('/', atPos);
+  return {
+    packageIdentifier: fileIdentifier.slice(0, startOfInternal),
+    relFile: fileIdentifier.slice(startOfInternal + 1)
+  };
+}
 class UnsupportedCompiledDependencyError extends TungstenError {
   constructor(dependency, importedFrom, importHistory, options) {
     super(`Could not resolve ${dependency} from ${importedFrom}`);
@@ -210,11 +224,9 @@ export function MakeBabelTransformPackageImports(opts) {
     const {
       file
     } = fileInfo;
-    const precinctStart = performance.now();
-    const precinctResults = precinct.paperwork(file, {
+    const precinctResults = tallied('precinct.paperwork', () => precinct().paperwork(file, {
       includeCore: false
-    });
-    tally('precinct.paperwork', performance.now() - precinctStart);
+    }));
     const deps = precinctResults.map(d => {
       //console.log('getFileDependencies', 'd', d)
       return isBareImport(d) ? applyImportAliases(d, fileInfo.type) : d;
@@ -348,9 +360,7 @@ export function MakeBabelTransformPackageImports(opts) {
   async function babelFileEsm(file /*, packageInfo*/, nonEsmDeps, onStylesheet) {
     // Sync, so it can be tallied: these run concurrently in the deferred package work, where a
     // wall clock around an async call would count the same time once per file in flight.
-    const esmStart = performance.now();
-    const result = babelTransformFileSync(file, makeModifyImportsEsmBabelOptions(nonEsmDeps.map(d => d.webLocation), onStylesheet));
-    tally('babel transform (packages)', performance.now() - esmStart);
+    const result = tallied('babel transform (packages)', () => babelTransformFileSync(file, makeModifyImportsEsmBabelOptions(nonEsmDeps.map(d => d.webLocation), onStylesheet)));
     if (result === null) {
       throw new TungstenError(`BabelTransformPackageImports error: sub file babel transform (1) returned null: ${file}`);
     }
@@ -384,9 +394,7 @@ export function MakeBabelTransformPackageImports(opts) {
   async function babelFileCjs(file, cacheDest, finalDest, packageInfo, nonEsmDeps) {
     //console.log(chalk.yellow`cjs file ${file}`)
     const nonEsmDepsWebPath = nonEsmDeps.map(fi => fi.webLocation);
-    const cjsStart = performance.now();
-    let result = babelTransformFileSync(file, makeCjsToEsmBabelOptions(nonEsmDepsWebPath));
-    tally('babel transform (packages)', performance.now() - cjsStart);
+    let result = tallied('babel transform (packages)', () => babelTransformFileSync(file, makeCjsToEsmBabelOptions(nonEsmDepsWebPath)));
     if (result === null) {
       throw new TungstenError(`BabelTransformPackageImports error: sub file babel transform (2) returned null: ${file}`);
     }
@@ -399,12 +407,11 @@ export function MakeBabelTransformPackageImports(opts) {
     });
     //console.log('writing file', intermedCacheLocation)
     await fsPromises.writeFile(intermedCacheLocation, result.code); // rel contains the slash at start
-    const cjsImportsStart = performance.now();
-    result = babelTransformSync(result.code, {
+    const code = result.code;
+    result = tallied('babel transform (packages)', () => babelTransformSync(code, {
       filename: file,
       ...makeModifyImportsCjsBabelOptions(nonEsmDepsWebPath)
-    });
-    tally('babel transform (packages)', performance.now() - cjsImportsStart);
+    }));
     if (result === null) {
       throw new TungstenError(`BabelTransformPackageImports error: sub file babel transform (3) returned null: ${file}
                 `);
@@ -567,6 +574,24 @@ export function MakeBabelTransformPackageImports(opts) {
   // A cached file is only reusable if its whole dependency closure is too: processCacheDependencies
   // walks that closure from identifiers alone and has no way to resolve one back to a source file
   // to compile instead, so the entire subtree is checked before any of it is used.
+  // Existence is checked per package directory, not per file. An installed package at a version
+  // has all its files, and the graph is written only once a run has completed, so a cache
+  // directory a node names is whole unless deleted by hand - `--fresh` covers that. Two stats per
+  // node were ~85ms of a full-hit start on 327 nodes; a recursive readdirSync of the cache was
+  // 68ms, so it was not taken either.
+  const dirsKnown = new Map();
+  function dirExists(dir) {
+    let known = dirsKnown.get(dir);
+    if (known === undefined) dirsKnown.set(dir, known = existsSync(dir));
+    return known;
+  }
+  function packageDirsExist(fileIdentifier, node) {
+    // both locations end in the file's path within its package; what precedes it is the package
+    const {
+      relFile
+    } = breakFileIdentifier(fileIdentifier);
+    return dirExists(node.originalLocation.slice(0, -relFile.length)) && dirExists(node.cacheLocation.slice(0, -relFile.length));
+  }
   const subtreeUsable = new Map();
   function cachedSubtreeIsUsable(fileIdentifier, visiting) {
     const settled = subtreeUsable.get(fileIdentifier);
@@ -579,7 +604,7 @@ export function MakeBabelTransformPackageImports(opts) {
     // pays rather than recompiling a linked framework's every file. The cache key is the
     // version, which a linked package changes underneath, so a profiled run can compile stale
     // code after that package is rebuilt until the packages cache is deleted - it warns.
-    const usable = node !== undefined && (isProfiling() || cacheKeyIdentifiesContent(node.originalLocation)) && existsSync(node.originalLocation) && existsSync(node.cacheLocation) && (node.dependencies ?? []).every(dep => cachedSubtreeIsUsable(dep, visiting));
+    const usable = node !== undefined && (isProfiling() || cacheKeyIdentifiesContent(node.originalLocation)) && tallied('package dirs exist', () => packageDirsExist(fileIdentifier, node)) && (node.dependencies ?? []).every(dep => cachedSubtreeIsUsable(dep, visiting));
     visiting.delete(fileIdentifier);
     subtreeUsable.set(fileIdentifier, usable);
     return usable;
@@ -600,7 +625,7 @@ export function MakeBabelTransformPackageImports(opts) {
     } else {
       processedFilesCache[file] = fileInfo.packageInfo;
       const cacheNode = opts.oldDependencyGraph[fileInfo.fileIdentifier];
-      if (cacheNode !== undefined && cachedSubtreeIsUsable(fileInfo.fileIdentifier, new Set())) {
+      if (cacheNode !== undefined && tallied('cached subtree check', () => cachedSubtreeIsUsable(fileInfo.fileIdentifier, new Set()))) {
         await copyFileFromCache(fileInfo.fileIdentifier, cacheNode);
       } else {
         await doProcessFile(fileInfo, sourceFilename, history);
@@ -660,8 +685,10 @@ export function MakeBabelTransformPackageImports(opts) {
     if (cachedFileInfo) {
       return cachedFileInfo;
     } else {
-      const fileInfo = resolveFile(file);
-      opts.promises.push(processFile(fileInfo, sourceFilename, [sourceFilename]).catch(error => {
+      const fileInfo = tallied('resolve file', () => resolveFile(file));
+      // async: the tally covers its synchronous prefix, up to the first await
+      const processing = tallied('start processing file', () => processFile(fileInfo, sourceFilename, [sourceFilename]));
+      opts.promises.push(processing.catch(error => {
         if (error instanceof UnsupportedCompiledDependencyError) {
           cliError(formatUnsupportedDependencyError(error));
         } else {
@@ -701,7 +728,7 @@ export function MakeBabelTransformPackageImports(opts) {
         reexports
       } = lexerParse(code);
       //console.log('lexInner exports', exports)
-      const exportsMap = arrays.mapToObject(exports, value => [value, true]);
+      const exportsMap = mapToObject(exports, value => [value, true]);
       //console.log('lexInner exports map', exportsMap)
       for (const re of reexports) {
         try {
@@ -775,18 +802,18 @@ export function MakeBabelTransformPackageImports(opts) {
     //         const location = source.value
     //     }
     // }
-    // Resolution is this visitor's whole cost - ~2ms of node_modules walking per bare import -
-    // and the same specifier from the same directory resolves identically within a run
-    // (tungsten/jsx-runtime, from every component). Keyed on the importer's directory because
-    // both resolvers start their walk there. Lives as long as the plugin, like
-    // importedPackageFiles, so a package changed in place mid-session is stale in both.
+    // Resolution is this visitor's whole cost - ~2ms of node_modules walking per bare import.
+    // Every importer is under the one code dir, so they all walk the same node_modules chain
+    // and a specifier resolves identically wherever it is imported from (tungsten/jsx-runtime,
+    // from every component): one resolution per specifier, not per importer directory. A
+    // node_modules nested inside the code dir would break that; none is expected. Lives as long
+    // as the plugin, like importedPackageFiles, so a package changed in place is stale in both.
     const resolvedImports = new Map();
     function resolveImportTarget(location, fromDir, requireFrom) {
-      const key = `${fromDir}\0${location}`;
-      const known = resolvedImports.get(key);
+      const known = resolvedImports.get(location);
       if (known !== undefined) return known;
       const target = resolveBareImport(location, [fromDir]) ?? requireFrom.resolve(location);
-      resolvedImports.set(key, target);
+      resolvedImports.set(location, target);
       return target;
     }
     return {
@@ -810,7 +837,7 @@ export function MakeBabelTransformPackageImports(opts) {
         ImportDeclaration: function (path) {
           if (skipPackageCompilationForFile) return;
           try {
-            let location = path.node.source.value;
+            const location = path.node.source.value;
             //console.log('BabelTransformPackageImports', 'ImportDeclaration', location)
             // see if it is a bare import
             if (isBareImport(location)) {
@@ -823,15 +850,10 @@ export function MakeBabelTransformPackageImports(opts) {
               //     throwError('BabelTransformPackageImports', 'Found an import to a node package in user code.')
               // }
               //console.log('*', filename, 'processing bare import', location)
-              // hacky alias
-              if (location === 'tungsten/jsx-runtime') {
-                //console.log(chalk.orange`We did the hacky jsx runtime alias in BabelTransformPackageImports`)
-                location = 'tungsten/jsxRuntime.js';
-              }
               // the real file location of the file being imported.
               // User code is served as ESM, so it resolves with the 'import'
               // condition - see resolvePrecinctDependencies()
-              const importTarget = resolveImportTarget(location, dirname(filename), require);
+              const importTarget = tallied('resolve import target', () => resolveImportTarget(location, dirname(filename), require));
               // Should do some checking here to show helpful errors about bad imports
               if (importTarget === location) {
                 //console.log()
@@ -847,7 +869,7 @@ export function MakeBabelTransformPackageImports(opts) {
                 return;
               }
               //console.log('** importTarget', importTarget)
-              const fileInfo = processPackageFile(importTarget, filename);
+              const fileInfo = tallied('process package file', () => processPackageFile(importTarget, filename));
               const {
                 file: sourceFile,
                 finalDest,
@@ -868,7 +890,7 @@ export function MakeBabelTransformPackageImports(opts) {
                   addImportAlias(location, webLocation);
                   //console.log('add alias for', location)
                 } else {
-                  const entryFile = makeCjsEntryFile(sourceFile, webLocation);
+                  const entryFile = tallied('make cjs entry file', () => makeCjsEntryFile(sourceFile, webLocation));
                   addImportAlias(location, entryFile);
                   //console.log('add alias for', location)
                 }

package/dist/babelPlugins/BabelTransformReactive.js

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

package/dist/babelPlugins/BabelTransformReactiveSvelteStyle.js

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

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

@@ -1 +1 @@
-{"version":3,"file":"BabelTransformRemoveBlocks.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformRemoveBlocks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAQ,QAAQ,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,EAAc,qBAAqB,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAE7E,KAAK,IAAI,GAAG;IACR,KAAK,EAAE,MAAM,EAAE,CAAA;CAClB,CAAA;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,IAAI;;0BAmBvB,QAAQ,CAAC,WAAW,CAAC;oCAWX,QAAQ,CAAC,qBAAqB,CAAC;;EAS1E"}
+{"version":3,"file":"BabelTransformRemoveBlocks.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformRemoveBlocks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAc,qBAAqB,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAE7E,KAAK,IAAI,GAAG;IACR,KAAK,EAAE,MAAM,EAAE,CAAA;CAClB,CAAA;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,IAAI;;0BAmBvB,QAAQ,CAAC,WAAW,CAAC;oCAWX,QAAQ,CAAC,qBAAqB,CAAC;;EAS1E"}

package/dist/babelPlugins/BabelTransformSxyFrameworkImports.js

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

package/dist/babelPlugins/BabelTransformUniqueComponents.js

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