From b85abf7b932c0605dd9ad863c34c34d341690442 Mon Sep 17 00:00:00 2001 From: Juergen Kunz Date: Tue, 24 Mar 2026 15:07:43 +0000 Subject: [PATCH] fix(cli): replace npmextra config loading with smartconfig --- changelog.md | 7 +++++++ package.json | 2 +- pnpm-lock.yaml | 28 ++++++++++++++++++++++++---- ts/00_commitinfo_data.ts | 2 +- ts/mod_cli/classes.tsrustcli.ts | 6 +++--- ts/plugins.ts | 4 ++-- 6 files changed, 38 insertions(+), 11 deletions(-) diff --git a/changelog.md b/changelog.md index 2299623..5db2634 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,12 @@ # Changelog +## 2026-03-24 - 1.3.1 - fix(cli) +replace npmextra config loading with smartconfig + +- updates the CLI to read tsrust configuration via @push.rocks/smartconfig +- replaces the @push.rocks/npmextra dependency with @push.rocks/smartconfig +- adjusts config fallback documentation to reference smartconfig.json + ## 2026-02-09 - 1.3.0 - feat(toolchain) add automatic bundled Rust toolchain fallback and integrate with CLI/CargoRunner diff --git a/package.json b/package.json index 32561d2..688d9a9 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "homepage": "https://code.foss.global/git.zone/tsrust#README", "dependencies": { "@push.rocks/early": "^4.0.4", - "@push.rocks/npmextra": "^5.3.3", + "@push.rocks/smartconfig": "^6.0.0", "@push.rocks/smartcli": "^4.0.20", "@push.rocks/smartfile": "^13.1.2", "@push.rocks/smartpath": "^6.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6ce5c96..252c1fe 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,12 +11,12 @@ importers: '@push.rocks/early': specifier: ^4.0.4 version: 4.0.4 - '@push.rocks/npmextra': - specifier: ^5.3.3 - version: 5.3.3 '@push.rocks/smartcli': - specifier: ^4.0.19 + specifier: ^4.0.20 version: 4.0.20 + '@push.rocks/smartconfig': + specifier: ^6.0.0 + version: 6.0.0 '@push.rocks/smartfile': specifier: ^13.1.2 version: 13.1.2 @@ -669,6 +669,9 @@ packages: '@push.rocks/smartclickhouse@2.0.17': resolution: {integrity: sha512-IYO8Obor/Ruam2KQ2B/+5uQ+rL0exU5KZoSgOc3jkkrfjn+zZenN2xoV8lVqavAtxZVfG7MfxFrcv6I7I9ZMmA==} + '@push.rocks/smartconfig@6.0.0': + resolution: {integrity: sha512-ohXwJdbDXV2budErnZKWBOz01YkjP6gJsZ7QM9+6Wsh+r7O1CVT3JpV+mD8xJWy5tZRHI+3B9L8z0+WkIDtKzw==} + '@push.rocks/smartcrypto@2.0.4': resolution: {integrity: sha512-1+/5bsjyataf5uUkUNnnVXGRAt+gHVk1KDzozjTqgqJxHvQk1d9fVDohL6CxUhUucTPtu5VR5xNBiV8YCDuGyw==} @@ -4780,6 +4783,23 @@ snapshots: '@push.rocks/smarturl': 3.1.0 '@push.rocks/webrequest': 3.0.37 + '@push.rocks/smartconfig@6.0.0': + dependencies: + '@push.rocks/qenv': 6.1.3 + '@push.rocks/smartfile': 11.2.7 + '@push.rocks/smartjson': 5.2.0 + '@push.rocks/smartlog': 3.1.10 + '@push.rocks/smartpath': 6.0.0 + '@push.rocks/smartpromise': 4.2.3 + '@push.rocks/smartrx': 3.0.10 + '@push.rocks/taskbuffer': 3.5.0 + '@tsclass/tsclass': 9.3.0 + transitivePeerDependencies: + - '@nuxt/kit' + - react + - supports-color + - vue + '@push.rocks/smartcrypto@2.0.4': dependencies: '@push.rocks/smartpromise': 4.2.3 diff --git a/ts/00_commitinfo_data.ts b/ts/00_commitinfo_data.ts index 1a7c193..cb49f10 100644 --- a/ts/00_commitinfo_data.ts +++ b/ts/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@git.zone/tsrust', - version: '1.3.0', + version: '1.3.1', description: 'A tool for compiling Rust projects, detecting Cargo workspaces, building with cargo, and placing binaries in a conventional dist_rust directory.' } diff --git a/ts/mod_cli/classes.tsrustcli.ts b/ts/mod_cli/classes.tsrustcli.ts index 40db382..b58c95d 100644 --- a/ts/mod_cli/classes.tsrustcli.ts +++ b/ts/mod_cli/classes.tsrustcli.ts @@ -53,8 +53,8 @@ export class TsRustCli { constructor(cwd: string = process.cwd()) { this.cwd = cwd; this.cli = new plugins.smartcli.Smartcli(); - const npmextraInstance = new plugins.npmextra.Npmextra(this.cwd); - this.config = npmextraInstance.dataFor('@git.zone/tsrust', { targets: [] }); + const smartconfigInstance = new plugins.smartconfig.Smartconfig(this.cwd); + this.config = smartconfigInstance.dataFor('@git.zone/tsrust', { targets: [] }); this.registerCommands(); } @@ -122,7 +122,7 @@ export class TsRustCli { const distDir = path.join(this.cwd, 'dist_rust'); const profile = isDebug ? 'debug' : 'release'; - // Parse --target flag (can appear multiple times), fall back to npmextra.json config + // Parse --target flag (can appear multiple times), fall back to smartconfig.json config const cliTargets = (argvArg as any).target; const targets: string[] = cliTargets ? (Array.isArray(cliTargets) ? cliTargets : [cliTargets]) diff --git a/ts/plugins.ts b/ts/plugins.ts index 21183d3..d54c628 100644 --- a/ts/plugins.ts +++ b/ts/plugins.ts @@ -1,5 +1,5 @@ import * as early from '@push.rocks/early'; -import * as npmextra from '@push.rocks/npmextra'; +import * as smartconfig from '@push.rocks/smartconfig'; import * as smartcli from '@push.rocks/smartcli'; import * as smartfile from '@push.rocks/smartfile'; import * as smartpath from '@push.rocks/smartpath'; @@ -7,7 +7,7 @@ import * as smartshell from '@push.rocks/smartshell'; export { early, - npmextra, + smartconfig, smartcli, smartfile, smartpath,