tungsten 0.2.16 → 0.2.18

package/dist/_client/cjsHelpers.sxyt.js

@@ -22,13 +22,15 @@ describe('_client/cjsHelpers loadDeps()', ({
   it(`loads a dependency cycle instead of hanging`, async () => {
     const dir = await mkdtemp(join(tmpdir(), 'tungsten-load-deps-'));
     try {
-      const a = pathToFileURL(join(dir, 'a.js')).href;
-      const b = pathToFileURL(join(dir, 'b.js')).href;
-      const c = pathToFileURL(join(dir, 'c.js')).href;
+      // .mjs so that node does not have to guess the module type of a file in a
+      // temp dir with no package.json
+      const a = pathToFileURL(join(dir, 'a.mjs')).href;
+      const b = pathToFileURL(join(dir, 'b.mjs')).href;
+      const c = pathToFileURL(join(dir, 'c.mjs')).href;
       // a <-> b is circular, and both reach c
-      await writeFile(join(dir, 'a.js'), moduleSource([b, c]));
-      await writeFile(join(dir, 'b.js'), moduleSource([a, c]));
-      await writeFile(join(dir, 'c.js'), moduleSource([]));
+      await writeFile(join(dir, 'a.mjs'), moduleSource([b, c]));
+      await writeFile(join(dir, 'b.mjs'), moduleSource([a, c]));
+      await writeFile(join(dir, 'c.mjs'), moduleSource([]));
       const timeout = new Promise(resolve => setTimeout(() => resolve('timed out'), 5000).unref());
       const loaded = await Promise.race([loadDeps([a]), timeout]);
       expect(loaded).not.to.equal('timed out');

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

@@ -93,7 +93,11 @@ export function MakeBabelTransformPackageImports(opts) {
       try {
         const packageName = location.startsWith('@') ? location.split('/').slice(0, 2).join('/') : location.split('/')[0];
         const resolutionPaths = packageName === 'react' || packageName === 'react-dom' ? [opts.projectDir, sourcePackageDir] : [sourcePackageDir];
-        fullLocation = resolveBareImport(location, resolutionPaths) ?? require.resolve(location, {
+        // an import site resolves with the 'import' condition, a require()
+        // site with 'require' - see resolvePrecinctDependencies()
+        fullLocation = fileType === 'esm' ? resolveBareImport(location, resolutionPaths) ?? require.resolve(location, {
+          paths: resolutionPaths
+        }) : require.resolve(location, {
           paths: resolutionPaths
         });
       } catch (e) {
@@ -172,21 +176,24 @@ export function MakeBabelTransformPackageImports(opts) {
     history.push(`${error.dependency} (unresolved)`);
     return 'Your code that is compiled may depend on a node module - this is not allowed.' + `\nCould not resolve "${error.dependency}".` + `\nImport history:\n  ${history.join('\n  -> ')}`;
   }
-  function resolvePrecinctDependencies(deps, file, sourceFilename, history) {
+  function resolvePrecinctDependencies(deps, file, fileType, sourceFilename, history) {
+    // Only a file that will be served as ESM may resolve with the 'import' condition.
+    // A converted CJS file's require() shim looks its dependencies up by the location
+    // recorded here, and the CJS transform resolves the same specifier with the
+    // 'require' condition - resolving the two differently loses the file.
+    const esmSource = fileType === 'esm';
     const out = [];
     for (const dep of deps) {
       if (dep.startsWith('node:')) continue;
       try {
         const packageName = dep.startsWith('@') ? dep.split('/').slice(0, 2).join('/') : dep.split('/')[0];
         if (packageName === 'react' || packageName === 'react-dom') {
-          out.push(resolveBareImport(dep, [opts.projectDir]) ?? require.resolve(dep, {
+          out.push((esmSource ? resolveBareImport(dep, [opts.projectDir]) : undefined) ?? require.resolve(dep, {
             paths: [opts.projectDir]
           }));
           continue;
         }
-        // bare imports resolve the way `import` would first, so that a package
-        // shipping both builds is taken as ESM rather than through the CJS route
-        const f = (isBareImport(dep) ? resolveBareImport(dep, [dirname(file)]) : undefined) ?? getCjsRequire(file).resolve(dep);
+        const f = esmSource && isBareImport(dep) ? resolveBareImport(dep, [dirname(file)]) ?? getCjsRequire(file).resolve(dep) : getCjsRequire(file).resolve(dep);
         out.push(f);
       } catch (error) {
         throw new UnsupportedCompiledDependencyError(dep, file, history.length === 0 ? [sourceFilename] : history, {
@@ -207,7 +214,7 @@ export function MakeBabelTransformPackageImports(opts) {
       //console.log('getFileDependencies', 'd', d)
       return isBareImport(d) ? applyImportAliases(d, fileInfo.type) : d;
     });
-    const resolved = resolvePrecinctDependencies(deps, file, sourceFilename, history);
+    const resolved = resolvePrecinctDependencies(deps, file, fileInfo.type, sourceFilename, history);
     return resolved;
   }
   function getFileEsmGenIntermediateCacheLocation(file, packageInfo) {
@@ -744,8 +751,10 @@ export function MakeBabelTransformPackageImports(opts) {
                 //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
-              const importTarget = require.resolve(location);
+              // 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 = resolveBareImport(location, [dirname(filename)]) ?? require.resolve(location);
               // Should do some checking here to show helpful errors about bad imports
               if (importTarget === location) {
                 //console.log()

package/dist/babelPlugins/BabelTransformRemoveDevBlocks.d.ts

@@ -0,0 +1,9 @@
+import { NodePath } from '@babel/core';
+import type { ConditionalExpression, IfStatement } from '@babel/types';
+export declare function MakeBabelTransformRemoveDevBlocks(): () => {
+    visitor: {
+        IfStatement(path: NodePath<IfStatement>): void;
+        ConditionalExpression(path: NodePath<ConditionalExpression>): void;
+    };
+};
+//# sourceMappingURL=BabelTransformRemoveDevBlocks.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"BabelTransformRemoveDevBlocks.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformRemoveDevBlocks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,EAAE,qBAAqB,EAAc,WAAW,EAAE,MAAM,cAAc,CAAA;AAOlF,wBAAgB,iCAAiC;;0BAef,QAAQ,CAAC,WAAW,CAAC;oCAUX,QAAQ,CAAC,qBAAqB,CAAC;;EAS1E"}

package/dist/babelPlugins/BabelTransformRemoveDevBlocks.js

@@ -0,0 +1,38 @@
+// Removes dev only branches from the production client bundle.
+// `isDev` is false in production, so `if (isDev) {...}` blocks and `isDev ? a : b`
+// expressions collapse to their alternate (or disappear entirely).
+// This also lets rollup tree shake modules that are only imported by dev branches.
+export function MakeBabelTransformRemoveDevBlocks() {
+  return function BabelTransformRemoveDevBlocks(/*babel*/
+  ) {
+    function investigationCondition(test) {
+      if (test.type === 'Identifier' && test.name === 'isDev') {
+        return true;
+      } else if (test.type === 'LogicalExpression' && test.operator === '&&') {
+        // false && anything is false
+        return investigationCondition(test.left) || investigationCondition(test.right);
+      }
+      return false;
+    }
+    return {
+      visitor: {
+        IfStatement(path) {
+          const test = path.node.test;
+          if (investigationCondition(test)) {
+            if (path.node.alternate) {
+              path.replaceWith(path.node.alternate);
+            } else {
+              path.remove();
+            }
+          }
+        },
+        ConditionalExpression(path) {
+          const test = path.node.test;
+          if (investigationCondition(test)) {
+            path.replaceWith(path.node.alternate);
+          }
+        }
+      }
+    };
+  };
+}

package/dist/bin/commands/compile.sxyt.js

@@ -94,6 +94,71 @@ describe('tungsten compile', ({
       });
     }
   });
+  it('takes the import build of a dual package for an import, and the require build for a require', async () => {
+    const projectDir = await mkdtemp(join(tmpdir(), 'tungsten-compile-conditions-test-'));
+    const cliLocation = join(findProjectDir(import.meta.url), 'dist', 'bin', 'index.js');
+    const sourceDir = join(projectDir, 'src');
+    const dualDir = join(projectDir, 'node_modules', 'dual-package');
+    const cjsDir = join(projectDir, 'node_modules', 'cjs-package');
+    async function copiedToPackages(rel) {
+      try {
+        await readFile(join(projectDir, '.tungsten/test/.packages', rel), 'utf8');
+        return true;
+      } catch {
+        return false;
+      }
+    }
+    try {
+      await mkdir(dualDir, {
+        recursive: true
+      });
+      await mkdir(cjsDir, {
+        recursive: true
+      });
+      await mkdir(sourceDir, {
+        recursive: true
+      });
+      await writeFile(join(projectDir, 'package.json'), '{"type":"module"}');
+      await writeFile(join(projectDir, 'tungsten.config.js'), 'export default { codeDir: "src", useRootComponent: false }');
+      // ships both builds, as @trpc/server and zod do
+      await writeFile(join(dualDir, 'package.json'), JSON.stringify({
+        name: 'dual-package',
+        version: '1.0.0',
+        exports: {
+          '.': {
+            import: './index.mjs',
+            require: './index.cjs'
+          }
+        }
+      }));
+      await writeFile(join(dualDir, 'index.mjs'), 'export const dual = "esm"');
+      await writeFile(join(dualDir, 'index.cjs'), 'module.exports = { dual: "cjs" }');
+      // a CJS package that require()s the dual package
+      await writeFile(join(cjsDir, 'package.json'), JSON.stringify({
+        name: 'cjs-package',
+        version: '1.0.0',
+        main: './index.js'
+      }));
+      await writeFile(join(cjsDir, 'index.js'), 'module.exports = require(\'dual-package\')');
+      await writeFile(join(sourceDir, 'entry.js'), 'import { dual } from \'dual-package\'\n' + 'import viaCjs from \'cjs-package\'\n' + 'export { dual, viaCjs }');
+      const {
+        stdout
+      } = await execFileAsync(process.execPath, [cliLocation, 'compile', '--js', '--output', '.tungsten/test', '--quiet'], {
+        cwd: projectDir
+      });
+      expect(stdout).to.contain('Compile complete');
+      // the ESM import took ./index.mjs
+      expect(await copiedToPackages('dual-package@1.0.0/index.mjs')).to.equal(true);
+      // and the require() inside the CJS package took ./index.cjs, so that the
+      // converted require() shim can find it in its deps
+      expect(await copiedToPackages('dual-package@1.0.0/index.cjs')).to.equal(true);
+    } finally {
+      await rm(projectDir, {
+        recursive: true,
+        force: true
+      });
+    }
+  });
   it('overrides the ignoreDirs and ignorePatterns config entries from the command line', async () => {
     const projectDir = await mkdtemp(join(tmpdir(), 'tungsten-compile-ignore-test-'));
     const cliLocation = join(findProjectDir(import.meta.url), 'dist', 'bin', 'index.js');

package/dist/build/rollup.user.prod.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rollup.user.prod.config.d.ts","sourceRoot":"","sources":["../../src/build/rollup.user.prod.config.ts"],"names":[],"mappings":"AAaA,KAAK,YAAY,GAAG;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CACrB,CAAA;AAeD,QAAA,MAAM,YAAY,EAAE,YAkBnB,CAAA;AAED,eAAe,YAAY,CAAA"}
+{"version":3,"file":"rollup.user.prod.config.d.ts","sourceRoot":"","sources":["../../src/build/rollup.user.prod.config.ts"],"names":[],"mappings":"AAcA,KAAK,YAAY,GAAG;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CACrB,CAAA;AAeD,QAAA,MAAM,YAAY,EAAE,YAkBnB,CAAA;AAED,eAAe,YAAY,CAAA"}

package/dist/build/rollup.user.prod.config.js

@@ -6,6 +6,7 @@ import { terser } from "rollup-plugin-terser";
 //import gzip from "rollup-plugin-gzip"
 import jsonModule from "@rollup/plugin-json";
 import { MakeBabelTransformRemoveServerBlocks } from "../babelPlugins/BabelTransformRemoveServerBlocks.js";
+import { MakeBabelTransformRemoveDevBlocks } from "../babelPlugins/BabelTransformRemoveDevBlocks.js";
 const json = typeof jsonModule === "function" ? jsonModule : jsonModule.default;
 function replaceProductionNodeEnv() {
   return {
@@ -25,7 +26,7 @@ const rollupConfig = {
   replaceProductionNodeEnv(), babel({
     babelHelpers: 'bundled',
     exclude: '**/node_modules/**',
-    plugins: [MakeBabelTransformRemoveServerBlocks()]
+    plugins: [MakeBabelTransformRemoveServerBlocks(), MakeBabelTransformRemoveDevBlocks()]
   }),
   // must be after commonjs
   terser({

package/dist/style/styleContentSxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"styleContentSxy.d.ts","sourceRoot":"","sources":["../../src/style/styleContentSxy.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAE,KAAK,WAAW,EAAsF,MAAM,mBAAmB,CAAA;AAWxI,wBAAgB,eAAe,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,eAIrE"}
+{"version":3,"file":"styleContentSxy.d.ts","sourceRoot":"","sources":["../../src/style/styleContentSxy.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EACH,KAAK,WAAW,EACnB,MAAM,mBAAmB,CAAA;AAa1B,wBAAgB,eAAe,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,eAIrE"}

package/dist/style/styleContentSxy.js

@@ -4,15 +4,17 @@ import { warn } from "../output.js";
 import { TungstenError } from "../TungstenError.js";
 import { componentBumpClass } from "../componentClassName.js";
 import { $props, $type } from "../contentNodeSymbols.js";
+import { isDev } from "../isDev.js";
+import { getStyleUsage } from "./unusedStyles.js";
 function debug(...texts) {
   //console.log(...texts)
 }
 export function styleContentSxy(content, styles) {
   if (count(styles.tags) === 0 && count(styles.classes) === 0) return content; // optimization short circuit
-  processElement(content, styles);
+  processElement(content, styles, isDev ? getStyleUsage(styles) : undefined);
   return content;
 }
-function processElement(element, styles) {
+function processElement(element, styles, usage) {
   //console.log('element', element)
   debug('styles', styles);
   //debug(`---- style element ----`)
@@ -37,14 +39,15 @@ function processElement(element, styles) {
   if (Array.isArray(element)) {
     //debug('**** array element ****', element)
     for (const e of element) {
-      processElement(e, styles);
+      processElement(e, styles, usage);
     }
     return;
   }
   debug('Element must be an element. Type: ', typeof element);
   // element is a ContentNodeElement
   let tagName;
-  if (element[$props] !== undefined && element[$props].tagName !== undefined) {
+  //if (element[$props] !== undefined && element[$props].tagName !== undefined) {
+  if (element[$props].tagName !== undefined) {
     if (typeof element[$props].tagName !== 'string') {
       throw new TungstenError(`styleContentSxy() error: ${ContentNodeElementIsHtml(element) ? element[$type] : getComponentName(element)}` + ` component tagName field should be type string. Received ${typeof element[$props].tagName}`);
     }
@@ -97,6 +100,7 @@ function processElement(element, styles) {
   let newClassName = '';
   if (tagName in styles.tags) {
     newClassName += ' ' + componentBumpClass + ' ' + styles.tags[tagName];
+    usage?.usedTags.add(tagName);
   }
   //console.log(element.props.className)
   //if (element.props.className !== undefined) console.log(element.props.className)
@@ -110,6 +114,7 @@ function processElement(element, styles) {
     for (const cn of classNames) {
       if (cn in styles.classes) {
         newClassName += ` ${styles.classes[cn]}`;
+        usage?.usedClasses.add(cn);
       }
     }
   }
@@ -120,7 +125,7 @@ function processElement(element, styles) {
   if (element[$props].children !== undefined) {
     //debug(tagName + '^^^^children', element.props.children)
     //element.props.children = element.props.children as ContentNode
-    processElement(element[$props].children, styles);
+    processElement(element[$props].children, styles, usage);
   }
   //console.log('element after mods', tagName, element)
 }

package/dist/style/unusedStyles.d.ts

@@ -0,0 +1,11 @@
+import type { CssNames } from '../CssNames.js';
+export type StyleUsage = {
+    styles: CssNames;
+    usedTags: Set<string>;
+    usedClasses: Set<string>;
+    reportedTags: Set<string>;
+    reportedClasses: Set<string>;
+};
+export declare function getStyleUsage(styles: CssNames): StyleUsage;
+export declare function reportUnusedStyles(): void;
+//# sourceMappingURL=unusedStyles.d.ts.map

package/dist/style/unusedStyles.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"unusedStyles.d.ts","sourceRoot":"","sources":["../../src/style/unusedStyles.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAU9C,MAAM,MAAM,UAAU,GAAG;IACrB,MAAM,EAAE,QAAQ,CAAA;IAChB,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACrB,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACxB,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACzB,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CAC/B,CAAA;AAUD,wBAAgB,aAAa,CAAC,MAAM,EAAE,QAAQ,cAc7C;AASD,wBAAgB,kBAAkB,SA0BjC"}

package/dist/style/unusedStyles.js

@@ -0,0 +1,43 @@
+import { warn } from "../output.js";
+// component stylesheets are module level singletons, so holding them here is not a leak
+const usageByStyles = new Map();
+// wait for render activity to settle before reporting, so that content rendered a little
+// later (async components, route changes) doesn't get reported as unused
+const reportDelayMs = 5000;
+let reportHandle;
+export function getStyleUsage(styles) {
+  let usage = usageByStyles.get(styles);
+  if (usage === undefined) {
+    usage = {
+      styles,
+      usedTags: new Set(),
+      usedClasses: new Set(),
+      reportedTags: new Set(),
+      reportedClasses: new Set()
+    };
+    usageByStyles.set(styles, usage);
+  }
+  scheduleUnusedStylesReport();
+  return usage;
+}
+function scheduleUnusedStylesReport() {
+  if (reportHandle !== undefined) clearTimeout(reportHandle);
+  reportHandle = setTimeout(reportUnusedStyles, reportDelayMs);
+  // don't hold a node process open just for the report
+  if (typeof reportHandle === 'object' && typeof reportHandle.unref === 'function') reportHandle.unref();
+}
+export function reportUnusedStyles() {
+  if (reportHandle !== undefined) {
+    clearTimeout(reportHandle);
+    reportHandle = undefined;
+  }
+  for (const usage of usageByStyles.values()) {
+    const tags = Object.keys(usage.styles.tags).filter(tag => !usage.usedTags.has(tag) && !usage.reportedTags.has(tag));
+    const classes = Object.keys(usage.styles.classes).filter(className => !usage.usedClasses.has(className) && !usage.reportedClasses.has(className));
+    if (tags.length === 0 && classes.length === 0) continue;
+    // only report each selector once, otherwise every later render repeats the warning
+    for (const tag of tags) usage.reportedTags.add(tag);
+    for (const className of classes) usage.reportedClasses.add(className);
+    warn(`Tungsten dev: styles in module "${usage.styles.moduleName}" have not matched any content:` + (tags.length > 0 ? `\n    tag/component names: ${tags.join(', ')}` : '') + (classes.length > 0 ? `\n    class names: ${classes.join(', ')}` : ''));
+  }
+}

package/package.json

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