@haibun/utils 1.40.6 → 1.40.8

package/build/util/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAEA,wBAAgB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,MAAM,SAAM,EAAE,IAAI,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,GAAG,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;CAAE,GAAG,MAAM,GAAG,KAAK,CAkBjI"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAEA,wBAAgB,KAAK,CACpB,OAAO,EAAE,MAAM,EAAE,EACjB,MAAM,SAAM,EACZ,IAAI,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,GAAG,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;CAAE,GACxD,MAAM,GAAG,KAAK,CAmBhB"}

package/build/util/index.js

@@ -1,15 +1,16 @@
 import { spawnSync } from 'child_process';
 export function spawn(command, module = '.', opts) {
-    const place = module === '.' ? '<root>' : module;
+    const cwd = process.cwd();
+    const place = '<' + (module === '.' ? `root` : module) + `@${cwd}>`;
     console.group(`${place}$ ${command.join(' ')}`);
     const [cmd, ...args] = command;
     const { output, stdout, stderr, status, error } = spawnSync(cmd, args, { cwd: module, env: opts?.env || process.env });
     const errString = (error?.message || '') + (stderr?.toString() || '');
     if (errString.length > 0) {
-        console.log('stdout', stdout?.toString());
+        console.error('\n\n\n\nERROR', stdout?.toString());
         console.error(`${place}> "${output}"\nstatus: ${status}\nerrString: ${errString}`);
         if (status !== 0) {
-            throw Error(place + ': ' + (errString.substring(0, errString.indexOf('\n'))));
+            throw Error(place + ': ' + errString.substring(0, errString.indexOf('\n')));
         }
         if (opts?.show) {
             console.log(`${place}> ${output}`);

package/build/util/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,MAAM,UAAU,KAAK,CAAC,OAAiB,EAAE,MAAM,GAAG,GAAG,EAAE,IAA0D;IAC/G,MAAM,KAAK,GAAG,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;IACjD,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChD,MAAM,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC;IAC/B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACvH,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,OAAO,IAAI,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IACtE,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC1C,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK,MAAM,MAAM,cAAc,MAAM,gBAAgB,SAAS,EAAE,CAAC,CAAC;QACnF,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;YACjB,MAAM,KAAK,CAAC,KAAK,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAChF,CAAC;QACD,IAAI,IAAI,EAAE,IAAI,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,KAAK,MAAM,EAAE,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IACD,OAAO,CAAC,QAAQ,EAAE,CAAC;IACnB,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAC;AAC3B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,MAAM,UAAU,KAAK,CACpB,OAAiB,EACjB,MAAM,GAAG,GAAG,EACZ,IAA0D;IAE1D,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1B,MAAM,KAAK,GAAG,GAAG,GAAG,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,GAAG,GAAG,CAAC;IACpE,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChD,MAAM,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC;IAC/B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACvH,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,OAAO,IAAI,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IACtE,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1B,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QACnD,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK,MAAM,MAAM,cAAc,MAAM,gBAAgB,SAAS,EAAE,CAAC,CAAC;QACnF,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;YAClB,MAAM,KAAK,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC7E,CAAC;QACD,IAAI,IAAI,EAAE,IAAI,EAAE,CAAC;YAChB,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,KAAK,MAAM,EAAE,CAAC,CAAC;QACpC,CAAC;IACF,CAAC;IACD,OAAO,CAAC,QAAQ,EAAE,CAAC;IACnB,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAC;AAC1B,CAAC"}

package/build/version.js

@@ -1,110 +1,135 @@
 import { existsSync, readFileSync, writeFileSync } from 'fs';
+import prettier from 'prettier';
 import { spawn } from './util/index.js';
+import { createVitest } from 'vitest/node';
 const [, me, version, ...extra] = process.argv;
 class Versioner {
-    toPublish = [];
     version;
-    haibuns = {};
+    localAndExtraModules = {}; // Changed to an object
+    haibunPackageVersions = {};
     constructor(version) {
         this.version = version;
+        if (!version) {
+            console.error(`usage: ${me}: <version> <extra modules>`);
+            process.exit(1);
+        }
     }
-    doVersion() {
-        try {
-            const hpkg = JSON.parse(readFileSync('./package.json', 'utf-8'));
-            if (hpkg.name !== 'haibun') {
-                throw Error('not in haibun root');
-            }
-            for (const [dep, version] of Object.entries({
-                ...hpkg.dependencies,
-                ...hpkg.devDependencies,
-            })) {
-                this.haibuns[dep] = version;
-            }
+    async doVersion() {
+        const haibunPackageJson = this.updateHaibunPackageVersions();
+        haibunPackageJson.version = this.version;
+        writeFileSync('./package.json', this.format(haibunPackageJson));
+        this.setLocalAndExtraModules();
+        await this.forLocalAndExtraModules(this.updateModule);
+        this.updateSourceCurrentVersion();
+        this.gitCommit('haibun', '.', ['./modules/core/src/currentVersion.ts']);
+        await this.forLocalAndExtraModules(this.npmInstall);
+        await this.forLocalAndExtraModules(this.runTest);
+        await this.forLocalAndExtraModules(this.gitCommit);
+        await this.forLocalAndExtraModules(this.npmPublish);
+        await this.forLocalAndExtraModules(this.gitPush);
+    }
+    format(contents) {
+        return prettier.format(JSON.stringify(contents), { parser: 'json' });
+    }
+    async forLocalAndExtraModules(someFunction) {
+        for (const [name, module] of Object.entries(this.localAndExtraModules)) {
+            console.info('running', someFunction.name, 'for', name, module);
+            await someFunction.call(this, name, module); // Bind `this` to each action
         }
-        catch (e) {
-            console.error(e);
-            process.exit(1);
+    }
+    updateHaibunPackageVersions() {
+        const hpkg = JSON.parse(readFileSync('./package.json', 'utf-8'));
+        if (hpkg.name !== 'haibun') {
+            throw Error('not in haibun root');
         }
-        if (!this.version) {
-            console.error(`usage: ${me}: <version> <extra modules>`);
-            process.exit(1);
+        for (const [dep, version] of Object.entries({ ...hpkg.dependencies, ...hpkg.devDependencies })) {
+            this.haibunPackageVersions[dep] = version;
         }
+        return hpkg;
+    }
+    updateSourceCurrentVersion() {
         for (const [dest, ext] of Object.entries({ src: 'ts', build: 'js' })) {
             writeFileSync(`./modules/core/${dest}/currentVersion.${ext}`, `export const currentVersion = '${this.version}';\n`);
+            console.info('updated currentVersion', dest);
         }
+    }
+    setLocalAndExtraModules() {
         const modules = JSON.parse(readFileSync(`./modules/tsconfig.json`, 'utf-8'))
-            .references
-            .map(f => `./modules/${f.path}`)
+            .references.map((f) => `./modules/${f.path}`)
             .concat(extra);
         for (const module of modules) {
             const name = module.replace(/\/$/, '').replace(/.*\//, '');
-            if (this.verifyShouldPublishStructureAndUpdateVersion(name, module)) {
-                this.toPublish.push(module);
-            }
+            this.localAndExtraModules[name] = module;
         }
-        this.verifyShouldPublishStructureAndUpdateVersion('haibun', '.');
-        this.publishAll();
-        const packageJson = JSON.parse(readFileSync('./package.json', 'utf-8'));
-        packageJson.version = this.version;
-        writeFileSync('./package.json', JSON.stringify(packageJson, null, 2));
-        spawn(['git', 'commit', '-m', `'update haibun to version ${this.version}'`, 'package.json', 'modules/core/src/currentVersion.ts'], '.');
     }
-    publishAll() {
-        for (const module of this.toPublish) {
-            console.info('\n\n*** publishing', module);
-            spawn(['npm', 'publish'], module);
-            spawn(['git', 'push'], module);
-        }
+    npmPublish(name, module) {
+        spawn(['npm', 'publish'], module);
     }
-    verifyShouldPublishStructureAndUpdateVersion(name, location) {
-        if (location == '.') {
-            return true;
-        }
-        const tryOrFail = (cmd) => {
-            try {
-                spawn(['npm', 'link'], location);
-            }
-            catch (e) {
-                console.error(`${cmd} failed: ${e}`);
-                throw e;
-            }
-        };
+    gitPush(name, module) {
+        spawn(['git', 'push'], module);
+    }
+    updateModule(name, location) {
         const pkgFile = `${location}/package.json`;
         const pkg = JSON.parse(readFileSync(pkgFile, 'utf-8'));
-        if (!pkg.publsh && pkg.publish !== undefined) {
+        if (!pkg.publish && pkg.publish !== undefined) {
             return false;
         }
-        console.info('updating', name);
         const { main } = pkg;
         if (main && !main.includes('*') && !existsSync(`${location}/${main}`)) {
             throw Error(`main file ${main} does not exist in ${location}`);
         }
         pkg.version = this.version;
-        for (const d in pkg.dependencies) {
-            if (d.startsWith('@haibun/')) {
-                pkg.dependencies[d] = this.version;
-            }
-            if (this.haibuns[d]) {
-                pkg.dependencies[d] = this.haibuns[d];
-                tryOrFail(['npm', 'link', d]);
+        this.updateDependencies(pkg.dependencies);
+        this.updateDependencies(pkg.devDependencies);
+        writeFileSync(pkgFile, this.format(pkg));
+    }
+    updateDependencies(dependencies) {
+        for (const d in dependencies) {
+            if (Object.prototype.hasOwnProperty.call(dependencies, d)) {
+                if (d.startsWith('@haibun/')) {
+                    dependencies[d] = this.version;
+                }
+                if (this.haibunPackageVersions[d]) {
+                    dependencies[d] = this.haibunPackageVersions[d];
+                }
             }
         }
-        for (const d in pkg.devDependencies) {
-            if (d.startsWith('@haibun/')) {
-                pkg.devDependencies[d] = this.version;
-            }
-            if (this.haibuns[d]) {
-                pkg.devDependencies[d] = this.haibuns[d];
-                tryOrFail(['npm', 'link', d]);
-            }
+    }
+    gitCommit(name, location, extraPackages = []) {
+        const packages = [...extraPackages, 'package.json'];
+        try {
+            spawn(['git', 'commit', '-m', `'update ${name} to version ${this.version}'`, ...packages], location);
+        }
+        catch (e) {
+            console.error(`git commit failed for ${name}: ${e}`);
+            throw e;
+        }
+    }
+    async runTest(name, location) {
+        const originalDir = process.cwd();
+        try {
+            process.chdir(location);
+            const vitest = await createVitest('test', { watch: false });
+            await vitest.start();
+            await vitest?.close();
+        }
+        catch (error) {
+            console.error(`npm test failed for ${name}: ${error}`);
+            throw error;
+        }
+        finally {
+            process.chdir(originalDir);
+        }
+    }
+    npmInstall(name, location) {
+        try {
+            spawn(['npm', 'install'], location);
+        }
+        catch (e) {
+            console.error(`npm install failed for ${name}: ${e}`);
+            throw e;
         }
-        console.log('ww', this.haibuns);
-        writeFileSync(pkgFile, JSON.stringify(pkg, null, 2));
-        tryOrFail(['npm', 'link']);
-        tryOrFail(['npm', 'run', 'test']);
-        tryOrFail(['git', 'commit', '-m', `'update ${name} to version ${this.version}'`, 'package.json',]);
-        return true;
     }
 }
-new Versioner(version).doVersion();
+void (await new Versioner(version).doVersion());
 //# sourceMappingURL=version.js.map

package/build/version.js.map

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

package/package.json

@@ -1,14 +1,10 @@
 {
   "name": "@haibun/utils",
   "type": "module",
-  "version": "1.40.6",
+  "version": "1.40.8",
   "description": "",
   "main": "index.js",
-  "files": [
-    "ref.package.json",
-    "build/**",
-    "scaffold/**"
-  ],
+  "files": ["ref.package.json", "build/**", "scaffold/**"],
   "bin": {
     "scaffold": "build/scaffold/index.js",
     "version": "build/version.js",
@@ -25,8 +21,5 @@
   "author": "",
   "license": "ISC",
   "gitHead": "7cf9680bd922fb622fb59f1e6bf5b65284cb8fd5",
-  "dependencies": {
-    "@haibun/cli": "1.40.6",
-    "@haibun/core": "1.40.6"
-  }
-}
+  "dependencies": { "@haibun/cli": "1.40.8", "@haibun/core": "1.40.8" }
+}