@pezkuwi/dev 0.85.4 → 0.85.6

package/cjs/packageInfo.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageInfo = void 0;
-exports.packageInfo = { name: '@pezkuwi/dev', path: typeof __dirname === 'string' ? __dirname : 'auto', type: 'cjs', version: '0.85.4' };
+exports.packageInfo = { name: '@pezkuwi/dev', path: typeof __dirname === 'string' ? __dirname : 'auto', type: 'cjs', version: '0.85.5' };

package/cjs/rootJs/index.js

@@ -9,7 +9,7 @@ const tslib_1 = require("tslib");
 /** This should appear as-is in the output with: 1. extension added, 2. augmented.d.ts correct */
 require("./augmented.js");
 /** This import should appear as-in in the ouput (cjs without asserts) */
-const testJson_json_1 = tslib_1.__importDefault(require("@pezkuwi/dev/rootJs/testJson.json"));
+const testJson_json_1 = tslib_1.__importDefault(require("./testJson.json"));
 /** Double double work, i.e. re-exports */
 var Clazz_js_1 = require("./Clazz.js");
 Object.defineProperty(exports, "Clazz", { enumerable: true, get: function () { return Clazz_js_1.Clazz; } });
@@ -22,7 +22,7 @@ function bigIntExp() {
 async function dynamic(a, b) {
     // NOTE we go via this path so it points to the same location in both ESM
     // and CJS output (a './dynamic' import would be different otherwise)
-    const { sum } = await import('@pezkuwi/dev/rootJs/dynamic.mjs');
+    const { sum } = await Promise.resolve().then(() => tslib_1.__importStar(require('./dynamic.mjs')));
     // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return sum(a, b);
 }

package/package.json

@@ -15,10 +15,7 @@
   },
   "sideEffects": false,
   "type": "module",
-  "types": "./index.d.ts",
-  "version": "0.85.4",
-  "main": "./cjs/index.js",
-  "module": "./index.js",
+  "version": "0.85.6",
   "bin": {
     "pezkuwi-ci-ghact-build": "./scripts/pezkuwi-ci-ghact-build.mjs",
     "pezkuwi-ci-ghact-docs": "./scripts/pezkuwi-ci-ghact-docs.mjs",
@@ -44,7 +41,12 @@
     "pezkuwi-exec-tsc": "./scripts/pezkuwi-exec-tsc.mjs",
     "pezkuwi-exec-webpack": "./scripts/pezkuwi-exec-webpack.mjs"
   },
+  "main": "./cjs/index.js",
+  "module": "./cjs/index.js",
+  "types": "./cjs/index.d.ts",
   "exports": {
+    "./cjs/package.json": "./cjs/package.json",
+    "./cjs/*": "./cjs/*.js",
     ".": {
       "module": {
         "types": "./index.d.ts",
@@ -59,16 +61,14 @@
         "default": "./index.js"
       }
     },
-    "./cjs/*": "./cjs/*.js",
-    "./cjs/package.json": "./cjs/package.json",
     "./config/eslint": "./config/eslint.js",
     "./config/eslint.rules": "./config/eslint.rules.js",
-    "./config/prettier": "./config/prettier.cjs",
     "./config/prettier.cjs": "./config/prettier.cjs",
+    "./config/prettier": "./config/prettier.cjs",
     "./config/rollup": "./config/rollup.js",
     "./config/tsconfig.json": "./config/tsconfig.json",
-    "./config/typedoc": "./config/typedoc.cjs",
     "./config/typedoc.cjs": "./config/typedoc.cjs",
+    "./config/typedoc": "./config/typedoc.cjs",
     "./detectOther": {
       "module": {
         "types": "./detectOther.d.ts",
@@ -87,7 +87,7 @@
       "require": "./cjs/package.json",
       "default": "./package.json"
     },
-    "./packageInfo": {
+    "./packageInfo.js": {
       "module": {
         "types": "./packageInfo.d.ts",
         "default": "./packageInfo.js"
@@ -101,7 +101,7 @@
         "default": "./packageInfo.js"
       }
     },
-    "./packageInfo.js": {
+    "./packageInfo": {
       "module": {
         "types": "./packageInfo.d.ts",
         "default": "./packageInfo.js"
@@ -171,9 +171,9 @@
         "default": "./rootJs/Clazz.js"
       }
     },
-    "./rootJs/dynamic": "./rootJs/dynamic.mjs",
     "./rootJs/dynamic.d.mts": "./rootJs/dynamic.d.mts",
     "./rootJs/dynamic.mjs": "./rootJs/dynamic.mjs",
+    "./rootJs/dynamic": "./rootJs/dynamic.mjs",
     "./rootJs/Jsx": {
       "module": {
         "types": "./rootJs/Jsx.d.ts",
@@ -218,54 +218,54 @@
         "default": "./rootTests.js"
       }
     },
-    "./scripts/pezkuwi-ci-ghact-build": "./scripts/pezkuwi-ci-ghact-build.mjs",
     "./scripts/pezkuwi-ci-ghact-build.mjs": "./scripts/pezkuwi-ci-ghact-build.mjs",
-    "./scripts/pezkuwi-ci-ghact-docs": "./scripts/pezkuwi-ci-ghact-docs.mjs",
+    "./scripts/pezkuwi-ci-ghact-build": "./scripts/pezkuwi-ci-ghact-build.mjs",
     "./scripts/pezkuwi-ci-ghact-docs.mjs": "./scripts/pezkuwi-ci-ghact-docs.mjs",
-    "./scripts/pezkuwi-ci-ghpages-force": "./scripts/pezkuwi-ci-ghpages-force.mjs",
+    "./scripts/pezkuwi-ci-ghact-docs": "./scripts/pezkuwi-ci-ghact-docs.mjs",
     "./scripts/pezkuwi-ci-ghpages-force.mjs": "./scripts/pezkuwi-ci-ghpages-force.mjs",
-    "./scripts/pezkuwi-dev-build-docs": "./scripts/pezkuwi-dev-build-docs.mjs",
+    "./scripts/pezkuwi-ci-ghpages-force": "./scripts/pezkuwi-ci-ghpages-force.mjs",
     "./scripts/pezkuwi-dev-build-docs.mjs": "./scripts/pezkuwi-dev-build-docs.mjs",
-    "./scripts/pezkuwi-dev-build-ts": "./scripts/pezkuwi-dev-build-ts.mjs",
+    "./scripts/pezkuwi-dev-build-docs": "./scripts/pezkuwi-dev-build-docs.mjs",
     "./scripts/pezkuwi-dev-build-ts.mjs": "./scripts/pezkuwi-dev-build-ts.mjs",
-    "./scripts/pezkuwi-dev-circular": "./scripts/pezkuwi-dev-circular.mjs",
+    "./scripts/pezkuwi-dev-build-ts": "./scripts/pezkuwi-dev-build-ts.mjs",
     "./scripts/pezkuwi-dev-circular.mjs": "./scripts/pezkuwi-dev-circular.mjs",
-    "./scripts/pezkuwi-dev-clean-build": "./scripts/pezkuwi-dev-clean-build.mjs",
+    "./scripts/pezkuwi-dev-circular": "./scripts/pezkuwi-dev-circular.mjs",
     "./scripts/pezkuwi-dev-clean-build.mjs": "./scripts/pezkuwi-dev-clean-build.mjs",
-    "./scripts/pezkuwi-dev-contrib": "./scripts/pezkuwi-dev-contrib.mjs",
+    "./scripts/pezkuwi-dev-clean-build": "./scripts/pezkuwi-dev-clean-build.mjs",
     "./scripts/pezkuwi-dev-contrib.mjs": "./scripts/pezkuwi-dev-contrib.mjs",
-    "./scripts/pezkuwi-dev-copy-dir": "./scripts/pezkuwi-dev-copy-dir.mjs",
+    "./scripts/pezkuwi-dev-contrib": "./scripts/pezkuwi-dev-contrib.mjs",
     "./scripts/pezkuwi-dev-copy-dir.mjs": "./scripts/pezkuwi-dev-copy-dir.mjs",
-    "./scripts/pezkuwi-dev-copy-to": "./scripts/pezkuwi-dev-copy-to.mjs",
+    "./scripts/pezkuwi-dev-copy-dir": "./scripts/pezkuwi-dev-copy-dir.mjs",
     "./scripts/pezkuwi-dev-copy-to.mjs": "./scripts/pezkuwi-dev-copy-to.mjs",
-    "./scripts/pezkuwi-dev-deno-map": "./scripts/pezkuwi-dev-deno-map.mjs",
+    "./scripts/pezkuwi-dev-copy-to": "./scripts/pezkuwi-dev-copy-to.mjs",
     "./scripts/pezkuwi-dev-deno-map.mjs": "./scripts/pezkuwi-dev-deno-map.mjs",
-    "./scripts/pezkuwi-dev-run-lint": "./scripts/pezkuwi-dev-run-lint.mjs",
+    "./scripts/pezkuwi-dev-deno-map": "./scripts/pezkuwi-dev-deno-map.mjs",
     "./scripts/pezkuwi-dev-run-lint.mjs": "./scripts/pezkuwi-dev-run-lint.mjs",
-    "./scripts/pezkuwi-dev-run-node-ts": "./scripts/pezkuwi-dev-run-node-ts.mjs",
+    "./scripts/pezkuwi-dev-run-lint": "./scripts/pezkuwi-dev-run-lint.mjs",
     "./scripts/pezkuwi-dev-run-node-ts.mjs": "./scripts/pezkuwi-dev-run-node-ts.mjs",
-    "./scripts/pezkuwi-dev-run-test": "./scripts/pezkuwi-dev-run-test.mjs",
+    "./scripts/pezkuwi-dev-run-node-ts": "./scripts/pezkuwi-dev-run-node-ts.mjs",
     "./scripts/pezkuwi-dev-run-test.mjs": "./scripts/pezkuwi-dev-run-test.mjs",
-    "./scripts/pezkuwi-dev-version": "./scripts/pezkuwi-dev-version.mjs",
+    "./scripts/pezkuwi-dev-run-test": "./scripts/pezkuwi-dev-run-test.mjs",
     "./scripts/pezkuwi-dev-version.mjs": "./scripts/pezkuwi-dev-version.mjs",
-    "./scripts/pezkuwi-dev-yarn-only": "./scripts/pezkuwi-dev-yarn-only.mjs",
+    "./scripts/pezkuwi-dev-version": "./scripts/pezkuwi-dev-version.mjs",
     "./scripts/pezkuwi-dev-yarn-only.mjs": "./scripts/pezkuwi-dev-yarn-only.mjs",
-    "./scripts/pezkuwi-exec-eslint": "./scripts/pezkuwi-exec-eslint.mjs",
+    "./scripts/pezkuwi-dev-yarn-only": "./scripts/pezkuwi-dev-yarn-only.mjs",
     "./scripts/pezkuwi-exec-eslint.mjs": "./scripts/pezkuwi-exec-eslint.mjs",
-    "./scripts/pezkuwi-exec-ghpages": "./scripts/pezkuwi-exec-ghpages.mjs",
+    "./scripts/pezkuwi-exec-eslint": "./scripts/pezkuwi-exec-eslint.mjs",
     "./scripts/pezkuwi-exec-ghpages.mjs": "./scripts/pezkuwi-exec-ghpages.mjs",
-    "./scripts/pezkuwi-exec-ghrelease": "./scripts/pezkuwi-exec-ghrelease.mjs",
+    "./scripts/pezkuwi-exec-ghpages": "./scripts/pezkuwi-exec-ghpages.mjs",
     "./scripts/pezkuwi-exec-ghrelease.mjs": "./scripts/pezkuwi-exec-ghrelease.mjs",
-    "./scripts/pezkuwi-exec-node-test": "./scripts/pezkuwi-exec-node-test.mjs",
+    "./scripts/pezkuwi-exec-ghrelease": "./scripts/pezkuwi-exec-ghrelease.mjs",
     "./scripts/pezkuwi-exec-node-test.mjs": "./scripts/pezkuwi-exec-node-test.mjs",
-    "./scripts/pezkuwi-exec-rollup": "./scripts/pezkuwi-exec-rollup.mjs",
+    "./scripts/pezkuwi-exec-node-test": "./scripts/pezkuwi-exec-node-test.mjs",
     "./scripts/pezkuwi-exec-rollup.mjs": "./scripts/pezkuwi-exec-rollup.mjs",
-    "./scripts/pezkuwi-exec-tsc": "./scripts/pezkuwi-exec-tsc.mjs",
+    "./scripts/pezkuwi-exec-rollup": "./scripts/pezkuwi-exec-rollup.mjs",
     "./scripts/pezkuwi-exec-tsc.mjs": "./scripts/pezkuwi-exec-tsc.mjs",
-    "./scripts/pezkuwi-exec-webpack": "./scripts/pezkuwi-exec-webpack.mjs",
+    "./scripts/pezkuwi-exec-tsc": "./scripts/pezkuwi-exec-tsc.mjs",
     "./scripts/pezkuwi-exec-webpack.mjs": "./scripts/pezkuwi-exec-webpack.mjs",
-    "./scripts/util": "./scripts/util.mjs",
+    "./scripts/pezkuwi-exec-webpack": "./scripts/pezkuwi-exec-webpack.mjs",
     "./scripts/util.mjs": "./scripts/util.mjs",
+    "./scripts/util": "./scripts/util.mjs",
     "./types": {
       "module": {
         "types": "./types.d.ts",

package/packageInfo.js

@@ -1 +1 @@
-export const packageInfo = { name: '@pezkuwi/dev', path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto', type: 'esm', version: '0.85.4' };
+export const packageInfo = { name: '@pezkuwi/dev', path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto', type: 'esm', version: '0.85.5' };

package/rootJs/dynamic.d.mts

@@ -1,8 +1,4 @@
-/**
- * Returns the sum of 2 numbers
- *
- * @param {number} a
- * @param {number} b
- * @returns {number}
- */
+// Copyright 2017-2026 @pezkuwi/dev authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
 export function sum(a: number, b: number): number;

package/rootJs/index.js

@@ -1,7 +1,7 @@
 /** This should appear as-is in the output with: 1. extension added, 2. augmented.d.ts correct */
 import './augmented.js';
 /** This import should appear as-in in the ouput (cjs without asserts) */
-import testJson from '@pezkuwi/dev/rootJs/testJson.json' assert { type: 'json' };
+import testJson from './testJson.json' with { type: 'json' };
 /** Double double work, i.e. re-exports */
 export { Clazz } from './Clazz.js';
 /** Function to ensure that BigInt does not have the Babel Math.pow() transform */
@@ -13,7 +13,7 @@ export function bigIntExp() {
 export async function dynamic(a, b) {
     // NOTE we go via this path so it points to the same location in both ESM
     // and CJS output (a './dynamic' import would be different otherwise)
-    const { sum } = await import('@pezkuwi/dev/rootJs/dynamic.mjs');
+    const { sum } = await import('./dynamic.mjs');
     // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return sum(a, b);
 }

package/scripts/pezkuwi-dev-build-ts.mjs

@@ -363,24 +363,24 @@ function rewriteImports (dir, pkgCwd, pkgJson, replacer) {
             .filter((line) => !line.startsWith('//'))
             .map((line) =>
               line
-                // handle import/export
-                .replace(/(import|export) (.*) from '(.*)'/g, (o, t, a, f) => {
+                // handle import/export (use [^']* to avoid capturing 'json' from with { type: 'json' })
+                .replace(/(import|export) (.*) from '([^']*)'/g, (o, t, a, f) => {
                   const adjusted = replacer(pkgCwd, pkgJson, dir, f);
 
                   return adjusted
                     ? `${t} ${a} from '${adjusted}'`
                     : o;
                 })
-                // handle augmented inputs
-                .replace(/(import|declare module) '(.*)'/g, (o, t, f) => {
+                // handle augmented inputs (use [^']* to avoid capturing quotes from import attributes)
+                .replace(/(import|declare module) '([^']*)'/g, (o, t, f) => {
                   const adjusted = replacer(pkgCwd, pkgJson, dir, f, t !== 'import');
 
                   return adjusted
                     ? `${t} '${adjusted}'`
                     : o;
                 })
-                // handle dynamic imports
-                .replace(/( import|^import)\('(.*)'\)/g, (o, t, f) => {
+                // handle dynamic imports (use [^']* for consistency)
+                .replace(/( import|^import)\('([^']*)'\)/g, (o, t, f) => {
                   const adjusted = replacer(pkgCwd, pkgJson, dir, f);
 
                   return adjusted
@@ -792,7 +792,8 @@ function buildExports () {
       ? pkg.main
       : `./${pkg.main}`;
 
-    pkg.main = main.replace(/^\.\//, './cjs/');
+    // Only add ./cjs/ prefix if main doesn't already start with ./cjs/
+    pkg.main = main.startsWith('./cjs/') ? main : main.replace(/^\.\//, './cjs/');
     pkg.module = main;
     pkg.types = main.replace('.js', '.d.ts');
   }
@@ -806,7 +807,8 @@ function buildExports () {
         ? value
         : `./${value}`;
 
-      pkg[k] = entry.replace(/^\.\//, './cjs/');
+      // Only add ./cjs/ prefix if entry doesn't already start with ./cjs/
+      pkg[k] = entry.startsWith('./cjs/') ? entry : entry.replace(/^\.\//, './cjs/');
     }
   });