@dbx-tools/cli-service 0.9.71 → 0.9.72
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/index.ts +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.js +2 -2
- package/lib/src/_package.js +40 -10
- package/package.json +3 -3
- package/src/_package.ts +34 -7
package/index.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
// Hand edits are overwritten on the next watch; this file is read-only.
|
|
4
4
|
|
|
5
5
|
export const PACKAGE_IDENTIFIER = "@dbx-tools/cli-service";
|
|
6
|
-
export const PACKAGE_VERSION = "0.9.
|
|
6
|
+
export const PACKAGE_VERSION = "0.9.72";
|
|
7
7
|
export * as cli from "./src/cli.ts";
|
|
8
8
|
export * as definition from "./src/definition.ts";
|
|
9
9
|
export * as icon from "./src/icon.ts";
|
package/lib/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare const PACKAGE_IDENTIFIER = "@dbx-tools/cli-service";
|
|
2
|
-
export declare const PACKAGE_VERSION = "0.9.
|
|
2
|
+
export declare const PACKAGE_VERSION = "0.9.72";
|
|
3
3
|
export * as cli from "./src/cli.ts";
|
|
4
4
|
export * as definition from "./src/definition.ts";
|
|
5
5
|
export * as icon from "./src/icon.ts";
|
package/lib/index.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Regenerated from the exporting modules in ./src.
|
|
3
3
|
// Hand edits are overwritten on the next watch; this file is read-only.
|
|
4
4
|
export const PACKAGE_IDENTIFIER = "@dbx-tools/cli-service";
|
|
5
|
-
export const PACKAGE_VERSION = "0.9.
|
|
5
|
+
export const PACKAGE_VERSION = "0.9.72";
|
|
6
6
|
export * as cli from "./src/cli.js";
|
|
7
7
|
export * as definition from "./src/definition.js";
|
|
8
8
|
export * as icon from "./src/icon.js";
|
|
@@ -10,4 +10,4 @@ export * as service from "./src/service.js";
|
|
|
10
10
|
export { CliServiceInstallOptionsSchema } from "./src/cli.js";
|
|
11
11
|
export { CliServiceCommandSchema, CliServiceMenuItemSchema, CliServicePythonPackageSchema, CliServiceDefinitionSchema } from "./src/definition.js";
|
|
12
12
|
export { CliService } from "./src/service.js";
|
|
13
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwyQ0FBMkM7QUFDM0MsbURBQW1EO0FBQ25ELHdFQUF3RTtBQUV4RSxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBRyx3QkFBd0IsQ0FBQztBQUMzRCxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsUUFBUSxDQUFDO0FBQ3hDLE9BQU8sS0FBSyxHQUFHLE1BQU0sY0FBYyxDQUFDO0FBQ3BDLE9BQU8sS0FBSyxVQUFVLE1BQU0scUJBQXFCLENBQUM7QUFDbEQsT0FBTyxLQUFLLElBQUksTUFBTSxlQUFlLENBQUM7QUFDdEMsT0FBTyxLQUFLLE9BQU8sTUFBTSxrQkFBa0IsQ0FBQztBQUM1QyxPQUFPLEVBQUUsOEJBQThCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFOUQsT0FBTyxFQUFFLHVCQUF1QixFQUFFLHdCQUF3QixFQUFFLDZCQUE2QixFQUFFLDBCQUEwQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFbkosT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLy8gR0VORVJBVEVEIGJ5IHByb2plbiB3YXRjaCAtIERPIE5PVCBFRElULlxuLy8gUmVnZW5lcmF0ZWQgZnJvbSB0aGUgZXhwb3J0aW5nIG1vZHVsZXMgaW4gLi9zcmMuXG4vLyBIYW5kIGVkaXRzIGFyZSBvdmVyd3JpdHRlbiBvbiB0aGUgbmV4dCB3YXRjaDsgdGhpcyBmaWxlIGlzIHJlYWQtb25seS5cblxuZXhwb3J0IGNvbnN0IFBBQ0tBR0VfSURFTlRJRklFUiA9IFwiQGRieC10b29scy9jbGktc2VydmljZVwiO1xuZXhwb3J0IGNvbnN0IFBBQ0tBR0VfVkVSU0lPTiA9IFwiMC45LjcyXCI7XG5leHBvcnQgKiBhcyBjbGkgZnJvbSBcIi4vc3JjL2NsaS50c1wiO1xuZXhwb3J0ICogYXMgZGVmaW5pdGlvbiBmcm9tIFwiLi9zcmMvZGVmaW5pdGlvbi50c1wiO1xuZXhwb3J0ICogYXMgaWNvbiBmcm9tIFwiLi9zcmMvaWNvbi50c1wiO1xuZXhwb3J0ICogYXMgc2VydmljZSBmcm9tIFwiLi9zcmMvc2VydmljZS50c1wiO1xuZXhwb3J0IHsgQ2xpU2VydmljZUluc3RhbGxPcHRpb25zU2NoZW1hIH0gZnJvbSBcIi4vc3JjL2NsaS50c1wiO1xuZXhwb3J0IHR5cGUgeyBDbGlTZXJ2aWNlRGVmaW5pdGlvblNvdXJjZSwgQ2xpU2VydmljZUNsaURlcGVuZGVuY2llcyB9IGZyb20gXCIuL3NyYy9jbGkudHNcIjtcbmV4cG9ydCB7IENsaVNlcnZpY2VDb21tYW5kU2NoZW1hLCBDbGlTZXJ2aWNlTWVudUl0ZW1TY2hlbWEsIENsaVNlcnZpY2VQeXRob25QYWNrYWdlU2NoZW1hLCBDbGlTZXJ2aWNlRGVmaW5pdGlvblNjaGVtYSB9IGZyb20gXCIuL3NyYy9kZWZpbml0aW9uLnRzXCI7XG5leHBvcnQgdHlwZSB7IENsaVNlcnZpY2VDb21tYW5kLCBDbGlTZXJ2aWNlQ29tbWFuZElucHV0LCBDbGlTZXJ2aWNlTWVudUl0ZW0sIENsaVNlcnZpY2VQeXRob25QYWNrYWdlLCBDbGlTZXJ2aWNlUHl0aG9uUGFja2FnZUlucHV0LCBDbGlTZXJ2aWNlRGVmaW5pdGlvbiwgQ2xpU2VydmljZURlZmluaXRpb25PcHRpb25zIH0gZnJvbSBcIi4vc3JjL2RlZmluaXRpb24udHNcIjtcbmV4cG9ydCB7IENsaVNlcnZpY2UgfSBmcm9tIFwiLi9zcmMvc2VydmljZS50c1wiO1xuZXhwb3J0IHR5cGUgeyBDbGlTZXJ2aWNlQ29tcGlsZXIsIENsaVNlcnZpY2VSdW50aW1lSW5zdGFsbGVyLCBDbGlTZXJ2aWNlUHl0aG9uSW5zdGFsbGVyLCBDbGlTZXJ2aWNlUnVudGltZU9wdGlvbnMsIENsaVNlcnZpY2VTdGF0dXMsIENsaVNlcnZpY2VMaWZlY3ljbGUgfSBmcm9tIFwiLi9zcmMvc2VydmljZS50c1wiO1xuIl19
|
package/lib/src/_package.js
CHANGED
|
@@ -65,14 +65,7 @@ function localManifest(reference) {
|
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
67
|
function installedManifest(name) {
|
|
68
|
-
|
|
69
|
-
return createRequire(import.meta.url).resolve(`${name}/package.json`);
|
|
70
|
-
}
|
|
71
|
-
catch (error) {
|
|
72
|
-
if (error.code === "MODULE_NOT_FOUND")
|
|
73
|
-
return undefined;
|
|
74
|
-
throw error;
|
|
75
|
-
}
|
|
68
|
+
return packageManifest(createRequire(import.meta.url), name);
|
|
76
69
|
}
|
|
77
70
|
function servicePackage(manifestPath, expectedName) {
|
|
78
71
|
const manifest = readRecord(manifestPath);
|
|
@@ -99,7 +92,9 @@ function servicePackage(manifestPath, expectedName) {
|
|
|
99
92
|
: [];
|
|
100
93
|
const require = createRequire(manifestPath);
|
|
101
94
|
return Object.fromEntries(dependencies.map((dependency) => {
|
|
102
|
-
const path = require
|
|
95
|
+
const path = packageManifest(require, dependency);
|
|
96
|
+
if (!path)
|
|
97
|
+
throw new Error(`could not resolve dependency package: ${dependency}`);
|
|
103
98
|
const resolved = readRecord(path);
|
|
104
99
|
if (typeof resolved.version !== "string" || !resolved.version) {
|
|
105
100
|
throw new Error(`dependency has no version: ${path}`);
|
|
@@ -109,6 +104,41 @@ function servicePackage(manifestPath, expectedName) {
|
|
|
109
104
|
},
|
|
110
105
|
};
|
|
111
106
|
}
|
|
107
|
+
/** Resolve a package manifest without requiring its unexported `package.json` subpath. */
|
|
108
|
+
function packageManifest(require, name) {
|
|
109
|
+
for (const specifier of [name, `${name}/package.json`]) {
|
|
110
|
+
try {
|
|
111
|
+
const entry = require.resolve(specifier);
|
|
112
|
+
const manifest = namedManifest(entry, name);
|
|
113
|
+
if (manifest)
|
|
114
|
+
return manifest;
|
|
115
|
+
}
|
|
116
|
+
catch (error) {
|
|
117
|
+
const code = error.code;
|
|
118
|
+
if (code !== "MODULE_NOT_FOUND" && code !== "ERR_PACKAGE_PATH_NOT_EXPORTED")
|
|
119
|
+
throw error;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
for (const directory of require.resolve.paths(name) ?? []) {
|
|
123
|
+
const manifest = join(directory, name, "package.json");
|
|
124
|
+
if (existsSync(manifest) && readRecord(manifest).name === name)
|
|
125
|
+
return manifest;
|
|
126
|
+
}
|
|
127
|
+
return undefined;
|
|
128
|
+
}
|
|
129
|
+
/** Walk from a resolved package entry to the nearest manifest with the expected name. */
|
|
130
|
+
function namedManifest(path, name) {
|
|
131
|
+
let current = dirname(path);
|
|
132
|
+
while (true) {
|
|
133
|
+
const manifest = join(current, "package.json");
|
|
134
|
+
if (existsSync(manifest) && readRecord(manifest).name === name)
|
|
135
|
+
return manifest;
|
|
136
|
+
const parent = dirname(current);
|
|
137
|
+
if (parent === current)
|
|
138
|
+
return undefined;
|
|
139
|
+
current = parent;
|
|
140
|
+
}
|
|
141
|
+
}
|
|
112
142
|
function resolveBin(directory, value, name) {
|
|
113
143
|
if (typeof value === "string") {
|
|
114
144
|
if (name)
|
|
@@ -135,4 +165,4 @@ function readRecord(path) {
|
|
|
135
165
|
throw new Error(`package manifest is not an object: ${path}`);
|
|
136
166
|
return value;
|
|
137
167
|
}
|
|
138
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"_package.js","sourceRoot":"","sources":["../../src/_package.ts"],"names":[],"mappings":"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","sourcesContent":["import { existsSync, readFileSync } from \"node:fs\";\nimport { createRequire } from \"node:module\";\nimport { dirname, isAbsolute, join, resolve } from \"node:path\";\nimport { fileURLToPath } from \"node:url\";\n\nimport * as projectUtils from \"@dbx-tools/core/project-utils\";\nimport { object } from \"@dbx-tools/shared-core\";\n\nexport interface ServicePackage {\n  readonly directory: string;\n  readonly name: string;\n  readonly version: string;\n  bin(name?: string): string;\n  dependencies(): Readonly<Record<string, string>>;\n}\n\nexport function resolveServicePackage(\n  reference: string,\n  cwd: string = process.cwd(),\n): ServicePackage {\n  const local = localManifest(reference);\n  if (local) return servicePackage(local);\n\n  const name = reference;\n  const installed = installedManifest(name);\n  if (installed) return servicePackage(installed, name);\n\n  const root = projectUtils.root(cwd);\n  if (!root) throw new Error(`could not resolve package: ${name}`);\n  const manifest = readRecord(join(root, \"package.json\"));\n  const workspaces = Array.isArray(manifest.workspaces) ? manifest.workspaces : [];\n  for (const member of workspaces) {\n    if (typeof member !== \"string\" || /[*?[\\]{}]/.test(member)) continue;\n    const path = join(root, member, \"package.json\");\n    if (!existsSync(path)) continue;\n    const candidate = readRecord(path);\n    if (candidate.name === name) return servicePackage(path, name);\n  }\n  throw new Error(`could not resolve installed or workspace package: ${name}`);\n}\n\nexport function servicePackageDefaults(pkg: ServicePackage): {\n  id: string;\n  name: string;\n} {\n  const segments = pkg.name.replace(/^@/, \"\").split(\"/\");\n  const rawName = segments.at(-1)!;\n  const rawScope = segments.length > 1 ? segments[0]!.split(\"-\")[0]! : \"\";\n  const name = rawName.replace(/^cli-/, \"\").replaceAll(\"-\", \" \");\n  return {\n    id: pkg.name\n      .replace(/^@/, \"\")\n      .replaceAll(\"/\", \".\")\n      .replace(/[^a-z0-9._-]+/gi, \"-\"),\n    name: [rawScope, name].filter(Boolean).join(\" \"),\n  };\n}\n\nfunction localManifest(reference: string): string | undefined {\n  let path: string;\n  if (reference.startsWith(\"file:\")) {\n    path = fileURLToPath(reference);\n  } else if (isAbsolute(reference)) {\n    path = reference;\n  } else {\n    return undefined;\n  }\n  let current = existsSync(path) ? dirname(path) : path;\n  while (true) {\n    const manifest = join(current, \"package.json\");\n    if (existsSync(manifest)) return manifest;\n    const parent = dirname(current);\n    if (parent === current) return undefined;\n    current = parent;\n  }\n}\n\nfunction installedManifest(name: string): string | undefined {\n  try {\n    return createRequire(import.meta.url).resolve(`${name}/package.json`);\n  } catch (error) {\n    if ((error as NodeJS.ErrnoException).code === \"MODULE_NOT_FOUND\") return undefined;\n    throw error;\n  }\n}\n\nfunction servicePackage(manifestPath: string, expectedName?: string): ServicePackage {\n  const manifest = readRecord(manifestPath);\n  if (typeof manifest.name !== \"string\" || !manifest.name) {\n    throw new Error(`package has no name: ${manifestPath}`);\n  }\n  if (expectedName && manifest.name !== expectedName) {\n    throw new Error(`resolved package name does not match ${expectedName}: ${manifestPath}`);\n  }\n  if (typeof manifest.version !== \"string\" || !manifest.version) {\n    throw new Error(`package has no version: ${manifestPath}`);\n  }\n  const directory = dirname(manifestPath);\n  return {\n    directory,\n    name: manifest.name,\n    version: manifest.version,\n    bin(name) {\n      return resolveBin(directory, manifest.bin, name);\n    },\n    dependencies() {\n      const dependencies = object.isRecord(manifest.dependencies)\n        ? Object.keys(manifest.dependencies)\n        : [];\n      const require = createRequire(manifestPath);\n      return Object.fromEntries(\n        dependencies.map((dependency) => {\n          const path = require.resolve(`${dependency}/package.json`);\n          const resolved = readRecord(path);\n          if (typeof resolved.version !== \"string\" || !resolved.version) {\n            throw new Error(`dependency has no version: ${path}`);\n          }\n          return [dependency, resolved.version];\n        }),\n      );\n    },\n  };\n}\n\nfunction resolveBin(directory: string, value: unknown, name?: string): string {\n  if (typeof value === \"string\") {\n    if (name) throw new Error(`package exposes one unnamed bin, not ${name}`);\n    return resolve(directory, value);\n  }\n  if (!object.isRecord(value)) throw new Error(\"package has no bin\");\n  if (name) {\n    const target = value[name];\n    if (typeof target !== \"string\") throw new Error(`package has no bin named ${name}`);\n    return resolve(directory, target);\n  }\n  const targets = Object.values(value).filter(\n    (target): target is string => typeof target === \"string\",\n  );\n  if (targets.length !== 1) {\n    throw new Error(\"package has multiple bins; command.binName is required\");\n  }\n  return resolve(directory, targets[0]!);\n}\n\nfunction readRecord(path: string): Record<string, unknown> {\n  const value: unknown = JSON.parse(readFileSync(path, \"utf8\"));\n  if (!object.isRecord(value)) throw new Error(`package manifest is not an object: ${path}`);\n  return value;\n}\n"]}
|
|
168
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"_package.js","sourceRoot":"","sources":["../../src/_package.ts"],"names":[],"mappings":"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","sourcesContent":["import { existsSync, readFileSync } from \"node:fs\";\nimport { createRequire } from \"node:module\";\nimport { dirname, isAbsolute, join, resolve } from \"node:path\";\nimport { fileURLToPath } from \"node:url\";\n\nimport * as projectUtils from \"@dbx-tools/core/project-utils\";\nimport { object } from \"@dbx-tools/shared-core\";\n\nexport interface ServicePackage {\n  readonly directory: string;\n  readonly name: string;\n  readonly version: string;\n  bin(name?: string): string;\n  dependencies(): Readonly<Record<string, string>>;\n}\n\nexport function resolveServicePackage(\n  reference: string,\n  cwd: string = process.cwd(),\n): ServicePackage {\n  const local = localManifest(reference);\n  if (local) return servicePackage(local);\n\n  const name = reference;\n  const installed = installedManifest(name);\n  if (installed) return servicePackage(installed, name);\n\n  const root = projectUtils.root(cwd);\n  if (!root) throw new Error(`could not resolve package: ${name}`);\n  const manifest = readRecord(join(root, \"package.json\"));\n  const workspaces = Array.isArray(manifest.workspaces) ? manifest.workspaces : [];\n  for (const member of workspaces) {\n    if (typeof member !== \"string\" || /[*?[\\]{}]/.test(member)) continue;\n    const path = join(root, member, \"package.json\");\n    if (!existsSync(path)) continue;\n    const candidate = readRecord(path);\n    if (candidate.name === name) return servicePackage(path, name);\n  }\n  throw new Error(`could not resolve installed or workspace package: ${name}`);\n}\n\nexport function servicePackageDefaults(pkg: ServicePackage): {\n  id: string;\n  name: string;\n} {\n  const segments = pkg.name.replace(/^@/, \"\").split(\"/\");\n  const rawName = segments.at(-1)!;\n  const rawScope = segments.length > 1 ? segments[0]!.split(\"-\")[0]! : \"\";\n  const name = rawName.replace(/^cli-/, \"\").replaceAll(\"-\", \" \");\n  return {\n    id: pkg.name\n      .replace(/^@/, \"\")\n      .replaceAll(\"/\", \".\")\n      .replace(/[^a-z0-9._-]+/gi, \"-\"),\n    name: [rawScope, name].filter(Boolean).join(\" \"),\n  };\n}\n\nfunction localManifest(reference: string): string | undefined {\n  let path: string;\n  if (reference.startsWith(\"file:\")) {\n    path = fileURLToPath(reference);\n  } else if (isAbsolute(reference)) {\n    path = reference;\n  } else {\n    return undefined;\n  }\n  let current = existsSync(path) ? dirname(path) : path;\n  while (true) {\n    const manifest = join(current, \"package.json\");\n    if (existsSync(manifest)) return manifest;\n    const parent = dirname(current);\n    if (parent === current) return undefined;\n    current = parent;\n  }\n}\n\nfunction installedManifest(name: string): string | undefined {\n  return packageManifest(createRequire(import.meta.url), name);\n}\n\nfunction servicePackage(manifestPath: string, expectedName?: string): ServicePackage {\n  const manifest = readRecord(manifestPath);\n  if (typeof manifest.name !== \"string\" || !manifest.name) {\n    throw new Error(`package has no name: ${manifestPath}`);\n  }\n  if (expectedName && manifest.name !== expectedName) {\n    throw new Error(`resolved package name does not match ${expectedName}: ${manifestPath}`);\n  }\n  if (typeof manifest.version !== \"string\" || !manifest.version) {\n    throw new Error(`package has no version: ${manifestPath}`);\n  }\n  const directory = dirname(manifestPath);\n  return {\n    directory,\n    name: manifest.name,\n    version: manifest.version,\n    bin(name) {\n      return resolveBin(directory, manifest.bin, name);\n    },\n    dependencies() {\n      const dependencies = object.isRecord(manifest.dependencies)\n        ? Object.keys(manifest.dependencies)\n        : [];\n      const require = createRequire(manifestPath);\n      return Object.fromEntries(\n        dependencies.map((dependency) => {\n          const path = packageManifest(require, dependency);\n          if (!path) throw new Error(`could not resolve dependency package: ${dependency}`);\n          const resolved = readRecord(path);\n          if (typeof resolved.version !== \"string\" || !resolved.version) {\n            throw new Error(`dependency has no version: ${path}`);\n          }\n          return [dependency, resolved.version];\n        }),\n      );\n    },\n  };\n}\n\n/** Resolve a package manifest without requiring its unexported `package.json` subpath. */\nfunction packageManifest(require: NodeJS.Require, name: string): string | undefined {\n  for (const specifier of [name, `${name}/package.json`]) {\n    try {\n      const entry = require.resolve(specifier);\n      const manifest = namedManifest(entry, name);\n      if (manifest) return manifest;\n    } catch (error) {\n      const code = (error as NodeJS.ErrnoException).code;\n      if (code !== \"MODULE_NOT_FOUND\" && code !== \"ERR_PACKAGE_PATH_NOT_EXPORTED\") throw error;\n    }\n  }\n  for (const directory of require.resolve.paths(name) ?? []) {\n    const manifest = join(directory, name, \"package.json\");\n    if (existsSync(manifest) && readRecord(manifest).name === name) return manifest;\n  }\n  return undefined;\n}\n\n/** Walk from a resolved package entry to the nearest manifest with the expected name. */\nfunction namedManifest(path: string, name: string): string | undefined {\n  let current = dirname(path);\n  while (true) {\n    const manifest = join(current, \"package.json\");\n    if (existsSync(manifest) && readRecord(manifest).name === name) return manifest;\n    const parent = dirname(current);\n    if (parent === current) return undefined;\n    current = parent;\n  }\n}\n\nfunction resolveBin(directory: string, value: unknown, name?: string): string {\n  if (typeof value === \"string\") {\n    if (name) throw new Error(`package exposes one unnamed bin, not ${name}`);\n    return resolve(directory, value);\n  }\n  if (!object.isRecord(value)) throw new Error(\"package has no bin\");\n  if (name) {\n    const target = value[name];\n    if (typeof target !== \"string\") throw new Error(`package has no bin named ${name}`);\n    return resolve(directory, target);\n  }\n  const targets = Object.values(value).filter(\n    (target): target is string => typeof target === \"string\",\n  );\n  if (targets.length !== 1) {\n    throw new Error(\"package has multiple bins; command.binName is required\");\n  }\n  return resolve(directory, targets[0]!);\n}\n\nfunction readRecord(path: string): Record<string, unknown> {\n  const value: unknown = JSON.parse(readFileSync(path, \"utf8\"));\n  if (!object.isRecord(value)) throw new Error(`package manifest is not an object: ${path}`);\n  return value;\n}\n"]}
|
package/package.json
CHANGED
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"typescript": "^5.9.3"
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@dbx-tools/core": "^0.9.
|
|
27
|
-
"@dbx-tools/shared-core": "^0.9.
|
|
26
|
+
"@dbx-tools/core": "^0.9.72",
|
|
27
|
+
"@dbx-tools/shared-core": "^0.9.72",
|
|
28
28
|
"bun": "1.3.14",
|
|
29
29
|
"commander": "^15.0.0",
|
|
30
30
|
"systray2": "^2.1.4",
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
"./package.json": "./package.json"
|
|
61
61
|
}
|
|
62
62
|
},
|
|
63
|
-
"version": "0.9.
|
|
63
|
+
"version": "0.9.72",
|
|
64
64
|
"types": "./lib/index.d.ts",
|
|
65
65
|
"dbxToolsConfig": {
|
|
66
66
|
"tags": [
|
package/src/_package.ts
CHANGED
|
@@ -76,12 +76,7 @@ function localManifest(reference: string): string | undefined {
|
|
|
76
76
|
}
|
|
77
77
|
|
|
78
78
|
function installedManifest(name: string): string | undefined {
|
|
79
|
-
|
|
80
|
-
return createRequire(import.meta.url).resolve(`${name}/package.json`);
|
|
81
|
-
} catch (error) {
|
|
82
|
-
if ((error as NodeJS.ErrnoException).code === "MODULE_NOT_FOUND") return undefined;
|
|
83
|
-
throw error;
|
|
84
|
-
}
|
|
79
|
+
return packageManifest(createRequire(import.meta.url), name);
|
|
85
80
|
}
|
|
86
81
|
|
|
87
82
|
function servicePackage(manifestPath: string, expectedName?: string): ServicePackage {
|
|
@@ -110,7 +105,8 @@ function servicePackage(manifestPath: string, expectedName?: string): ServicePac
|
|
|
110
105
|
const require = createRequire(manifestPath);
|
|
111
106
|
return Object.fromEntries(
|
|
112
107
|
dependencies.map((dependency) => {
|
|
113
|
-
const path = require
|
|
108
|
+
const path = packageManifest(require, dependency);
|
|
109
|
+
if (!path) throw new Error(`could not resolve dependency package: ${dependency}`);
|
|
114
110
|
const resolved = readRecord(path);
|
|
115
111
|
if (typeof resolved.version !== "string" || !resolved.version) {
|
|
116
112
|
throw new Error(`dependency has no version: ${path}`);
|
|
@@ -122,6 +118,37 @@ function servicePackage(manifestPath: string, expectedName?: string): ServicePac
|
|
|
122
118
|
};
|
|
123
119
|
}
|
|
124
120
|
|
|
121
|
+
/** Resolve a package manifest without requiring its unexported `package.json` subpath. */
|
|
122
|
+
function packageManifest(require: NodeJS.Require, name: string): string | undefined {
|
|
123
|
+
for (const specifier of [name, `${name}/package.json`]) {
|
|
124
|
+
try {
|
|
125
|
+
const entry = require.resolve(specifier);
|
|
126
|
+
const manifest = namedManifest(entry, name);
|
|
127
|
+
if (manifest) return manifest;
|
|
128
|
+
} catch (error) {
|
|
129
|
+
const code = (error as NodeJS.ErrnoException).code;
|
|
130
|
+
if (code !== "MODULE_NOT_FOUND" && code !== "ERR_PACKAGE_PATH_NOT_EXPORTED") throw error;
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
for (const directory of require.resolve.paths(name) ?? []) {
|
|
134
|
+
const manifest = join(directory, name, "package.json");
|
|
135
|
+
if (existsSync(manifest) && readRecord(manifest).name === name) return manifest;
|
|
136
|
+
}
|
|
137
|
+
return undefined;
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
/** Walk from a resolved package entry to the nearest manifest with the expected name. */
|
|
141
|
+
function namedManifest(path: string, name: string): string | undefined {
|
|
142
|
+
let current = dirname(path);
|
|
143
|
+
while (true) {
|
|
144
|
+
const manifest = join(current, "package.json");
|
|
145
|
+
if (existsSync(manifest) && readRecord(manifest).name === name) return manifest;
|
|
146
|
+
const parent = dirname(current);
|
|
147
|
+
if (parent === current) return undefined;
|
|
148
|
+
current = parent;
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
|
|
125
152
|
function resolveBin(directory: string, value: unknown, name?: string): string {
|
|
126
153
|
if (typeof value === "string") {
|
|
127
154
|
if (name) throw new Error(`package exposes one unnamed bin, not ${name}`);
|