tungsten 0.2.15 → 0.2.17

package/dist/FrameworkConfig.d.ts

@@ -74,5 +74,6 @@ export type FrameworkConfigCompleteWithoutRootComponent = FrameworkConfigComplet
     useRootComponent: false;
 };
 export type FrameworkConfigComplete = FrameworkConfigCompleteWithRootComponent | FrameworkConfigCompleteWithoutRootComponent;
+export type FrameworkConfigOverrides = Pick<FrameworkConfigCompleteBase, 'ignoreDirs' | 'ignorePatterns'>;
 export {};
 //# sourceMappingURL=FrameworkConfig.d.ts.map

package/dist/FrameworkConfig.d.ts.map

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

package/dist/_client/cjsHelpers.d.ts

@@ -1,3 +1,4 @@
+import type { Module } from '../CjsTypes.js';
 declare global {
     interface Window {
         __tungsten_cjs_import: (location: string) => Promise<{
@@ -5,5 +6,5 @@ declare global {
         }>;
     }
 }
-export {};
+export declare function loadDeps(deps: string[]): Promise<Record<string, Module>>;
 //# sourceMappingURL=cjsHelpers.d.ts.map

package/dist/_client/cjsHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cjsHelpers.d.ts","sourceRoot":"","sources":["../../src/_client/cjsHelpers.ts"],"names":[],"mappings":"AAmCA,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ,qBAAqB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;SAAE,CAAC,CAAA;KAC/E;CACJ"}
+{"version":3,"file":"cjsHelpers.d.ts","sourceRoot":"","sources":["../../src/_client/cjsHelpers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAa,MAAM,gBAAgB,CAAA;AAkCvD,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ,qBAAqB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;SAAE,CAAC,CAAA;KAC/E;CACJ;AA6BD,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,mCAuC5C"}

package/dist/_client/cjsHelpers.js

@@ -40,19 +40,32 @@ function pathCombine(baseFile, dest) {
     throw new Error(`pathCombine error: unknown dest format, expected a relative import. baseDir: ${baseDir} dest: ${dest}`);
   }
 }
-async function loadDeps(deps) {
+export async function loadDeps(deps) {
   const loaded = {};
   const proms = [];
-  deps.forEach(async dep => {
-    if (dep.endsWith('json')) {
-      proms.push(fetch(dep).then(res => res.json()).then(json => loaded[dep] = json));
-    } else {
-      proms.push(import(dep).then(m => {
-        loaded[dep] = m.default;
-        proms.push(loadDeps(m.deps).then(mods => Object.assign(loaded, mods)));
-      }));
+  // Every dep is queued at most once. Without this, a circular require() between two
+  // converted CJS files (common in packages split over many small files) queues the pair
+  // forever: the browser serves the repeat import() from its module cache, so nothing
+  // fails or even slows down - the returned promise simply never settles, and every
+  // import() waiting on that module graph hangs with it.
+  const queued = new Set();
+  function queueDeps(deps) {
+    if (deps === undefined) return;
+    for (const dep of deps) {
+      if (queued.has(dep)) continue;
+      queued.add(dep);
+      if (dep.endsWith('json')) {
+        proms.push(fetch(dep).then(res => res.json()).then(json => loaded[dep] = json));
+      } else {
+        proms.push(import(dep).then(m => {
+          loaded[dep] = m.default;
+          queueDeps(m.deps);
+        }));
+      }
     }
-  });
+  }
+  queueDeps(deps);
+  // queueDeps() adds to proms as each module arrives with its own deps
   let resolved = 0;
   while (resolved < proms.length) {
     const results = await Promise.all(proms);
@@ -104,5 +117,4 @@ window.__tungsten_cjs_import = async function __tungsten_cjs_import(location /*
   cjsModule(module, module.exports, createRequire(location, loadedDeps, cjsModuleCache));
   return module.exports;
 };
-export {};
 //}

package/dist/_client/cjsHelpers.sxyt.d.ts

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

package/dist/_client/cjsHelpers.sxyt.d.ts.map

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

package/dist/_client/cjsHelpers.sxyt.js

@@ -0,0 +1,43 @@
+import { expect } from 'chai';
+import { describe } from 'sxy-test-runner';
+import { mkdtemp, rm, writeFile } from 'fs/promises';
+import { tmpdir } from 'os';
+import { join } from 'path';
+import { pathToFileURL } from 'url';
+// cjsHelpers is browser code - it installs a `process` shim and a window global as soon as
+// it is imported. Stub the window it expects and put node's own process back afterwards.
+const nodeProcess = Reflect.get(globalThis, 'process');
+Reflect.set(globalThis, 'window', {});
+const {
+  loadDeps
+} = await import("./cjsHelpers.js");
+Reflect.set(globalThis, 'process', nodeProcess);
+// a converted CJS module exports its factory as the default and its dependencies as `deps`
+function moduleSource(deps) {
+  return `export const deps = ${JSON.stringify(deps)}\n` + 'export default function (module) { module.exports = {} }\n';
+}
+describe('_client/cjsHelpers loadDeps()', ({
+  it
+}) => {
+  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;
+      // 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([]));
+      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');
+      expect(Object.keys(loaded).sort()).to.deep.equal([a, b, c].sort());
+    } finally {
+      await rm(dir, {
+        recursive: true,
+        force: true
+      });
+    }
+  });
+});

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

@@ -1 +1 @@
-{"version":3,"file":"BabelTransformPackageImports.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformPackageImports.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAOrD,OAAO,EAGH,QAAQ,EACX,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AA2B5C,MAAM,MAAM,QAAQ,GAAG,KAAK,GAAG,KAAK,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,CAAA;AAErE,MAAM,MAAM,QAAQ,GAAG;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,QAAQ,CAAA;IACd,WAAW,EAAE,WAAW,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,WAAW,GAAG,KAAK,GAAG,KAAK,GAAG,SAAS,CAAA;AAEnD,MAAM,MAAM,WAAW,GAAG;IACtB,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;IACtC,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,WAAW,CAAA;IACjB,iBAAiB,EAAE,MAAM,CAAA;IACzB,aAAa,EAAE,MAAM,CAAA;IACrB,aAAa,EAAE,MAAM,CAAA;CACxB,CAAA;AAGD,MAAM,MAAM,WAAW,GAAG;IACtB,CAAC,GAAG,EAAC,MAAM,GAAG,WAAW,CAAA;CAC5B,CAAA;AAED,MAAM,MAAM,cAAc,GAAG,WAAW,GAAG;IACvC,KAAK,EAAE,MAAM,EAAE,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IACzB,CAAC,GAAG,EAAC,MAAM,GAAG,cAAc,CAAA;CAC/B,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAC9B,IAAI,EAAE,QAAQ,CAAA;IACd,gBAAgB,EAAE,MAAM,CAAA;IACxB,aAAa,EAAE,MAAM,CAAA;IACrB,aAAa,EAAE,MAAM,CAAA;IACrB,YAAY,CAAC,EAAE,YAAY,CAAA;CAC9B,CAAA;AAED,MAAM,MAAM,iCAAiC,GAAG,mBAAmB,GAAG;IAClE,cAAc,EAAE,MAAM,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC1B,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;CACrC,CAAA;AAED,MAAM,MAAM,YAAY,GAAG,MAAM,EAAE,CAAA;AAEnC,KAAK,IAAI,GAAG;IACR,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,MAAM,CAAA;IACf,aAAa,EAAE,MAAM,CAAA;IACrB,iBAAiB,EAAE,MAAM,CAAA;IACzB,qBAAqB,EAAE,MAAM,CAAA;IAC7B,2BAA2B,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;IAChD,kBAAkB,EAAE,eAAe,CAAA;IACnC,eAAe,EAAE,eAAe,CAAA;IAChC,aAAa,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;IAGxC,QAAQ,EAAE,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,EAAE,CAAA;CAC/C,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAA;AAC3D,MAAM,MAAM,qBAAqB,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,WAAW,CAAA;AACjE,MAAM,MAAM,oCAAoC,GAC1C,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,KAAK,MAAM,CAAA;AACpG,MAAM,MAAM,kCAAkC,GACxC,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAmC,MAAM,CAAA;AAChF,MAAM,MAAM,uCAAuC,GAC7C,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAmC,MAAM,CAAA;AAChF,MAAM,MAAM,oBAAoB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,KAAK,MAAM,CAAA;AACrF,MAAM,MAAM,gBAAgB,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,KAAK,MAAM,CAAA;AA0DzF,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,IAAI;eAq0BpC,SAAS;;kCAkBmB,QAAQ,CAAC,iBAAiB,CAAC;;;EA0H7E"}
+{"version":3,"file":"BabelTransformPackageImports.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformPackageImports.ts"],"names":[],"mappings":"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"}

package/dist/babelPlugins/BabelTransformPackageImports.js

@@ -27,6 +27,7 @@ import { frameworkDistFolder, packageName as frameworkPackageName, packageName,
 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 { copyPackageModulesToPackagesFolder } from '../build/copyPackageModulesToPackagesFolder.js'
@@ -92,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 = 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) {
@@ -171,19 +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(require.resolve(dep, {
+          out.push((esmSource ? resolveBareImport(dep, [opts.projectDir]) : undefined) ?? require.resolve(dep, {
             paths: [opts.projectDir]
           }));
           continue;
         }
-        const f = 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, {
@@ -204,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) {
@@ -741,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/transformPackageImports/resolveBareImport.d.ts

@@ -0,0 +1,2 @@
+export declare function resolveBareImport(specifier: string, fromDirs: string[]): string | undefined;
+//# sourceMappingURL=resolveBareImport.d.ts.map

package/dist/babelPlugins/transformPackageImports/resolveBareImport.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveBareImport.d.ts","sourceRoot":"","sources":["../../../src/babelPlugins/transformPackageImports/resolveBareImport.ts"],"names":[],"mappings":"AAcA,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAgB3F"}

package/dist/babelPlugins/transformPackageImports/resolveBareImport.js

@@ -0,0 +1,28 @@
+import { join } from 'path';
+import { fileURLToPath, pathToFileURL } from 'url';
+import { moduleResolve } from 'import-meta-resolve';
+// The conditions Node itself uses for `import`. Packages that ship both builds (zod, for
+// example, has "import": "./index.js" and "require": "./index.cjs") then give us the ESM
+// entry point, which the browser runs as-is instead of going through the CJS conversion.
+const importConditions = new Set(['node', 'import']);
+// Resolve a bare import the way `import` would, from any of the given directories.
+// Returns undefined when the package cannot be resolved that way, so that the caller can
+// fall back to require.resolve() - packages with no "exports" map, or with an "exports"
+// map that only offers "require", still resolve through the CJS route.
+export function resolveBareImport(specifier, fromDirs) {
+  for (const dir of fromDirs) {
+    // the base must name a file inside the directory, otherwise the node_modules walk
+    // starts at the directory's parent
+    const base = pathToFileURL(join(dir, '_'));
+    let resolved;
+    try {
+      resolved = moduleResolve(specifier, base, importConditions);
+    } catch {
+      continue;
+    }
+    // node: and data: URLs are not files we can copy to the browser
+    if (resolved.protocol !== 'file:') return undefined;
+    return fileURLToPath(resolved);
+  }
+  return undefined;
+}

package/dist/babelPlugins/transformPackageImports/resolveBareImport.sxyt.d.ts

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

package/dist/babelPlugins/transformPackageImports/resolveBareImport.sxyt.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveBareImport.sxyt.d.ts","sourceRoot":"","sources":["../../../src/babelPlugins/transformPackageImports/resolveBareImport.sxyt.ts"],"names":[],"mappings":""}

package/dist/babelPlugins/transformPackageImports/resolveBareImport.sxyt.js

@@ -0,0 +1,104 @@
+import { expect } from 'chai';
+import { describe } from 'sxy-test-runner';
+import { mkdir, mkdtemp, rm, writeFile } from 'fs/promises';
+import { createRequire } from 'module';
+import { tmpdir } from 'os';
+import { join } from 'path';
+import { resolveBareImport } from "./resolveBareImport.js";
+async function makeFixture() {
+  const dir = await mkdtemp(join(tmpdir(), 'tungsten-resolve-bare-import-'));
+  const modules = join(dir, 'node_modules');
+  const dual = join(modules, 'dual-package');
+  await mkdir(dual, {
+    recursive: true
+  });
+  await writeFile(join(dual, 'package.json'), JSON.stringify({
+    name: 'dual-package',
+    version: '1.0.0',
+    exports: {
+      '.': {
+        import: './index.js',
+        require: './index.cjs'
+      }
+    }
+  }));
+  await writeFile(join(dual, 'index.js'), 'export default 1');
+  await writeFile(join(dual, 'index.cjs'), 'module.exports = 1');
+  const cjsOnly = join(modules, 'cjs-package');
+  await mkdir(cjsOnly, {
+    recursive: true
+  });
+  await writeFile(join(cjsOnly, 'package.json'), JSON.stringify({
+    name: 'cjs-package',
+    version: '1.0.0',
+    main: './main.js'
+  }));
+  await writeFile(join(cjsOnly, 'main.js'), 'module.exports = 1');
+  return {
+    dir,
+    dual,
+    cjsOnly
+  };
+}
+describe('resolveBareImport()', ({
+  it
+}) => {
+  it(`takes the 'import' condition where require.resolve takes 'require'`, async () => {
+    const {
+      dir,
+      dual
+    } = await makeFixture();
+    try {
+      const require = createRequire(join(dir, '_'));
+      expect(require.resolve('dual-package')).to.equal(join(dual, 'index.cjs'));
+      expect(resolveBareImport('dual-package', [dir])).to.equal(join(dual, 'index.js'));
+    } finally {
+      await rm(dir, {
+        recursive: true,
+        force: true
+      });
+    }
+  });
+  it(`resolves a package that only has a legacy main`, async () => {
+    const {
+      dir,
+      cjsOnly
+    } = await makeFixture();
+    try {
+      expect(resolveBareImport('cjs-package', [dir])).to.equal(join(cjsOnly, 'main.js'));
+    } finally {
+      await rm(dir, {
+        recursive: true,
+        force: true
+      });
+    }
+  });
+  it(`returns undefined for a package it cannot resolve, so the caller can fall back`, async () => {
+    const {
+      dir
+    } = await makeFixture();
+    try {
+      expect(resolveBareImport('not-installed', [dir])).to.equal(undefined);
+    } finally {
+      await rm(dir, {
+        recursive: true,
+        force: true
+      });
+    }
+  });
+  it(`tries each of the given directories in turn`, async () => {
+    const {
+      dir,
+      dual
+    } = await makeFixture();
+    try {
+      const missing = join(dir, 'no-such-dir');
+      expect(resolveBareImport('dual-package', [missing, dir])).to.equal(join(dual, 'index.js'));
+    } finally {
+      await rm(dir, {
+        recursive: true,
+        force: true
+      });
+    }
+  });
+});

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

@@ -1 +1 @@
-{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/compile.ts"],"names":[],"mappings":"AAyPA,OAAO,EAAE,CAAA"}
+{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/compile.ts"],"names":[],"mappings":"AA+QA,OAAO,EAAE,CAAA"}

package/dist/bin/commands/compile.js

@@ -18,38 +18,58 @@ const targetOptions = {
   '--public': 'public'
 };
 const args = process.argv.slice(3);
-function optionValue(option) {
-  const position = args.indexOf(option);
-  if (position === -1) return undefined;
-  const value = args[position + 1];
-  if (value === undefined || value.startsWith('--')) {
-    cliError(`${option} requires a path`);
-    process.exit(1);
-  }
-  return value;
-}
+const usage = 'Usage: tungsten compile [targets] [--all] [--watch] [--no-clean] [--output <dir>]';
 if (args.includes('--help') || args.includes('-h')) {
-  cliOut('Usage: tungsten compile [targets] [--all] [--watch] [--no-clean] [--output <dir>]');
+  cliOut(usage);
   cliOut('Targets: --js, --css, --client, --assets, --public');
   cliOut('With no target options, all targets are compiled.');
   cliOut('Options: --output <dir>, --ready-file <file>, --quiet');
+  cliOut('         --ignore-dirs <dir>, --ignore-patterns <pattern>');
+  cliOut('           override the config entries of the same name. Repeat the option to');
+  cliOut('           give several values, or pass an empty value to ignore nothing.');
   process.exit(0);
 }
 const commandOptions = new Set(['--all', '--watch', '--no-clean', '--quiet']);
-const valueOptions = new Set(['--output', '--ready-file']);
-const optionValues = new Set();
-for (const option of valueOptions) {
-  const position = args.indexOf(option);
-  if (position !== -1 && args[position + 1] !== undefined) optionValues.add(args[position + 1]);
+const valueOptions = new Set(['--output', '--ready-file', '--ignore-dirs', '--ignore-patterns']);
+// values are collected per option so that the list options can be repeated
+const givenOptionValues = new Map();
+const unknownOptions = [];
+let consumedPosition = -1;
+for (const [position, arg] of args.entries()) {
+  if (position === consumedPosition) continue; // already taken as an option value
+  if (arg in targetOptions || commandOptions.has(arg)) continue;
+  if (valueOptions.has(arg)) {
+    const value = args[position + 1];
+    if (value === undefined || value.startsWith('--')) {
+      cliError(`${arg} requires a value`);
+      process.exit(1);
+    }
+    const values = givenOptionValues.get(arg);
+    if (values === undefined) givenOptionValues.set(arg, [value]);else values.push(value);
+    consumedPosition = position + 1;
+  } else {
+    unknownOptions.push(arg);
+  }
 }
-const unknownOptions = args.filter(arg => !(arg in targetOptions) && !commandOptions.has(arg) && !valueOptions.has(arg) && !optionValues.has(arg));
 if (unknownOptions.length > 0) {
   cliError(`Unknown compile option${unknownOptions.length === 1 ? '' : 's'}: ${unknownOptions.join(', ')}`);
-  cliOut('Usage: tungsten compile [targets] [--all] [--watch] [--no-clean] [--output <dir>]');
+  cliOut(usage);
   process.exit(1);
 }
+function optionValue(option) {
+  return givenOptionValues.get(option)?.at(-1);
+}
+// undefined leaves the config entry alone, '' clears it
+function listOptionValue(option) {
+  const values = givenOptionValues.get(option);
+  if (values === undefined) return undefined;
+  const entries = values.filter(value => value !== '');
+  return entries.length === 0 ? '' : entries;
+}
 const outputOption = optionValue('--output');
 const readyFileOption = optionValue('--ready-file');
+const ignoreDirsOption = listOptionValue('--ignore-dirs');
+const ignorePatternsOption = listOptionValue('--ignore-patterns');
 const requestedTargets = new Set();
 for (const arg of args) {
   const target = targetOptions[arg];
@@ -60,7 +80,14 @@ const watch = args.includes('--watch');
 const clean = !args.includes('--no-clean');
 const quiet = args.includes('--quiet');
 const projectDir = process.cwd();
-const config = await getUserConfig();
+const config = await getUserConfig({
+  ...(ignoreDirsOption !== undefined ? {
+    ignoreDirs: ignoreDirsOption
+  } : {}),
+  ...(ignorePatternsOption !== undefined ? {
+    ignorePatterns: ignorePatternsOption
+  } : {})
+});
 const codeLocation = join(projectDir, config.codeDir);
 const relSourceDir = config.sourceDir !== undefined && config.sourceDir !== '' ? config.sourceDir : config.codeDir;
 const sourceLocation = join(projectDir, relSourceDir);
@@ -117,10 +144,10 @@ if (targets.has('js')) {
     onCycleComplete: watch ? async cycle => {
       if (cycle.success) {
         await markReady();
-        cliNews(`Compile cycle complete: js${cycle.file ? ` (${cycle.file})` : ''}`);
+        cliNews(`Compile cycle complete: js${cycle.file !== undefined ? ` (${cycle.file})` : ''}`);
       } else {
         await clearReadyFile();
-        cliError(`Compile cycle failed: js${cycle.file ? ` (${cycle.file})` : ''}`);
+        cliError(`Compile cycle failed: js${cycle.file !== undefined ? ` (${cycle.file})` : ''}`);
       }
     } : undefined
   });
@@ -137,8 +164,8 @@ if (targets.has('client')) {
   compilationTasks.push(createClientFiles(config, 'dev', buildLocation));
 }
 if (targets.has('assets')) {
-  const assetsTask = copyAssets(projectDir, config, buildLocation, watch);
-  if (assetsTask !== undefined) compilationTasks.push(assetsTask);
+  // copyAssets resolves to undefined when there is no assets dir - nothing to skip here
+  compilationTasks.push(copyAssets(projectDir, config, buildLocation, watch));
 }
 if (targets.has('public')) {
   compilationTasks.push(copyPublicFiles(projectDir, config, buildLocation, watch));

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

@@ -94,6 +94,125 @@ 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');
+    const sourceDir = join(projectDir, 'src');
+    async function compiled(rel) {
+      try {
+        await readFile(join(projectDir, '.tungsten/test/code', rel), 'utf8');
+        return true;
+      } catch {
+        return false;
+      }
+    }
+    try {
+      await mkdir(join(sourceDir, 'server'), {
+        recursive: true
+      });
+      await mkdir(join(sourceDir, 'tests'), {
+        recursive: true
+      });
+      await writeFile(join(projectDir, 'package.json'), '{"type":"module"}');
+      await writeFile(join(projectDir, 'tungsten.config.js'), 'export default {' + ' codeDir: "src",' + ' useRootComponent: false,' + ' ignoreDirs: "server",' + ' ignorePatterns: "**/*.domTest.js"' + ' }');
+      await writeFile(join(sourceDir, 'entry.js'), 'export const entry = 1');
+      await writeFile(join(sourceDir, 'server', 'api.js'), 'export const api = 1');
+      await writeFile(join(sourceDir, 'tests', 'unit.js'), 'export const unit = 1');
+      await writeFile(join(sourceDir, 'component.domTest.js'), 'export const domTest = 1');
+      // the config entries alone - server/ and *.domTest.js are left out
+      await execFileAsync(process.execPath, [cliLocation, 'compile', '--js', '--output', '.tungsten/test', '--quiet'], {
+        cwd: projectDir
+      });
+      expect(await compiled('entry.js')).to.equal(true);
+      expect(await compiled('server/api.js')).to.equal(false);
+      expect(await compiled('component.domTest.js')).to.equal(false);
+      // blank values override both entries away, so everything is compiled
+      await execFileAsync(process.execPath, [cliLocation, 'compile', '--js', '--output', '.tungsten/test', '--quiet', '--ignore-dirs', '', '--ignore-patterns', ''], {
+        cwd: projectDir
+      });
+      expect(await compiled('server/api.js')).to.equal(true);
+      expect(await compiled('component.domTest.js')).to.equal(true);
+      // repeating an option replaces the config entry with all of the given values
+      await execFileAsync(process.execPath, [cliLocation, 'compile', '--js', '--output', '.tungsten/test', '--quiet', '--ignore-dirs', 'tests', '--ignore-dirs', 'server'], {
+        cwd: projectDir
+      });
+      expect(await compiled('entry.js')).to.equal(true);
+      expect(await compiled('tests/unit.js')).to.equal(false);
+      expect(await compiled('server/api.js')).to.equal(false);
+      // ignorePatterns was not overridden, so it still applies
+      expect(await compiled('component.domTest.js')).to.equal(false);
+    } finally {
+      await rm(projectDir, {
+        recursive: true,
+        force: true
+      });
+    }
+  });
   it('skips package compilation for files selected by a JavaScript glob', async () => {
     const projectDir = await mkdtemp(join(tmpdir(), 'tungsten-skip-package-compilation-test-'));
     const cliLocation = join(findProjectDir(import.meta.url), 'dist', 'bin', 'index.js');

package/dist/getUserConfig.d.ts

@@ -1,3 +1,3 @@
-import { FrameworkConfigComplete } from './FrameworkConfig.js';
-export declare function getUserConfig(volume?: 'silent' | 'noisy'): Promise<FrameworkConfigComplete>;
+import { FrameworkConfigComplete, FrameworkConfigOverrides } from './FrameworkConfig.js';
+export declare function getUserConfig(overrides?: FrameworkConfigOverrides | null, volume?: 'silent' | 'noisy'): Promise<FrameworkConfigComplete>;
 //# sourceMappingURL=getUserConfig.d.ts.map

package/dist/getUserConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getUserConfig.d.ts","sourceRoot":"","sources":["../src/getUserConfig.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAM9D,wBAAsB,aAAa,CAAC,MAAM,GAAE,QAAQ,GAAG,OAAiB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAyB1G"}
+{"version":3,"file":"getUserConfig.d.ts","sourceRoot":"","sources":["../src/getUserConfig.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAA;AAMxF,wBAAsB,aAAa,CAC/B,SAAS,GAAE,wBAAwB,GAAG,IAAW,EACjD,MAAM,GAAE,QAAQ,GAAG,OAAiB,GACrC,OAAO,CAAC,uBAAuB,CAAC,CAyBlC"}

package/dist/getUserConfig.js

@@ -5,7 +5,7 @@ import { frameworkConfigValidator } from "./frameworkConfigSchema.js";
 import { makeFinalConfig } from "./makeFinalConfig.js";
 import { throwError } from "./throwError.js";
 import { cliOut } from "./cliOutput.js";
-export async function getUserConfig(volume = 'noisy') {
+export async function getUserConfig(overrides = null, volume = 'noisy') {
   const userConfigOrNull = await findUserConfig(process.cwd(), volume);
   //frameworkCon
   if (userConfigOrNull !== null) {
@@ -15,11 +15,11 @@ export async function getUserConfig(volume = 'noisy') {
       cliOut('Config', userConfig);
       throwError('Your tungsten config did not match the required format', JSON.stringify(result.flatProblemsByPath));
     }
-    const finalConfig = makeFinalConfig(result);
+    const finalConfig = makeFinalConfig(result, overrides);
     //console.log('finalConfig', finalConfig)
     return finalConfig;
     //return makeFinalConfig(userConfig.data)
   } else {
-    return defaultConfig;
+    return makeFinalConfig(defaultConfig, overrides);
   }
 }

package/dist/makeFinalConfig.d.ts

@@ -1,3 +1,3 @@
-import type { FrameworkConfig, FrameworkConfigComplete } from './FrameworkConfig.js';
-export declare function makeFinalConfig(userConfig: FrameworkConfig): FrameworkConfigComplete;
+import type { FrameworkConfig, FrameworkConfigComplete, FrameworkConfigOverrides } from './FrameworkConfig.js';
+export declare function makeFinalConfig(userConfig: FrameworkConfig, overrides?: FrameworkConfigOverrides | null): FrameworkConfigComplete;
 //# sourceMappingURL=makeFinalConfig.d.ts.map

package/dist/makeFinalConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"makeFinalConfig.d.ts","sourceRoot":"","sources":["../src/makeFinalConfig.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAGpF,wBAAgB,eAAe,CAAC,UAAU,EAAE,eAAe,GAAG,uBAAuB,CAUpF"}
+{"version":3,"file":"makeFinalConfig.d.ts","sourceRoot":"","sources":["../src/makeFinalConfig.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACR,eAAe,EAAE,uBAAuB,EAAE,wBAAwB,EACrE,MAAM,sBAAsB,CAAA;AAG7B,wBAAgB,eAAe,CAC3B,UAAU,EAAE,eAAe,EAC3B,SAAS,GAAE,wBAAwB,GAAG,IAAW,GAClD,uBAAuB,CAiBzB"}

package/dist/makeFinalConfig.js

@@ -1,10 +1,16 @@
 import { defaultConfig } from "./defaultConfig.js";
-export function makeFinalConfig(userConfig) {
+export function makeFinalConfig(userConfig, overrides = null) {
   const finalConfig = structuredClone(defaultConfig);
   for (const key in userConfig) {
     //if (Object.prototype.hasOwnProperty.call(userConfig, key)) { // github co-pilot suggestion, unsure if needed
     finalConfig[key] = userConfig[key]; // eslint-disable-line no-type-assertion/no-type-assertion
     //}
   }
+  // an override left undefined keeps the user config / default value
+  for (const key in overrides) {
+    const value = overrides[key];
+    if (value === undefined) continue;
+    finalConfig[key] = value; // eslint-disable-line no-type-assertion/no-type-assertion
+  }
   return finalConfig;
 }

package/dist/testing/ensureTestEnvLoaded.js

@@ -21,7 +21,7 @@ export function ensureTestEnvLoaded() {
   if (loadPromise === undefined) {
     loadPromise = (async () => {
       if (!testEnvIsRequested(process.env[testEnvVariableName])) return;
-      const config = await getUserConfig('silent');
+      const config = await getUserConfig({}, 'silent');
       // iteration 0: schemas are stable within a test run.
       // _firstLoad = false: suppress the CLI boot output.
       // useTestEnvFiles = true: prefer .env.test* files.

package/package.json

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