dropsh 0.7.0 → 0.7.2

package/README.md

@@ -235,10 +235,14 @@ environment variable:
 | 2 | `--connection <id>` | names an **entry** |
 | 3 | `$DROPSH_CONFIG` | names a **file** |
 | 4 | `$DROPSH_CONNECTION` | names an **entry** |
-| 5 | `./dropsh.config.js` | the cwd default |
+| 5 | existing default config | `./dropsh.config.js` by default |
+| 6 | sole named connection | only when the default is absent |
+| 7 | default config path | lets loading report the missing config |
 
 `--config` and `--connection` given together is not an error: `--config` names a
-file and wins.
+file and wins. When no selector is set and the default config does not exist,
+exactly one `.js` file in the connections directory is selected automatically.
+Two or more named connections remain ambiguous and require a selector.
 
 An unknown id is a hard error — non-zero exit, naming the id, the directory
 searched and the available ids. Nothing is prompted and nothing is created, so
@@ -662,6 +666,35 @@ export default {
 `@dropsh/plugin-*` packages), so `import { DropSHPlugin } from "dropsh/plugin"`
 is typed with no ambient `declare module`.
 
+The connection-resolution API is available to embedders as well:
+
+```ts
+import {
+  resolveConfigSource,
+  resolveConnectionsDir,
+} from "dropsh/plugin";
+
+const connectionsDir = resolveConnectionsDir({
+  flag: "/home/me/.config/dropsh/connections",
+});
+const config = resolveConfigSource({
+  connection: "staging",
+  connectionsDir,
+});
+// config.path and config.source identify the selected config file and selector.
+```
+
+Embedders whose default config is not `./dropsh.config.js` can pass its path as
+`defaultConfig`. An existing default wins over implicit sole-connection
+selection; when it is absent, a sole named connection is selected instead.
+
+The same entry point also exports `CWD_CONFIG_FILE`, `listConnectionIds`, and
+`listConnections`, plus the `ConfigSource`, `ConfigSourceKind`,
+`ConnectionEntry`, `ResolveConfigSourceInput`, and `ResolveConnectionsDirInput`
+types. These exports use the same selector precedence and connections-directory
+semantics as the CLI; see [Named connections](#named-connections--one-config-file-per-site)
+for the full documentation.
+
 ### Composing plugins
 
 `composePlugins(...children)` bundles several plugins into one flat list, so an

package/dist/src/core/config.js

@@ -176,6 +176,14 @@ async function importConfig(filePath) {
         throw new ConfigError("site section missing");
     if (typeof site.base_url !== "string" || site.base_url.length === 0)
         throw new ConfigError("site.base_url required");
+    // Reject rather than silently trim, so the persisted config stays canonical.
+    // A trailing slash survives into every string-concatenated URL a consumer
+    // builds from base_url — notably `${base_url}/oauth/token` — where the doubled
+    // slash addresses a route that is not the token endpoint (DROPSH-13).
+    if (site.base_url.endsWith("/")) {
+        const corrected = site.base_url.replace(/\/+$/, "");
+        throw new ConfigError(`site.base_url must not end with a trailing slash — set it to ${corrected}`);
+    }
     return {
         configPath,
         raw,

package/dist/src/core/connections.d.ts

@@ -1,7 +1,7 @@
 /** The name of the config file dropsh falls back to in the current directory. */
 export declare const CWD_CONFIG_FILE = "dropsh.config.js";
 /** Which selector produced the resolved config path. */
-export type ConfigSourceKind = "flag-config" | "flag-connection" | "env-config" | "env-connection" | "cwd";
+export type ConfigSourceKind = "flag-config" | "flag-connection" | "env-config" | "env-connection" | "default-config" | "sole-connection" | "cwd";
 /** The chosen config file plus the provenance of that choice. */
 export interface ConfigSource {
     path: string;
@@ -25,6 +25,8 @@ export interface ResolveConfigSourceInput {
     config?: string | undefined;
     /** `--connection <id>`. */
     connection?: string | undefined;
+    /** Embedder-owned default config, used ahead of an implicit sole connection. */
+    defaultConfig?: string | undefined;
     connectionsDir?: string;
     env?: NodeJS.ProcessEnv;
     cwd?: string;
@@ -32,8 +34,10 @@ export interface ResolveConfigSourceInput {
 /**
  * Resolve the config file for this invocation, highest selector first:
  * `--config` > `--connection` > `$DROPSH_CONFIG` > `$DROPSH_CONNECTION` >
- * `./dropsh.config.js`. `--config` and `--connection` together is not an error:
- * `--config` names a *file* and that is its stated meaning, so it wins silently.
+ * an existing default config > the sole named connection > the default path.
+ * The default path is `./dropsh.config.js`. `--config` and `--connection`
+ * together is not an error: `--config` names a *file* and that is its stated
+ * meaning, so it wins silently.
  *
  * Returns the path *and* its provenance, so every caller — the command context,
  * the auth wiring, the pre-parse plugin bootstrap and `connections list` — reads

package/dist/src/core/connections.js

@@ -26,8 +26,8 @@ function toIds(entries) {
 }
 /**
  * Sorted ids of the `.js` files in `dir`; `[]` when the directory is absent.
- * Synchronous because it is only reached on the unknown-id error path, and the
- * resolver itself has to stay synchronous for the commander option wiring.
+ * Synchronous because the resolver uses it for implicit sole-connection
+ * selection and has to stay synchronous for the commander option wiring.
  */
 function listConnectionIdsSync(dir) {
     try {
@@ -40,8 +40,10 @@ function listConnectionIdsSync(dir) {
 /**
  * Resolve the config file for this invocation, highest selector first:
  * `--config` > `--connection` > `$DROPSH_CONFIG` > `$DROPSH_CONNECTION` >
- * `./dropsh.config.js`. `--config` and `--connection` together is not an error:
- * `--config` names a *file* and that is its stated meaning, so it wins silently.
+ * an existing default config > the sole named connection > the default path.
+ * The default path is `./dropsh.config.js`. `--config` and `--connection`
+ * together is not an error: `--config` names a *file* and that is its stated
+ * meaning, so it wins silently.
  *
  * Returns the path *and* its provenance, so every caller — the command context,
  * the auth wiring, the pre-parse plugin bootstrap and `connections list` — reads
@@ -66,7 +68,17 @@ export function resolveConfigSource(input = {}) {
         const id = env.DROPSH_CONNECTION;
         return { path: requireConnection(dir, id), source: "env-connection", id };
     }
-    return { path: join(cwd, CWD_CONFIG_FILE), source: "cwd" };
+    const defaultConfig = input.defaultConfig ?? join(cwd, CWD_CONFIG_FILE);
+    const defaultSource = input.defaultConfig === undefined ? "cwd" : "default-config";
+    if (existsSync(defaultConfig))
+        return { path: defaultConfig, source: defaultSource };
+    const available = listConnectionIdsSync(dir);
+    if (available.length === 1) {
+        const id = available[0];
+        if (id)
+            return { path: connectionPath(dir, id), source: "sole-connection", id };
+    }
+    return { path: defaultConfig, source: defaultSource };
 }
 /**
  * The path of connection `id`, or a `ConfigError` naming the id, the directory

package/dist/src/plugin-api.d.ts

@@ -5,6 +5,8 @@ export type { AnyRenderer, InteractiveRenderer, RenderContext, Renderer, RenderS
 export { indexIncluded, isInteractive } from "./core/cli/render.js";
 export type { Config, SiteConfig } from "./core/config.js";
 export { loadConfig } from "./core/config.js";
+export type { ConfigSource, ConfigSourceKind, ConnectionEntry, ResolveConfigSourceInput, ResolveConnectionsDirInput, } from "./core/connections.js";
+export { CWD_CONFIG_FILE, listConnectionIds, listConnections, resolveConfigSource, resolveConnectionsDir, } from "./core/connections.js";
 export type { HttpClient, HttpRequest } from "./core/http.js";
 export { createHttpClient } from "./core/http.js";
 export type { DropSHOperation, JsonApiClient, JsonApiOptions, ResourceWriteBody, } from "./core/jsonapi/client.js";

package/dist/src/plugin-api.js

@@ -1,6 +1,7 @@
 export { basicAuthPlugin, basicAuthProvider } from "./core/auth/basic.js";
 export { indexIncluded, isInteractive } from "./core/cli/render.js";
 export { loadConfig } from "./core/config.js";
+export { CWD_CONFIG_FILE, listConnectionIds, listConnections, resolveConfigSource, resolveConnectionsDir, } from "./core/connections.js";
 export { createHttpClient } from "./core/http.js";
 export { createJsonApiClient } from "./core/jsonapi/client.js";
 export { buildPayloadFromParameters } from "./core/params/from-parameters.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dropsh",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "Entity-agnostic helper CLI for Drupal 11 JSON:API, used by the dropsh Claude skill for editorial publishing workflows.",
   "type": "module",
   "bin": {