@nocobase/cli 2.2.0-beta.3 → 2.2.0-beta.5

package/dist/commands/init.js

@@ -23,6 +23,7 @@ import { runPromptCatalogWebUI } from "../lib/prompt-web-ui.js";
 import { validateApiBaseUrl, validateEnvKey } from "../lib/prompt-validators.js";
 import { installNocoBaseSkills, isNpmRegistryUnavailable } from '../lib/skills-manager.js';
 import { omitKeys, pickKeys } from "../lib/object-utils.js";
+import { ENV_CONFIG_SCHEMA_VERSION } from '../lib/env-config.js';
 import { printInfo, printStage, printVerbose, printWarning } from '../lib/ui.js';
 import Download from "./download.js";
 import EnvAdd from "./env/add.js";
@@ -1036,6 +1037,7 @@ Prompt modes:
         results.appKey = appKey;
         results.timeZone = timeZone;
         await upsertEnv(envName, {
+            schemaVersion: ENV_CONFIG_SCHEMA_VERSION,
             ...(source === 'docker'
                 ? { kind: 'docker' }
                 : source || appPath || appRootPath

package/dist/lib/auth-store.js

@@ -12,6 +12,7 @@ import { resolveAppPublicPath } from './app-public-path.js';
 import { resolveCliHomeDir, resolveConfiguredEnvPath, resolveEnvRelativePath } from './cli-home.js';
 import { normalizeCliLocale } from './cli-locale.js';
 import { inferConfiguredAppPathFromLegacyConfig, resolveConfiguredAppPath, resolveConfiguredSourcePath, resolveConfiguredStoragePath, } from './env-paths.js';
+import { ENV_CONFIG_SCHEMA_VERSION, normalizeEnvConfigSchemaVersion } from './env-config.js';
 import { cleanupCurrentSessionAfterEnvRemoval, resolveEffectiveCurrentEnv, setSessionCurrentEnv, } from './session-store.js';
 function normalizeStoredEnvKind(value) {
     const kind = String(value ?? '').trim();
@@ -76,11 +77,13 @@ function normalizeEnvConfigEntry(entry) {
     if (!entry) {
         return entry;
     }
-    const { kind: _kind, apiBaseUrl: _apiBaseUrl, baseUrl: _baseUrl, apibaseUrl: _legacyApiBaseUrl, ...rest } = entry;
+    const { kind: _kind, apiBaseUrl: _apiBaseUrl, baseUrl: _baseUrl, apibaseUrl: _legacyApiBaseUrl, schemaVersion: _schemaVersion, ...rest } = entry;
     const normalizedKind = resolveEnvKind(entry);
     const apiBaseUrl = readEnvApiBaseUrl(entry);
+    const schemaVersion = normalizeEnvConfigSchemaVersion(entry.schemaVersion);
     return {
         ...rest,
+        ...(schemaVersion ? { schemaVersion } : {}),
         ...(normalizedKind ? { kind: normalizedKind } : {}),
         ...(apiBaseUrl !== undefined ? { apiBaseUrl } : {}),
         ...(normalizeOptionalString(entry.appPublicPath) ? { appPublicPath: resolveAppPublicPath(entry.appPublicPath) } : {}),
@@ -366,7 +369,13 @@ function areAuthConfigsEquivalent(left, right) {
 async function writeEnv(envName, updater, options = {}) {
     const config = await loadExactAuthConfig(options);
     const previous = config.envs[envName];
-    config.envs[envName] = updater(previous);
+    const next = updater(previous);
+    config.envs[envName] = {
+        ...next,
+        schemaVersion: normalizeEnvConfigSchemaVersion(next.schemaVersion) ??
+            normalizeEnvConfigSchemaVersion(previous?.schemaVersion) ??
+            ENV_CONFIG_SCHEMA_VERSION,
+    };
     await saveAuthConfig(config, options);
 }
 function normalizeConfiguredAuthType(value) {
@@ -377,18 +386,19 @@ export function resolveConfiguredAuthType(config) {
 }
 export async function upsertEnv(envName, config, options = {}) {
     await writeEnv(envName, (previous) => {
-        const { apiBaseUrl: _apiBaseUrl, baseUrl: _baseUrl, apibaseUrl: _legacyApiBaseUrl, accessToken, authType, authUsername, ...rest } = config;
+        const { apiBaseUrl: _apiBaseUrl, baseUrl: _baseUrl, apibaseUrl: _legacyApiBaseUrl, accessToken, authType, authUsername, schemaVersion, ...rest } = config;
         const nextApiBaseUrl = readEnvApiBaseUrl(config);
         const previousApiBaseUrl = readEnvApiBaseUrl(previous);
         const baseUrlChanged = previousApiBaseUrl !== nextApiBaseUrl;
         const previousAuthType = resolveConfiguredAuthType(previous);
         const requestedAuthType = normalizeConfiguredAuthType(authType);
-        const nextAuthType = requestedAuthType ?? (accessToken ? 'token' : previousAuthType);
+        const nextAccessToken = normalizeOptionalString(accessToken);
+        const nextAuthType = requestedAuthType ?? (nextAccessToken ? 'token' : previousAuthType);
         const nextAuthUsername = nextAuthType === 'basic' ? normalizeOptionalString(authUsername) ?? previous?.authUsername : undefined;
-        const nextAuth = accessToken
+        const nextAuth = nextAccessToken
             ? {
                 type: 'token',
-                accessToken,
+                accessToken: nextAccessToken,
             }
             : nextAuthType === 'oauth' && !baseUrlChanged && previous?.auth?.type === 'oauth'
                 ? previous.auth
@@ -396,6 +406,9 @@ export async function upsertEnv(envName, config, options = {}) {
         const authChanged = !areAuthConfigsEquivalent(previous?.auth, nextAuth);
         const authTypeChanged = previousAuthType !== nextAuthType;
         const authUsernameChanged = previous?.authUsername !== nextAuthUsername;
+        const nextSchemaVersion = normalizeEnvConfigSchemaVersion(schemaVersion) ??
+            normalizeEnvConfigSchemaVersion(previous?.schemaVersion) ??
+            ENV_CONFIG_SCHEMA_VERSION;
         return {
             ...previous,
             apiBaseUrl: nextApiBaseUrl,
@@ -403,6 +416,7 @@ export async function upsertEnv(envName, config, options = {}) {
             authUsername: nextAuthUsername,
             auth: nextAuth,
             ...rest,
+            schemaVersion: nextSchemaVersion,
             runtime: baseUrlChanged || authChanged || authTypeChanged || authUsernameChanged ? undefined : previous?.runtime,
         };
     }, options);

package/dist/lib/env-config.js

@@ -46,6 +46,7 @@ const BOOLEAN_ENV_CONFIG_KEYS = [
     'buildDts',
     'dbUnderscored',
 ];
+export const ENV_CONFIG_SCHEMA_VERSION = 1;
 function trimConfigValue(value) {
     const text = String(value ?? '').trim();
     return text || undefined;
@@ -53,6 +54,9 @@ function trimConfigValue(value) {
 function resolveSetupState(value) {
     return value === 'prepared' || value === 'installed' ? value : undefined;
 }
+export function normalizeEnvConfigSchemaVersion(value) {
+    return typeof value === 'number' && Number.isInteger(value) && value > 0 ? value : undefined;
+}
 function resolveEnvKind(input) {
     const source = trimConfigValue(input.source);
     const appPath = trimConfigValue(input.appPath);
@@ -67,6 +71,7 @@ function resolveEnvKind(input) {
 }
 export function buildStoredEnvConfig(input) {
     const envConfig = {
+        schemaVersion: normalizeEnvConfigSchemaVersion(input.schemaVersion) ?? ENV_CONFIG_SCHEMA_VERSION,
         kind: resolveEnvKind(input),
         apiBaseUrl: trimConfigValue(input.apiBaseUrl) ?? '',
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.2.0-beta.3",
+  "version": "2.2.0-beta.5",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",
@@ -143,5 +143,5 @@
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git"
   },
-  "gitHead": "7b16bb2cfd427c110c6671252138cd85155723c5"
+  "gitHead": "81eab2cfa9d3d989e99ba0c914807b38db55f023"
 }