@aui.io/apollo 0.1.69 → 0.1.70

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 (7) hide show
  1. package/node_modules/@aui.io/apollo-cli/dist/src/meta.d.ts +11 -1
  2. package/node_modules/@aui.io/apollo-cli/dist/src/meta.js +49 -45
  3. package/node_modules/@aui.io/apollo-cli/dist/src/meta.js.map +1 -1
  4. package/node_modules/@aui.io/apollo-cli/package.json +3 -3
  5. package/node_modules/@aui.io/apollo-core/package.json +1 -1
  6. package/node_modules/@aui.io/apollo-tui/package.json +2 -2
  7. package/package.json +4 -4
package/node_modules/@aui.io/apollo-cli/dist/src/meta.d.ts CHANGED
@@ -1,4 +1,14 @@
1
- /** The only package published to npm — CLI + TUI are bundled inside it. */
1
+ /** The public distribution — CLI + TUI are bundled inside it. */
2
2
  export declare const APOLLO_PACKAGE_NAME = "@aui.io/apollo";
3
+ export interface PackageMeta {
4
+ name: string;
5
+ version: string;
6
+ }
7
+ /**
8
+ * The console this module ships in. A distribution bundles this package under
9
+ * its own node_modules, so the nearest ancestor bundling it is the installed
10
+ * distribution; outside one, this package's own manifest (kept in lockstep).
11
+ */
12
+ export declare function resolveConsoleMeta(modulePath: string): PackageMeta;
3
13
  export declare const CLI_PACKAGE_NAME = "@aui.io/apollo";
4
14
  export declare const CLI_VERSION: string;
package/node_modules/@aui.io/apollo-cli/dist/src/meta.js CHANGED
@@ -1,65 +1,69 @@
1
- import { createRequire } from "node:module";
2
1
  import { readFileSync } from "node:fs";
3
2
  import { dirname, join } from "node:path";
4
3
  import { fileURLToPath } from "node:url";
5
- /** The only package published to npm — CLI + TUI are bundled inside it. */
4
+ /** The public distribution — CLI + TUI are bundled inside it. */
6
5
  export const APOLLO_PACKAGE_NAME = "@aui.io/apollo";
7
- function readJson(path) {
6
+ /** This package, as the distributions name it in `bundleDependencies`. */
7
+ const CLI_PACKAGE = "@aui.io/apollo-cli";
8
+ function readManifest(path) {
8
9
  try {
9
10
  const raw = JSON.parse(readFileSync(path, "utf8"));
10
- if (typeof raw.name === "string" && typeof raw.version === "string") {
11
- return { name: raw.name, version: raw.version };
11
+ if (typeof raw.name !== "string" || typeof raw.version !== "string") {
12
+ return undefined;
12
13
  }
14
+ const bundled = raw.bundleDependencies ?? raw.bundledDependencies;
15
+ return {
16
+ name: raw.name,
17
+ version: raw.version,
18
+ dependencies: typeof raw.dependencies === "object" && raw.dependencies !== null
19
+ ? raw.dependencies
20
+ : {},
21
+ bundleDependencies: bundled === true ||
22
+ (Array.isArray(bundled) && bundled.every((v) => typeof v === "string"))
23
+ ? bundled
24
+ : [],
25
+ };
13
26
  }
14
27
  catch {
15
- // missing / unreadable
28
+ return undefined;
16
29
  }
17
- return undefined;
18
30
  }
19
- /**
20
- * Prefer the installed `@aui.io/apollo` version (global/meta install). Fall
21
- * back to the workspace apollo package, then the local cli package version
22
- * (dev / path install).
23
- */
24
- function loadApolloMeta() {
25
- try {
26
- const require = createRequire(import.meta.url);
27
- const fromInstall = readJson(require.resolve(`${APOLLO_PACKAGE_NAME}/package.json`));
28
- if (fromInstall)
29
- return { name: APOLLO_PACKAGE_NAME, version: fromInstall.version };
30
- }
31
- catch {
32
- // not installed as the meta package
33
- }
34
- let dir = dirname(fileURLToPath(import.meta.url));
35
- for (let i = 0; i < 8; i++) {
36
- const sibling = readJson(join(dir, "apollo", "package.json"));
37
- if (sibling?.name === APOLLO_PACKAGE_NAME) {
38
- return { name: APOLLO_PACKAGE_NAME, version: sibling.version };
39
- }
40
- const here = readJson(join(dir, "package.json"));
41
- if (here?.name === APOLLO_PACKAGE_NAME) {
42
- return { name: APOLLO_PACKAGE_NAME, version: here.version };
43
- }
31
+ /** `bundleDependencies: true` bundles every dependency (npm semantics). */
32
+ function bundlesCli(manifest) {
33
+ return manifest.bundleDependencies === true
34
+ ? CLI_PACKAGE in manifest.dependencies
35
+ : manifest.bundleDependencies.includes(CLI_PACKAGE);
36
+ }
37
+ function* ancestors(dir) {
38
+ for (;;) {
39
+ yield dir;
44
40
  const parent = dirname(dir);
45
41
  if (parent === dir)
46
- break;
42
+ return;
47
43
  dir = parent;
48
44
  }
49
- // Last resort: workspace cli version (kept in sync with apollo).
50
- dir = dirname(fileURLToPath(import.meta.url));
51
- for (let i = 0; i < 5; i++) {
52
- const here = readJson(join(dir, "package.json"));
53
- if (here)
54
- return { name: APOLLO_PACKAGE_NAME, version: here.version };
55
- const parent = dirname(dir);
56
- if (parent === dir)
57
- break;
58
- dir = parent;
45
+ }
46
+ /**
47
+ * The console this module ships in. A distribution bundles this package under
48
+ * its own node_modules, so the nearest ancestor bundling it is the installed
49
+ * distribution; outside one, this package's own manifest (kept in lockstep).
50
+ */
51
+ export function resolveConsoleMeta(modulePath) {
52
+ let own;
53
+ for (const dir of ancestors(dirname(modulePath))) {
54
+ const manifest = readManifest(join(dir, "package.json"));
55
+ if (manifest === undefined)
56
+ continue;
57
+ if (bundlesCli(manifest)) {
58
+ return { name: manifest.name, version: manifest.version };
59
+ }
60
+ own ??= { name: manifest.name, version: manifest.version };
59
61
  }
60
- throw new Error("Unable to locate @aui.io/apollo package version.");
62
+ if (own !== undefined)
63
+ return own;
64
+ throw new Error("Unable to locate the apollo console package version.");
61
65
  }
62
- const meta = loadApolloMeta();
66
+ const meta = resolveConsoleMeta(fileURLToPath(import.meta.url));
63
67
  export const CLI_PACKAGE_NAME = APOLLO_PACKAGE_NAME;
64
68
  export const CLI_VERSION = meta.version;
65
69
  //# sourceMappingURL=meta.js.map
package/node_modules/@aui.io/apollo-cli/dist/src/meta.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"meta.js","sourceRoot":"","sources":["../../src/meta.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"meta.js","sourceRoot":"","sources":["../../src/meta.ts"],"names":[],"mappings":"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"}
package/node_modules/@aui.io/apollo-cli/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aui.io/apollo-cli",
3
- "version": "0.1.69",
3
+ "version": "0.1.70",
4
4
  "description": "Command-line client for the Apollo runtime",
5
5
  "type": "module",
6
6
  "engines": {
@@ -33,12 +33,12 @@
33
33
  "test": "vitest run"
34
34
  },
35
35
  "dependencies": {
36
- "@aui.io/apollo-core": "0.1.69",
36
+ "@aui.io/apollo-core": "0.1.70",
37
37
  "commander": "^14.0.3",
38
38
  "picocolors": "^1.1.1"
39
39
  },
40
40
  "optionalDependencies": {
41
- "@aui.io/apollo-tui": "0.1.69"
41
+ "@aui.io/apollo-tui": "0.1.70"
42
42
  },
43
43
  "devDependencies": {
44
44
  "@eslint/js": "^9.39.5",
package/node_modules/@aui.io/apollo-core/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aui.io/apollo-core",
3
- "version": "0.1.69",
3
+ "version": "0.1.70",
4
4
  "description": "Shared Apollo console core — API clients, config, and services",
5
5
  "type": "module",
6
6
  "engines": {
package/node_modules/@aui.io/apollo-tui/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aui.io/apollo-tui",
3
- "version": "0.1.69",
3
+ "version": "0.1.70",
4
4
  "description": "Interactive Apollo operator TUI built on OpenTUI",
5
5
  "type": "module",
6
6
  "engines": {
@@ -35,7 +35,7 @@
35
35
  "start": "node ./bin/apollo-tui.js"
36
36
  },
37
37
  "dependencies": {
38
- "@aui.io/apollo-core": "0.1.69",
38
+ "@aui.io/apollo-core": "0.1.70",
39
39
  "@opentui/core": "^0.4.5",
40
40
  "@opentui/react": "^0.4.5",
41
41
  "diff": "8.0.2",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aui.io/apollo",
3
- "version": "0.1.69",
3
+ "version": "0.1.70",
4
4
  "description": "Apollo operator console — CLI + interactive TUI",
5
5
  "type": "module",
6
6
  "engines": {
@@ -31,9 +31,9 @@
31
31
  "postpack": "node ./scripts/clean-bundle.mjs"
32
32
  },
33
33
  "dependencies": {
34
- "@aui.io/apollo-core": "0.1.69",
35
- "@aui.io/apollo-cli": "0.1.69",
36
- "@aui.io/apollo-tui": "0.1.69",
34
+ "@aui.io/apollo-core": "0.1.70",
35
+ "@aui.io/apollo-cli": "0.1.70",
36
+ "@aui.io/apollo-tui": "0.1.70",
37
37
  "picocolors": "^1.1.1",
38
38
  "yaml": "^2.9.0",
39
39
  "commander": "^14.0.3",