tshy 1.0.0-3 → 1.1.0

package/README.md

@@ -1,10 +1,13 @@
 # tshy - TypeScript HYbridizer
 
-Hybrid (CommonJS/ESM) TypeScript node package builder.
+Hybrid (CommonJS/ESM) TypeScript node package builder. Write
+modules that Just Work in ESM and CommonJS, in easy mode.
 
 This tool manages the `exports` in your package.json file, and
-builds your TypeScript program using `tsc` 5.2 in both ESM and
-CJS modes.
+builds your TypeScript program using `tsc` 5.2, emitting both ESM
+and CommonJS variants, [providing the full strength of
+TypeScript’s checking for both output
+formats](https://twitter.com/atcb/status/1702069237710479608).
 
 ## USAGE
 
@@ -35,11 +38,11 @@ points.
 
 ## Configuration
 
-Mostly, this is opinionated convention, and so there is very
-little to configure.
+Mostly, this just uses opinionated convention, and so there is
+very little to configure.
 
-Source must be in `./src`. Builds are in `./dist/cjs` for
-CommonJS and `./dist/mjs` for ESM.
+Source must be in `./src`. Builds are in `./dist/commonjs` for
+CommonJS and `./dist/esm` for ESM.
 
 There is very little configuration for this. The only thing to
 decide is the exported paths. If you have a `./index.ts` file,
@@ -69,12 +72,12 @@ appropriate build target locations, like:
   "exports": {
     "./foo": {
       "import": {
-        "types": "./dist/mjs/foo.d.ts",
-        "default": "./dist/mjs/foo.js"
+        "types": "./dist/esm/foo.d.ts",
+        "default": "./dist/esm/foo.js"
       },
       "require": {
-        "types": "./dist/cjs/foo.d.ts",
-        "default": "./dist/cjs/foo.js"
+        "types": "./dist/commonjs/foo.d.ts",
+        "default": "./dist/commonjs/foo.js"
       }
     }
   }
@@ -82,16 +85,27 @@ appropriate build target locations, like:
 ```
 
 Any exports that are not within `./src` will not be built, and
-can be either a string, or a `{ import, require, types }` object:
+can be anything supported by package.json `exports`, as they will
+just be passed through as-is.
 
 ```json
 {
-  "exports": {
-    "./package.json": "./package.json"
-    "./thing": {
-      "import": "./lib/thing.mjs",
-      "require": "./lib/thing.cjs",
-      "types": "./lib/thing.d.ts"
+  "tshy": {
+    "exports": {
+      ".": "./src/my-built-module.ts",
+      "./package.json": "./package.json"
+      "./thing": {
+        "import": "./lib/thing.mjs",
+        "require": "./lib/thing.cjs",
+        "types": "./lib/thing.d.ts"
+      },
+      "./arraystyle": [
+        { "import": "./no-op.js" },
+        { "browser": "./browser-thing.js" },
+        { "require": [{ "types": "./using-require.d.ts" }, "./using-require.js"]},
+        { "types": "./blah.d.ts" },
+        "./etc.js"
+      ]
     }
   }
 }
@@ -137,7 +151,7 @@ To do this, create a polyfill file with the CommonJS code in
 ```js
 // src/source-dir-cjs.cts
 //     ^^^^^^^^^^--------- matching name
-//               ^^^^----- "-cts" tag
+//               ^^^^----- "-cjs" tag
 //                   ^^^^- ".cts" filename suffix
 // this one has a -cjs.cts suffix, so it will override the
 // module at src/source-dir.ts in the CJS build,
@@ -149,23 +163,28 @@ export const sourceDir = pathToFileURL(__dirname)
 
 Then put the "real" ESM code in `<name>.ts` (not `.mts`!)
 
+You will generally have to `//@ts-ignore` a bunch of stuff to get
+the CommonJS build to ignore it, so it's best to keep the
+polyfill surface as small as possible.
+
 ```js
 // src/source-dir.ts
 // This is the ESM version of the module
+//@ts-ignore
 export const sourceDir = new URL('.', import.meta.url)
 ```
 
 Then in your code, you can just `import { sourceDir } from
-'./source-dir.js'` and it'll work in both dialects.
+'./source-dir.js'` and it'll work in both builds.
 
-## `.cts` and `.mts` files
+## Excluding from a build using `.cts` and `.mts` files
 
 Files named `*.mts` will be excluded from the CommonJS build.
 
 Files named `*.cts` will be excluded from the ESM build.
 
-If you need to do something one way for CJS and another way for
-ESM, use the "Dialect Switching" trick, with the ESM code living
+If you need to do something one way for CommonJS and another way for
+esm, use the "Dialect Switching" trick, with the ESM code living
 in `src/<whatever>.ts` and the CommonJS polyfill living in
 `src/<whatever>-cjs.cts`.
 
@@ -195,17 +214,6 @@ If you don't provide that config, then the default is:
 }
 ```
 
-## Package `#imports`
-
-Using the `imports` field in `package.json` is not currently
-supported, because this looks at the nearest `package.json` to
-get local imports, and the package.json files placed in
-`dist/{cjs,mjs}` can't have local imports outside of their
-folders.
-
-There's a way it could theoretically be done, but it's a bit
-complicated. A future version may support this.
-
 ## TSConfigs
 
 Put whatever configuration you want in `tsconfig.json`, with the
@@ -225,12 +233,12 @@ If you don't have a `tsconfig.json` file, then one will be
 provided for you.
 
 Then the `tsconfig.json` file will be used as the default project
-for code hints in VSCode/nvim, your tests, etc.
+for code hints in VSCode, neovim, tests, etc.
 
 ## `src/package.json`
 
 As of TypeScript 5.2, the only way to emit JavaScript to ESM or
-CJS, and also import packages using node-style `"exports"`-aware
+cjs, and also import packages using node-style `"exports"`-aware
 module resolution, is to set the `type` field in the
 `package.json` file closest to the TypeScript source code.
 
@@ -238,3 +246,124 @@ During the build, `tshy` will create a file at `src/package.json`
 for this purpose, and then delete it afterwards. If that file
 exists and _wasn't_ put there by `tshy`, then it will be
 destroyed.
+
+## Package `#imports`
+
+If you use `"imports"` in your package.json, then tshy will set
+`scripts.preinstall` to set up some symbolic links to make it
+work. This just means you can't use `scripts.preinstall` for
+anything else if you use `"imports"`.
+
+<details>
+<summary>tl;dr explanation</summary>
+
+The `"imports"` field in package.json allows you to set local
+package imports, which have the same kind of conditional import
+logic as `"exports"`. This is especially useful when you have a
+vendored dependency with `require` and `import` variants, modules
+that have to be bundled in different ways for different
+environments, or different dependencies for different
+environments.
+
+These package imports are _always_ resolved against the nearest
+`package.json` file, and tshy uses generated package.json files
+to set the module dialect to `"type":"module"` in `dist/esm` and
+`"type":"commonjs"` in `dist/commonjs`, and it swaps the
+`src/package.json` file between this during the `tsc` builds.
+
+Furthermore, local package imports may not be relative files
+outside the package folder. They may only be local files within
+the local package, or dependencies resolved in `node_modules`.
+
+To support this, tshy copies the `imports` field from the
+project's package.json into these dialect-setting generated
+package.json files, and creates symlinks into the appropriate
+places so that they resolve to the same files on disk.
+
+Because symlinks may not be included in npm packages (and even if
+they are included, they won't be unpacked at install time), the
+symlinks it places in `./dist` wouldn't do much good. In order to
+work around _this_ restriction, tshy creates a node program at
+`dist/.tshy-link-imports.mjs`, which generates the symlinks at
+install time via the `preinstall` script.
+
+</details>
+
+## Local Package `exports`
+
+In order to facilitate local package exports, tshy will create a
+symlink to the current package temporarily in
+`./src/node_modules` and permanently in `./dist/node_modules`.
+
+If you rely on this feature, you may need to add a `paths`
+section to your `tsconfig.json` so that you don't get nagged
+constantly by your editor about missing type references.
+
+<details>
+<summary>tl;dr explanation</summary>
+
+Similar to local module imports, Node supports importing the
+`exports` of the current package as if it was a dependency of
+itself. The generated `package.json` files mess with this similar
+to `imports`, but it's much easier to work around.
+
+For example, if you had this in your package.json:
+
+```json
+{
+  "name": "@my/package",
+  "exports": {
+    "./foo": {
+      "import": "./lib/foo.mjs",
+      "require": "./lib/foo.cjs"
+    }
+  }
+}
+```
+
+Then any module in the package could do
+`import('@my/package/foo')` or `require('@my/package/foo')` to
+pull in the appropriate file.
+
+In order to make this wort, tshy links the current project
+directory into `./src/node_modules/<pkgname>` during the builds,
+and removes the link afterwards, so that TypeScript knows what
+those things refer to.
+
+The link is also created in the `dist` folder, but it's only
+relevant if your tests load the code from `./dist` rather than
+from `./src`. In the install, there's no need to re-create this
+link, because the package will be in a `node_modules` folder
+already.
+
+If you use this feature, you can put something like this in your
+`tsconfig.json` file so that your editor knows what those things
+refer to:
+
+```json
+{
+  "compilerOptions": {
+    "paths": {
+      "@my/package/foo": ["./src/foo.js"],
+      "@my/package/bar": ["./src/bar.js"]
+    }
+  }
+}
+```
+
+Note the `.js` extension, rather than `.ts`. Add this for each
+submodule path that you use in this way, or use a wildcard if you
+prefer, though this might result in failing to catch errors if
+you use a submodule identifier that isn't actually exported:
+
+```json
+{
+  "compilerOptions": {
+    "paths": {
+      "@my/package/*": ["./src/*.js"]
+    }
+  }
+}
+```
+
+</details>

package/dist/esm/add-dot.d.ts

@@ -0,0 +1,3 @@
+declare const _default: (s: string) => string;
+export default _default;
+//# sourceMappingURL=add-dot.d.ts.map

package/dist/esm/add-dot.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-dot.d.ts","sourceRoot":"","sources":["../../src/add-dot.ts"],"names":[],"mappings":"4BACmB,MAAM;AAAzB,wBAA4C"}

package/dist/esm/add-dot.js

@@ -0,0 +1,3 @@
+import { join } from 'node:path/posix';
+export default (s) => `./${join(s)}`;
+//# sourceMappingURL=add-dot.js.map

package/dist/esm/add-dot.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-dot.js","sourceRoot":"","sources":["../../src/add-dot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACtC,eAAe,CAAC,CAAS,EAAE,EAAE,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAA","sourcesContent":["import { join } from 'node:path/posix'\nexport default (s: string) => `./${join(s)}`\n"]}

package/dist/esm/build-commonjs.d.ts

@@ -0,0 +1,3 @@
+import './tsconfig.js';
+export declare const buildCommonJS: () => undefined;
+//# sourceMappingURL=build-commonjs.d.ts.map

package/dist/esm/build-commonjs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"build-commonjs.d.ts","sourceRoot":"","sources":["../../src/build-commonjs.ts"],"names":[],"mappings":"AAQA,OAAO,eAAe,CAAA;AAEtB,eAAO,MAAM,aAAa,iBAwBzB,CAAA"}

package/dist/esm/build-commonjs.js

@@ -0,0 +1,30 @@
+import chalk from 'chalk';
+import { spawnSync } from 'node:child_process';
+import { renameSync } from 'node:fs';
+import { relative, resolve } from 'node:path/posix';
+import buildFail from './build-fail.js';
+import * as console from './console.js';
+import polyfills from './polyfills.js';
+import setFolderDialect from './set-folder-dialect.js';
+import './tsconfig.js';
+export const buildCommonJS = () => {
+    console.debug(chalk.cyan.dim('building commonjs'));
+    setFolderDialect('src', 'commonjs');
+    const res = spawnSync('tsc -p .tshy/commonjs.json', {
+        shell: true,
+        stdio: 'inherit',
+    });
+    setFolderDialect('src');
+    if (res.status || res.signal)
+        return buildFail(res);
+    setFolderDialect('.tshy-build-tmp/commonjs', 'commonjs');
+    console.error(chalk.cyan.bold('built commonjs'));
+    // apply polyfills
+    for (const [f, t] of polyfills.entries()) {
+        const stemFrom = resolve('.tshy-build-tmp/commonjs', relative(resolve('src'), resolve(f))).replace(/\.cts$/, '');
+        const stemTo = resolve('.tshy-build-tmp/commonjs', relative(resolve('src'), resolve(t))).replace(/\.tsx?$/, '');
+        renameSync(`${stemFrom}.cjs`, `${stemTo}.js`);
+        renameSync(`${stemFrom}.d.cts`, `${stemTo}.d.ts`);
+    }
+};
+//# sourceMappingURL=build-commonjs.js.map

package/dist/esm/build-commonjs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"build-commonjs.js","sourceRoot":"","sources":["../../src/build-commonjs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AACpC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,SAAS,MAAM,iBAAiB,CAAA;AACvC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,SAAS,MAAM,gBAAgB,CAAA;AACtC,OAAO,gBAAgB,MAAM,yBAAyB,CAAA;AACtD,OAAO,eAAe,CAAA;AAEtB,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,EAAE;IAChC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAA;IAClD,gBAAgB,CAAC,KAAK,EAAE,UAAU,CAAC,CAAA;IACnC,MAAM,GAAG,GAAG,SAAS,CAAC,4BAA4B,EAAE;QAClD,KAAK,EAAE,IAAI;QACX,KAAK,EAAE,SAAS;KACjB,CAAC,CAAA;IACF,gBAAgB,CAAC,KAAK,CAAC,CAAA;IACvB,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC,GAAG,CAAC,CAAA;IACnD,gBAAgB,CAAC,0BAA0B,EAAE,UAAU,CAAC,CAAA;IACxD,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAA;IAChD,kBAAkB;IAClB,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,SAAS,CAAC,OAAO,EAAE,EAAE;QACxC,MAAM,QAAQ,GAAG,OAAO,CACtB,0BAA0B,EAC1B,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CACrC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;QACvB,MAAM,MAAM,GAAG,OAAO,CACpB,0BAA0B,EAC1B,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CACrC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA;QACxB,UAAU,CAAC,GAAG,QAAQ,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,CAAA;QAC7C,UAAU,CAAC,GAAG,QAAQ,QAAQ,EAAE,GAAG,MAAM,OAAO,CAAC,CAAA;KAClD;AACH,CAAC,CAAA","sourcesContent":["import chalk from 'chalk'\nimport { spawnSync } from 'node:child_process'\nimport { renameSync } from 'node:fs'\nimport { relative, resolve } from 'node:path/posix'\nimport buildFail from './build-fail.js'\nimport * as console from './console.js'\nimport polyfills from './polyfills.js'\nimport setFolderDialect from './set-folder-dialect.js'\nimport './tsconfig.js'\n\nexport const buildCommonJS = () => {\n  console.debug(chalk.cyan.dim('building commonjs'))\n  setFolderDialect('src', 'commonjs')\n  const res = spawnSync('tsc -p .tshy/commonjs.json', {\n    shell: true,\n    stdio: 'inherit',\n  })\n  setFolderDialect('src')\n  if (res.status || res.signal) return buildFail(res)\n  setFolderDialect('.tshy-build-tmp/commonjs', 'commonjs')\n  console.error(chalk.cyan.bold('built commonjs'))\n  // apply polyfills\n  for (const [f, t] of polyfills.entries()) {\n    const stemFrom = resolve(\n      '.tshy-build-tmp/commonjs',\n      relative(resolve('src'), resolve(f))\n    ).replace(/\\.cts$/, '')\n    const stemTo = resolve(\n      '.tshy-build-tmp/commonjs',\n      relative(resolve('src'), resolve(t))\n    ).replace(/\\.tsx?$/, '')\n    renameSync(`${stemFrom}.cjs`, `${stemTo}.js`)\n    renameSync(`${stemFrom}.d.cts`, `${stemTo}.d.ts`)\n  }\n}\n"]}

package/dist/esm/build-esm.d.ts

@@ -0,0 +1,3 @@
+import './tsconfig.js';
+export declare const buildESM: () => undefined;
+//# sourceMappingURL=build-esm.d.ts.map

package/dist/esm/build-esm.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"build-esm.d.ts","sourceRoot":"","sources":["../../src/build-esm.ts"],"names":[],"mappings":"AAKA,OAAO,eAAe,CAAA;AAEtB,eAAO,MAAM,QAAQ,iBAWpB,CAAA"}

package/dist/esm/build-esm.js

@@ -0,0 +1,20 @@
+import chalk from 'chalk';
+import { spawnSync } from 'node:child_process';
+import buildFail from './build-fail.js';
+import * as console from './console.js';
+import setFolderDialect from './set-folder-dialect.js';
+import './tsconfig.js';
+export const buildESM = () => {
+    console.debug(chalk.cyan.dim('building esm'));
+    setFolderDialect('src', 'esm');
+    const res = spawnSync('tsc -p .tshy/esm.json', {
+        shell: true,
+        stdio: 'inherit',
+    });
+    setFolderDialect('src');
+    if (res.status || res.signal)
+        return buildFail(res);
+    setFolderDialect('.tshy-build-tmp/esm', 'esm');
+    console.error(chalk.cyan.bold('built esm'));
+};
+//# sourceMappingURL=build-esm.js.map

package/dist/esm/build-esm.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"build-esm.js","sourceRoot":"","sources":["../../src/build-esm.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,SAAS,MAAM,iBAAiB,CAAA;AACvC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,gBAAgB,MAAM,yBAAyB,CAAA;AACtD,OAAO,eAAe,CAAA;AAEtB,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,EAAE;IAC3B,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAA;IAC7C,gBAAgB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;IAC9B,MAAM,GAAG,GAAG,SAAS,CAAC,uBAAuB,EAAE;QAC7C,KAAK,EAAE,IAAI;QACX,KAAK,EAAE,SAAS;KACjB,CAAC,CAAA;IACF,gBAAgB,CAAC,KAAK,CAAC,CAAA;IACvB,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC,GAAG,CAAC,CAAA;IACnD,gBAAgB,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAA;IAC9C,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAA;AAC7C,CAAC,CAAA","sourcesContent":["import chalk from 'chalk'\nimport { spawnSync } from 'node:child_process'\nimport buildFail from './build-fail.js'\nimport * as console from './console.js'\nimport setFolderDialect from './set-folder-dialect.js'\nimport './tsconfig.js'\n\nexport const buildESM = () => {\n  console.debug(chalk.cyan.dim('building esm'))\n  setFolderDialect('src', 'esm')\n  const res = spawnSync('tsc -p .tshy/esm.json', {\n    shell: true,\n    stdio: 'inherit',\n  })\n  setFolderDialect('src')\n  if (res.status || res.signal) return buildFail(res)\n  setFolderDialect('.tshy-build-tmp/esm', 'esm')\n  console.error(chalk.cyan.bold('built esm'))\n}\n"]}

package/dist/esm/build-fail.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="node" resolution-mode="require"/>
+import { SpawnSyncReturns } from 'node:child_process';
+import './tsconfig.js';
+declare const _default: (res: SpawnSyncReturns<Buffer>) => never;
+export default _default;
+//# sourceMappingURL=build-fail.d.ts.map

package/dist/esm/build-fail.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"build-fail.d.ts","sourceRoot":"","sources":["../../src/build-fail.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAIrD,OAAO,eAAe,CAAA;8BAKD,iBAAiB,MAAM,CAAC;AAA7C,wBAOC"}

package/dist/esm/build-fail.js

@@ -0,0 +1,16 @@
+import * as console from './console.js';
+import fail from './fail.js';
+import setFolderDialect from './set-folder-dialect.js';
+import './tsconfig.js';
+import { unlink as unlinkImports } from './imports.js';
+import { unlink as unlinkSelfDep } from './self-dep.js';
+import pkg from './package.js';
+export default (res) => {
+    setFolderDialect('src');
+    unlinkImports(pkg, 'src');
+    unlinkSelfDep(pkg, 'src');
+    fail('build failed');
+    console.error(res);
+    process.exit(1);
+};
+//# sourceMappingURL=build-fail.js.map

package/dist/esm/build-fail.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"build-fail.js","sourceRoot":"","sources":["../../src/build-fail.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,gBAAgB,MAAM,yBAAyB,CAAA;AACtD,OAAO,eAAe,CAAA;AACtB,OAAO,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,cAAc,CAAA;AACtD,OAAO,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,eAAe,CAAA;AACvD,OAAO,GAAG,MAAM,cAAc,CAAA;AAE9B,eAAe,CAAC,GAA6B,EAAE,EAAE;IAC/C,gBAAgB,CAAC,KAAK,CAAC,CAAA;IACvB,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IACzB,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IACzB,IAAI,CAAC,cAAc,CAAC,CAAA;IACpB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACjB,CAAC,CAAA","sourcesContent":["import { SpawnSyncReturns } from 'node:child_process'\nimport * as console from './console.js'\nimport fail from './fail.js'\nimport setFolderDialect from './set-folder-dialect.js'\nimport './tsconfig.js'\nimport { unlink as unlinkImports } from './imports.js'\nimport { unlink as unlinkSelfDep } from './self-dep.js'\nimport pkg from './package.js'\n\nexport default (res: SpawnSyncReturns<Buffer>) => {\n  setFolderDialect('src')\n  unlinkImports(pkg, 'src')\n  unlinkSelfDep(pkg, 'src')\n  fail('build failed')\n  console.error(res)\n  process.exit(1)\n}\n"]}

package/dist/esm/build.d.ts

@@ -1,2 +1,4 @@
 import './tsconfig.js';
+declare const _default: () => Promise<void>;
+export default _default;
 //# sourceMappingURL=build.d.ts.map

package/dist/esm/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/build.ts"],"names":[],"mappings":"AAYA,OAAO,eAAe,CAAA"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/build.ts"],"names":[],"mappings":"AAkBA,OAAO,eAAe,CAAA;;AAGtB,wBAmCC"}

package/dist/esm/build.js

@@ -1,63 +1,47 @@
 import chalk from 'chalk';
-import { spawnSync } from 'node:child_process';
-import { renameSync } from 'node:fs';
-import { relative, resolve } from 'node:path/posix';
 import { rimrafSync } from 'rimraf';
 import { syncContentSync } from 'sync-content';
 import bins from './bins.js';
+import { buildCommonJS } from './build-commonjs.js';
+import { buildESM } from './build-esm.js';
 import * as console from './console.js';
 import dialects from './dialects.js';
-import { fail } from './fail.js';
-import polyfills from './polyfills.js';
-import setFolderDialect from './set-folder-dialect.js';
+import { link as linkImports, save as saveImports, unlink as unlinkImports, } from './imports.js';
+import pkg from './package.js';
+import { link as linkSelfDep, unlink as unlinkSelfDep, } from './self-dep.js';
 import './tsconfig.js';
 import writePackage from './write-package.js';
-const buildFail = (res) => {
-    setFolderDialect('src');
-    fail('build failed');
-    console.error(res);
-    process.exit(1);
-};
-rimrafSync('.tshy-build-tmp');
-if (dialects.includes('esm')) {
-    setFolderDialect('src', 'esm');
-    console.debug(chalk.cyan.dim('building esm'));
-    const res = spawnSync('tsc -p .tshy/esm.json', {
-        shell: true,
-        stdio: 'inherit',
-    });
-    setFolderDialect('src');
-    if (res.status || res.signal)
-        buildFail(res);
-    setFolderDialect('.tshy-build-tmp/esm', 'esm');
-    console.error(chalk.cyan.bold('built esm'));
-}
-if (dialects.includes('commonjs')) {
-    setFolderDialect('src', 'commonjs');
-    console.debug(chalk.cyan.dim('building commonjs'));
-    const res = spawnSync('tsc -p .tshy/commonjs.json', {
-        shell: true,
-        stdio: 'inherit',
-    });
-    setFolderDialect('src');
-    if (res.status || res.signal)
-        buildFail(res);
-    setFolderDialect('.tshy-build-tmp/commonjs', 'commonjs');
-    console.error(chalk.cyan.bold('built commonjs'));
-    // apply polyfills
-    for (const [f, t] of polyfills.entries()) {
-        const stemFrom = resolve('.tshy-build-tmp/commonjs', relative(resolve('src'), resolve(f))).replace(/\.cts$/, '');
-        const stemTo = resolve('.tshy-build-tmp/commonjs', relative(resolve('src'), resolve(t))).replace(/\.tsx?$/, '');
-        renameSync(`${stemFrom}.cjs`, `${stemTo}.js`);
-        renameSync(`${stemFrom}.d.cts`, `${stemTo}.d.ts`);
+export default async () => {
+    rimrafSync('.tshy-build-tmp');
+    linkSelfDep(pkg, 'src');
+    await linkImports(pkg, 'src');
+    if (dialects.includes('esm'))
+        buildESM();
+    if (dialects.includes('commonjs'))
+        buildCommonJS();
+    await unlinkImports(pkg, 'src');
+    unlinkSelfDep(pkg, 'src');
+    console.debug(chalk.cyan.dim('moving to ./dist'));
+    syncContentSync('.tshy-build-tmp', 'dist');
+    console.debug(chalk.cyan.dim('removing build temp dir'));
+    rimrafSync('.tshy-build-tmp');
+    linkSelfDep(pkg, 'dist');
+    if (pkg.imports) {
+        console.debug('linking package imports', pkg.imports);
+        if (dialects.includes('commonjs'))
+            await linkImports(pkg, 'dist/commonjs', true);
+        if (dialects.includes('esm'))
+            await linkImports(pkg, 'dist/esm', true);
+        if (saveImports('dist/.tshy-link-imports.mjs')) {
+            pkg.scripts = pkg.scripts || {};
+            pkg.scripts.preinstall =
+                'node -e "import(process.argv[1]).catch(()=>{})" ' +
+                    'dist/.tshy-link-imports.mjs';
+        }
     }
-}
-console.debug(chalk.cyan.dim('moving to ./dist'));
-syncContentSync('.tshy-build-tmp', 'dist');
-console.debug(chalk.cyan.dim('removing build temp dir'));
-rimrafSync('.tshy-build-tmp');
-console.debug(chalk.cyan.dim('chmod bins'));
-bins();
-console.debug(chalk.cyan.dim('write package.json'));
-writePackage();
+    console.debug(chalk.cyan.dim('chmod bins'));
+    bins();
+    console.debug(chalk.cyan.dim('write package.json'));
+    writePackage();
+};
 //# sourceMappingURL=build.js.map

package/dist/esm/build.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/build.ts"],"names":[],"mappings":"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","sourcesContent":["import chalk from 'chalk'\nimport { spawnSync, SpawnSyncReturns } from 'node:child_process'\nimport { renameSync } from 'node:fs'\nimport { relative, resolve } from 'node:path/posix'\nimport { rimrafSync } from 'rimraf'\nimport { syncContentSync } from 'sync-content'\nimport bins from './bins.js'\nimport * as console from './console.js'\nimport dialects from './dialects.js'\nimport { fail } from './fail.js'\nimport polyfills from './polyfills.js'\nimport setFolderDialect from './set-folder-dialect.js'\nimport './tsconfig.js'\nimport writePackage from './write-package.js'\n\nconst buildFail = (res: SpawnSyncReturns<Buffer>) => {\n  setFolderDialect('src')\n  fail('build failed')\n  console.error(res)\n  process.exit(1)\n}\n\nrimrafSync('.tshy-build-tmp')\n\nif (dialects.includes('esm')) {\n  setFolderDialect('src', 'esm')\n  console.debug(chalk.cyan.dim('building esm'))\n  const res = spawnSync('tsc -p .tshy/esm.json', {\n    shell: true,\n    stdio: 'inherit',\n  })\n  setFolderDialect('src')\n  if (res.status || res.signal) buildFail(res)\n  setFolderDialect('.tshy-build-tmp/esm', 'esm')\n  console.error(chalk.cyan.bold('built esm'))\n}\n\nif (dialects.includes('commonjs')) {\n  setFolderDialect('src', 'commonjs')\n  console.debug(chalk.cyan.dim('building commonjs'))\n  const res = spawnSync('tsc -p .tshy/commonjs.json', {\n    shell: true,\n    stdio: 'inherit',\n  })\n  setFolderDialect('src')\n  if (res.status || res.signal) buildFail(res)\n  setFolderDialect('.tshy-build-tmp/commonjs', 'commonjs')\n  console.error(chalk.cyan.bold('built commonjs'))\n  // apply polyfills\n  for (const [f, t] of polyfills.entries()) {\n    const stemFrom = resolve(\n      '.tshy-build-tmp/commonjs',\n      relative(resolve('src'), resolve(f))\n    ).replace(/\\.cts$/, '')\n    const stemTo = resolve(\n      '.tshy-build-tmp/commonjs',\n      relative(resolve('src'), resolve(t))\n    ).replace(/\\.tsx?$/, '')\n    renameSync(`${stemFrom}.cjs`, `${stemTo}.js`)\n    renameSync(`${stemFrom}.d.cts`, `${stemTo}.d.ts`)\n  }\n}\n\nconsole.debug(chalk.cyan.dim('moving to ./dist'))\nsyncContentSync('.tshy-build-tmp', 'dist')\nconsole.debug(chalk.cyan.dim('removing build temp dir'))\nrimrafSync('.tshy-build-tmp')\nconsole.debug(chalk.cyan.dim('chmod bins'))\nbins()\nconsole.debug(chalk.cyan.dim('write package.json'))\nwritePackage()\n"]}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/build.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,QAAQ,MAAM,eAAe,CAAA;AACpC,OAAO,EACL,IAAI,IAAI,WAAW,EACnB,IAAI,IAAI,WAAW,EACnB,MAAM,IAAI,aAAa,GACxB,MAAM,cAAc,CAAA;AACrB,OAAO,GAAG,MAAM,cAAc,CAAA;AAC9B,OAAO,EACL,IAAI,IAAI,WAAW,EACnB,MAAM,IAAI,aAAa,GACxB,MAAM,eAAe,CAAA;AACtB,OAAO,eAAe,CAAA;AACtB,OAAO,YAAY,MAAM,oBAAoB,CAAA;AAE7C,eAAe,KAAK,IAAI,EAAE;IACxB,UAAU,CAAC,iBAAiB,CAAC,CAAA;IAE7B,WAAW,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IACvB,MAAM,WAAW,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IAC7B,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,QAAQ,EAAE,CAAA;IACxC,IAAI,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC;QAAE,aAAa,EAAE,CAAA;IAClD,MAAM,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IAC/B,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IAEzB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAA;IACjD,eAAe,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAA;IAC1C,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,CAAA;IACxD,UAAU,CAAC,iBAAiB,CAAC,CAAA;IAE7B,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IAExB,IAAI,GAAG,CAAC,OAAO,EAAE;QACf,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,GAAG,CAAC,OAAO,CAAC,CAAA;QACrD,IAAI,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC;YAC/B,MAAM,WAAW,CAAC,GAAG,EAAE,eAAe,EAAE,IAAI,CAAC,CAAA;QAC/C,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC;YAC1B,MAAM,WAAW,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,CAAA;QAC1C,IAAI,WAAW,CAAC,6BAA6B,CAAC,EAAE;YAC9C,GAAG,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,IAAI,EAAE,CAAA;YAC/B,GAAG,CAAC,OAAO,CAAC,UAAU;gBACpB,kDAAkD;oBAClD,6BAA6B,CAAA;SAChC;KACF;IAED,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAA;IAC3C,IAAI,EAAE,CAAA;IACN,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAA;IACnD,YAAY,EAAE,CAAA;AAChB,CAAC,CAAA","sourcesContent":["import chalk from 'chalk'\nimport { rimrafSync } from 'rimraf'\nimport { syncContentSync } from 'sync-content'\nimport bins from './bins.js'\nimport { buildCommonJS } from './build-commonjs.js'\nimport { buildESM } from './build-esm.js'\nimport * as console from './console.js'\nimport dialects from './dialects.js'\nimport {\n  link as linkImports,\n  save as saveImports,\n  unlink as unlinkImports,\n} from './imports.js'\nimport pkg from './package.js'\nimport {\n  link as linkSelfDep,\n  unlink as unlinkSelfDep,\n} from './self-dep.js'\nimport './tsconfig.js'\nimport writePackage from './write-package.js'\n\nexport default async () => {\n  rimrafSync('.tshy-build-tmp')\n\n  linkSelfDep(pkg, 'src')\n  await linkImports(pkg, 'src')\n  if (dialects.includes('esm')) buildESM()\n  if (dialects.includes('commonjs')) buildCommonJS()\n  await unlinkImports(pkg, 'src')\n  unlinkSelfDep(pkg, 'src')\n\n  console.debug(chalk.cyan.dim('moving to ./dist'))\n  syncContentSync('.tshy-build-tmp', 'dist')\n  console.debug(chalk.cyan.dim('removing build temp dir'))\n  rimrafSync('.tshy-build-tmp')\n\n  linkSelfDep(pkg, 'dist')\n\n  if (pkg.imports) {\n    console.debug('linking package imports', pkg.imports)\n    if (dialects.includes('commonjs'))\n      await linkImports(pkg, 'dist/commonjs', true)\n    if (dialects.includes('esm'))\n      await linkImports(pkg, 'dist/esm', true)\n    if (saveImports('dist/.tshy-link-imports.mjs')) {\n      pkg.scripts = pkg.scripts || {}\n      pkg.scripts.preinstall =\n        'node -e \"import(process.argv[1]).catch(()=>{})\" ' +\n        'dist/.tshy-link-imports.mjs'\n    }\n  }\n\n  console.debug(chalk.cyan.dim('chmod bins'))\n  bins()\n  console.debug(chalk.cyan.dim('write package.json'))\n  writePackage()\n}\n"]}

package/dist/esm/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAGA,OAAO,EAA4B,UAAU,EAAE,MAAM,YAAY,CAAA;AA4GjE,QAAA,MAAM,MAAM,EAAE,UAAoC,CAAA;AAClD,eAAe,MAAM,CAAA"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAIA,OAAO,EAAW,UAAU,EAAE,MAAM,YAAY,CAAA;AA8BhD,QAAA,MAAM,MAAM,EAAE,UAAoC,CAAA;AAClD,eAAe,MAAM,CAAA"}