@antelopejs/core 0.0.2 → 0.1.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.
Files changed (77) hide show
  1. package/README.md +0 -12
  2. package/dist/cli/common.d.ts +1 -0
  3. package/dist/cli/common.js +32 -15
  4. package/dist/cli/common.js.map +1 -1
  5. package/dist/cli/config/get.js +1 -1
  6. package/dist/cli/config/get.js.map +1 -1
  7. package/dist/cli/config/set.js +3 -13
  8. package/dist/cli/config/set.js.map +1 -1
  9. package/dist/cli/git.d.ts +1 -0
  10. package/dist/cli/git.js +95 -50
  11. package/dist/cli/git.js.map +1 -1
  12. package/dist/cli/index.js +0 -3
  13. package/dist/cli/index.js.map +1 -1
  14. package/dist/cli/module/exports/generate.js +8 -8
  15. package/dist/cli/module/exports/generate.js.map +1 -1
  16. package/dist/cli/module/imports/add.d.ts +2 -1
  17. package/dist/cli/module/imports/add.js +12 -6
  18. package/dist/cli/module/imports/add.js.map +1 -1
  19. package/dist/cli/module/imports/list.js +4 -2
  20. package/dist/cli/module/imports/list.js.map +1 -1
  21. package/dist/cli/module/imports/update.js +11 -5
  22. package/dist/cli/module/imports/update.js.map +1 -1
  23. package/dist/cli/module/init.js +80 -9
  24. package/dist/cli/module/init.js.map +1 -1
  25. package/dist/cli/package-manager.d.ts +6 -0
  26. package/dist/cli/package-manager.js +99 -0
  27. package/dist/cli/package-manager.js.map +1 -0
  28. package/dist/cli/project/init.js +17 -23
  29. package/dist/cli/project/init.js.map +1 -1
  30. package/dist/cli/project/modules/add.d.ts +1 -0
  31. package/dist/cli/project/modules/add.js +100 -34
  32. package/dist/cli/project/modules/add.js.map +1 -1
  33. package/dist/cli/project/modules/fix.js +48 -48
  34. package/dist/cli/project/modules/fix.js.map +1 -1
  35. package/dist/cli/project/modules/list.d.ts +2 -0
  36. package/dist/cli/project/modules/list.js +91 -0
  37. package/dist/cli/project/modules/list.js.map +1 -0
  38. package/dist/cli/project/modules/update.js +13 -8
  39. package/dist/cli/project/modules/update.js.map +1 -1
  40. package/dist/cli/project/run.js +43 -8
  41. package/dist/cli/project/run.js.map +1 -1
  42. package/dist/common/cache.js +8 -4
  43. package/dist/common/cache.js.map +1 -1
  44. package/dist/common/config.js.map +1 -1
  45. package/dist/common/downloader/git.js +26 -15
  46. package/dist/common/downloader/git.js.map +1 -1
  47. package/dist/common/downloader/index.js +3 -3
  48. package/dist/common/downloader/index.js.map +1 -1
  49. package/dist/common/downloader/local.d.ts +1 -0
  50. package/dist/common/downloader/local.js +3 -3
  51. package/dist/common/downloader/local.js.map +1 -1
  52. package/dist/common/downloader/package.js +14 -10
  53. package/dist/common/downloader/package.js.map +1 -1
  54. package/dist/common/manifest.d.ts +5 -2
  55. package/dist/common/manifest.js +16 -6
  56. package/dist/common/manifest.js.map +1 -1
  57. package/dist/index.js +0 -1
  58. package/dist/index.js.map +1 -1
  59. package/dist/interfaces/logging/beta/index.d.ts +7 -0
  60. package/dist/interfaces/logging/beta/index.js +23 -0
  61. package/dist/interfaces/logging/beta/index.js.map +1 -1
  62. package/dist/loader/index.js +10 -8
  63. package/dist/loader/index.js.map +1 -1
  64. package/dist/loader/module.js +3 -4
  65. package/dist/loader/module.js.map +1 -1
  66. package/dist/logging/index.js +107 -25
  67. package/dist/logging/index.js.map +1 -1
  68. package/dist/utils/command.d.ts +6 -1
  69. package/dist/utils/command.js +11 -4
  70. package/dist/utils/command.js.map +1 -1
  71. package/dist/utils/lock.d.ts +1 -0
  72. package/dist/utils/lock.js +36 -0
  73. package/dist/utils/lock.js.map +1 -0
  74. package/dist/utils/package-manager.d.ts +5 -2
  75. package/dist/utils/package-manager.js +77 -17
  76. package/dist/utils/package-manager.js.map +1 -1
  77. package/package.json +3 -1
@@ -1,4 +1,37 @@
1
1
  "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
2
35
  var __importDefault = (this && this.__importDefault) || function (mod) {
3
36
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
37
  };
@@ -14,26 +47,30 @@ const path_1 = __importDefault(require("path"));
14
47
  const config_1 = require("../../../common/config");
15
48
  const common_1 = require("../../common");
16
49
  const command_1 = require("../../../utils/command");
17
- const inquirer_1 = __importDefault(require("inquirer"));
18
50
  const cli_ui_1 = require("../../../utils/cli-ui");
19
51
  const package_manager_1 = require("../../../utils/package-manager");
52
+ const cache_1 = require("../../../common/cache");
53
+ const downloader_1 = __importStar(require("../../../common/downloader"));
20
54
  exports.handlers = new Map();
21
55
  async function projectModulesAddCommand(modules, options) {
22
56
  console.log('');
23
57
  (0, cli_ui_1.info)(`Adding modules to your project...`);
24
- let sources = await Promise.all(modules.map((module) => {
25
- console.log(`Adding ${chalk_1.default.bold(options.mode === 'local' || options.mode === 'dir' ? path_1.default.join(options.project, module) : module)} using ${options.mode} mode`);
26
- return exports.handlers.get(options.mode)(module, options).catch((err) => {
27
- (0, cli_ui_1.error)(`Failed to add module "${module}": ${err.message || err}`);
28
- return null;
29
- });
30
- }));
31
58
  const config = await (0, common_1.readConfig)(options.project);
32
59
  if (!config) {
33
60
  (0, cli_ui_1.error)(`No project configuration found at: ${chalk_1.default.bold(options.project)}`);
34
61
  console.log(`Make sure you're in an AntelopeJS project or use the --project option.`);
35
62
  return;
36
63
  }
64
+ const antelopeConfig = await (0, config_1.LoadConfig)(options.project, options.env || 'default');
65
+ let sources = await Promise.all(modules.map((module) => {
66
+ const modulePath = options.mode === 'local' || options.mode === 'dir' ? path_1.default.join(options.project, module) : module;
67
+ console.log(`Adding ${chalk_1.default.bold(modulePath)} using ${options.mode} mode`);
68
+ return exports.handlers.get(options.mode)(module, options).catch((err) => {
69
+ (0, cli_ui_1.error)(`Failed to add module "${module}": ${err.message || err}`);
70
+ return null;
71
+ });
72
+ }));
73
+ sources = sources.filter((source) => source !== null);
37
74
  const env = options.env && options.env !== 'default' ? config?.environments && config?.environments[options.env] : config;
38
75
  if (!env) {
39
76
  (0, cli_ui_1.error)(`Environment ${options.env || 'default'} not found in project config`);
@@ -42,31 +79,51 @@ async function projectModulesAddCommand(modules, options) {
42
79
  if (!env.modules) {
43
80
  env.modules = {};
44
81
  }
45
- const antelopeConfig = await (0, config_1.LoadConfig)(options.project, options.env || 'default');
46
82
  const added = [];
47
83
  const skipped = [];
48
- for (const source of sources) {
84
+ const cache = new cache_1.ModuleCache(path_1.default.join(options.project, '.antelope', 'cache'));
85
+ await cache.load();
86
+ const moduleLoadingTasks = sources.map(async (source) => {
49
87
  if (!source)
50
- continue;
88
+ return null;
51
89
  let [moduleName, moduleConfig] = source;
52
90
  if (antelopeConfig.modules[moduleName]) {
53
- const { confirm } = await inquirer_1.default.prompt([
54
- {
55
- type: 'confirm',
56
- name: 'confirm',
57
- message: `Module ${chalk_1.default.yellow(moduleName)} already exists. Add with a different name?`,
58
- },
59
- ]);
60
- if (!confirm) {
61
- skipped.push(moduleName);
62
- continue;
91
+ return { moduleName, moduleConfig, skipped: true };
92
+ }
93
+ if (typeof moduleConfig === 'object' && moduleConfig !== null && 'source' in moduleConfig) {
94
+ const loaderIdentifier = (0, downloader_1.GetLoaderIdentifier)(moduleConfig.source);
95
+ if (loaderIdentifier) {
96
+ (0, cli_ui_1.info)(`Downloading module ${chalk_1.default.bold(moduleName)} to cache...`);
97
+ try {
98
+ const moduleManifests = await (0, downloader_1.default)(options.project, cache, moduleConfig.source);
99
+ if (moduleManifests.length > 0) {
100
+ const manifest = moduleManifests[0];
101
+ if (manifest.manifest.antelopeJs?.defaultConfig) {
102
+ moduleConfig.config = manifest.manifest.antelopeJs.defaultConfig;
103
+ }
104
+ }
105
+ (0, cli_ui_1.success)(`Successfully downloaded module ${chalk_1.default.bold(moduleName)} to cache`);
106
+ }
107
+ catch (error) {
108
+ const errorMessage = error instanceof Error ? error.message : String(error);
109
+ (0, cli_ui_1.warning)(`Failed to download module ${chalk_1.default.bold(moduleName)} to cache: ${errorMessage}`);
110
+ }
63
111
  }
64
- const newName = `${moduleName}-${Object.keys(env.modules).filter((key) => key.startsWith(moduleName)).length}`;
65
- (0, cli_ui_1.info)(`Using name ${chalk_1.default.bold(newName)} instead of ${moduleName}`);
66
- moduleName = newName;
67
112
  }
68
- env.modules[moduleName] = moduleConfig;
69
- added.push(moduleName);
113
+ return { moduleName, moduleConfig, skipped: false };
114
+ });
115
+ const moduleResults = await Promise.all(moduleLoadingTasks);
116
+ for (const result of moduleResults) {
117
+ if (!result)
118
+ continue;
119
+ const { moduleName, moduleConfig, skipped: wasSkipped } = result;
120
+ if (wasSkipped) {
121
+ skipped.push(moduleName);
122
+ }
123
+ else {
124
+ env.modules[moduleName] = moduleConfig;
125
+ added.push(moduleName);
126
+ }
70
127
  }
71
128
  await (0, common_1.writeConfig)(options.project, config);
72
129
  let resultContent = '';
@@ -95,23 +152,32 @@ function default_1() {
95
152
  return new commander_1.Command('add')
96
153
  .description(`Add modules to your project\n` + `Import modules from npm, git, or local directories.`)
97
154
  .argument('<modules...>', 'Modules to add (format depends on --mode)')
98
- .addOption(new commander_1.Option('-m, --mode <mode>', 'Source type for the modules').choices([...exports.handlers.keys()]).default('npm'))
155
+ .addOption(new commander_1.Option('-m, --mode <mode>', 'Source type for the modules').choices([...exports.handlers.keys()]).default('package'))
99
156
  .addOption(common_1.Options.project)
100
157
  .addOption(new commander_1.Option('-e, --env <environment>', 'Environment to add modules to').env('ANTELOPEJS_LAUNCH_ENV'))
101
158
  .action(projectModulesAddCommand);
102
159
  }
103
- exports.handlers.set('npm', async (module) => {
160
+ exports.handlers.set('package', async (module) => {
104
161
  const m = module.match(/^(.+?)(?:@(.*))?$/);
105
162
  (0, assert_1.default)(m, `Invalid npm module format: '${module}'. Use <name>@<version>, <name>version or <name>`);
106
163
  let [, name, version] = m;
107
164
  if (!version) {
108
- (0, cli_ui_1.info)(`Fetching latest version for ${chalk_1.default.bold(name)}...`);
109
- const [output, err] = await (0, command_1.ExecuteCMD)(`npm view ${name} version`, {});
110
- (0, assert_1.default)(!err, err);
111
- version = (0, package_manager_1.parsePackageInfoOutput)(output);
112
- (0, cli_ui_1.success)(`Using version ${version}`);
165
+ const result = await (0, command_1.ExecuteCMD)(`npm view ${name} version`, {});
166
+ if (result.code !== 0) {
167
+ throw new Error(`Failed to fetch version: ${result.stderr}`);
168
+ }
169
+ version = (0, package_manager_1.parsePackageInfoOutput)(result.stdout);
113
170
  }
114
- return [name, version];
171
+ return [
172
+ name,
173
+ {
174
+ source: {
175
+ type: 'package',
176
+ package: name,
177
+ version: version,
178
+ },
179
+ },
180
+ ];
115
181
  });
116
182
  exports.handlers.set('git', async (module) => {
117
183
  (0, assert_1.default)(module.includes('://') || module.includes('@'), `Invalid git URL format: '${module}'`);
@@ -1 +1 @@
1
- {"version":3,"file":"add.js","sourceRoot":"","sources":["../../../../src/cli/project/modules/add.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"add.js","sourceRoot":"","sources":["../../../../src/cli/project/modules/add.ts"],"names":[],"mappings":"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"}
@@ -47,7 +47,6 @@ const path_1 = __importDefault(require("path"));
47
47
  const manifest_1 = require("../../../common/manifest");
48
48
  const inquirer_1 = __importDefault(require("inquirer"));
49
49
  const git_1 = require("../../git");
50
- const remove_1 = require("./remove");
51
50
  const add_1 = require("./add");
52
51
  const cli_ui_1 = require("../../../utils/cli-ui");
53
52
  async function analyzeConfig(projectFolder, cache, config) {
@@ -61,8 +60,7 @@ async function analyzeConfig(projectFolder, cache, config) {
61
60
  await Promise.all(modules.map((module) => module.loadExports()));
62
61
  const imports = [...new Set(modules.map((module) => module.imports).flat())];
63
62
  const unresolvedImports = imports.filter((imp) => !modules.find((module) => module.exports[imp]));
64
- const unusedModulesExports = modules.filter((module) => !Object.keys(module.exports).find((exp) => imports.includes(exp)) && module.source.type !== 'none');
65
- return { unresolvedImports, unusedModulesExports };
63
+ return { unresolvedImports };
66
64
  }
67
65
  function default_1() {
68
66
  return new commander_1.Command('fix')
@@ -88,28 +86,30 @@ function default_1() {
88
86
  : baseConfig?.environments
89
87
  ? Object.keys(baseConfig.environments)
90
88
  : ['default'];
91
- const addedModules = [];
89
+ const addedModules = {};
92
90
  const removedModules = [];
91
+ const modulesToInstall = [];
93
92
  for (const env of envs) {
94
93
  (0, cli_ui_1.info)(chalk_1.default.bold `\nAnalyzing environment: ${env}`);
95
94
  const config = await (0, config_1.LoadConfig)(options.project, env);
96
- const { unresolvedImports, unusedModulesExports } = await analyzeConfig(options.project, cache, config);
95
+ const { unresolvedImports } = await analyzeConfig(options.project, cache, config);
97
96
  if (unresolvedImports.length > 0) {
98
97
  (0, cli_ui_1.warning)(chalk_1.default.yellow `Found ${unresolvedImports.length} unresolved imports:`);
99
98
  for (const imp of unresolvedImports) {
100
- (0, cli_ui_1.info)(` ${chalk_1.default.yellow('•')} ${chalk_1.default.bold(imp)}`);
101
99
  const m = imp.match(/^([^@]+)(?:@(.+))?$/);
102
100
  if (!m || !m[1] || !m[2]) {
103
101
  (0, cli_ui_1.warning)(` ${chalk_1.default.yellow('↳')} Malformed interface name, skipping`);
104
102
  continue;
105
103
  }
106
104
  const interfaceInfo = await (0, git_1.loadInterfaceFromGit)(git, m[1]);
107
- if (interfaceInfo && interfaceInfo.manifest.modules.length > 0) {
105
+ const choices = [...(interfaceInfo?.manifest.modules.map((module) => module.name) || [])];
106
+ const alreadySelectedModule = modulesToInstall.find((module) => choices.includes(module.moduleName));
107
+ if (interfaceInfo && choices.length > 0 && !alreadySelectedModule) {
108
+ (0, cli_ui_1.info)(` ${chalk_1.default.yellow('•')} ${chalk_1.default.bold(imp)}`);
108
109
  (0, cli_ui_1.info)(` ${chalk_1.default.blue('↳')} Available modules that implement this interface:`);
109
110
  interfaceInfo.manifest.modules.forEach((mod, i) => {
110
111
  (0, cli_ui_1.info)(` ${i + 1}. ${chalk_1.default.bold(mod.name)}`);
111
112
  });
112
- const choices = [...interfaceInfo.manifest.modules.map((module) => module.name)];
113
113
  const { moduleName } = await inquirer_1.default.prompt([
114
114
  {
115
115
  type: 'list',
@@ -124,19 +124,25 @@ function default_1() {
124
124
  const mode = source.type;
125
125
  const loaderIdentifier = (0, downloader_1.GetLoaderIdentifier)(source);
126
126
  if (loaderIdentifier) {
127
- (0, cli_ui_1.success)(` ${chalk_1.default.green('↳')} Adding module: ${chalk_1.default.bold(moduleName)}`);
128
- await (0, add_1.projectModulesAddCommand)([loaderIdentifier], {
127
+ (0, cli_ui_1.success)(` ${chalk_1.default.green('↳')} Selected module: ${chalk_1.default.bold(moduleName)} for ${imp}`);
128
+ modulesToInstall.push({
129
+ loaderIdentifier,
129
130
  mode,
130
- project: options.project,
131
+ moduleName,
132
+ imports: [imp],
131
133
  env,
132
134
  });
133
- addedModules.push(`${moduleName} (for ${imp})`);
135
+ addedModules[moduleName] = [imp];
134
136
  }
135
137
  }
136
138
  else {
137
139
  (0, cli_ui_1.warning)(` ${chalk_1.default.yellow('↳')} No modules found implementing this interface in repository ${git}`);
138
140
  }
139
141
  }
142
+ else if (alreadySelectedModule) {
143
+ alreadySelectedModule.imports.push(imp);
144
+ addedModules[alreadySelectedModule.moduleName].push(imp);
145
+ }
140
146
  else {
141
147
  (0, cli_ui_1.warning)(` ${chalk_1.default.yellow('↳')} No modules found implementing this interface in repository ${git}`);
142
148
  }
@@ -145,45 +151,39 @@ function default_1() {
145
151
  else {
146
152
  (0, cli_ui_1.success)(chalk_1.default.green `✓ No unresolved imports found`);
147
153
  }
148
- if (unusedModulesExports.length > 0) {
149
- (0, cli_ui_1.warning)(chalk_1.default.yellow `\nFound ${unusedModulesExports.length} unused modules:`);
150
- for (const module of unusedModulesExports) {
151
- (0, cli_ui_1.info)(` ${chalk_1.default.yellow('•')} ${chalk_1.default.bold(module.name)}`);
152
- const { shouldRemove } = await inquirer_1.default.prompt([
153
- {
154
- type: 'confirm',
155
- name: 'shouldRemove',
156
- message: `Remove this unused module? (All exports are unused)`,
157
- default: false,
158
- },
159
- ]);
160
- if (shouldRemove) {
161
- try {
162
- await (0, remove_1.projectModulesRemoveCommand)([module.name], {
163
- project: options.project,
164
- env,
165
- force: true,
166
- });
167
- removedModules.push(`${module.name} (environment: ${env})`);
168
- }
169
- catch (err) {
170
- (0, cli_ui_1.error)(chalk_1.default.red ` Failed to remove module: ${err}`);
171
- }
172
- }
173
- else {
174
- (0, cli_ui_1.info)(` ${chalk_1.default.dim('↳')} Keeping module`);
175
- }
154
+ }
155
+ if (modulesToInstall.length > 0) {
156
+ (0, cli_ui_1.info)(chalk_1.default.blue.bold `\nInstalling selected modules...`);
157
+ const modulesByEnvAndMode = modulesToInstall.reduce((acc, module) => {
158
+ const key = `${module.env}:${module.mode}`;
159
+ if (!acc[key]) {
160
+ acc[key] = [];
161
+ }
162
+ acc[key].push(module);
163
+ return acc;
164
+ }, {});
165
+ for (const [key, modules] of Object.entries(modulesByEnvAndMode)) {
166
+ const [env, mode] = key.split(':');
167
+ const loaderIdentifiers = modules.map((m) => m.loaderIdentifier);
168
+ (0, cli_ui_1.info)(chalk_1.default.blue `Installing ${modules.length} module(s) for environment ${env} (mode: ${mode})...`);
169
+ try {
170
+ await (0, add_1.projectModulesAddCommand)(loaderIdentifiers, {
171
+ mode,
172
+ project: options.project,
173
+ env,
174
+ });
175
+ (0, cli_ui_1.success)(chalk_1.default.green `Successfully installed modules for environment ${env} (mode: ${mode})`);
176
+ }
177
+ catch (err) {
178
+ (0, cli_ui_1.error)(chalk_1.default.red `Failed to install modules for environment ${env} (mode: ${mode}): ${err}`);
176
179
  }
177
- }
178
- else {
179
- (0, cli_ui_1.success)(chalk_1.default.green `✓ No unused modules found`);
180
180
  }
181
181
  }
182
182
  (0, cli_ui_1.info)(chalk_1.default.blue.bold `\nDependency analysis summary:`);
183
- if (addedModules.length > 0) {
184
- (0, cli_ui_1.success)(chalk_1.default.green `Added ${addedModules.length} module(s):`);
185
- addedModules.forEach((name) => {
186
- (0, cli_ui_1.info)(` ${chalk_1.default.green('•')} ${name}`);
183
+ if (Object.keys(addedModules).length > 0) {
184
+ (0, cli_ui_1.success)(chalk_1.default.green `Added ${Object.keys(addedModules).length} module(s):`);
185
+ Object.entries(addedModules).forEach(([moduleName, imports]) => {
186
+ (0, cli_ui_1.info)(` ${chalk_1.default.green('•')} ${moduleName} for: ${imports.join(', ')}`);
187
187
  });
188
188
  }
189
189
  if (removedModules.length > 0) {
@@ -192,7 +192,7 @@ function default_1() {
192
192
  (0, cli_ui_1.info)(` ${chalk_1.default.green('•')} ${name}`);
193
193
  });
194
194
  }
195
- if (addedModules.length === 0 && removedModules.length === 0) {
195
+ if (Object.keys(addedModules).length === 0 && removedModules.length === 0) {
196
196
  (0, cli_ui_1.success)(chalk_1.default.green `No changes were made. Your project dependencies are already optimized!`);
197
197
  }
198
198
  (0, cli_ui_1.info)(chalk_1.default.blue `\nDependency analysis complete!`);
@@ -1 +1 @@
1
- {"version":3,"file":"fix.js","sourceRoot":"","sources":["../../../../src/cli/project/modules/fix.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fix.js","sourceRoot":"","sources":["../../../../src/cli/project/modules/fix.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ import { Command } from 'commander';
2
+ export default function (): Command;
@@ -0,0 +1,91 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.default = default_1;
7
+ const chalk_1 = __importDefault(require("chalk"));
8
+ const commander_1 = require("commander");
9
+ const config_1 = require("../../../common/config");
10
+ const common_1 = require("../../common");
11
+ const cli_ui_1 = require("../../../utils/cli-ui");
12
+ function default_1() {
13
+ return new commander_1.Command('list')
14
+ .alias('ls')
15
+ .description(`List installed modules in your project\n` +
16
+ `Display all modules configured in the project with their source information.`)
17
+ .addOption(common_1.Options.project)
18
+ .addOption(new commander_1.Option('-e, --env <environment>', 'Environment to list modules from').env('ANTELOPEJS_LAUNCH_ENV'))
19
+ .action(async (options) => {
20
+ console.log('');
21
+ const config = await (0, common_1.readConfig)(options.project);
22
+ if (!config) {
23
+ (0, cli_ui_1.error)(`No project configuration found at: ${chalk_1.default.bold(options.project)}`);
24
+ console.log(`Make sure you're in an AntelopeJS project or use the --project option.`);
25
+ return;
26
+ }
27
+ const antelopeConfig = await (0, config_1.LoadConfig)(options.project, options.env || 'default');
28
+ const modules = antelopeConfig.modules;
29
+ const projectName = config.name;
30
+ const moduleEntries = Object.entries(modules);
31
+ if (moduleEntries.length === 0) {
32
+ const title = `📦 Installed Modules: ${chalk_1.default.cyan(projectName)}${options.env ? ` (${chalk_1.default.yellow(options.env)})` : ''}`;
33
+ await (0, cli_ui_1.displayBox)(`${chalk_1.default.dim('No modules installed in this project.')}\n\n` +
34
+ `Use ${chalk_1.default.bold('ajs project modules add <module>')} to add modules.`, title, {
35
+ padding: 1,
36
+ borderColor: 'yellow',
37
+ });
38
+ return;
39
+ }
40
+ let content = '';
41
+ for (const [moduleName, moduleConfig] of moduleEntries) {
42
+ content += `${chalk_1.default.bold.blue('●')} ${chalk_1.default.bold(moduleName)}\n`;
43
+ const source = moduleConfig.source;
44
+ if (!source) {
45
+ content += ` ${(0, cli_ui_1.keyValue)('Type', chalk_1.default.gray('unknown'))}\n`;
46
+ content += ` ${(0, cli_ui_1.keyValue)('Source', JSON.stringify(moduleConfig))}\n`;
47
+ continue;
48
+ }
49
+ switch (source.type) {
50
+ case 'package': {
51
+ const packageSource = source;
52
+ content += ` ${(0, cli_ui_1.keyValue)('Type', chalk_1.default.green('npm package'))}\n`;
53
+ content += ` ${(0, cli_ui_1.keyValue)('Package', packageSource.package)}\n`;
54
+ content += ` ${(0, cli_ui_1.keyValue)('Version', packageSource.version)}\n`;
55
+ break;
56
+ }
57
+ case 'git': {
58
+ const gitSource = source;
59
+ content += ` ${(0, cli_ui_1.keyValue)('Type', chalk_1.default.blue('git repository'))}\n`;
60
+ content += ` ${(0, cli_ui_1.keyValue)('Remote', gitSource.remote)}\n`;
61
+ if (gitSource.branch) {
62
+ content += ` ${(0, cli_ui_1.keyValue)('Branch', gitSource.branch)}\n`;
63
+ }
64
+ if (gitSource.commit) {
65
+ content += ` ${(0, cli_ui_1.keyValue)('Commit', gitSource.commit.substring(0, 8))}\n`;
66
+ }
67
+ break;
68
+ }
69
+ case 'local':
70
+ case 'local-folder': {
71
+ const localSource = source;
72
+ content += ` ${(0, cli_ui_1.keyValue)('Type', chalk_1.default.yellow('local directory'))}\n`;
73
+ content += ` ${(0, cli_ui_1.keyValue)('Path', localSource.path)}\n`;
74
+ break;
75
+ }
76
+ default:
77
+ content += ` ${(0, cli_ui_1.keyValue)('Type', chalk_1.default.gray('unknown'))}\n`;
78
+ content += ` ${(0, cli_ui_1.keyValue)('Source', JSON.stringify(source))}\n`;
79
+ }
80
+ content += '\n';
81
+ }
82
+ content = content.trim();
83
+ const title = `📦 Installed Modules: ${chalk_1.default.cyan(projectName)}${options.env ? ` (${chalk_1.default.yellow(options.env)})` : ''}`;
84
+ await (0, cli_ui_1.displayBox)(content, title, {
85
+ padding: 1,
86
+ borderColor: 'green',
87
+ });
88
+ (0, cli_ui_1.info)(`Found ${chalk_1.default.bold(moduleEntries.length)} module${moduleEntries.length === 1 ? '' : 's'} installed.`);
89
+ });
90
+ }
91
+ //# sourceMappingURL=list.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/cli/project/modules/list.ts"],"names":[],"mappings":"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"}
@@ -9,6 +9,7 @@ const commander_1 = require("commander");
9
9
  const config_1 = require("../../../common/config");
10
10
  const common_1 = require("../../common");
11
11
  const command_1 = require("../../../utils/command");
12
+ const package_manager_1 = require("../../../utils/package-manager");
12
13
  const cli_ui_1 = require("../../../utils/cli-ui");
13
14
  function default_1() {
14
15
  return new commander_1.Command('update')
@@ -62,13 +63,11 @@ function default_1() {
62
63
  }
63
64
  (0, cli_ui_1.info)(`${chalk_1.default.bold(module)}: Checking for updates...`);
64
65
  try {
65
- const [output, err] = await (0, command_1.ExecuteCMD)(`npm view ${module} version`, {});
66
- if (err) {
67
- (0, cli_ui_1.error)(chalk_1.default.red `${chalk_1.default.bold(module)}: Error checking version: ${err}`);
68
- skipped.push(module);
69
- continue;
66
+ const result = await (0, command_1.ExecuteCMD)(`npm view ${module} version`, {});
67
+ if (result.code !== 0) {
68
+ throw new Error(`Failed to fetch version: ${result.stderr}`);
70
69
  }
71
- const latestVersion = output.replace('\n', '');
70
+ const latestVersion = (0, package_manager_1.parsePackageInfoOutput)(result.stdout);
72
71
  const currentVersion = moduleInfo.source.version;
73
72
  if (currentVersion === latestVersion) {
74
73
  (0, cli_ui_1.info)(`${chalk_1.default.bold(module)}: ${chalk_1.default.green('Already up to date')} (${currentVersion})`);
@@ -76,7 +75,13 @@ function default_1() {
76
75
  continue;
77
76
  }
78
77
  if (!options.dryRun) {
79
- env.modules[module] = latestVersion;
78
+ env.modules[module] = {
79
+ ...moduleInfo,
80
+ source: {
81
+ ...moduleInfo.source,
82
+ version: latestVersion,
83
+ },
84
+ };
80
85
  updated.push(`${module}: ${chalk_1.default.dim(currentVersion)} → ${latestVersion}`);
81
86
  }
82
87
  else {
@@ -84,7 +89,7 @@ function default_1() {
84
89
  }
85
90
  }
86
91
  catch (err) {
87
- (0, cli_ui_1.error)(chalk_1.default.red `${chalk_1.default.bold(module)}: Error: ${err}`);
92
+ (0, cli_ui_1.error)(chalk_1.default.red `${chalk_1.default.bold(module)}: Error: ${err instanceof Error ? err.message : String(err)}`);
88
93
  skipped.push(module);
89
94
  }
90
95
  }
@@ -1 +1 @@
1
- {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/cli/project/modules/update.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/cli/project/modules/update.ts"],"names":[],"mappings":"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"}