opkg 0.6.0 → 0.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +35 -15
- package/dist/commands/duplicate.js +5 -2
- package/dist/commands/duplicate.js.map +1 -1
- package/dist/commands/init.js +4 -1
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/install.js +8 -7
- package/dist/commands/install.js.map +1 -1
- package/dist/commands/list.js +9 -3
- package/dist/commands/list.js.map +1 -1
- package/dist/commands/login.js +58 -0
- package/dist/commands/login.js.map +1 -0
- package/dist/commands/logout.js +28 -0
- package/dist/commands/logout.js.map +1 -0
- package/dist/commands/pull.js +5 -299
- package/dist/commands/pull.js.map +1 -1
- package/dist/commands/push.js +5 -245
- package/dist/commands/push.js.map +1 -1
- package/dist/commands/save.js +20 -4
- package/dist/commands/save.js.map +1 -1
- package/dist/commands/show.js +18 -5
- package/dist/commands/show.js.map +1 -1
- package/dist/commands/status.js +19 -6
- package/dist/commands/status.js.map +1 -1
- package/dist/commands/tui.js +61 -0
- package/dist/commands/tui.js.map +1 -0
- package/dist/constants/index.js +1 -0
- package/dist/constants/index.js.map +1 -1
- package/dist/core/add/package-index-updater.js +4 -3
- package/dist/core/add/package-index-updater.js.map +1 -1
- package/dist/core/api-keys.js +6 -2
- package/dist/core/api-keys.js.map +1 -1
- package/dist/core/auth.js +25 -40
- package/dist/core/auth.js.map +1 -1
- package/dist/core/config.js +11 -3
- package/dist/core/config.js.map +1 -1
- package/dist/core/dependency-resolver.js +21 -10
- package/dist/core/dependency-resolver.js.map +1 -1
- package/dist/core/device-auth.js +81 -0
- package/dist/core/device-auth.js.map +1 -0
- package/dist/core/directory.js +14 -8
- package/dist/core/directory.js.map +1 -1
- package/dist/core/install/bulk-install-pipeline.js +2 -1
- package/dist/core/install/bulk-install-pipeline.js.map +1 -1
- package/dist/core/install/canonical-plan.js +11 -5
- package/dist/core/install/canonical-plan.js.map +1 -1
- package/dist/core/install/download-keys.js +2 -2
- package/dist/core/install/download-keys.js.map +1 -1
- package/dist/core/install/install-flow.js +6 -4
- package/dist/core/install/install-flow.js.map +1 -1
- package/dist/core/install/install-pipeline.js +74 -6
- package/dist/core/install/install-pipeline.js.map +1 -1
- package/dist/core/install/remote-flow.js +17 -6
- package/dist/core/install/remote-flow.js.map +1 -1
- package/dist/core/install/version-selection.js +25 -8
- package/dist/core/install/version-selection.js.map +1 -1
- package/dist/core/openpackage.js +6 -6
- package/dist/core/openpackage.js.map +1 -1
- package/dist/core/package.js +71 -8
- package/dist/core/package.js.map +1 -1
- package/dist/core/profiles.js +60 -3
- package/dist/core/profiles.js.map +1 -1
- package/dist/core/pull/pull-errors.js +62 -0
- package/dist/core/pull/pull-errors.js.map +1 -0
- package/dist/core/pull/pull-options.js +2 -0
- package/dist/core/pull/pull-options.js.map +1 -0
- package/dist/core/pull/pull-output.js +50 -0
- package/dist/core/pull/pull-output.js.map +1 -0
- package/dist/core/pull/pull-pipeline.js +141 -0
- package/dist/core/pull/pull-pipeline.js.map +1 -0
- package/dist/core/pull/pull-strategies.js +103 -0
- package/dist/core/pull/pull-strategies.js.map +1 -0
- package/dist/core/pull/pull-types.js +2 -0
- package/dist/core/pull/pull-types.js.map +1 -0
- package/dist/core/push/push-context.js +95 -0
- package/dist/core/push/push-context.js.map +1 -0
- package/dist/core/push/push-errors.js +133 -0
- package/dist/core/push/push-errors.js.map +1 -0
- package/dist/core/push/push-output.js +44 -0
- package/dist/core/push/push-output.js.map +1 -0
- package/dist/core/push/push-pipeline.js +74 -0
- package/dist/core/push/push-pipeline.js.map +1 -0
- package/dist/core/push/push-single-file.js +56 -0
- package/dist/core/push/push-single-file.js.map +1 -0
- package/dist/core/push/push-types.js +2 -0
- package/dist/core/push/push-types.js.map +1 -0
- package/dist/core/push/push-upload.js +68 -0
- package/dist/core/push/push-upload.js.map +1 -0
- package/dist/core/registry.js +4 -2
- package/dist/core/registry.js.map +1 -1
- package/dist/core/remote-pull.js +163 -35
- package/dist/core/remote-pull.js.map +1 -1
- package/dist/core/save/package-saver.js +37 -1
- package/dist/core/save/package-saver.js.map +1 -1
- package/dist/core/save/package-yml-generator.js +5 -4
- package/dist/core/save/package-yml-generator.js.map +1 -1
- package/dist/core/save/save-pipeline.js +17 -6
- package/dist/core/save/save-pipeline.js.map +1 -1
- package/dist/core/save/save-single-file.js +124 -0
- package/dist/core/save/save-single-file.js.map +1 -0
- package/dist/core/scoping/package-scoping.js +1 -1
- package/dist/core/scoping/package-scoping.js.map +1 -1
- package/dist/core/token-store.js +73 -0
- package/dist/core/token-store.js.map +1 -0
- package/dist/index.js +4 -0
- package/dist/index.js.map +1 -1
- package/dist/tui/app.js +95 -0
- package/dist/tui/app.js.map +1 -0
- package/dist/tui/components/package-list.js +73 -0
- package/dist/tui/components/package-list.js.map +1 -0
- package/dist/tui/controller.js +365 -0
- package/dist/tui/controller.js.map +1 -0
- package/dist/tui/index.js +12 -0
- package/dist/tui/index.js.map +1 -0
- package/dist/tui/services/file-index.js +64 -0
- package/dist/tui/services/file-index.js.map +1 -0
- package/dist/tui/services/packages.js +18 -0
- package/dist/tui/services/packages.js.map +1 -0
- package/dist/tui/services/save.js +21 -0
- package/dist/tui/services/save.js.map +1 -0
- package/dist/tui/state/app-state.js +15 -0
- package/dist/tui/state/app-state.js.map +1 -0
- package/dist/tui/state.js +17 -0
- package/dist/tui/state.js.map +1 -0
- package/dist/tui/types.js +2 -0
- package/dist/tui/types.js.map +1 -0
- package/dist/tui/views/add-file-modal.js +129 -0
- package/dist/tui/views/add-file-modal.js.map +1 -0
- package/dist/tui/views/file-preview.js +44 -0
- package/dist/tui/views/file-preview.js.map +1 -0
- package/dist/tui/views/list-packages.js +73 -0
- package/dist/tui/views/list-packages.js.map +1 -0
- package/dist/tui/views/main-menu.js +29 -0
- package/dist/tui/views/main-menu.js.map +1 -0
- package/dist/tui/views/manage-view.js +81 -0
- package/dist/tui/views/manage-view.js.map +1 -0
- package/dist/tui/views/package-hub.js +120 -0
- package/dist/tui/views/package-hub.js.map +1 -0
- package/dist/tui/views/placeholder.js +24 -0
- package/dist/tui/views/placeholder.js.map +1 -0
- package/dist/types/index.js.map +1 -1
- package/dist/utils/bun-bootstrap.js +72 -0
- package/dist/utils/bun-bootstrap.js.map +1 -0
- package/dist/utils/formatters.js +3 -1
- package/dist/utils/formatters.js.map +1 -1
- package/dist/utils/http-client.js +27 -5
- package/dist/utils/http-client.js.map +1 -1
- package/dist/utils/index-based-installer.js +25 -2
- package/dist/utils/index-based-installer.js.map +1 -1
- package/dist/utils/install-file-discovery.js +17 -23
- package/dist/utils/install-file-discovery.js.map +1 -1
- package/dist/utils/manifest-paths.js +27 -0
- package/dist/utils/manifest-paths.js.map +1 -0
- package/dist/utils/package-management.js +139 -45
- package/dist/utils/package-management.js.map +1 -1
- package/dist/utils/package-merge.js +48 -0
- package/dist/utils/package-merge.js.map +1 -0
- package/dist/utils/package-name.js +29 -0
- package/dist/utils/package-name.js.map +1 -1
- package/dist/utils/package-versioning.js +16 -4
- package/dist/utils/package-versioning.js.map +1 -1
- package/dist/utils/package-yml.js +17 -12
- package/dist/utils/package-yml.js.map +1 -1
- package/dist/utils/prompts.js +0 -31
- package/dist/utils/prompts.js.map +1 -1
- package/dist/utils/registry-entry-filter.js +2 -2
- package/dist/utils/registry-entry-filter.js.map +1 -1
- package/dist/utils/registry-paths.js +38 -0
- package/dist/utils/registry-paths.js.map +1 -1
- package/dist/utils/tarball.js +6 -2
- package/dist/utils/tarball.js.map +1 -1
- package/dist/utils/version-ranges.js +11 -8
- package/dist/utils/version-ranges.js.map +1 -1
- package/package.json +2 -2
- package/specs/auth/auth-device-flow.md +70 -0
- package/specs/install/install-behavior.md +30 -0
- package/specs/install/package-yml-canonical.md +21 -1
- package/specs/install/version-resolution.md +9 -7
- package/specs/login/login-device-flow.md +70 -0
- package/specs/push/push-behavior.md +38 -10
- package/specs/push/push-errors-and-hints.md +19 -6
- package/specs/push/push-remote-upload.md +3 -0
- package/specs/push/push-scoping.md +14 -22
- package/specs/push/push-version-selection.md +18 -16
- package/specs/save/save-modes-inputs.md +3 -1
- package/specs/save-pack.md +1 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-yml-generator.js","sourceRoot":"","sources":["../../../src/core/save/package-yml-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,iBAAiB,EAAuB,MAAM,uBAAuB,CAAC;AACtH,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"package-yml-generator.js","sourceRoot":"","sources":["../../../src/core/save/package-yml-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PACKAGE_PATHS } from '../../constants/index.js';
|
|
1
|
+
import { PACKAGE_PATHS, UNVERSIONED } from '../../constants/index.js';
|
|
2
2
|
import { ensureRegistryDirectories } from '../directory.js';
|
|
3
3
|
import { logger } from '../../utils/logger.js';
|
|
4
4
|
import { addPackageToYml, createWorkspacePackageYml } from '../../utils/package-management.js';
|
|
@@ -9,7 +9,7 @@ import { readPackageIndex, writePackageIndex } from '../../utils/package-index-y
|
|
|
9
9
|
import { createWorkspaceHash, createWorkspaceTag } from '../../utils/version-generator.js';
|
|
10
10
|
import { computeWipVersion, computePackTargetVersion } from './save-versioning.js';
|
|
11
11
|
import { savePackageToRegistry } from './package-saver.js';
|
|
12
|
-
import { packageVersionExists } from '../../utils/package-versioning.js';
|
|
12
|
+
import { isUnversionedVersion, packageVersionExists } from '../../utils/package-versioning.js';
|
|
13
13
|
import { deleteWorkspaceWipCopies } from './workspace-wip-cleanup.js';
|
|
14
14
|
import { writePackageYml } from '../../utils/package-yml.js';
|
|
15
15
|
import { formatRegistryPathForDisplay } from '../../utils/registry-paths.js';
|
|
@@ -60,11 +60,20 @@ export async function runSavePipeline(packageName, options) {
|
|
|
60
60
|
const indexRecord = await readPackageIndex(cwd, packageContext.config.name, packageContext.location);
|
|
61
61
|
const workspaceHash = createWorkspaceHash(cwd);
|
|
62
62
|
const workspaceTag = createWorkspaceTag(cwd);
|
|
63
|
+
const baseVersion = packageContext.config.version;
|
|
64
|
+
const isUnversioned = isUnversionedVersion(baseVersion);
|
|
63
65
|
let targetVersion;
|
|
64
66
|
let shouldBumpPackageYml = false;
|
|
65
67
|
let nextStable;
|
|
66
|
-
if (
|
|
67
|
-
|
|
68
|
+
if (isUnversioned) {
|
|
69
|
+
if (mode === 'stable') {
|
|
70
|
+
throw new Error('package.yml must contain a semver version to pack a release.');
|
|
71
|
+
}
|
|
72
|
+
targetVersion = UNVERSIONED;
|
|
73
|
+
}
|
|
74
|
+
else if (mode === 'wip') {
|
|
75
|
+
const stableBase = baseVersion;
|
|
76
|
+
const wipInfo = computeWipVersion(stableBase, indexRecord?.workspace?.version, cwd);
|
|
68
77
|
if (wipInfo.resetMessage)
|
|
69
78
|
console.log(wipInfo.resetMessage);
|
|
70
79
|
targetVersion = wipInfo.wipVersion;
|
|
@@ -72,7 +81,8 @@ export async function runSavePipeline(packageName, options) {
|
|
|
72
81
|
nextStable = wipInfo.nextStable;
|
|
73
82
|
}
|
|
74
83
|
else {
|
|
75
|
-
const
|
|
84
|
+
const stableBase = baseVersion;
|
|
85
|
+
const packInfo = computePackTargetVersion(stableBase, indexRecord?.workspace?.version);
|
|
76
86
|
if (packInfo.resetMessage)
|
|
77
87
|
console.log(packInfo.resetMessage);
|
|
78
88
|
targetVersion = packInfo.targetVersion;
|
|
@@ -110,7 +120,8 @@ export async function runSavePipeline(packageName, options) {
|
|
|
110
120
|
if (packageContext.location !== 'root') {
|
|
111
121
|
const covered = await isPackageTransitivelyCovered(cwd, effectiveConfig.name);
|
|
112
122
|
if (!covered) {
|
|
113
|
-
|
|
123
|
+
const versionForYml = isUnversioned ? undefined : effectiveConfig.version;
|
|
124
|
+
await addPackageToYml(cwd, effectiveConfig.name, versionForYml, false, undefined, true);
|
|
114
125
|
}
|
|
115
126
|
else {
|
|
116
127
|
logger.debug(`Skipping addition of ${effectiveConfig.name} to package.yml; already covered transitively.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"save-pipeline.js","sourceRoot":"","sources":["../../../src/core/save/save-pipeline.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"save-pipeline.js","sourceRoot":"","sources":["../../../src/core/save/save-pipeline.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,124 @@
|
|
|
1
|
+
import { dirname, join, relative } from 'path';
|
|
2
|
+
import { DIR_PATTERNS, PACKAGE_PATHS, UNVERSIONED } from '../../constants/index.js';
|
|
3
|
+
import { exists, ensureDir, readTextFile, writeTextFile } from '../../utils/fs.js';
|
|
4
|
+
import { normalizePathForProcessing, isWithinDirectory } from '../../utils/path-normalization.js';
|
|
5
|
+
import { createWorkspacePackageYml, ensurePackageWithYml, addPackageToYml, updatePackageDependencyInclude, writeLocalPackageFromRegistry } from '../../utils/package-management.js';
|
|
6
|
+
import { packageManager } from '../package.js';
|
|
7
|
+
import { getLocalPackageDir, getLocalPackageYmlPath } from '../../utils/paths.js';
|
|
8
|
+
import { parsePackageYml } from '../../utils/package-yml.js';
|
|
9
|
+
import { readPackageFilesForRegistry } from '../../utils/package-copy.js';
|
|
10
|
+
import { buildMappingAndWriteIndex } from '../add/package-index-updater.js';
|
|
11
|
+
import { getDetectedPlatforms } from '../platforms.js';
|
|
12
|
+
import { logger } from '../../utils/logger.js';
|
|
13
|
+
import { mapPlatformFileToUniversal } from '../../utils/platform-mapper.js';
|
|
14
|
+
import { arePackageNamesEquivalent } from '../../utils/package-name.js';
|
|
15
|
+
import { performPlatformSync } from '../sync/platform-sync.js';
|
|
16
|
+
const SINGLE_FILE_PACKAGE = 'f';
|
|
17
|
+
export async function runSingleFileSave(absolutePath, options = {}) {
|
|
18
|
+
const cwd = process.cwd();
|
|
19
|
+
const normalizedInput = normalizePathForProcessing(relative(cwd, absolutePath));
|
|
20
|
+
await validateInputPath(cwd, absolutePath, normalizedInput);
|
|
21
|
+
await createWorkspacePackageYml(cwd);
|
|
22
|
+
// Ensure local cache for f@0.0.0; refresh from registry when present.
|
|
23
|
+
const ensured = await ensurePackageWithYml(cwd, SINGLE_FILE_PACKAGE, {
|
|
24
|
+
defaultVersion: undefined,
|
|
25
|
+
interactive: false
|
|
26
|
+
});
|
|
27
|
+
const packageRootDir = dirname(ensured.packageDir);
|
|
28
|
+
const packageYmlPath = ensured.packageYmlPath;
|
|
29
|
+
await refreshFromRegistryIfAvailable(cwd);
|
|
30
|
+
const registryPath = resolveRegistryPath(normalizedInput, absolutePath);
|
|
31
|
+
// Copy the file into the cached package directory, preserving relative path.
|
|
32
|
+
const targetPath = join(packageRootDir, registryPath);
|
|
33
|
+
await ensureDir(dirname(targetPath));
|
|
34
|
+
const content = await readTextFile(absolutePath);
|
|
35
|
+
await writeTextFile(targetPath, content);
|
|
36
|
+
// Rebuild index for f to include new file list.
|
|
37
|
+
const packageFiles = await readPackageFilesForRegistry(packageRootDir);
|
|
38
|
+
const filteredFiles = packageFiles.filter(f => f.path !== PACKAGE_PATHS.INDEX_RELATIVE);
|
|
39
|
+
const packageContext = {
|
|
40
|
+
name: SINGLE_FILE_PACKAGE,
|
|
41
|
+
version: UNVERSIONED,
|
|
42
|
+
config: await parsePackageYml(packageYmlPath),
|
|
43
|
+
packageYmlPath,
|
|
44
|
+
packageRootDir,
|
|
45
|
+
packageFilesDir: ensured.packageDir,
|
|
46
|
+
location: 'nested',
|
|
47
|
+
isCwdPackage: false,
|
|
48
|
+
isNew: ensured.isNew
|
|
49
|
+
};
|
|
50
|
+
const detectedPlatforms = await getDetectedPlatforms(cwd);
|
|
51
|
+
await buildMappingAndWriteIndex(cwd, packageContext, packageFiles, detectedPlatforms, {
|
|
52
|
+
preserveExactPaths: true,
|
|
53
|
+
versionOverride: UNVERSIONED
|
|
54
|
+
});
|
|
55
|
+
// Ensure dependency entry and include list in workspace package.yml
|
|
56
|
+
const targetArray = options.dev ? 'dev-packages' : 'packages';
|
|
57
|
+
await addPackageToYml(cwd, SINGLE_FILE_PACKAGE, undefined, options.dev ?? false, undefined, true, undefined);
|
|
58
|
+
const mergedInclude = await mergeDependencyInclude(cwd, targetArray, registryPath);
|
|
59
|
+
await updatePackageDependencyInclude(cwd, SINGLE_FILE_PACKAGE, targetArray, mergedInclude);
|
|
60
|
+
// Persist updated f package to local registry
|
|
61
|
+
const pkg = {
|
|
62
|
+
metadata: { ...packageContext.config, name: SINGLE_FILE_PACKAGE, version: UNVERSIONED },
|
|
63
|
+
files: filteredFiles
|
|
64
|
+
};
|
|
65
|
+
await packageManager.savePackage(pkg);
|
|
66
|
+
// Sync root/platform files to workspace targets (matches standard save flow)
|
|
67
|
+
const syncResult = await performPlatformSync(cwd, SINGLE_FILE_PACKAGE, UNVERSIONED, filteredFiles, {
|
|
68
|
+
packageLocation: 'nested',
|
|
69
|
+
conflictStrategy: 'overwrite',
|
|
70
|
+
skipRootSync: false
|
|
71
|
+
});
|
|
72
|
+
logger.info(`Saved single file to local registry: ${registryPath} -> ${SINGLE_FILE_PACKAGE}@${UNVERSIONED}`);
|
|
73
|
+
return {
|
|
74
|
+
success: true,
|
|
75
|
+
data: { packageFiles: filteredFiles, syncResult }
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
async function validateInputPath(cwd, absolutePath, normalizedInput) {
|
|
79
|
+
if (!(await exists(absolutePath))) {
|
|
80
|
+
throw new Error(`Path '${normalizedInput}' does not exist`);
|
|
81
|
+
}
|
|
82
|
+
if (!isWithinDirectory(cwd, absolutePath)) {
|
|
83
|
+
throw new Error('Path must be within the current working directory.');
|
|
84
|
+
}
|
|
85
|
+
const openpackageDir = join(cwd, '.openpackage');
|
|
86
|
+
if (isWithinDirectory(openpackageDir, absolutePath)) {
|
|
87
|
+
throw new Error('Cannot save files from inside the .openpackage directory.');
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
async function refreshFromRegistryIfAvailable(cwd) {
|
|
91
|
+
const localPackageDir = getLocalPackageDir(cwd, SINGLE_FILE_PACKAGE);
|
|
92
|
+
try {
|
|
93
|
+
await packageManager.loadPackage(SINGLE_FILE_PACKAGE, UNVERSIONED);
|
|
94
|
+
await ensureDir(localPackageDir);
|
|
95
|
+
await writeLocalPackageFromRegistry(cwd, SINGLE_FILE_PACKAGE, UNVERSIONED);
|
|
96
|
+
}
|
|
97
|
+
catch {
|
|
98
|
+
// If the package does not exist in the registry yet, continue with local cache creation.
|
|
99
|
+
return;
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
function resolveRegistryPath(normalizedInput, absolutePath) {
|
|
103
|
+
const platformMapping = mapPlatformFileToUniversal(absolutePath);
|
|
104
|
+
if (platformMapping) {
|
|
105
|
+
const { subdir, relPath } = platformMapping;
|
|
106
|
+
return normalizePathForProcessing([DIR_PATTERNS.OPENPACKAGE, subdir, relPath].filter(Boolean).join('/'));
|
|
107
|
+
}
|
|
108
|
+
return normalizedInput;
|
|
109
|
+
}
|
|
110
|
+
async function mergeDependencyInclude(cwd, targetArray, newPath) {
|
|
111
|
+
const packageYmlPath = getLocalPackageYmlPath(cwd);
|
|
112
|
+
const config = (await exists(packageYmlPath)) ? await parsePackageYml(packageYmlPath) : null;
|
|
113
|
+
const currentFiles = [];
|
|
114
|
+
if (config && config[targetArray]) {
|
|
115
|
+
const deps = config[targetArray];
|
|
116
|
+
const idx = deps.findIndex(dep => arePackageNamesEquivalent(dep.name, SINGLE_FILE_PACKAGE));
|
|
117
|
+
if (idx >= 0 && Array.isArray(deps[idx].include)) {
|
|
118
|
+
currentFiles.push(...deps[idx].include);
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
const unique = Array.from(new Set([...currentFiles, newPath])).filter(Boolean);
|
|
122
|
+
return unique;
|
|
123
|
+
}
|
|
124
|
+
//# sourceMappingURL=save-single-file.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"save-single-file.js","sourceRoot":"","sources":["../../../src/core/save/save-single-file.ts"],"names":[],"mappings":"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"}
|
|
@@ -76,7 +76,7 @@ export async function getDefaultScopeForProfile(profileName) {
|
|
|
76
76
|
}
|
|
77
77
|
const config = await configManager.getAll();
|
|
78
78
|
const profileConfig = config.profiles?.[profileName];
|
|
79
|
-
return profileConfig?.
|
|
79
|
+
return profileConfig?.defaults?.scope;
|
|
80
80
|
}
|
|
81
81
|
/**
|
|
82
82
|
* Suggest a scoped package name using the configured default scope.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-scoping.js","sourceRoot":"","sources":["../../../src/core/scoping/package-scoping.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"package-scoping.js","sourceRoot":"","sources":["../../../src/core/scoping/package-scoping.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import { logger } from '../utils/logger.js';
|
|
2
|
+
import { ConfigError } from '../utils/errors.js';
|
|
3
|
+
const KEYCHAIN_REQUIRED_MESSAGE = 'OS keychain unavailable. Install optional "keytar" dependency to store tokens securely (file-based token storage has been removed).';
|
|
4
|
+
/**
|
|
5
|
+
* Token storage implementation using the OS keychain (via keytar).
|
|
6
|
+
* Uses a dynamic import so the CLI still starts even if keytar is missing,
|
|
7
|
+
* but operations will fail with a ConfigError until keytar is installed.
|
|
8
|
+
*/
|
|
9
|
+
export class KeychainTokenStore {
|
|
10
|
+
constructor(service = 'opkg-cli') {
|
|
11
|
+
this.keytar = null;
|
|
12
|
+
this.service = service;
|
|
13
|
+
}
|
|
14
|
+
async available() {
|
|
15
|
+
return !!(await this.ensureKeytar());
|
|
16
|
+
}
|
|
17
|
+
async get(profileName) {
|
|
18
|
+
const keytar = await this.requireKeytar();
|
|
19
|
+
const raw = await keytar.getPassword(this.service, profileName);
|
|
20
|
+
if (!raw)
|
|
21
|
+
return null;
|
|
22
|
+
try {
|
|
23
|
+
return JSON.parse(raw);
|
|
24
|
+
}
|
|
25
|
+
catch (error) {
|
|
26
|
+
logger.warn('Failed to parse keychain token entry, deleting it', { error });
|
|
27
|
+
await keytar.deletePassword(this.service, profileName);
|
|
28
|
+
return null;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
async set(profileName, value) {
|
|
32
|
+
const keytar = await this.requireKeytar();
|
|
33
|
+
await keytar.setPassword(this.service, profileName, JSON.stringify(value));
|
|
34
|
+
}
|
|
35
|
+
async delete(profileName) {
|
|
36
|
+
const keytar = await this.requireKeytar();
|
|
37
|
+
await keytar.deletePassword(this.service, profileName);
|
|
38
|
+
}
|
|
39
|
+
async requireKeytar() {
|
|
40
|
+
const keytar = await this.ensureKeytar();
|
|
41
|
+
if (!keytar) {
|
|
42
|
+
throw new ConfigError(KEYCHAIN_REQUIRED_MESSAGE);
|
|
43
|
+
}
|
|
44
|
+
return keytar;
|
|
45
|
+
}
|
|
46
|
+
async ensureKeytar() {
|
|
47
|
+
if (this.keytar) {
|
|
48
|
+
return this.keytar;
|
|
49
|
+
}
|
|
50
|
+
try {
|
|
51
|
+
const mod = (await import('keytar'));
|
|
52
|
+
this.keytar = mod;
|
|
53
|
+
return mod;
|
|
54
|
+
}
|
|
55
|
+
catch (error) {
|
|
56
|
+
logger.warn('Keychain (keytar) not available', { error });
|
|
57
|
+
this.keytar = null;
|
|
58
|
+
return null;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Factory that returns a keychain-backed token store.
|
|
64
|
+
* Throws a ConfigError when the OS keychain/keytar is unavailable.
|
|
65
|
+
*/
|
|
66
|
+
export async function createTokenStore() {
|
|
67
|
+
const keychainStore = new KeychainTokenStore();
|
|
68
|
+
if (await keychainStore.available()) {
|
|
69
|
+
return keychainStore;
|
|
70
|
+
}
|
|
71
|
+
throw new ConfigError(KEYCHAIN_REQUIRED_MESSAGE);
|
|
72
|
+
}
|
|
73
|
+
//# sourceMappingURL=token-store.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"token-store.js","sourceRoot":"","sources":["../../src/core/token-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAwBjD,MAAM,yBAAyB,GAC9B,qIAAqI,CAAC;AAEvI;;;;GAIG;AACH,MAAM,OAAO,kBAAkB;IAI9B,YAAY,OAAO,GAAG,UAAU;QAHxB,WAAM,GAAwB,IAAI,CAAC;QAI1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,SAAS;QACd,OAAO,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,WAAmB;QAC5B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAE1C,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAChE,IAAI,CAAC,GAAG;YAAE,OAAO,IAAI,CAAC;QAEtB,IAAI,CAAC;YACJ,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAgB,CAAC;QACvC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,CAAC,IAAI,CAAC,mDAAmD,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YAC5E,MAAM,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;YACvD,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,WAAmB,EAAE,KAAkB;QAChD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC1C,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,WAAmB;QAC/B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC1C,MAAM,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACxD,CAAC;IAEO,KAAK,CAAC,aAAa;QAC1B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QACzC,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,MAAM,IAAI,WAAW,CAAC,yBAAyB,CAAC,CAAC;QAClD,CAAC;QACD,OAAO,MAAM,CAAC;IACf,CAAC;IAEO,KAAK,CAAC,YAAY;QACzB,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC,MAAM,CAAC;QACpB,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,GAAG,GAAG,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAiB,CAAC;YACrD,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC;YAClB,OAAO,GAAG,CAAC;QACZ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,CAAC,IAAI,CAAC,iCAAiC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YAC1D,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;YACnB,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;CACD;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB;IACrC,MAAM,aAAa,GAAG,IAAI,kBAAkB,EAAE,CAAC;IAC/C,IAAI,MAAM,aAAa,CAAC,SAAS,EAAE,EAAE,CAAC;QACrC,OAAO,aAAa,CAAC;IACtB,CAAC;IAED,MAAM,IAAI,WAAW,CAAC,yBAAyB,CAAC,CAAC;AAClD,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -19,6 +19,8 @@ import { setupPushCommand } from './commands/push.js';
|
|
|
19
19
|
import { setupPullCommand } from './commands/pull.js';
|
|
20
20
|
import { setupConfigureCommand } from './commands/configure.js';
|
|
21
21
|
import { setupDuplicateCommand } from './commands/duplicate.js';
|
|
22
|
+
import { setupLoginCommand } from './commands/login.js';
|
|
23
|
+
import { setupLogoutCommand } from './commands/logout.js';
|
|
22
24
|
/**
|
|
23
25
|
* OpenPackage CLI - Main entry point
|
|
24
26
|
*
|
|
@@ -54,6 +56,8 @@ setupPushCommand(program);
|
|
|
54
56
|
setupPullCommand(program);
|
|
55
57
|
// === CONFIGURATION ===
|
|
56
58
|
setupConfigureCommand(program);
|
|
59
|
+
setupLoginCommand(program);
|
|
60
|
+
setupLogoutCommand(program);
|
|
57
61
|
// === GLOBAL ERROR HANDLING ===
|
|
58
62
|
/**
|
|
59
63
|
* Handle uncaught exceptions gracefully
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,iCAAiC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/tui/app.js
ADDED
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
import { BoxRenderable, ConsolePosition, TextRenderable, createCliRenderer } from '@opentui/core';
|
|
2
|
+
import { logger } from '../utils/logger.js';
|
|
3
|
+
import { createMainMenu } from './views/main-menu.js';
|
|
4
|
+
import { createListPackagesView } from './views/list-packages.js';
|
|
5
|
+
import { createPackageHubView } from './views/package-hub.js';
|
|
6
|
+
import { createFilePreviewView } from './views/file-preview.js';
|
|
7
|
+
import { createAddFileModalView } from './views/add-file-modal.js';
|
|
8
|
+
import { TuiController } from './controller.js';
|
|
9
|
+
export async function startOpenPackageTui() {
|
|
10
|
+
logger.info('Launching OpenPackage TUI (phase 1 shell + list-first)');
|
|
11
|
+
try {
|
|
12
|
+
const renderer = await createCliRenderer({
|
|
13
|
+
consoleOptions: {
|
|
14
|
+
position: ConsolePosition.BOTTOM,
|
|
15
|
+
sizePercent: 30,
|
|
16
|
+
startInDebugMode: false,
|
|
17
|
+
},
|
|
18
|
+
});
|
|
19
|
+
const root = new BoxRenderable(renderer, {
|
|
20
|
+
id: 'opkg-root',
|
|
21
|
+
width: '100%',
|
|
22
|
+
height: '100%',
|
|
23
|
+
padding: 1,
|
|
24
|
+
flexDirection: 'column',
|
|
25
|
+
gap: 1,
|
|
26
|
+
});
|
|
27
|
+
const header = new TextRenderable(renderer, {
|
|
28
|
+
id: 'opkg-header',
|
|
29
|
+
content: 'OpenPackage TUI',
|
|
30
|
+
fg: '#00ffaf',
|
|
31
|
+
});
|
|
32
|
+
const subtitle = new TextRenderable(renderer, {
|
|
33
|
+
id: 'opkg-subtitle',
|
|
34
|
+
content: 'Phase 1: Navigation shell',
|
|
35
|
+
fg: '#cccccc',
|
|
36
|
+
});
|
|
37
|
+
const body = new BoxRenderable(renderer, {
|
|
38
|
+
id: 'opkg-body',
|
|
39
|
+
width: '100%',
|
|
40
|
+
height: '100%',
|
|
41
|
+
flexDirection: 'column',
|
|
42
|
+
flexGrow: 1,
|
|
43
|
+
gap: 1,
|
|
44
|
+
});
|
|
45
|
+
const statusText = new TextRenderable(renderer, {
|
|
46
|
+
id: 'opkg-status',
|
|
47
|
+
content: 'Press ↑/↓ + Enter to choose. q/Esc to exit.',
|
|
48
|
+
fg: '#888888',
|
|
49
|
+
});
|
|
50
|
+
// --- Views ---
|
|
51
|
+
const { mainMenuContainer, mainMenuSelect } = createMainMenu(renderer);
|
|
52
|
+
const packageHubView = createPackageHubView(renderer);
|
|
53
|
+
const filePreviewView = createFilePreviewView(renderer);
|
|
54
|
+
const addFileModalView = createAddFileModalView(renderer);
|
|
55
|
+
const listPackagesView = createListPackagesView(renderer);
|
|
56
|
+
body.add(mainMenuContainer);
|
|
57
|
+
body.add(packageHubView.container);
|
|
58
|
+
body.add(listPackagesView.container);
|
|
59
|
+
body.add(filePreviewView.container);
|
|
60
|
+
body.add(addFileModalView.container);
|
|
61
|
+
root.add(header);
|
|
62
|
+
root.add(subtitle);
|
|
63
|
+
root.add(body);
|
|
64
|
+
root.add(statusText);
|
|
65
|
+
renderer.root.add(root);
|
|
66
|
+
const views = {
|
|
67
|
+
mainMenu: mainMenuContainer,
|
|
68
|
+
packageHub: packageHubView.container,
|
|
69
|
+
listPackages: listPackagesView.container,
|
|
70
|
+
filePreview: filePreviewView.container,
|
|
71
|
+
addFile: addFileModalView.container,
|
|
72
|
+
};
|
|
73
|
+
const ui = {
|
|
74
|
+
mainMenuSelect,
|
|
75
|
+
statusText,
|
|
76
|
+
};
|
|
77
|
+
const controller = new TuiController({
|
|
78
|
+
renderer,
|
|
79
|
+
views,
|
|
80
|
+
ui,
|
|
81
|
+
mainMenuSelect,
|
|
82
|
+
listPackagesView,
|
|
83
|
+
packageHubView,
|
|
84
|
+
filePreviewView,
|
|
85
|
+
addFileModalView,
|
|
86
|
+
});
|
|
87
|
+
controller.init();
|
|
88
|
+
await renderer.start();
|
|
89
|
+
}
|
|
90
|
+
catch (error) {
|
|
91
|
+
console.error('[opkg] Failed to start TUI:', error);
|
|
92
|
+
throw error;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
//# sourceMappingURL=app.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/tui/app.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import blessed from 'blessed';
|
|
2
|
+
import { registryManager } from '../../core/registry.js';
|
|
3
|
+
export async function createPackageList(state, screen, onSelect) {
|
|
4
|
+
const listBox = blessed.box({
|
|
5
|
+
label: ' Local Packages (Press Esc or Back to return) ',
|
|
6
|
+
border: {
|
|
7
|
+
type: 'line'
|
|
8
|
+
},
|
|
9
|
+
style: {
|
|
10
|
+
bg: 'black',
|
|
11
|
+
fg: 'white',
|
|
12
|
+
border: {
|
|
13
|
+
fg: 'green'
|
|
14
|
+
}
|
|
15
|
+
},
|
|
16
|
+
width: 70,
|
|
17
|
+
height: '80%',
|
|
18
|
+
top: 2,
|
|
19
|
+
left: 'center',
|
|
20
|
+
scrollable: true,
|
|
21
|
+
mouse: true,
|
|
22
|
+
keys: true,
|
|
23
|
+
vi: true,
|
|
24
|
+
content: 'Loading packages...'
|
|
25
|
+
});
|
|
26
|
+
screen.append(listBox);
|
|
27
|
+
// Fetch real packages
|
|
28
|
+
try {
|
|
29
|
+
const packages = await registryManager.listPackages(); // Latest versions by default
|
|
30
|
+
const items = packages.map(pkg => {
|
|
31
|
+
const ver = pkg.version || 'latest';
|
|
32
|
+
const desc = pkg.description || 'No description';
|
|
33
|
+
return `${pkg.name}@${ver} - ${desc.substring(0, 50)}${desc.length > 50 ? '...' : ''}`;
|
|
34
|
+
}).concat('← Back to Main Menu');
|
|
35
|
+
const list = blessed.list({
|
|
36
|
+
items,
|
|
37
|
+
style: {
|
|
38
|
+
selected: {
|
|
39
|
+
bg: 'cyan',
|
|
40
|
+
fg: 'black'
|
|
41
|
+
}
|
|
42
|
+
},
|
|
43
|
+
keys: true,
|
|
44
|
+
mouse: true,
|
|
45
|
+
vi: true
|
|
46
|
+
});
|
|
47
|
+
listBox.append(list);
|
|
48
|
+
list.focus();
|
|
49
|
+
list.on('select', (item, idx) => {
|
|
50
|
+
const selectedText = list.getItem(idx).getText();
|
|
51
|
+
if (selectedText.includes('Back')) {
|
|
52
|
+
onSelect(null); // Trigger back to main
|
|
53
|
+
listBox.detach();
|
|
54
|
+
screen.render();
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
57
|
+
const pkg = packages[idx];
|
|
58
|
+
state.setCurrentPackage(pkg); // Set for manage view
|
|
59
|
+
screen.log(`Selected package: ${pkg.name}@${pkg.version}`);
|
|
60
|
+
onSelect(pkg); // Trigger Phase 3 manage view
|
|
61
|
+
});
|
|
62
|
+
// Update content after load
|
|
63
|
+
listBox.setContent('');
|
|
64
|
+
screen.render();
|
|
65
|
+
}
|
|
66
|
+
catch (error) {
|
|
67
|
+
listBox.setContent(`Error loading packages: ${error}`);
|
|
68
|
+
screen.log('Error: Failed to list packages - check registry dirs');
|
|
69
|
+
screen.render();
|
|
70
|
+
}
|
|
71
|
+
return listBox;
|
|
72
|
+
}
|
|
73
|
+
//# sourceMappingURL=package-list.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"package-list.js","sourceRoot":"","sources":["../../../src/tui/components/package-list.ts"],"names":[],"mappings":"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"}
|