opkg 0.5.0 → 0.6.0

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.
Files changed (272) hide show
  1. package/README.md +49 -8
  2. package/dist/commands/add.js +11 -276
  3. package/dist/commands/add.js.map +1 -1
  4. package/dist/commands/init.js +73 -145
  5. package/dist/commands/init.js.map +1 -1
  6. package/dist/commands/install.js +26 -668
  7. package/dist/commands/install.js.map +1 -1
  8. package/dist/commands/pack.js +10 -137
  9. package/dist/commands/pack.js.map +1 -1
  10. package/dist/commands/push.js +14 -8
  11. package/dist/commands/push.js.map +1 -1
  12. package/dist/commands/save.js +12 -167
  13. package/dist/commands/save.js.map +1 -1
  14. package/dist/commands/status.js +2 -2
  15. package/dist/commands/status.js.map +1 -1
  16. package/dist/commands/uninstall.js +5 -5
  17. package/dist/commands/uninstall.js.map +1 -1
  18. package/dist/constants/index.js +18 -45
  19. package/dist/constants/index.js.map +1 -1
  20. package/dist/constants/workspace.js +9 -0
  21. package/dist/constants/workspace.js.map +1 -0
  22. package/dist/core/add/add-conflict-handler.js +68 -0
  23. package/dist/core/add/add-conflict-handler.js.map +1 -0
  24. package/dist/core/add/add-pipeline.js +137 -0
  25. package/dist/core/add/add-pipeline.js.map +1 -0
  26. package/dist/core/add/package-index-updater.js +62 -33
  27. package/dist/core/add/package-index-updater.js.map +1 -1
  28. package/dist/core/add/platform-path-transformer.js +47 -0
  29. package/dist/core/add/platform-path-transformer.js.map +1 -0
  30. package/dist/core/add/source-collector.js +57 -0
  31. package/dist/core/add/source-collector.js.map +1 -0
  32. package/dist/core/dependency-resolver.js +3 -1
  33. package/dist/core/dependency-resolver.js.map +1 -1
  34. package/dist/core/directory.js +2 -2
  35. package/dist/core/directory.js.map +1 -1
  36. package/dist/core/discovery/file-discovery.js +55 -54
  37. package/dist/core/discovery/file-discovery.js.map +1 -1
  38. package/dist/core/discovery/platform-files-discovery.js +32 -17
  39. package/dist/core/discovery/platform-files-discovery.js.map +1 -1
  40. package/dist/core/install/bulk-install-pipeline.js +199 -0
  41. package/dist/core/install/bulk-install-pipeline.js.map +1 -0
  42. package/dist/core/install/canonical-plan.js +123 -0
  43. package/dist/core/install/canonical-plan.js.map +1 -0
  44. package/dist/core/install/dry-run.js +2 -2
  45. package/dist/core/install/dry-run.js.map +1 -1
  46. package/dist/core/install/index.js +3 -0
  47. package/dist/core/install/index.js.map +1 -0
  48. package/dist/core/install/install-errors.js +41 -0
  49. package/dist/core/install/install-errors.js.map +1 -0
  50. package/dist/core/install/install-flow.js +2 -5
  51. package/dist/core/install/install-flow.js.map +1 -1
  52. package/dist/core/install/install-pipeline.js +228 -0
  53. package/dist/core/install/install-pipeline.js.map +1 -0
  54. package/dist/core/install/install-reporting.js +99 -0
  55. package/dist/core/install/install-reporting.js.map +1 -0
  56. package/dist/core/install/platform-resolution.js +6 -6
  57. package/dist/core/install/platform-resolution.js.map +1 -1
  58. package/dist/core/install/remote-flow.js +67 -1
  59. package/dist/core/install/remote-flow.js.map +1 -1
  60. package/dist/core/openpackage.js +16 -8
  61. package/dist/core/openpackage.js.map +1 -1
  62. package/dist/core/package-context.js +246 -0
  63. package/dist/core/package-context.js.map +1 -0
  64. package/dist/core/package.js +3 -2
  65. package/dist/core/package.js.map +1 -1
  66. package/dist/core/platforms.js +126 -217
  67. package/dist/core/platforms.js.map +1 -1
  68. package/dist/core/registry/registry-rename.js +2 -1
  69. package/dist/core/registry/registry-rename.js.map +1 -1
  70. package/dist/core/registry.js +10 -3
  71. package/dist/core/registry.js.map +1 -1
  72. package/dist/core/remote-pull.js +2 -1
  73. package/dist/core/remote-pull.js.map +1 -1
  74. package/dist/core/save/constants.js +4 -0
  75. package/dist/core/save/constants.js.map +1 -1
  76. package/dist/core/save/name-resolution.js +31 -0
  77. package/dist/core/save/name-resolution.js.map +1 -0
  78. package/dist/core/save/package-detection.js +147 -0
  79. package/dist/core/save/package-detection.js.map +1 -0
  80. package/dist/core/save/package-saver.js +46 -43
  81. package/dist/core/save/package-saver.js.map +1 -1
  82. package/dist/core/save/package-yml-generator.js +50 -71
  83. package/dist/core/save/package-yml-generator.js.map +1 -1
  84. package/dist/core/save/root-save-candidates.js.map +1 -1
  85. package/dist/core/save/save-candidate-loader.js +89 -0
  86. package/dist/core/save/save-candidate-loader.js.map +1 -0
  87. package/dist/core/save/save-conflict-resolution.js +72 -410
  88. package/dist/core/save/save-conflict-resolution.js.map +1 -1
  89. package/dist/core/save/save-conflict-resolver.js +277 -0
  90. package/dist/core/save/save-conflict-resolver.js.map +1 -0
  91. package/dist/core/save/save-pipeline.js +151 -0
  92. package/dist/core/save/save-pipeline.js.map +1 -0
  93. package/dist/core/save/save-types.js +2 -0
  94. package/dist/core/save/save-types.js.map +1 -0
  95. package/dist/core/save/save-yml-resolution.js +77 -39
  96. package/dist/core/save/save-yml-resolution.js.map +1 -1
  97. package/dist/core/save/workspace-rename.js +6 -6
  98. package/dist/core/save/workspace-rename.js.map +1 -1
  99. package/dist/core/scoping/package-scoping.js +13 -1
  100. package/dist/core/scoping/package-scoping.js.map +1 -1
  101. package/dist/core/status/status-file-discovery.js +12 -30
  102. package/dist/core/status/status-file-discovery.js.map +1 -1
  103. package/dist/core/sync/platform-sync.js +7 -4
  104. package/dist/core/sync/platform-sync.js.map +1 -1
  105. package/dist/core/sync/root-files-sync.js +59 -1
  106. package/dist/core/sync/root-files-sync.js.map +1 -1
  107. package/dist/core/uninstall/uninstall-file-discovery.js +1 -2
  108. package/dist/core/uninstall/uninstall-file-discovery.js.map +1 -1
  109. package/dist/types/index.js.map +1 -1
  110. package/dist/utils/file-processing.js +5 -58
  111. package/dist/utils/file-processing.js.map +1 -1
  112. package/dist/utils/index-based-installer.js +15 -33
  113. package/dist/utils/index-based-installer.js.map +1 -1
  114. package/dist/utils/install-file-discovery.js +3 -3
  115. package/dist/utils/install-file-discovery.js.map +1 -1
  116. package/dist/utils/install-orchestrator.js +21 -21
  117. package/dist/utils/install-orchestrator.js.map +1 -1
  118. package/dist/utils/jsonc.js +44 -0
  119. package/dist/utils/jsonc.js.map +1 -0
  120. package/dist/utils/package-copy.js +199 -0
  121. package/dist/utils/package-copy.js.map +1 -0
  122. package/dist/utils/package-filters.js +125 -0
  123. package/dist/utils/package-filters.js.map +1 -0
  124. package/dist/utils/package-index-yml.js +15 -10
  125. package/dist/utils/package-index-yml.js.map +1 -1
  126. package/dist/utils/package-installation.js +4 -113
  127. package/dist/utils/package-installation.js.map +1 -1
  128. package/dist/utils/package-local-files.js +2 -35
  129. package/dist/utils/package-local-files.js.map +1 -1
  130. package/dist/utils/package-management.js +59 -37
  131. package/dist/utils/package-management.js.map +1 -1
  132. package/dist/utils/package-yml.js +24 -0
  133. package/dist/utils/package-yml.js.map +1 -1
  134. package/dist/utils/path-normalization.js +8 -53
  135. package/dist/utils/path-normalization.js.map +1 -1
  136. package/dist/utils/paths.js +17 -9
  137. package/dist/utils/paths.js.map +1 -1
  138. package/dist/utils/platform-file.js +16 -59
  139. package/dist/utils/platform-file.js.map +1 -1
  140. package/dist/utils/platform-mapper.js +29 -41
  141. package/dist/utils/platform-mapper.js.map +1 -1
  142. package/dist/utils/platform-specific-paths.js.map +1 -1
  143. package/dist/utils/platform-utils.js +28 -139
  144. package/dist/utils/platform-utils.js.map +1 -1
  145. package/dist/utils/platform-yaml-merge.js +13 -6
  146. package/dist/utils/platform-yaml-merge.js.map +1 -1
  147. package/dist/utils/registry-entry-filter.js +38 -24
  148. package/dist/utils/registry-entry-filter.js.map +1 -1
  149. package/dist/utils/registry-paths.js +10 -0
  150. package/dist/utils/registry-paths.js.map +1 -0
  151. package/dist/utils/root-file-installer.js +19 -0
  152. package/dist/utils/root-file-installer.js.map +1 -1
  153. package/dist/utils/root-file-registry.js.map +1 -1
  154. package/package.json +3 -2
  155. package/platforms.jsonc +178 -0
  156. package/specs/package/README.md +60 -0
  157. package/specs/package/nested-packages-and-parent-packages.md +79 -0
  158. package/specs/package/package-index-yml.md +171 -0
  159. package/specs/package/package-root-layout.md +78 -0
  160. package/specs/package/registry-payload-and-copy.md +77 -0
  161. package/specs/package/universal-content.md +144 -0
  162. package/specs/platforms.md +193 -0
  163. package/specs/save/README.md +40 -0
  164. package/specs/save/save-conflict-resolution.md +146 -0
  165. package/specs/save/save-file-discovery.md +101 -0
  166. package/specs/save/save-frontmatter-overrides.md +81 -0
  167. package/specs/save/save-modes-inputs.md +53 -0
  168. package/specs/save/save-naming-scoping.md +93 -0
  169. package/specs/save/save-package-detection.md +60 -0
  170. package/specs/save/save-registry-sync.md +126 -0
  171. package/dist/commands/release.js +0 -33
  172. package/dist/commands/release.js.map +0 -1
  173. package/dist/commands/tag.js +0 -311
  174. package/dist/commands/tag.js.map +0 -1
  175. package/dist/commands/update.js +0 -30
  176. package/dist/commands/update.js.map +0 -1
  177. package/dist/core/add/formula-index-updater.js +0 -290
  178. package/dist/core/add/formula-index-updater.js.map +0 -1
  179. package/dist/core/discovery/ai-files-discovery.js +0 -2
  180. package/dist/core/discovery/ai-files-discovery.js.map +0 -1
  181. package/dist/core/discovery/formula-files-discovery.js +0 -14
  182. package/dist/core/discovery/formula-files-discovery.js.map +0 -1
  183. package/dist/core/discovery/index-files-discovery.js +0 -91
  184. package/dist/core/discovery/index-files-discovery.js.map +0 -1
  185. package/dist/core/discovery/md-files-discovery.js +0 -82
  186. package/dist/core/discovery/md-files-discovery.js.map +0 -1
  187. package/dist/core/discovery/package-files-discovery.js +0 -14
  188. package/dist/core/discovery/package-files-discovery.js.map +0 -1
  189. package/dist/core/discovery/platform-discovery.js +0 -84
  190. package/dist/core/discovery/platform-discovery.js.map +0 -1
  191. package/dist/core/discovery/root-files-discovery.js +0 -2
  192. package/dist/core/discovery/root-files-discovery.js.map +0 -1
  193. package/dist/core/formula.js +0 -170
  194. package/dist/core/formula.js.map +0 -1
  195. package/dist/core/git-registry.js +0 -46
  196. package/dist/core/git-registry.js.map +0 -1
  197. package/dist/core/groundzero.js +0 -277
  198. package/dist/core/groundzero.js.map +0 -1
  199. package/dist/core/install/scenario.js +0 -11
  200. package/dist/core/install/scenario.js.map +0 -1
  201. package/dist/core/package-sync.js +0 -219
  202. package/dist/core/package-sync.js.map +0 -1
  203. package/dist/core/save/formula-file-generator.js +0 -167
  204. package/dist/core/save/formula-file-generator.js.map +0 -1
  205. package/dist/core/save/formula-saver.js +0 -52
  206. package/dist/core/save/formula-saver.js.map +0 -1
  207. package/dist/core/save/formula-yml-generator.js +0 -89
  208. package/dist/core/save/formula-yml-generator.js.map +0 -1
  209. package/dist/core/save/formula-yml-versioning.js +0 -108
  210. package/dist/core/save/formula-yml-versioning.js.map +0 -1
  211. package/dist/core/save/generic-file-sync.js +0 -38
  212. package/dist/core/save/generic-file-sync.js.map +0 -1
  213. package/dist/core/save/md-files-sync.js +0 -33
  214. package/dist/core/save/md-files-sync.js.map +0 -1
  215. package/dist/core/save/package-yml-versioning.js +0 -108
  216. package/dist/core/save/package-yml-versioning.js.map +0 -1
  217. package/dist/core/save/platform-sync.js +0 -95
  218. package/dist/core/save/platform-sync.js.map +0 -1
  219. package/dist/core/save/root-files-sync.js +0 -140
  220. package/dist/core/save/root-files-sync.js.map +0 -1
  221. package/dist/core/save/save-candidate-types.js +0 -2
  222. package/dist/core/save/save-candidate-types.js.map +0 -1
  223. package/dist/core/save/save-conflict-types.js +0 -2
  224. package/dist/core/save/save-conflict-types.js.map +0 -1
  225. package/dist/core/save/save-file-discovery.js +0 -5
  226. package/dist/core/save/save-file-discovery.js.map +0 -1
  227. package/dist/core/status-file-discovery.js +0 -175
  228. package/dist/core/status-file-discovery.js.map +0 -1
  229. package/dist/utils/discovery/file-processing.js +0 -156
  230. package/dist/utils/discovery/file-processing.js.map +0 -1
  231. package/dist/utils/discovery/formula-discovery.js +0 -211
  232. package/dist/utils/discovery/formula-discovery.js.map +0 -1
  233. package/dist/utils/discovery/platform-discovery.js +0 -2
  234. package/dist/utils/discovery/platform-discovery.js.map +0 -1
  235. package/dist/utils/formula-discovery.js +0 -102
  236. package/dist/utils/formula-discovery.js.map +0 -1
  237. package/dist/utils/formula-index-yml.js +0 -122
  238. package/dist/utils/formula-index-yml.js.map +0 -1
  239. package/dist/utils/formula-installation.js +0 -110
  240. package/dist/utils/formula-installation.js.map +0 -1
  241. package/dist/utils/formula-local-files.js +0 -38
  242. package/dist/utils/formula-local-files.js.map +0 -1
  243. package/dist/utils/formula-management.js +0 -191
  244. package/dist/utils/formula-management.js.map +0 -1
  245. package/dist/utils/formula-name.js +0 -97
  246. package/dist/utils/formula-name.js.map +0 -1
  247. package/dist/utils/formula-versioning.js +0 -109
  248. package/dist/utils/formula-versioning.js.map +0 -1
  249. package/dist/utils/formula-yml.js +0 -82
  250. package/dist/utils/formula-yml.js.map +0 -1
  251. package/dist/utils/git.js +0 -54
  252. package/dist/utils/git.js.map +0 -1
  253. package/dist/utils/id-based-discovery.js +0 -126
  254. package/dist/utils/id-based-discovery.js.map +0 -1
  255. package/dist/utils/id-based-installer.js +0 -249
  256. package/dist/utils/id-based-installer.js.map +0 -1
  257. package/dist/utils/index-yml-based-installer.js +0 -375
  258. package/dist/utils/index-yml-based-installer.js.map +0 -1
  259. package/dist/utils/index-yml.js +0 -124
  260. package/dist/utils/index-yml.js.map +0 -1
  261. package/dist/utils/md-frontmatter.js +0 -3
  262. package/dist/utils/md-frontmatter.js.map +0 -1
  263. package/dist/utils/package-link-yml.js +0 -92
  264. package/dist/utils/package-link-yml.js.map +0 -1
  265. package/dist/utils/platform-discovery.js +0 -2
  266. package/dist/utils/platform-discovery.js.map +0 -1
  267. package/dist/utils/platform-frontmatter-split.js +0 -15
  268. package/dist/utils/platform-frontmatter-split.js.map +0 -1
  269. package/dist/utils/timestamp-encoder.js +0 -13
  270. package/dist/utils/timestamp-encoder.js.map +0 -1
  271. package/dist/utils/wip-versioning.js +0 -24
  272. package/dist/utils/wip-versioning.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"install.js","sourceRoot":"","sources":["../../src/commands/install.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"install.js","sourceRoot":"","sources":["../../src/commands/install.ts"],"names":[],"mappings":"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"}
@@ -1,147 +1,20 @@
1
- import { ensureRegistryDirectories } from '../core/directory.js';
2
- import { logger } from '../utils/logger.js';
3
- import { withErrorHandling, ValidationError } from '../utils/errors.js';
4
- import { addPackageToYml, createBasicPackageYml } from '../utils/package-management.js';
5
- import { performPlatformSync } from '../core/sync/platform-sync.js';
6
- import { parsePackageInput, normalizePackageName } from '../utils/package-name.js';
7
- import { discoverPackageFilesForSave } from '../core/save/save-file-discovery.js';
8
- import { LOG_PREFIXES, ERROR_MESSAGES } from '../core/save/constants.js';
9
- import { readOrCreateBasePackageYml } from '../core/save/package-yml-generator.js';
10
- import { applyWorkspacePackageRename } from '../core/save/workspace-rename.js';
11
- import { isPackageTransitivelyCovered } from '../utils/dependency-coverage.js';
12
- import { resolveEffectiveNameForSave } from '../core/scoping/package-scoping.js';
13
- import { readPackageIndex, writePackageIndex } from '../utils/package-index-yml.js';
14
- import { createWorkspaceHash, createWorkspaceTag } from '../utils/version-generator.js';
15
- import { computePackTargetVersion } from '../core/save/save-versioning.js';
16
- import { savePackageToRegistry } from '../core/save/package-saver.js';
17
- import { packageVersionExists } from '../utils/package-versioning.js';
18
- import { deleteWorkspaceWipCopies } from '../core/save/workspace-wip-cleanup.js';
1
+ import { withErrorHandling } from '../utils/errors.js';
2
+ import { runSavePipeline } from '../core/save/save-pipeline.js';
19
3
  async function packPackageCommand(packageName, options) {
20
- const cwd = process.cwd();
21
- await createBasicPackageYml(cwd);
22
- const { name, version: explicitVersion } = parsePackageInput(packageName);
23
- if (explicitVersion) {
24
- throw new ValidationError('Pack command does not accept explicit versions. Edit package.yml to change the stable line.');
25
- }
26
- const nameResolution = await resolveEffectiveNameForSave(name);
27
- const resolvedName = nameResolution.effectiveName;
28
- const renameInput = options?.rename?.trim();
29
- let renameTarget;
30
- if (renameInput) {
31
- const { name: renameName, version: renameVer } = parsePackageInput(renameInput);
32
- if (renameVer) {
33
- throw new ValidationError('Rename target cannot include a version when using pack.');
34
- }
35
- const normalizedRename = normalizePackageName(renameName);
36
- if (normalizedRename !== name) {
37
- renameTarget = normalizedRename;
38
- logger.debug(`Renaming package during pack`, { from: name, to: renameTarget });
39
- }
40
- }
41
- else if (nameResolution.nameChanged) {
42
- renameTarget = resolvedName;
43
- logger.debug(`Applying scoped name resolution for pack`, { from: name, to: renameTarget });
44
- console.log(`✓ Using scoped package name '${renameTarget}' for pack operation`);
45
- }
46
- logger.debug(`Packing package with name: ${resolvedName}`, { options });
47
- await ensureRegistryDirectories();
48
- let packageInfo = await readOrCreateBasePackageYml(cwd, name);
49
- let packageConfig = packageInfo.config;
50
- let isRootPackage = packageInfo.isRootPackage;
51
- if (renameTarget) {
52
- await applyWorkspacePackageRename(cwd, packageInfo, renameTarget);
53
- packageInfo = await readOrCreateBasePackageYml(cwd, renameTarget);
54
- packageConfig = packageInfo.config;
55
- isRootPackage = packageInfo.isRootPackage;
56
- }
57
- const indexRecord = await readPackageIndex(cwd, packageConfig.name);
58
- const workspaceHash = createWorkspaceHash(cwd);
59
- const workspaceTag = createWorkspaceTag(cwd);
60
- const packVersionInfo = computePackTargetVersion(packageConfig.version, indexRecord?.workspace?.version);
61
- if (packVersionInfo.resetMessage) {
62
- console.log(packVersionInfo.resetMessage);
63
- }
64
- const effectiveConfig = { ...packageConfig, version: packVersionInfo.targetVersion };
65
- if (!(options?.force)) {
66
- const exists = await packageVersionExists(effectiveConfig.name, effectiveConfig.version);
67
- if (exists) {
68
- throw new Error(ERROR_MESSAGES.VERSION_EXISTS.replace('%s', effectiveConfig.version));
69
- }
70
- }
71
- const packageFiles = await discoverPackageFilesForSave(packageInfo, {
72
- force: options?.force
73
- });
74
- const registrySave = await savePackageToRegistry({ ...packageInfo, config: effectiveConfig }, packageFiles);
75
- if (!registrySave.success) {
76
- return { success: false, error: registrySave.error || 'Pack operation failed' };
77
- }
78
- await deleteWorkspaceWipCopies(effectiveConfig.name, workspaceTag);
79
- const syncResult = await performPlatformSync(cwd, effectiveConfig.name, effectiveConfig.version, packageFiles, {
4
+ return runSavePipeline(packageName, {
5
+ mode: 'stable',
80
6
  force: options?.force,
81
- conflictStrategy: options?.force ? 'overwrite' : 'ask'
7
+ rename: options?.rename
82
8
  });
83
- if (!isRootPackage) {
84
- const transitivelyCovered = await isPackageTransitivelyCovered(cwd, effectiveConfig.name);
85
- if (!transitivelyCovered) {
86
- await addPackageToYml(cwd, effectiveConfig.name, effectiveConfig.version,
87
- /* isDev */ false,
88
- /* originalVersion */ undefined,
89
- /* silent */ true);
90
- }
91
- else {
92
- logger.debug(`Skipping addition of ${effectiveConfig.name} to package.yml; already covered transitively.`);
93
- }
94
- }
95
- // Update package.index.yml workspace.version to the just-packed stable version
96
- if (indexRecord) {
97
- await writePackageIndex({
98
- ...indexRecord,
99
- workspace: {
100
- hash: workspaceHash,
101
- version: effectiveConfig.version
102
- }
103
- });
104
- }
105
- const packageType = isRootPackage ? 'root package' : 'package';
106
- console.log(`${LOG_PREFIXES.SAVED} ${effectiveConfig.name}@${effectiveConfig.version} (${packageType}, ${packageFiles.length} files):`);
107
- if (packageFiles.length > 0) {
108
- const savedPaths = packageFiles.map(f => f.path);
109
- const sortedSaved = [...savedPaths].sort((a, b) => a.localeCompare(b));
110
- for (const savedPath of sortedSaved) {
111
- console.log(` ├── ${savedPath}`);
112
- }
113
- }
114
- const totalCreated = syncResult.created.length;
115
- const totalUpdated = syncResult.updated.length;
116
- const totalDeleted = syncResult.deleted?.length ?? 0;
117
- if (totalCreated > 0) {
118
- const allCreated = [...syncResult.created].sort((a, b) => a.localeCompare(b));
119
- console.log(`✓ Platform sync created ${totalCreated} files:`);
120
- for (const createdFile of allCreated) {
121
- console.log(` ├── ${createdFile}`);
122
- }
123
- }
124
- if (totalUpdated > 0) {
125
- const allUpdated = [...syncResult.updated].sort((a, b) => a.localeCompare(b));
126
- console.log(`✓ Platform sync updated ${totalUpdated} files:`);
127
- for (const updatedFile of allUpdated) {
128
- console.log(` ├── ${updatedFile}`);
129
- }
130
- }
131
- if (totalDeleted > 0 && syncResult.deleted) {
132
- const allDeleted = [...syncResult.deleted].sort((a, b) => a.localeCompare(b));
133
- console.log(`✓ Platform sync removed ${totalDeleted} files:`);
134
- for (const deletedFile of allDeleted) {
135
- console.log(` ├── ${deletedFile}`);
136
- }
137
- }
138
- return { success: true, data: { config: effectiveConfig, packVersionInfo } };
139
9
  }
140
10
  export function setupPackCommand(program) {
141
11
  program
142
12
  .command('pack')
143
- .argument('<package-name>', 'package name (no @version syntax)')
144
- .description('Promote the current workspace package to a stable registry copy.')
13
+ .argument('[package-name]', 'package name (optional if cwd is a package)')
14
+ .description('Promote the current workspace package to a stable registry copy.\n' +
15
+ 'Usage:\n' +
16
+ ' opkg pack # Pack cwd package (requires .openpackage/package.yml)\n' +
17
+ ' opkg pack <package-name> # Pack specific package by name')
145
18
  .option('-f, --force', 'overwrite existing stable versions or skip confirmations')
146
19
  .option('--rename <newName>', 'Rename package during pack')
147
20
  .action(withErrorHandling(async (packageName, options) => {
@@ -1 +1 @@
1
- {"version":3,"file":"pack.js","sourceRoot":"","sources":["../../src/commands/pack.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pack.js","sourceRoot":"","sources":["../../src/commands/pack.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,KAAK,UAAU,kBAAkB,CAC/B,WAA+B,EAC/B,OAAqB;IAErB,OAAO,eAAe,CAAC,WAAW,EAAE;QAClC,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,OAAO,EAAE,KAAK;QACrB,MAAM,EAAE,OAAO,EAAE,MAAM;KACxB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAAgB;IAC/C,OAAO;SACJ,OAAO,CAAC,MAAM,CAAC;SACf,QAAQ,CAAC,gBAAgB,EAAE,6CAA6C,CAAC;SACzE,WAAW,CACV,oEAAoE;QACpE,UAAU;QACV,uFAAuF;QACvF,8DAA8D,CAC/D;SACA,MAAM,CAAC,aAAa,EAAE,0DAA0D,CAAC;SACjF,MAAM,CAAC,oBAAoB,EAAE,4BAA4B,CAAC;SAC1D,MAAM,CAAC,iBAAiB,CAAC,KAAK,EAAE,WAA+B,EAAE,OAAqB,EAAE,EAAE;QACzF,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAC9D,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,uBAAuB,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC,CAAC,CAAC,CAAC;AACR,CAAC"}
@@ -16,26 +16,32 @@ import { getLatestStableVersion } from '../utils/package-versioning.js';
16
16
  import { resolveScopedNameForPushWithUserScope, isScopedName } from '../core/scoping/package-scoping.js';
17
17
  import { renameRegistryPackage } from '../core/registry/registry-rename.js';
18
18
  import { getLocalPackageDir } from '../utils/paths.js';
19
- import { FILE_PATTERNS } from '../constants/index.js';
19
+ import { FILE_PATTERNS, DIR_PATTERNS } from '../constants/index.js';
20
20
  import { exists } from '../utils/fs.js';
21
21
  import { parsePackageYml } from '../utils/package-yml.js';
22
22
  import { applyWorkspacePackageRename } from '../core/save/workspace-rename.js';
23
23
  import { getCurrentUsername } from '../core/api-keys.js';
24
24
  async function tryRenameWorkspacePackage(cwd, oldName, newName) {
25
25
  try {
26
- const packageDir = getLocalPackageDir(cwd, oldName);
27
- const packageYmlPath = join(packageDir, FILE_PATTERNS.PACKAGE_YML);
26
+ const packageRootDir = getLocalPackageDir(cwd, oldName);
27
+ const packageYmlPath = join(packageRootDir, DIR_PATTERNS.OPENPACKAGE, FILE_PATTERNS.PACKAGE_YML);
28
28
  if (!(await exists(packageYmlPath))) {
29
29
  return;
30
30
  }
31
31
  const config = await parsePackageYml(packageYmlPath);
32
- const packageInfo = {
33
- fullPath: packageYmlPath,
32
+ // Construct full PackageContext for nested package
33
+ const packageContext = {
34
+ name: config.name,
35
+ version: config.version,
34
36
  config,
35
- isNewPackage: false,
36
- isRootPackage: false
37
+ packageYmlPath,
38
+ packageRootDir,
39
+ packageFilesDir: join(packageRootDir, DIR_PATTERNS.OPENPACKAGE),
40
+ location: 'nested',
41
+ isCwdPackage: false,
42
+ isNew: false
37
43
  };
38
- await applyWorkspacePackageRename(cwd, packageInfo, newName);
44
+ await applyWorkspacePackageRename(cwd, packageContext, newName);
39
45
  console.log(`✓ Updated workspace package name: ${oldName} → ${newName}`);
40
46
  }
41
47
  catch (error) {
@@ -1 +1 @@
1
- {"version":3,"file":"push.js","sourceRoot":"","sources":["../../src/commands/push.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"push.js","sourceRoot":"","sources":["../../src/commands/push.ts"],"names":[],"mappings":"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"}
@@ -1,183 +1,28 @@
1
- import { ensureRegistryDirectories } from '../core/directory.js';
2
- import { logger } from '../utils/logger.js';
3
- import { withErrorHandling, ValidationError } from '../utils/errors.js';
4
- import { addPackageToYml, createBasicPackageYml } from '../utils/package-management.js';
5
- import { performPlatformSync } from '../core/sync/platform-sync.js';
6
- import { parsePackageInput, normalizePackageName } from '../utils/package-name.js';
7
- import { discoverPackageFilesForSave } from '../core/save/save-file-discovery.js';
8
- import { LOG_PREFIXES } from '../core/save/constants.js';
9
- import { readOrCreateBasePackageYml } from '../core/save/package-yml-generator.js';
10
- import { applyWorkspacePackageRename } from '../core/save/workspace-rename.js';
11
- import { isPackageTransitivelyCovered } from '../utils/dependency-coverage.js';
12
- import { resolveEffectiveNameForSave } from '../core/scoping/package-scoping.js';
13
- import { readPackageIndex } from '../utils/package-index-yml.js';
14
- import { createWorkspaceHash, createWorkspaceTag } from '../utils/version-generator.js';
15
- import { computeWipVersion } from '../core/save/save-versioning.js';
16
- import { savePackageToRegistry } from '../core/save/package-saver.js';
17
- import { deleteWorkspaceWipCopies } from '../core/save/workspace-wip-cleanup.js';
18
- import { writePackageYml } from '../utils/package-yml.js';
19
- /**
20
- * Main implementation of the save package command
21
- * Now only supports specifying the package name (no @version syntax)
22
- * @param packageName - Package name (optionally name@version)
23
- * @param options - Command options (force, rename, etc.)
24
- * @returns Promise resolving to command result
25
- */
26
- async function savePackageCommand(packageName, options) {
27
- const cwd = process.cwd();
28
- // Ensure the workspace-level package.yml exists for dependency tracking
29
- await createBasicPackageYml(cwd);
30
- // Parse inputs to determine the pattern being used
31
- const { name, version: explicitVersion } = parsePackageInput(packageName);
32
- if (explicitVersion) {
33
- throw new ValidationError('Save command does not accept explicit versions. Edit package.yml to change the stable line.');
34
- }
35
- const nameResolution = await resolveEffectiveNameForSave(name);
36
- const resolvedName = nameResolution.effectiveName;
37
- const renameInput = options?.rename?.trim();
38
- let renameTarget;
39
- if (renameInput) {
40
- const { name: renameName, version: renameVer } = parsePackageInput(renameInput);
41
- if (renameVer) {
42
- throw new ValidationError('Rename target cannot include a version when using save.');
43
- }
44
- const normalizedRename = normalizePackageName(renameName);
45
- if (normalizedRename !== name) {
46
- renameTarget = normalizedRename;
47
- logger.debug(`Renaming package during save`, { from: name, to: renameTarget });
48
- }
49
- }
50
- else if (nameResolution.nameChanged) {
51
- renameTarget = resolvedName;
52
- logger.debug(`Applying scoped name resolution for save`, { from: name, to: renameTarget });
53
- console.log(`✓ Using scoped package name '${renameTarget}' for save operation`);
54
- }
55
- logger.debug(`Saving package with name: ${resolvedName}`, { options });
56
- // Initialize package environment
57
- await ensureRegistryDirectories();
58
- let packageInfo = await readOrCreateBasePackageYml(cwd, name);
59
- let packageConfig = packageInfo.config;
60
- let isRootPackage = packageInfo.isRootPackage;
61
- if (renameTarget) {
62
- await applyWorkspacePackageRename(cwd, packageInfo, renameTarget);
63
- // Re-fetch package info at the new location with the same target version
64
- packageInfo = await readOrCreateBasePackageYml(cwd, renameTarget);
65
- packageConfig = packageInfo.config;
66
- isRootPackage = packageInfo.isRootPackage;
67
- }
68
- const indexRecord = await readPackageIndex(cwd, packageConfig.name);
69
- const workspaceHash = createWorkspaceHash(cwd);
70
- const workspaceTag = createWorkspaceTag(cwd);
71
- const wipVersionInfo = computeWipVersion(packageConfig.version, indexRecord?.workspace?.version, cwd);
72
- if (wipVersionInfo.resetMessage) {
73
- console.log(wipVersionInfo.resetMessage);
74
- }
75
- // If the last workspace version was a stable S matching package.yml.version,
76
- // begin the next development cycle by bumping package.yml.version to patch(S)
77
- // *before* discovering files and saving to the registry. This ensures the
78
- // saved snapshot's package.yml reflects the new stable line.
79
- if (wipVersionInfo.shouldBumpPackageYml && wipVersionInfo.nextStable) {
80
- try {
81
- const bumpedConfig = { ...packageConfig, version: wipVersionInfo.nextStable };
82
- // Update the on-disk package.yml so discovery sees the bumped version
83
- await writePackageYml(packageInfo.fullPath, bumpedConfig);
84
- // Update in-memory configs to keep them in sync
85
- packageConfig = bumpedConfig;
86
- packageInfo = { ...packageInfo, config: bumpedConfig };
87
- console.log(`✓ Updated package.yml.version to ${wipVersionInfo.nextStable} for the next cycle`);
88
- }
89
- catch (error) {
90
- logger.warn(`Failed to auto-bump package.yml before save: ${String(error)}`);
91
- }
92
- }
93
- const effectiveConfig = { ...packageConfig, version: wipVersionInfo.wipVersion };
94
- // Discover and process files directly into package files array
95
- // Only use explicit --force flag to skip prompts; WIP versions should still prompt for conflicts
96
- const packageFiles = await discoverPackageFilesForSave(packageInfo, {
97
- force: options?.force
1
+ import { withErrorHandling } from '../utils/errors.js';
2
+ import { runSavePipeline } from '../core/save/save-pipeline.js';
3
+ async function savePackageCommand(packageName, options = {}) {
4
+ return runSavePipeline(packageName, {
5
+ mode: 'wip',
6
+ force: options.force,
7
+ rename: options.rename
98
8
  });
99
- // Sync universal files across detected platforms using planner-based workflow
100
- const syncResult = await performPlatformSync(cwd, effectiveConfig.name, effectiveConfig.version, packageFiles, {
101
- force: options?.force,
102
- conflictStrategy: options?.force ? 'overwrite' : 'ask'
103
- });
104
- const registrySave = await savePackageToRegistry({ ...packageInfo, config: effectiveConfig }, packageFiles);
105
- if (!registrySave.success) {
106
- return { success: false, error: registrySave.error || 'Save operation failed' };
107
- }
108
- await deleteWorkspaceWipCopies(effectiveConfig.name, workspaceTag, {
109
- keepVersion: effectiveConfig.version
110
- });
111
- // Finalize the save operation
112
- // Don't add root package to itself as a dependency
113
- if (!isRootPackage) {
114
- const transitivelyCovered = await isPackageTransitivelyCovered(cwd, effectiveConfig.name);
115
- if (!transitivelyCovered) {
116
- await addPackageToYml(cwd, effectiveConfig.name, effectiveConfig.version,
117
- /* isDev */ false,
118
- /* originalVersion */ undefined,
119
- /* silent */ true);
120
- }
121
- else {
122
- logger.debug(`Skipping addition of ${effectiveConfig.name} to package.yml; already covered transitively.`);
123
- }
124
- }
125
- // Display appropriate message based on package type
126
- const packageType = isRootPackage ? 'root package' : 'package';
127
- console.log(`${LOG_PREFIXES.SAVED} ${effectiveConfig.name}@${effectiveConfig.version} (${packageType}, ${packageFiles.length} files):`);
128
- if (packageFiles.length > 0) {
129
- const savedPaths = packageFiles.map(f => f.path);
130
- const sortedSaved = [...savedPaths].sort((a, b) => a.localeCompare(b));
131
- for (const savedPath of sortedSaved) {
132
- console.log(` ├── ${savedPath}`);
133
- }
134
- }
135
- // Display platform sync results
136
- const totalCreated = syncResult.created.length;
137
- const totalUpdated = syncResult.updated.length;
138
- const totalDeleted = syncResult.deleted?.length ?? 0;
139
- if (totalCreated > 0) {
140
- const allCreated = [...syncResult.created].sort((a, b) => a.localeCompare(b));
141
- console.log(`✓ Platform sync created ${totalCreated} files:`);
142
- for (const createdFile of allCreated) {
143
- console.log(` ├── ${createdFile}`);
144
- }
145
- }
146
- if (totalUpdated > 0) {
147
- const allUpdated = [...syncResult.updated].sort((a, b) => a.localeCompare(b));
148
- console.log(`✓ Platform sync updated ${totalUpdated} files:`);
149
- for (const updatedFile of allUpdated) {
150
- console.log(` ├── ${updatedFile}`);
151
- }
152
- }
153
- if (totalDeleted > 0 && syncResult.deleted) {
154
- const allDeleted = [...syncResult.deleted].sort((a, b) => a.localeCompare(b));
155
- console.log(`✓ Platform sync removed ${totalDeleted} files:`);
156
- for (const deletedFile of allDeleted) {
157
- console.log(` ├── ${deletedFile}`);
158
- }
159
- }
160
- return { success: true, data: effectiveConfig };
161
9
  }
162
- /**
163
- * Setup the save command
164
- */
165
10
  export function setupSaveCommand(program) {
166
11
  program
167
12
  .command('save')
168
13
  .alias('s')
169
- .argument('<package-name>', 'package name (no @version syntax)')
14
+ .argument('[package-name]', 'package name (optional if cwd is a package)')
170
15
  .description('Save a package snapshot for this workspace.\n' +
171
16
  'Usage:\n' +
172
- ' opkg save <package-name> # Detects files, syncs platforms, records WIP metadata\n' +
17
+ ' opkg save # Save cwd package (requires .openpackage/package.yml)\n' +
18
+ ' opkg save <package-name> # Save specific package by name\n' +
173
19
  'Use `opkg pack` to create a stable copy in the registry.')
174
20
  .option('-f, --force', 'overwrite existing version or skip confirmations')
175
21
  .option('--rename <newName>', 'Rename package during save')
176
22
  .action(withErrorHandling(async (packageName, options) => {
177
- const result = await savePackageCommand(packageName, options);
178
- if (!result.success) {
23
+ const result = await savePackageCommand(packageName, options ?? {});
24
+ if (!result.success)
179
25
  throw new Error(result.error || 'Save operation failed');
180
- }
181
26
  }));
182
27
  }
183
28
  //# sourceMappingURL=save.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"save.js","sourceRoot":"","sources":["../../src/commands/save.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"save.js","sourceRoot":"","sources":["../../src/commands/save.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,KAAK,UAAU,kBAAkB,CAC/B,WAA+B,EAC/B,UAAuB,EAAE;IAEzB,OAAO,eAAe,CAAC,WAAW,EAAE;QAClC,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAAgB;IAC/C,OAAO;SACJ,OAAO,CAAC,MAAM,CAAC;SACf,KAAK,CAAC,GAAG,CAAC;SACV,QAAQ,CAAC,gBAAgB,EAAE,6CAA6C,CAAC;SACzE,WAAW,CACV,+CAA+C;QAC/C,UAAU;QACV,uFAAuF;QACvF,gEAAgE;QAChE,0DAA0D,CAC3D;SACA,MAAM,CAAC,aAAa,EAAE,kDAAkD,CAAC;SACzE,MAAM,CAAC,oBAAoB,EAAE,4BAA4B,CAAC;SAC1D,MAAM,CACL,iBAAiB,CAAC,KAAK,EAAE,WAA+B,EAAE,OAAqB,EAAE,EAAE;QACjF,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,WAAW,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC;QACpE,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,uBAAuB,CAAC,CAAC;IAChF,CAAC,CAAC,CACH,CAAC;AACN,CAAC"}
@@ -8,7 +8,7 @@ import { registryManager } from '../core/registry.js';
8
8
  import { exists } from '../utils/fs.js';
9
9
  import { logger } from '../utils/logger.js';
10
10
  import { withErrorHandling, ValidationError } from '../utils/errors.js';
11
- import { getLocalPackageYmlPath, getLocalPackagesDir, getLocalOpenPackageDir, getAIDir } from '../utils/paths.js';
11
+ import { getLocalPackageYmlPath, getLocalPackagesDir, getLocalOpenPackageDir, getInstallRootDir } from '../utils/paths.js';
12
12
  import { satisfiesVersion, isExactVersion, describeVersionRange } from '../utils/version-ranges.js';
13
13
  import { FILE_PATTERNS, DEPENDENCY_ARRAYS, } from '../constants/index.js';
14
14
  import { getPlatformDefinition, detectAllPlatforms } from '../core/platforms.js';
@@ -251,7 +251,7 @@ async function performStatusAnalysis(cwd, options = {}) {
251
251
  getLocalOpenPackageDir(cwd),
252
252
  getLocalPackageYmlPath(cwd),
253
253
  getLocalPackagesDir(cwd),
254
- getAIDir(cwd)
254
+ getInstallRootDir(cwd)
255
255
  ];
256
256
  const [openpackageExists, packageYmlExists, packagesDirExists, aiDirExists] = await Promise.all([
257
257
  exists(openpackageDir),