@atscript/db-client 0.1.134 → 0.1.136

package/dist/index.cjs

@@ -132,7 +132,7 @@ var Client = class {
 	_lenientWrites;
 	_metaPromise;
 	_validatorPromise;
-	/** Cached deserialized form schemas keyed by form name. */
+	/** Cached deserialized form schemas keyed by resolved URL. */
 	_formCache = /* @__PURE__ */ new Map();
 	constructor(path, opts) {
 		this._path = path.endsWith("/") ? path.slice(0, -1) : path;
@@ -333,20 +333,25 @@ var Client = class {
 	* returned annotated type to a form-renderer (e.g. `@atscript/ui` form
 	* components) and then submit the collected payload through
 	* {@link action}'s `input` argument.
+	*
+	* The schema comes from this controller's `meta/form/:name`, or — when the
+	* action carries `formUrl` — from `baseUrl + formUrl`.
+	* Cached per resolved URL.
 	*/
 	async getActionForm(actionName) {
 		const action = (await this.meta()).actions.find((a) => a.name === actionName);
 		if (!action?.inputForm) return null;
-		return this._loadActionForm(action.inputForm);
+		const url = action.formUrl ? `${this._baseUrl}${action.formUrl}` : this._endpointUrl(`meta/form/${encodeURIComponent(action.inputForm)}`);
+		return this._loadActionForm(url);
 	}
-	_loadActionForm(formName) {
-		let p = this._formCache.get(formName);
+	_loadActionForm(url) {
+		let p = this._formCache.get(url);
 		if (!p) {
-			p = this._request("GET", `meta/form/${encodeURIComponent(formName)}`).then((schema) => (0, _atscript_typescript_utils.deserializeAnnotatedType)(schema)).catch((err) => {
-				this._formCache.delete(formName);
+			p = this._requestUrl("GET", url).then((schema) => (0, _atscript_typescript_utils.deserializeAnnotatedType)(schema)).catch((err) => {
+				this._formCache.delete(url);
 				throw err;
 			});
-			this._formCache.set(formName, p);
+			this._formCache.set(url, p);
 		}
 		return p;
 	}
@@ -408,10 +413,8 @@ var Client = class {
 		}
 		throw new ActionUnsupportedError(action.name, "navigate", `Action "${action.name}" is processor: 'navigate' but no browser is available and no \`navigate\` option was provided to Client.`);
 	}
-	async _postAction(action, body) {
-		const url = `${this._baseUrl}${action.value}`;
-		const init = await this._buildInit("POST", body);
-		return this._send(url, init, true);
+	_postAction(action, body) {
+		return this._requestUrl("POST", `${this._baseUrl}${action.value}`, body, true);
 	}
 	_idToParams(id) {
 		const params = new URLSearchParams();
@@ -435,13 +438,16 @@ var Client = class {
 		if (typeof this._headers === "function") return await this._headers();
 		return this._headers;
 	}
-	async _request(method, endpoint, body) {
+	_request(method, endpoint, body) {
+		return this._requestUrl(method, this._endpointUrl(endpoint), body);
+	}
+	/** `baseUrl + path` joined with an endpoint relative to this controller (`""`, `meta`, `?q`…). */
+	_endpointUrl(endpoint) {
 		const sep = endpoint && !endpoint.startsWith("?") ? "/" : "";
-		const url = `${this._baseUrl}${this._path}${sep}${endpoint}`;
-		const init = await this._buildInit(method, body);
-		return this._send(url, init, false);
+		return `${this._baseUrl}${this._path}${sep}${endpoint}`;
 	}
-	async _buildInit(method, body) {
+	/** Sends one request to an absolute URL with the client's headers and a JSON body. */
+	async _requestUrl(method, url, body, allowEmpty = false) {
 		const headers = { ...await this._resolveHeaders() };
 		const init = {
 			method,
@@ -451,7 +457,7 @@ var Client = class {
 			headers["Content-Type"] = "application/json";
 			init.body = JSON.stringify(body);
 		}
-		return init;
+		return this._send(url, init, allowEmpty);
 	}
 	async _send(url, init, allowEmpty) {
 		const method = init.method ?? "GET";

package/dist/index.d.cts

@@ -38,7 +38,7 @@ declare class Client<T extends AtscriptClientShape = AtscriptClientShape> {
   private readonly _lenientWrites?;
   private _metaPromise?;
   private _validatorPromise?;
-  /** Cached deserialized form schemas keyed by form name. */
+  /** Cached deserialized form schemas keyed by resolved URL. */
   private _formCache;
   constructor(path: string, opts?: ClientOptions);
   /**
@@ -178,6 +178,10 @@ declare class Client<T extends AtscriptClientShape = AtscriptClientShape> {
    * returned annotated type to a form-renderer (e.g. `@atscript/ui` form
    * components) and then submit the collected payload through
    * {@link action}'s `input` argument.
+   *
+   * The schema comes from this controller's `meta/form/:name`, or — when the
+   * action carries `formUrl` — from `baseUrl + formUrl`.
+   * Cached per resolved URL.
    */
   getActionForm(actionName: string): Promise<TAtscriptAnnotatedType | null>;
   private _loadActionForm;
@@ -198,7 +202,10 @@ declare class Client<T extends AtscriptClientShape = AtscriptClientShape> {
   private _get;
   private _resolveHeaders;
   private _request;
-  private _buildInit;
+  /** `baseUrl + path` joined with an endpoint relative to this controller (`""`, `meta`, `?q`…). */
+  private _endpointUrl;
+  /** Sends one request to an absolute URL with the client's headers and a JSON body. */
+  private _requestUrl;
   private _send;
 }
 /**

package/dist/index.d.mts

@@ -38,7 +38,7 @@ declare class Client<T extends AtscriptClientShape = AtscriptClientShape> {
   private readonly _lenientWrites?;
   private _metaPromise?;
   private _validatorPromise?;
-  /** Cached deserialized form schemas keyed by form name. */
+  /** Cached deserialized form schemas keyed by resolved URL. */
   private _formCache;
   constructor(path: string, opts?: ClientOptions);
   /**
@@ -178,6 +178,10 @@ declare class Client<T extends AtscriptClientShape = AtscriptClientShape> {
    * returned annotated type to a form-renderer (e.g. `@atscript/ui` form
    * components) and then submit the collected payload through
    * {@link action}'s `input` argument.
+   *
+   * The schema comes from this controller's `meta/form/:name`, or — when the
+   * action carries `formUrl` — from `baseUrl + formUrl`.
+   * Cached per resolved URL.
    */
   getActionForm(actionName: string): Promise<TAtscriptAnnotatedType | null>;
   private _loadActionForm;
@@ -198,7 +202,10 @@ declare class Client<T extends AtscriptClientShape = AtscriptClientShape> {
   private _get;
   private _resolveHeaders;
   private _request;
-  private _buildInit;
+  /** `baseUrl + path` joined with an endpoint relative to this controller (`""`, `meta`, `?q`…). */
+  private _endpointUrl;
+  /** Sends one request to an absolute URL with the client's headers and a JSON body. */
+  private _requestUrl;
   private _send;
 }
 /**

package/dist/index.mjs

@@ -131,7 +131,7 @@ var Client = class {
 	_lenientWrites;
 	_metaPromise;
 	_validatorPromise;
-	/** Cached deserialized form schemas keyed by form name. */
+	/** Cached deserialized form schemas keyed by resolved URL. */
 	_formCache = /* @__PURE__ */ new Map();
 	constructor(path, opts) {
 		this._path = path.endsWith("/") ? path.slice(0, -1) : path;
@@ -332,20 +332,25 @@ var Client = class {
 	* returned annotated type to a form-renderer (e.g. `@atscript/ui` form
 	* components) and then submit the collected payload through
 	* {@link action}'s `input` argument.
+	*
+	* The schema comes from this controller's `meta/form/:name`, or — when the
+	* action carries `formUrl` — from `baseUrl + formUrl`.
+	* Cached per resolved URL.
 	*/
 	async getActionForm(actionName) {
 		const action = (await this.meta()).actions.find((a) => a.name === actionName);
 		if (!action?.inputForm) return null;
-		return this._loadActionForm(action.inputForm);
+		const url = action.formUrl ? `${this._baseUrl}${action.formUrl}` : this._endpointUrl(`meta/form/${encodeURIComponent(action.inputForm)}`);
+		return this._loadActionForm(url);
 	}
-	_loadActionForm(formName) {
-		let p = this._formCache.get(formName);
+	_loadActionForm(url) {
+		let p = this._formCache.get(url);
 		if (!p) {
-			p = this._request("GET", `meta/form/${encodeURIComponent(formName)}`).then((schema) => deserializeAnnotatedType(schema)).catch((err) => {
-				this._formCache.delete(formName);
+			p = this._requestUrl("GET", url).then((schema) => deserializeAnnotatedType(schema)).catch((err) => {
+				this._formCache.delete(url);
 				throw err;
 			});
-			this._formCache.set(formName, p);
+			this._formCache.set(url, p);
 		}
 		return p;
 	}
@@ -407,10 +412,8 @@ var Client = class {
 		}
 		throw new ActionUnsupportedError(action.name, "navigate", `Action "${action.name}" is processor: 'navigate' but no browser is available and no \`navigate\` option was provided to Client.`);
 	}
-	async _postAction(action, body) {
-		const url = `${this._baseUrl}${action.value}`;
-		const init = await this._buildInit("POST", body);
-		return this._send(url, init, true);
+	_postAction(action, body) {
+		return this._requestUrl("POST", `${this._baseUrl}${action.value}`, body, true);
 	}
 	_idToParams(id) {
 		const params = new URLSearchParams();
@@ -434,13 +437,16 @@ var Client = class {
 		if (typeof this._headers === "function") return await this._headers();
 		return this._headers;
 	}
-	async _request(method, endpoint, body) {
+	_request(method, endpoint, body) {
+		return this._requestUrl(method, this._endpointUrl(endpoint), body);
+	}
+	/** `baseUrl + path` joined with an endpoint relative to this controller (`""`, `meta`, `?q`…). */
+	_endpointUrl(endpoint) {
 		const sep = endpoint && !endpoint.startsWith("?") ? "/" : "";
-		const url = `${this._baseUrl}${this._path}${sep}${endpoint}`;
-		const init = await this._buildInit(method, body);
-		return this._send(url, init, false);
+		return `${this._baseUrl}${this._path}${sep}${endpoint}`;
 	}
-	async _buildInit(method, body) {
+	/** Sends one request to an absolute URL with the client's headers and a JSON body. */
+	async _requestUrl(method, url, body, allowEmpty = false) {
 		const headers = { ...await this._resolveHeaders() };
 		const init = {
 			method,
@@ -450,7 +456,7 @@ var Client = class {
 			headers["Content-Type"] = "application/json";
 			init.body = JSON.stringify(body);
 		}
-		return init;
+		return this._send(url, init, allowEmpty);
 	}
 	async _send(url, init, allowEmpty) {
 		const method = init.method ?? "GET";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-client",
-  "version": "0.1.134",
+  "version": "0.1.136",
   "description": "Browser-compatible HTTP client for @atscript/moost-db REST endpoints.",
   "keywords": [
     "atscript",
@@ -43,14 +43,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@uniqu/core": "^0.1.10",
-    "@uniqu/url": "^0.1.10"
+    "@uniqu/core": "^0.1.11",
+    "@uniqu/url": "^0.1.11"
   },
   "devDependencies": {
     "@atscript/core": "^0.1.92",
     "@atscript/typescript": "^0.1.92",
     "unplugin-atscript": "^0.1.92",
-    "@atscript/db": "0.1.134"
+    "@atscript/db": "0.1.136"
   },
   "peerDependencies": {
     "@atscript/db": "^0.1.44",