@diephp/vue-apix 0.1.2 → 0.1.4

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/README.md CHANGED
@@ -41,6 +41,12 @@ apix.setHeader({
41
41
  'x-app': 'admin',
42
42
  });
43
43
 
44
+ // Header names are case-insensitive ('Content-Type' and 'content-type' are the same key).
45
+ // Content-Type is auto-set to application/json only when a request has a JSON body and
46
+ // you haven't configured it yourself; configure it explicitly to send it on every request
47
+ // (including GET). For FormData bodies any content-type is dropped so the browser can
48
+ // set the multipart boundary.
49
+
44
50
  // fires with true when the first request starts, false when the last one ends —
45
51
  // perfect for a global progress bar / spinner
46
52
  apix.onProcessing((active) => progressBar.toggle(active));
@@ -222,7 +228,8 @@ const submit = () =>
222
228
  | `model.setErrors(errors)` / `model.clearErrors(keys?)` | manage errors manually |
223
229
  | `model.reset(keys?)` | restore the snapshot: first server response, else `default()`; `reset(['name'])` for specific paths |
224
230
  | `model.post/put/patch/delete(url?, opts?)` | submit `model.data` (or `opts.data` / `opts.only: ['name']`), returns the response Promise |
225
- | `model.reload(url?)` | re-run the fill request |
231
+ | `model.reload(url?)` | re-run the fill request as configured (fresh load — ignores watch payload) |
232
+ | `model.refresh()` | re-send the fill request with the CURRENT state — a manual watch trigger for a "Search" button |
226
233
  | `model.watch(paths?, opts?)` / `model.unwatch()` | auto-refetch on change, see below |
227
234
  | `model.transformResponse(fn)` / `model.transformRequest(fn)` | reshape server data ↔ model data, see below |
228
235
 
@@ -233,8 +240,42 @@ treated as validation errors — only `model.message` is surfaced.
233
240
 
234
241
  **Reserved names.** These model members always win over data keys:
235
242
  `data, errors, message, processing, hasErrors, isDirty, get, error, setData, setErrors,
236
- clearErrors, reset, post, put, patch, delete, reload, watch, unwatch, transformRequest,
237
- transformResponse`. A data field with such a name is still there — via `model.data.<key>`.
243
+ clearErrors, reset, post, put, patch, delete, reload, refresh, watch, unwatch,
244
+ transformRequest, transformResponse`. A data field with such a name is still there —
245
+ via `model.data.<key>`.
246
+
247
+ ## Passing a model to a child component
248
+
249
+ A model is a plain object reference — hand it to a child and every mutation stays shared
250
+ and reactive. Two equivalent ways:
251
+
252
+ ```ts
253
+ // ChildForm.vue — via defineModel (parent: <ChildForm v-model="model" />)
254
+ import type { Model } from '@diephp/vue-apix';
255
+
256
+ // type it through the macro GENERIC — not a cast on the left side,
257
+ // otherwise .value loses the model members (errors, processing, data…)
258
+ const form = defineModel<Model<AttrDto>>({ required: true });
259
+ ```
260
+
261
+ ```ts
262
+ // ChildForm.vue — via a plain prop (parent: <ChildForm :form="model" />)
263
+ import type { Model } from '@diephp/vue-apix';
264
+
265
+ const props = defineProps<{ form: Model<AttrDto> }>();
266
+ ```
267
+
268
+ ```html
269
+ <!-- child template is identical either way -->
270
+ <el-form-item label="Name" :error="form.errors.name">
271
+ <el-input v-model="form.name" clearable />
272
+ </el-form-item>
273
+ ```
274
+
275
+ One rule with `defineModel`: never REPLACE the model from the child
276
+ (`form.value = ...`) — mutate it instead (`form.value.setData(...)`, `form.value.reset()`).
277
+ The child mutates the same model instance the parent owns, so a separate `:errors` prop
278
+ is unnecessary — `form.errors` is already reactive inside the child.
238
279
 
239
280
  ## watch() — filters, pagination, live search
240
281
 
@@ -329,6 +370,9 @@ How `watch()` behaves:
329
370
  - **Debounce** (`debounce: 300`) collapses fast typing into one request.
330
371
  - `reset()` restores the first-response snapshot; if that actually changes watched data,
331
372
  the request is re-sent — reset filters, the table refreshes itself.
373
+ - **A "Search" button is `model.refresh()`** — it re-sends the request with the current
374
+ watched values (and cancels a pending debounce). `model.reload()` is different: it
375
+ re-runs the ORIGINAL fill request without the watch payload, i.e. it resets the view.
332
376
  - **Watch server-owned fields precisely**: `['filters', 'paginator.page']`, not
333
377
  `['paginator']` — a watched path is preserved from responses, so watching the whole
334
378
  `paginator` would freeze `paginator.total` at its first value.
package/dist/model.d.ts CHANGED
@@ -14,7 +14,7 @@ interface ModelState {
14
14
  * Reserved members (always win over data keys, use `model.data.<key>` for those):
15
15
  * data, errors, message, processing, hasErrors, isDirty,
16
16
  * get, error, setData, setErrors, clearErrors, reset,
17
- * post, put, patch, delete, reload, watch, unwatch,
17
+ * post, put, patch, delete, reload, refresh, watch, unwatch,
18
18
  * transformRequest, transformResponse.
19
19
  */
20
20
  export declare class ApixModel<T = any> {
@@ -71,6 +71,13 @@ export declare class ApixModel<T = any> {
71
71
  delete(url?: string, options?: SubmitOptions): Promise<any>;
72
72
  /** Re-run the fill request (or set a new source URL and run it). */
73
73
  reload(url?: string): Promise<any>;
74
+ /**
75
+ * Re-send the fill request with the CURRENT state — a manual watch trigger
76
+ * (a "Search" button next to filters). Sends the watched paths as payload and
77
+ * preserves them in the response, exactly like a watch-triggered request; any
78
+ * pending debounce is cancelled. Without an active watch() it equals reload().
79
+ */
80
+ refresh(): Promise<any>;
74
81
  /**
75
82
  * Map server data into the model shape. Runs on every fill (initial, reload,
76
83
  * watch) AFTER path extraction and BEFORE the reactive data is touched — so it
@@ -104,6 +111,8 @@ export declare class ApixModel<T = any> {
104
111
  private _submit;
105
112
  private _onWatchTrigger;
106
113
  private _sendWatchRequest;
114
+ /** Build the fill() extra for a watch-shaped request from the current state. */
115
+ private _watchExtra;
107
116
  private _payloadJson;
108
117
  private _syncLastSent;
109
118
  }
package/dist/vue-apix.cjs CHANGED
@@ -1 +1 @@
1
- "use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const _=require("vue");function c(i){const t=_.toRaw(i);if(t===null||typeof t!="object")return t;if(Array.isArray(t))return t.map(s=>c(s));if(t instanceof Date)return new Date(t.getTime());const e=Object.getPrototypeOf(t);if(e===Object.prototype||e===null){const s={};for(const r of Object.keys(t))s[r]=c(t[r]);return s}return t}function b(i){if(i===null||typeof i!="object")return!1;const t=Object.getPrototypeOf(i);return t===Object.prototype||t===null}function A(i,t){if(!b(t))return i===void 0?c(t):i;if(i==null)return c(t);if(!b(i))return i;for(const e of Object.keys(t))i[e]=e in i?A(i[e],t[e]):c(t[e]);return i}function f(i,t){if(i==null)return;let e=i;for(const s of t.split(".")){if(e==null)return;e=e[s]}return e}function m(i,t,e){const s=t.split(".");let r=i;for(let o=0;o<s.length-1;o++){const a=s[o];(r[a]===null||typeof r[a]!="object")&&(r[a]={}),r=r[a]}r[s[s.length-1]]=e}function w(i,t){const e={};for(const s of t){const r=f(i,s);r!==void 0&&m(e,s,c(r))}return e}function x(i){const t={};for(const[e,s]of Object.entries(i??{}))s!=null&&(t[e]=Array.isArray(s)?String(s[0]):String(s));return t}function p(i){return i&&typeof i=="object"&&typeof i.message=="string"?i.message:null}function S(i,t){const e=i&&typeof i=="object"&&!Array.isArray(i)&&"data"in i?i.data:i;return t?f(e,t):e}class y extends Error{constructor(t,e,s){super(p(e)??`Request failed with status ${t}`),this.name="ApixError",this.status=t,this.body=e,this.response=s,this.errors=e&&typeof e=="object"&&e.errors&&typeof e.errors=="object"?e.errors:{}}get isValidationError(){return this.status>=400&&this.status<500&&Object.keys(this.errors).length>0}}function R(i){return i instanceof Error&&i.name==="AbortError"}function T(i){const t=[],e=(r,o)=>{t.push(`${encodeURIComponent(r)}=${encodeURIComponent(o)}`)},s=(r,o)=>{if(r!=null){if(typeof r=="boolean")return e(o,r?"1":"0");if(r instanceof Date)return e(o,r.toISOString());if(Array.isArray(r)){r.forEach((a,n)=>s(a,`${o}[${n}]`));return}if(typeof r=="object"){for(const[a,n]of Object.entries(r))s(n,`${o}[${a}]`);return}e(o,String(r))}};for(const[r,o]of Object.entries(i))s(o,r);return t.join("&")}async function k(i){if(i.status===204)return null;const t=await i.text();if(!t)return null;try{return JSON.parse(t)}catch{return t}}class v{constructor(t,e={},s=null){this._snapshot=null,this._snapshotLocked=!1,this._stopWatch=null,this._debounceTimer=null,this._watched=null,this._watchOptions={},this._lastSent=null,this._fillAbort=null,this._transformResponse=null,this._transformRequest=null,this._apix=t,this._options=e,this._source=s,this._transformResponse=e.transformResponse??null,this._transformRequest=e.transformRequest??null;const r=e.default?e.default():null;this._state=_.reactive({data:r,errors:{},message:null,processing:!1}),this._snapshot=c(r)}get data(){return this._state.data}set data(t){this._state.data=t}get errors(){return this._state.errors}get message(){return this._state.message}get processing(){return this._state.processing}get hasErrors(){return Object.keys(this._state.errors).length>0}get isDirty(){return JSON.stringify(this._state.data)!==JSON.stringify(this._snapshot)}get(t){return c(f(this._state.data,t))}setData(t){return this._state.data=c(t),this._proxy}error(t){const e=this._state.errors;if(e[t]!==void 0)return e[t];const s=`${t}.`;for(const r of Object.keys(e))if(r.startsWith(s))return e[r]}setErrors(t){return this._state.errors=x(t),this._proxy}clearErrors(t){if(!t)return this._state.errors={},this._proxy;for(const e of t){const s=`${e}.`;for(const r of Object.keys(this._state.errors))(r===e||r.startsWith(s))&&delete this._state.errors[r]}return this._proxy}reset(t){if(t===void 0||Array.isArray(t)&&t.length===0)return this._state.data=c(this._snapshot),this._state.errors={},this._state.message=null,this._proxy;const e=Array.isArray(t)?t:[t];if(this._state.data&&typeof this._state.data=="object")for(const s of e)m(this._state.data,s,c(f(this._snapshot,s)));return this.clearErrors(e),this._proxy}post(t,e){return this._submit("post",t,e)}put(t,e){return this._submit("put",t,e)}patch(t,e){return this._submit("patch",t,e)}delete(t,e){return this._submit("delete",t,e)}reload(t){var e;return t&&(this._source={url:t,method:((e=this._source)==null?void 0:e.method)??"get"}),this._source?this._fill():Promise.reject(new Error("[vue-apix] The model has no source URL. Use apix.getForm(url) or model.reload(url)."))}transformResponse(t){return this._transformResponse=t,this._proxy}transformRequest(t){return this._transformRequest=t,this._proxy}watch(t,e){let s=null,r;Array.isArray(t)?(s=t,r=e??{}):r=t??e??{},this._source||console.warn("[vue-apix] model.watch() has no effect until the model has a source URL (getForm/postForm/reload)."),this.unwatch(),this._watched=s,this._watchOptions=r,this._syncLastSent();const o=s&&s.length?s.map(a=>()=>f(this._state.data,a)):()=>this._state.data;return this._stopWatch=_.watch(o,()=>this._onWatchTrigger(),{deep:r.deep??!0}),this._proxy}unwatch(){var t;return(t=this._stopWatch)==null||t.call(this),this._stopWatch=null,this._debounceTimer&&(clearTimeout(this._debounceTimer),this._debounceTimer=null),this._proxy}async _fill(t={}){var o,a,n,h,l;const e=this._source;(o=this._fillAbort)==null||o.abort();const s=new AbortController;this._fillAbort=s,this._state.processing=!0;const r={signal:s.signal};e.method==="get"?r.params={...this._options.params,...t.params}:(r.params=this._options.params,r.data=t.data!==void 0?t.data:this._options.data);try{const u=await this._apix.request(e.method,e.url,r);let d=S(u,this._options.path);if(this._transformResponse){const g=c(d);d=this._transformResponse(g,u)??g}return this._applyFill(d,t.preserve??null),this._state.message=p(u),this._state.errors={},(n=(a=this._options).onSuccess)==null||n.call(a,u,this._proxy),u}catch(u){throw R(u)||(this._applyError(u),(l=(h=this._options).onError)==null||l.call(h,u,this._proxy)),u}finally{this._fillAbort===s&&(this._fillAbort=null,this._state.processing=!1)}}_applyFill(t,e){let s=c(t);this._options.mergeDefaults!==!1&&this._options.default&&(s=A(s,this._options.default()));const r=this._snapshotLocked?null:c(s);if(e&&e.length&&s&&typeof s=="object"&&this._state.data&&typeof this._state.data=="object")for(const o of e){const a=f(this._state.data,o);a!==void 0&&m(s,o,c(a))}this._state.data=s,this._snapshotLocked||(this._snapshot=r,this._snapshotLocked=!0),this._syncLastSent()}_applyError(t){t instanceof y&&(this._state.message=p(t.body)??t.message,t.isValidationError&&(this._state.errors=x(t.errors)))}async _submit(t,e,s={}){var a;const r=e??((a=this._source)==null?void 0:a.url);if(!r)throw new Error(`[vue-apix] The model has no URL. Pass one explicitly: model.${t}(url).`);let o=s.data!==void 0?s.data:s.only?w(this._state.data,s.only):this._state.data??void 0;if(s.data===void 0&&this._transformRequest&&o!==void 0){const n=c(o);o=this._transformRequest(n)??n}this._state.processing=!0,this._state.errors={},this._state.message=null;try{const n=await this._apix.request(t,r,{data:o,params:s.params,headers:s.headers});return this._state.message=p(n),n}catch(n){throw this._applyError(n),n}finally{this._state.processing=!1}}_onWatchTrigger(){if(this._payloadJson()===this._lastSent)return;this._debounceTimer&&clearTimeout(this._debounceTimer);const t=this._watchOptions.debounce??0;t>0?this._debounceTimer=setTimeout(()=>this._sendWatchRequest(),t):this._sendWatchRequest()}_sendWatchRequest(){if(this._debounceTimer=null,!this._source)return;const t=this._watched,e=this._watchOptions.payload??t;let s=e&&e.length?w(this._state.data,e):c(this._state.data);this._transformRequest&&(s=this._transformRequest(s)??s),this._lastSent=this._payloadJson();const r=this._watchOptions.refreshWatched?null:t,o=this._source.method==="get"?{params:s,preserve:r}:{data:s,preserve:r};this._fill(o).catch(()=>{})}_payloadJson(){const t=this._watched,e=t&&t.length?t.map(s=>f(this._state.data,s)):this._state.data;return JSON.stringify(e)??"undefined"}_syncLastSent(){this._lastSent=this._payloadJson()}}function j(i,t={},e=null){const s=new v(i,t,e),r=new Proxy(s,{get(o,a){if(typeof a=="symbol"||a in o)return Reflect.get(o,a);const n=o._state.data;if(n&&typeof n=="object")return n[a]},set(o,a,n){if(typeof a=="symbol"||a in o)return Reflect.set(o,a,n);const h=o._state.data;return h&&typeof h=="object"?(h[a]=n,!0):(o._state.data={[a]:n},!0)},has(o,a){if(a in o)return!0;const n=o._state.data;return!!n&&typeof n=="object"&&a in n}});return s._proxy=r,e&&t.immediate!==!1&&r.reload().catch(()=>{}),r}class E{constructor(t={}){this.baseUrl="",this.headers={},this.processingHooks=[],this.errorHooks=[],this.bodyTransformer=null,this.active=0,t.baseUrl&&this.setBaseUrl(t.baseUrl),t.headers&&this.setHeader(t.headers),t.credentials&&(this.credentials=t.credentials)}setBaseUrl(t){return this.baseUrl=t.replace(/\/+$/,""),this}setHeader(t){return Object.assign(this.headers,t),this}setCredentials(t){return this.credentials=t,this}onProcessing(t){return this.processingHooks.push(t),()=>{this.processingHooks=this.processingHooks.filter(e=>e!==t)}}onError(t){return this.errorHooks.push(t),()=>{this.errorHooks=this.errorHooks.filter(e=>e!==t)}}transformResponse(t){return this.bodyTransformer=t,this}async request(t,e,s={}){let r=/^https?:\/\//i.test(e)?e:this.baseUrl+e;if(s.params){const h=T(s.params);h&&(r+=(r.includes("?")?"&":"?")+h)}const o={Accept:"application/json","X-Requested-With":"XMLHttpRequest"};for(const[h,l]of Object.entries(this.headers)){const u=typeof l=="function"?l():l;u!=null&&(o[h]=u)}Object.assign(o,s.headers);const a={method:t.toUpperCase(),headers:o,signal:s.signal};this.credentials&&(a.credentials=this.credentials),s.data!==void 0&&t!=="get"&&(typeof FormData<"u"&&s.data instanceof FormData?a.body=s.data:(o["Content-Type"]="application/json",a.body=JSON.stringify(s.data)));const n={method:t,url:r,options:s};this.trackStart();try{const h=await fetch(r,a);let l=await k(h);if(this.bodyTransformer&&(l=this.bodyTransformer(l,n)??l),!h.ok)throw new y(h.status,l,h);return l}catch(h){throw R(h)?h:this.emitError(h,n)}finally{this.trackEnd()}}get(t,e,s={}){return this.request("get",t,e?{...s,params:e}:s)}post(t,e,s={}){return this.request("post",t,e!==void 0?{...s,data:e}:s)}put(t,e,s={}){return this.request("put",t,e!==void 0?{...s,data:e}:s)}patch(t,e,s={}){return this.request("patch",t,e!==void 0?{...s,data:e}:s)}delete(t,e,s={}){return this.request("delete",t,e!==void 0?{...s,data:e}:s)}form(t,e={}){return j(this,{...e,default:typeof t=="function"?t:()=>c(t)})}getForm(t,e){return this.createFormModel("get",t,e)}postForm(t,e){return this.createFormModel("post",t,e)}createFormModel(t,e,s){const r=typeof s=="string"?{path:s}:{...s??{}};return j(this,r,{url:e,method:t})}trackStart(){++this.active===1&&this.emitProcessing(!0)}trackEnd(){--this.active===0&&this.emitProcessing(!1)}emitProcessing(t){for(const e of this.processingHooks)try{e(t)}catch{}}emitError(t,e){let s=t;for(const r of this.errorHooks)try{const o=r(s,e);o instanceof Error&&(s=o)}catch{}return s}}function O(i={}){return new E(i)}const q=O();exports.Apix=E;exports.ApixError=y;exports.ApixModel=v;exports.apix=q;exports.createApix=O;exports.default=q;
1
+ "use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const d=require("vue");function c(i){const t=d.toRaw(i);if(t===null||typeof t!="object")return t;if(Array.isArray(t))return t.map(s=>c(s));if(t instanceof Date)return new Date(t.getTime());const e=Object.getPrototypeOf(t);if(e===Object.prototype||e===null){const s={};for(const r of Object.keys(t))s[r]=c(t[r]);return s}return t}function b(i){if(i===null||typeof i!="object")return!1;const t=Object.getPrototypeOf(i);return t===Object.prototype||t===null}function A(i,t){if(!b(t))return i===void 0?c(t):i;if(i==null)return c(t);if(!b(i))return i;for(const e of Object.keys(t))i[e]=e in i?A(i[e],t[e]):c(t[e]);return i}function f(i,t){if(i==null)return;let e=i;for(const s of t.split(".")){if(e==null)return;e=e[s]}return e}function m(i,t,e){const s=t.split(".");let r=i;for(let o=0;o<s.length-1;o++){const a=s[o];(r[a]===null||typeof r[a]!="object")&&(r[a]={}),r=r[a]}r[s[s.length-1]]=e}function w(i,t){const e={};for(const s of t){const r=f(i,s);r!==void 0&&m(e,s,c(r))}return e}function x(i){const t={};for(const[e,s]of Object.entries(i??{}))s!=null&&(t[e]=Array.isArray(s)?String(s[0]):String(s));return t}function _(i){return i&&typeof i=="object"&&typeof i.message=="string"?i.message:null}function T(i,t){const e=i&&typeof i=="object"&&!Array.isArray(i)&&"data"in i?i.data:i;return t?f(e,t):e}class y extends Error{constructor(t,e,s){super(_(e)??`Request failed with status ${t}`),this.name="ApixError",this.status=t,this.body=e,this.response=s,this.errors=e&&typeof e=="object"&&e.errors&&typeof e.errors=="object"?e.errors:{}}get isValidationError(){return this.status>=400&&this.status<500&&Object.keys(this.errors).length>0}}function E(i){return i instanceof Error&&i.name==="AbortError"}function S(i){const t=[],e=(r,o)=>{t.push(`${encodeURIComponent(r)}=${encodeURIComponent(o)}`)},s=(r,o)=>{if(r!=null){if(typeof r=="boolean")return e(o,r?"1":"0");if(r instanceof Date)return e(o,r.toISOString());if(Array.isArray(r)){r.forEach((a,n)=>s(a,`${o}[${n}]`));return}if(typeof r=="object"){for(const[a,n]of Object.entries(r))s(n,`${o}[${a}]`);return}e(o,String(r))}};for(const[r,o]of Object.entries(i))s(o,r);return t.join("&")}async function k(i){if(i.status===204)return null;const t=await i.text();if(!t)return null;try{return JSON.parse(t)}catch{return t}}class R{constructor(t,e={},s=null){this._snapshot=null,this._snapshotLocked=!1,this._stopWatch=null,this._debounceTimer=null,this._watched=null,this._watchOptions={},this._lastSent=null,this._fillAbort=null,this._transformResponse=null,this._transformRequest=null,this._apix=t,this._options=e,this._source=s,this._transformResponse=e.transformResponse??null,this._transformRequest=e.transformRequest??null;const r=e.default?e.default():null;this._state=d.reactive({data:r,errors:{},message:null,processing:!1}),this._snapshot=c(r)}get data(){return this._state.data}set data(t){this._state.data=t}get errors(){return this._state.errors}get message(){return this._state.message}get processing(){return this._state.processing}get hasErrors(){return Object.keys(this._state.errors).length>0}get isDirty(){return JSON.stringify(this._state.data)!==JSON.stringify(this._snapshot)}get(t){return c(f(this._state.data,t))}setData(t){return this._state.data=c(t),this._proxy}error(t){const e=this._state.errors;if(e[t]!==void 0)return e[t];const s=`${t}.`;for(const r of Object.keys(e))if(r.startsWith(s))return e[r]}setErrors(t){return this._state.errors=x(t),this._proxy}clearErrors(t){if(!t)return this._state.errors={},this._proxy;for(const e of t){const s=`${e}.`;for(const r of Object.keys(this._state.errors))(r===e||r.startsWith(s))&&delete this._state.errors[r]}return this._proxy}reset(t){if(t===void 0||Array.isArray(t)&&t.length===0)return this._state.data=c(this._snapshot),this._state.errors={},this._state.message=null,this._proxy;const e=Array.isArray(t)?t:[t];if(this._state.data&&typeof this._state.data=="object")for(const s of e)m(this._state.data,s,c(f(this._snapshot,s)));return this.clearErrors(e),this._proxy}post(t,e){return this._submit("post",t,e)}put(t,e){return this._submit("put",t,e)}patch(t,e){return this._submit("patch",t,e)}delete(t,e){return this._submit("delete",t,e)}reload(t){var e;return t&&(this._source={url:t,method:((e=this._source)==null?void 0:e.method)??"get"}),this._source?this._fill():Promise.reject(new Error("[vue-apix] The model has no source URL. Use apix.getForm(url) or model.reload(url)."))}refresh(){return this._source?this._stopWatch?(this._debounceTimer&&(clearTimeout(this._debounceTimer),this._debounceTimer=null),this._lastSent=this._payloadJson(),this._fill(this._watchExtra())):this._fill():Promise.reject(new Error("[vue-apix] The model has no source URL. Use apix.getForm(url) or model.reload(url)."))}transformResponse(t){return this._transformResponse=t,this._proxy}transformRequest(t){return this._transformRequest=t,this._proxy}watch(t,e){let s=null,r;Array.isArray(t)?(s=t,r=e??{}):r=t??e??{},this._source||console.warn("[vue-apix] model.watch() has no effect until the model has a source URL (getForm/postForm/reload)."),this.unwatch(),this._watched=s,this._watchOptions=r,this._syncLastSent();const o=s&&s.length?s.map(a=>()=>f(this._state.data,a)):()=>this._state.data;return this._stopWatch=d.watch(o,()=>this._onWatchTrigger(),{deep:r.deep??!0}),this._proxy}unwatch(){var t;return(t=this._stopWatch)==null||t.call(this),this._stopWatch=null,this._debounceTimer&&(clearTimeout(this._debounceTimer),this._debounceTimer=null),this._proxy}async _fill(t={}){var o,a,n,h,u;const e=this._source;(o=this._fillAbort)==null||o.abort();const s=new AbortController;this._fillAbort=s,this._state.processing=!0;const r={signal:s.signal};e.method==="get"?r.params={...this._options.params,...t.params}:(r.params=this._options.params,r.data=t.data!==void 0?t.data:this._options.data);try{const l=await this._apix.request(e.method,e.url,r);let p=T(l,this._options.path);if(this._transformResponse){const g=c(p);p=this._transformResponse(g,l)??g}return this._applyFill(p,t.preserve??null),this._state.message=_(l),this._state.errors={},(n=(a=this._options).onSuccess)==null||n.call(a,l,this._proxy),l}catch(l){throw E(l)||(this._applyError(l),(u=(h=this._options).onError)==null||u.call(h,l,this._proxy)),l}finally{this._fillAbort===s&&(this._fillAbort=null,this._state.processing=!1)}}_applyFill(t,e){let s=c(t);this._options.mergeDefaults!==!1&&this._options.default&&(s=A(s,this._options.default()));const r=this._snapshotLocked?null:c(s);if(e&&e.length&&s&&typeof s=="object"&&this._state.data&&typeof this._state.data=="object")for(const o of e){const a=f(this._state.data,o);a!==void 0&&m(s,o,c(a))}this._state.data=s,this._snapshotLocked||(this._snapshot=r,this._snapshotLocked=!0),this._syncLastSent()}_applyError(t){t instanceof y&&(this._state.message=_(t.body)??t.message,t.isValidationError&&(this._state.errors=x(t.errors)))}async _submit(t,e,s={}){var a;const r=e??((a=this._source)==null?void 0:a.url);if(!r)throw new Error(`[vue-apix] The model has no URL. Pass one explicitly: model.${t}(url).`);let o=s.data!==void 0?s.data:s.only?w(this._state.data,s.only):this._state.data??void 0;if(s.data===void 0&&this._transformRequest&&o!==void 0){const n=c(o);o=this._transformRequest(n)??n}this._state.processing=!0,this._state.errors={},this._state.message=null;try{const n=await this._apix.request(t,r,{data:o,params:s.params,headers:s.headers});return this._state.message=_(n),n}catch(n){throw this._applyError(n),n}finally{this._state.processing=!1}}_onWatchTrigger(){if(this._payloadJson()===this._lastSent)return;this._debounceTimer&&clearTimeout(this._debounceTimer);const t=this._watchOptions.debounce??0;t>0?this._debounceTimer=setTimeout(()=>this._sendWatchRequest(),t):this._sendWatchRequest()}_sendWatchRequest(){this._debounceTimer=null,this._source&&(this._lastSent=this._payloadJson(),this._fill(this._watchExtra()).catch(()=>{}))}_watchExtra(){const t=this._watched,e=this._watchOptions.payload??t;let s=e&&e.length?w(this._state.data,e):c(this._state.data);this._transformRequest&&(s=this._transformRequest(s)??s);const r=this._watchOptions.refreshWatched?null:t;return this._source.method==="get"?{params:s,preserve:r}:{data:s,preserve:r}}_payloadJson(){const t=this._watched,e=t&&t.length?t.map(s=>f(this._state.data,s)):this._state.data;return JSON.stringify(e)??"undefined"}_syncLastSent(){this._lastSent=this._payloadJson()}}function j(i,t={},e=null){const s=new R(i,t,e),r=new Proxy(s,{get(o,a){if(typeof a=="symbol"||a in o)return Reflect.get(o,a);const n=o._state.data;if(n&&typeof n=="object")return n[a]},set(o,a,n){if(typeof a=="symbol"||a in o)return Reflect.set(o,a,n);const h=o._state.data;return h&&typeof h=="object"?(h[a]=n,!0):(o._state.data={[a]:n},!0)},has(o,a){if(a in o)return!0;const n=o._state.data;return!!n&&typeof n=="object"&&a in n}});return s._proxy=r,e&&t.immediate!==!1&&r.reload().catch(()=>{}),r}class v{constructor(t={}){this.baseUrl="",this.headers={},this.processingHooks=[],this.errorHooks=[],this.bodyTransformer=null,this.active=0,t.baseUrl&&this.setBaseUrl(t.baseUrl),t.headers&&this.setHeader(t.headers),t.credentials&&(this.credentials=t.credentials)}setBaseUrl(t){return this.baseUrl=t.replace(/\/+$/,""),this}setHeader(t){return Object.assign(this.headers,t),this}setCredentials(t){return this.credentials=t,this}onProcessing(t){return this.processingHooks.push(t),()=>{this.processingHooks=this.processingHooks.filter(e=>e!==t)}}onError(t){return this.errorHooks.push(t),()=>{this.errorHooks=this.errorHooks.filter(e=>e!==t)}}transformResponse(t){return this.bodyTransformer=t,this}async request(t,e,s={}){let r=/^https?:\/\//i.test(e)?e:this.baseUrl+e;if(s.params){const h=S(s.params);h&&(r+=(r.includes("?")?"&":"?")+h)}const o={accept:"application/json","x-requested-with":"XMLHttpRequest"};for(const[h,u]of Object.entries(this.headers)){const l=typeof u=="function"?u():u;l!=null&&(o[h.toLowerCase()]=l)}for(const[h,u]of Object.entries(s.headers??{}))o[h.toLowerCase()]=u;const a={method:t.toUpperCase(),headers:o,signal:s.signal};this.credentials&&(a.credentials=this.credentials),s.data!==void 0&&t!=="get"&&(typeof FormData<"u"&&s.data instanceof FormData?(delete o["content-type"],a.body=s.data):(o["content-type"]??(o["content-type"]="application/json"),a.body=JSON.stringify(s.data)));const n={method:t,url:r,options:s};this.trackStart();try{const h=await fetch(r,a);let u=await k(h);if(this.bodyTransformer&&(u=this.bodyTransformer(u,n)??u),!h.ok)throw new y(h.status,u,h);return u}catch(h){throw E(h)?h:this.emitError(h,n)}finally{this.trackEnd()}}get(t,e,s={}){return this.request("get",t,e?{...s,params:e}:s)}post(t,e,s={}){return this.request("post",t,e!==void 0?{...s,data:e}:s)}put(t,e,s={}){return this.request("put",t,e!==void 0?{...s,data:e}:s)}patch(t,e,s={}){return this.request("patch",t,e!==void 0?{...s,data:e}:s)}delete(t,e,s={}){return this.request("delete",t,e!==void 0?{...s,data:e}:s)}form(t,e={}){return j(this,{...e,default:typeof t=="function"?t:()=>c(t)})}getForm(t,e){return this.createFormModel("get",t,e)}postForm(t,e){return this.createFormModel("post",t,e)}createFormModel(t,e,s){const r=typeof s=="string"?{path:s}:{...s??{}};return j(this,r,{url:e,method:t})}trackStart(){++this.active===1&&this.emitProcessing(!0)}trackEnd(){--this.active===0&&this.emitProcessing(!1)}emitProcessing(t){for(const e of this.processingHooks)try{e(t)}catch{}}emitError(t,e){let s=t;for(const r of this.errorHooks)try{const o=r(s,e);o instanceof Error&&(s=o)}catch{}return s}}function O(i={}){return new v(i)}const q=O();exports.Apix=v;exports.ApixError=y;exports.ApixModel=R;exports.apix=q;exports.createApix=O;exports.default=q;
package/dist/vue-apix.js CHANGED
@@ -1,14 +1,14 @@
1
- import { toRaw as A, reactive as E, watch as O } from "vue";
1
+ import { toRaw as E, reactive as v, watch as A } from "vue";
2
2
  function c(i) {
3
- const t = A(i);
3
+ const t = E(i);
4
4
  if (t === null || typeof t != "object") return t;
5
- if (Array.isArray(t)) return t.map((e) => c(e));
5
+ if (Array.isArray(t)) return t.map((s) => c(s));
6
6
  if (t instanceof Date) return new Date(t.getTime());
7
- const s = Object.getPrototypeOf(t);
8
- if (s === Object.prototype || s === null) {
9
- const e = {};
10
- for (const r of Object.keys(t)) e[r] = c(t[r]);
11
- return e;
7
+ const e = Object.getPrototypeOf(t);
8
+ if (e === Object.prototype || e === null) {
9
+ const s = {};
10
+ for (const r of Object.keys(t)) s[r] = c(t[r]);
11
+ return s;
12
12
  }
13
13
  return t;
14
14
  }
@@ -22,52 +22,52 @@ function x(i, t) {
22
22
  return i === void 0 ? c(t) : i;
23
23
  if (i == null) return c(t);
24
24
  if (!y(i)) return i;
25
- for (const s of Object.keys(t))
26
- i[s] = s in i ? x(i[s], t[s]) : c(t[s]);
25
+ for (const e of Object.keys(t))
26
+ i[e] = e in i ? x(i[e], t[e]) : c(t[e]);
27
27
  return i;
28
28
  }
29
29
  function f(i, t) {
30
30
  if (i == null) return;
31
- let s = i;
32
- for (const e of t.split(".")) {
33
- if (s == null) return;
34
- s = s[e];
31
+ let e = i;
32
+ for (const s of t.split(".")) {
33
+ if (e == null) return;
34
+ e = e[s];
35
35
  }
36
- return s;
36
+ return e;
37
37
  }
38
- function d(i, t, s) {
39
- const e = t.split(".");
38
+ function d(i, t, e) {
39
+ const s = t.split(".");
40
40
  let r = i;
41
- for (let o = 0; o < e.length - 1; o++) {
42
- const a = e[o];
41
+ for (let o = 0; o < s.length - 1; o++) {
42
+ const a = s[o];
43
43
  (r[a] === null || typeof r[a] != "object") && (r[a] = {}), r = r[a];
44
44
  }
45
- r[e[e.length - 1]] = s;
45
+ r[s[s.length - 1]] = e;
46
46
  }
47
47
  function g(i, t) {
48
- const s = {};
49
- for (const e of t) {
50
- const r = f(i, e);
51
- r !== void 0 && d(s, e, c(r));
48
+ const e = {};
49
+ for (const s of t) {
50
+ const r = f(i, s);
51
+ r !== void 0 && d(e, s, c(r));
52
52
  }
53
- return s;
53
+ return e;
54
54
  }
55
55
  function b(i) {
56
56
  const t = {};
57
- for (const [s, e] of Object.entries(i ?? {}))
58
- e != null && (t[s] = Array.isArray(e) ? String(e[0]) : String(e));
57
+ for (const [e, s] of Object.entries(i ?? {}))
58
+ s != null && (t[e] = Array.isArray(s) ? String(s[0]) : String(s));
59
59
  return t;
60
60
  }
61
- function p(i) {
61
+ function _(i) {
62
62
  return i && typeof i == "object" && typeof i.message == "string" ? i.message : null;
63
63
  }
64
- function q(i, t) {
65
- const s = i && typeof i == "object" && !Array.isArray(i) && "data" in i ? i.data : i;
66
- return t ? f(s, t) : s;
64
+ function O(i, t) {
65
+ const e = i && typeof i == "object" && !Array.isArray(i) && "data" in i ? i.data : i;
66
+ return t ? f(e, t) : e;
67
67
  }
68
68
  class j extends Error {
69
- constructor(t, s, e) {
70
- super(p(s) ?? `Request failed with status ${t}`), this.name = "ApixError", this.status = t, this.body = s, this.response = e, this.errors = s && typeof s == "object" && s.errors && typeof s.errors == "object" ? s.errors : {};
69
+ constructor(t, e, s) {
70
+ super(_(e) ?? `Request failed with status ${t}`), this.name = "ApixError", this.status = t, this.body = e, this.response = s, this.errors = e && typeof e == "object" && e.errors && typeof e.errors == "object" ? e.errors : {};
71
71
  }
72
72
  /**
73
73
  * True for any 4xx response whose body carries an `errors` object
@@ -81,28 +81,28 @@ class j extends Error {
81
81
  function R(i) {
82
82
  return i instanceof Error && i.name === "AbortError";
83
83
  }
84
- function v(i) {
85
- const t = [], s = (r, o) => {
84
+ function q(i) {
85
+ const t = [], e = (r, o) => {
86
86
  t.push(`${encodeURIComponent(r)}=${encodeURIComponent(o)}`);
87
- }, e = (r, o) => {
87
+ }, s = (r, o) => {
88
88
  if (r != null) {
89
- if (typeof r == "boolean") return s(o, r ? "1" : "0");
90
- if (r instanceof Date) return s(o, r.toISOString());
89
+ if (typeof r == "boolean") return e(o, r ? "1" : "0");
90
+ if (r instanceof Date) return e(o, r.toISOString());
91
91
  if (Array.isArray(r)) {
92
- r.forEach((a, n) => e(a, `${o}[${n}]`));
92
+ r.forEach((a, n) => s(a, `${o}[${n}]`));
93
93
  return;
94
94
  }
95
95
  if (typeof r == "object") {
96
- for (const [a, n] of Object.entries(r)) e(n, `${o}[${a}]`);
96
+ for (const [a, n] of Object.entries(r)) s(n, `${o}[${a}]`);
97
97
  return;
98
98
  }
99
- s(o, String(r));
99
+ e(o, String(r));
100
100
  }
101
101
  };
102
- for (const [r, o] of Object.entries(i)) e(o, r);
102
+ for (const [r, o] of Object.entries(i)) s(o, r);
103
103
  return t.join("&");
104
104
  }
105
- async function S(i) {
105
+ async function T(i) {
106
106
  if (i.status === 204) return null;
107
107
  const t = await i.text();
108
108
  if (!t) return null;
@@ -112,11 +112,11 @@ async function S(i) {
112
112
  return t;
113
113
  }
114
114
  }
115
- class T {
116
- constructor(t, s = {}, e = null) {
117
- this._snapshot = null, this._snapshotLocked = !1, this._stopWatch = null, this._debounceTimer = null, this._watched = null, this._watchOptions = {}, this._lastSent = null, this._fillAbort = null, this._transformResponse = null, this._transformRequest = null, this._apix = t, this._options = s, this._source = e, this._transformResponse = s.transformResponse ?? null, this._transformRequest = s.transformRequest ?? null;
118
- const r = s.default ? s.default() : null;
119
- this._state = E({ data: r, errors: {}, message: null, processing: !1 }), this._snapshot = c(r);
115
+ class S {
116
+ constructor(t, e = {}, s = null) {
117
+ this._snapshot = null, this._snapshotLocked = !1, this._stopWatch = null, this._debounceTimer = null, this._watched = null, this._watchOptions = {}, this._lastSent = null, this._fillAbort = null, this._transformResponse = null, this._transformRequest = null, this._apix = t, this._options = e, this._source = s, this._transformResponse = e.transformResponse ?? null, this._transformRequest = e.transformRequest ?? null;
118
+ const r = e.default ? e.default() : null;
119
+ this._state = v({ data: r, errors: {}, message: null, processing: !1 }), this._snapshot = c(r);
120
120
  }
121
121
  // --- reactive state ---------------------------------------------------------
122
122
  get data() {
@@ -160,11 +160,11 @@ class T {
160
160
  * so `error('name')` also surfaces `name.en.label` messages.
161
161
  */
162
162
  error(t) {
163
- const s = this._state.errors;
164
- if (s[t] !== void 0) return s[t];
165
- const e = `${t}.`;
166
- for (const r of Object.keys(s))
167
- if (r.startsWith(e)) return s[r];
163
+ const e = this._state.errors;
164
+ if (e[t] !== void 0) return e[t];
165
+ const s = `${t}.`;
166
+ for (const r of Object.keys(e))
167
+ if (r.startsWith(s)) return e[r];
168
168
  }
169
169
  setErrors(t) {
170
170
  return this._state.errors = b(t), this._proxy;
@@ -173,10 +173,10 @@ class T {
173
173
  clearErrors(t) {
174
174
  if (!t)
175
175
  return this._state.errors = {}, this._proxy;
176
- for (const s of t) {
177
- const e = `${s}.`;
176
+ for (const e of t) {
177
+ const s = `${e}.`;
178
178
  for (const r of Object.keys(this._state.errors))
179
- (r === s || r.startsWith(e)) && delete this._state.errors[r];
179
+ (r === e || r.startsWith(s)) && delete this._state.errors[r];
180
180
  }
181
181
  return this._proxy;
182
182
  }
@@ -188,29 +188,40 @@ class T {
188
188
  reset(t) {
189
189
  if (t === void 0 || Array.isArray(t) && t.length === 0)
190
190
  return this._state.data = c(this._snapshot), this._state.errors = {}, this._state.message = null, this._proxy;
191
- const s = Array.isArray(t) ? t : [t];
191
+ const e = Array.isArray(t) ? t : [t];
192
192
  if (this._state.data && typeof this._state.data == "object")
193
- for (const e of s)
194
- d(this._state.data, e, c(f(this._snapshot, e)));
195
- return this.clearErrors(s), this._proxy;
193
+ for (const s of e)
194
+ d(this._state.data, s, c(f(this._snapshot, s)));
195
+ return this.clearErrors(e), this._proxy;
196
196
  }
197
197
  // --- HTTP ------------------------------------------------------------------------
198
- post(t, s) {
199
- return this._submit("post", t, s);
198
+ post(t, e) {
199
+ return this._submit("post", t, e);
200
200
  }
201
- put(t, s) {
202
- return this._submit("put", t, s);
201
+ put(t, e) {
202
+ return this._submit("put", t, e);
203
203
  }
204
- patch(t, s) {
205
- return this._submit("patch", t, s);
204
+ patch(t, e) {
205
+ return this._submit("patch", t, e);
206
206
  }
207
- delete(t, s) {
208
- return this._submit("delete", t, s);
207
+ delete(t, e) {
208
+ return this._submit("delete", t, e);
209
209
  }
210
210
  /** Re-run the fill request (or set a new source URL and run it). */
211
211
  reload(t) {
212
- var s;
213
- return t && (this._source = { url: t, method: ((s = this._source) == null ? void 0 : s.method) ?? "get" }), this._source ? this._fill() : Promise.reject(
212
+ var e;
213
+ return t && (this._source = { url: t, method: ((e = this._source) == null ? void 0 : e.method) ?? "get" }), this._source ? this._fill() : Promise.reject(
214
+ new Error("[vue-apix] The model has no source URL. Use apix.getForm(url) or model.reload(url).")
215
+ );
216
+ }
217
+ /**
218
+ * Re-send the fill request with the CURRENT state — a manual watch trigger
219
+ * (a "Search" button next to filters). Sends the watched paths as payload and
220
+ * preserves them in the response, exactly like a watch-triggered request; any
221
+ * pending debounce is cancelled. Without an active watch() it equals reload().
222
+ */
223
+ refresh() {
224
+ return this._source ? this._stopWatch ? (this._debounceTimer && (clearTimeout(this._debounceTimer), this._debounceTimer = null), this._lastSent = this._payloadJson(), this._fill(this._watchExtra())) : this._fill() : Promise.reject(
214
225
  new Error("[vue-apix] The model has no source URL. Use apix.getForm(url) or model.reload(url).")
215
226
  );
216
227
  }
@@ -240,11 +251,11 @@ class T {
240
251
  * The response updates everything except the watched paths (see WatchOptions).
241
252
  * A new trigger aborts the previous in-flight watch request.
242
253
  */
243
- watch(t, s) {
244
- let e = null, r;
245
- Array.isArray(t) ? (e = t, r = s ?? {}) : r = t ?? s ?? {}, this._source || console.warn("[vue-apix] model.watch() has no effect until the model has a source URL (getForm/postForm/reload)."), this.unwatch(), this._watched = e, this._watchOptions = r, this._syncLastSent();
246
- const o = e && e.length ? e.map((a) => () => f(this._state.data, a)) : () => this._state.data;
247
- return this._stopWatch = O(o, () => this._onWatchTrigger(), {
254
+ watch(t, e) {
255
+ let s = null, r;
256
+ Array.isArray(t) ? (s = t, r = e ?? {}) : r = t ?? e ?? {}, this._source || console.warn("[vue-apix] model.watch() has no effect until the model has a source URL (getForm/postForm/reload)."), this.unwatch(), this._watched = s, this._watchOptions = r, this._syncLastSent();
257
+ const o = s && s.length ? s.map((a) => () => f(this._state.data, a)) : () => this._state.data;
258
+ return this._stopWatch = A(o, () => this._onWatchTrigger(), {
248
259
  deep: r.deep ?? !0
249
260
  }), this._proxy;
250
261
  }
@@ -255,48 +266,48 @@ class T {
255
266
  // --- internals ----------------------------------------------------------------------
256
267
  /** @internal */
257
268
  async _fill(t = {}) {
258
- var o, a, n, h, l;
259
- const s = this._source;
269
+ var o, a, n, h, u;
270
+ const e = this._source;
260
271
  (o = this._fillAbort) == null || o.abort();
261
- const e = new AbortController();
262
- this._fillAbort = e, this._state.processing = !0;
263
- const r = { signal: e.signal };
264
- s.method === "get" ? r.params = { ...this._options.params, ...t.params } : (r.params = this._options.params, r.data = t.data !== void 0 ? t.data : this._options.data);
272
+ const s = new AbortController();
273
+ this._fillAbort = s, this._state.processing = !0;
274
+ const r = { signal: s.signal };
275
+ e.method === "get" ? r.params = { ...this._options.params, ...t.params } : (r.params = this._options.params, r.data = t.data !== void 0 ? t.data : this._options.data);
265
276
  try {
266
- const u = await this._apix.request(s.method, s.url, r);
267
- let _ = q(u, this._options.path);
277
+ const l = await this._apix.request(e.method, e.url, r);
278
+ let p = O(l, this._options.path);
268
279
  if (this._transformResponse) {
269
- const m = c(_);
270
- _ = this._transformResponse(m, u) ?? m;
280
+ const m = c(p);
281
+ p = this._transformResponse(m, l) ?? m;
271
282
  }
272
- return this._applyFill(_, t.preserve ?? null), this._state.message = p(u), this._state.errors = {}, (n = (a = this._options).onSuccess) == null || n.call(a, u, this._proxy), u;
273
- } catch (u) {
274
- throw R(u) || (this._applyError(u), (l = (h = this._options).onError) == null || l.call(h, u, this._proxy)), u;
283
+ return this._applyFill(p, t.preserve ?? null), this._state.message = _(l), this._state.errors = {}, (n = (a = this._options).onSuccess) == null || n.call(a, l, this._proxy), l;
284
+ } catch (l) {
285
+ throw R(l) || (this._applyError(l), (u = (h = this._options).onError) == null || u.call(h, l, this._proxy)), l;
275
286
  } finally {
276
- this._fillAbort === e && (this._fillAbort = null, this._state.processing = !1);
287
+ this._fillAbort === s && (this._fillAbort = null, this._state.processing = !1);
277
288
  }
278
289
  }
279
- _applyFill(t, s) {
280
- let e = c(t);
281
- this._options.mergeDefaults !== !1 && this._options.default && (e = x(e, this._options.default()));
282
- const r = this._snapshotLocked ? null : c(e);
283
- if (s && s.length && e && typeof e == "object" && this._state.data && typeof this._state.data == "object")
284
- for (const o of s) {
290
+ _applyFill(t, e) {
291
+ let s = c(t);
292
+ this._options.mergeDefaults !== !1 && this._options.default && (s = x(s, this._options.default()));
293
+ const r = this._snapshotLocked ? null : c(s);
294
+ if (e && e.length && s && typeof s == "object" && this._state.data && typeof this._state.data == "object")
295
+ for (const o of e) {
285
296
  const a = f(this._state.data, o);
286
- a !== void 0 && d(e, o, c(a));
297
+ a !== void 0 && d(s, o, c(a));
287
298
  }
288
- this._state.data = e, this._snapshotLocked || (this._snapshot = r, this._snapshotLocked = !0), this._syncLastSent();
299
+ this._state.data = s, this._snapshotLocked || (this._snapshot = r, this._snapshotLocked = !0), this._syncLastSent();
289
300
  }
290
301
  _applyError(t) {
291
- t instanceof j && (this._state.message = p(t.body) ?? t.message, t.isValidationError && (this._state.errors = b(t.errors)));
302
+ t instanceof j && (this._state.message = _(t.body) ?? t.message, t.isValidationError && (this._state.errors = b(t.errors)));
292
303
  }
293
- async _submit(t, s, e = {}) {
304
+ async _submit(t, e, s = {}) {
294
305
  var a;
295
- const r = s ?? ((a = this._source) == null ? void 0 : a.url);
306
+ const r = e ?? ((a = this._source) == null ? void 0 : a.url);
296
307
  if (!r)
297
308
  throw new Error(`[vue-apix] The model has no URL. Pass one explicitly: model.${t}(url).`);
298
- let o = e.data !== void 0 ? e.data : e.only ? g(this._state.data, e.only) : this._state.data ?? void 0;
299
- if (e.data === void 0 && this._transformRequest && o !== void 0) {
309
+ let o = s.data !== void 0 ? s.data : s.only ? g(this._state.data, s.only) : this._state.data ?? void 0;
310
+ if (s.data === void 0 && this._transformRequest && o !== void 0) {
300
311
  const n = c(o);
301
312
  o = this._transformRequest(n) ?? n;
302
313
  }
@@ -304,10 +315,10 @@ class T {
304
315
  try {
305
316
  const n = await this._apix.request(t, r, {
306
317
  data: o,
307
- params: e.params,
308
- headers: e.headers
318
+ params: s.params,
319
+ headers: s.headers
309
320
  });
310
- return this._state.message = p(n), n;
321
+ return this._state.message = _(n), n;
311
322
  } catch (n) {
312
323
  throw this._applyError(n), n;
313
324
  } finally {
@@ -321,24 +332,27 @@ class T {
321
332
  t > 0 ? this._debounceTimer = setTimeout(() => this._sendWatchRequest(), t) : this._sendWatchRequest();
322
333
  }
323
334
  _sendWatchRequest() {
324
- if (this._debounceTimer = null, !this._source) return;
325
- const t = this._watched, s = this._watchOptions.payload ?? t;
326
- let e = s && s.length ? g(this._state.data, s) : c(this._state.data);
327
- this._transformRequest && (e = this._transformRequest(e) ?? e), this._lastSent = this._payloadJson();
328
- const r = this._watchOptions.refreshWatched ? null : t, o = this._source.method === "get" ? { params: e, preserve: r } : { data: e, preserve: r };
329
- this._fill(o).catch(() => {
330
- });
335
+ this._debounceTimer = null, this._source && (this._lastSent = this._payloadJson(), this._fill(this._watchExtra()).catch(() => {
336
+ }));
337
+ }
338
+ /** Build the fill() extra for a watch-shaped request from the current state. */
339
+ _watchExtra() {
340
+ const t = this._watched, e = this._watchOptions.payload ?? t;
341
+ let s = e && e.length ? g(this._state.data, e) : c(this._state.data);
342
+ this._transformRequest && (s = this._transformRequest(s) ?? s);
343
+ const r = this._watchOptions.refreshWatched ? null : t;
344
+ return this._source.method === "get" ? { params: s, preserve: r } : { data: s, preserve: r };
331
345
  }
332
346
  _payloadJson() {
333
- const t = this._watched, s = t && t.length ? t.map((e) => f(this._state.data, e)) : this._state.data;
334
- return JSON.stringify(s) ?? "undefined";
347
+ const t = this._watched, e = t && t.length ? t.map((s) => f(this._state.data, s)) : this._state.data;
348
+ return JSON.stringify(e) ?? "undefined";
335
349
  }
336
350
  _syncLastSent() {
337
351
  this._lastSent = this._payloadJson();
338
352
  }
339
353
  }
340
- function w(i, t = {}, s = null) {
341
- const e = new T(i, t, s), r = new Proxy(e, {
354
+ function w(i, t = {}, e = null) {
355
+ const s = new S(i, t, e), r = new Proxy(s, {
342
356
  get(o, a) {
343
357
  if (typeof a == "symbol" || a in o) return Reflect.get(o, a);
344
358
  const n = o._state.data;
@@ -355,7 +369,7 @@ function w(i, t = {}, s = null) {
355
369
  return !!n && typeof n == "object" && a in n;
356
370
  }
357
371
  });
358
- return e._proxy = r, s && t.immediate !== !1 && r.reload().catch(() => {
372
+ return s._proxy = r, e && t.immediate !== !1 && r.reload().catch(() => {
359
373
  }), r;
360
374
  }
361
375
  class k {
@@ -375,7 +389,7 @@ class k {
375
389
  /** Global hook: fires with true when the first request starts, false when the last one ends. */
376
390
  onProcessing(t) {
377
391
  return this.processingHooks.push(t), () => {
378
- this.processingHooks = this.processingHooks.filter((s) => s !== t);
392
+ this.processingHooks = this.processingHooks.filter((e) => e !== t);
379
393
  };
380
394
  }
381
395
  /**
@@ -385,7 +399,7 @@ class k {
385
399
  */
386
400
  onError(t) {
387
401
  return this.errorHooks.push(t), () => {
388
- this.errorHooks = this.errorHooks.filter((s) => s !== t);
402
+ this.errorHooks = this.errorHooks.filter((e) => e !== t);
389
403
  };
390
404
  }
391
405
  /**
@@ -398,68 +412,69 @@ class k {
398
412
  return this.bodyTransformer = t, this;
399
413
  }
400
414
  // --- plain requests (Promise, no model) -----------------------------------
401
- async request(t, s, e = {}) {
402
- let r = /^https?:\/\//i.test(s) ? s : this.baseUrl + s;
403
- if (e.params) {
404
- const h = v(e.params);
415
+ async request(t, e, s = {}) {
416
+ let r = /^https?:\/\//i.test(e) ? e : this.baseUrl + e;
417
+ if (s.params) {
418
+ const h = q(s.params);
405
419
  h && (r += (r.includes("?") ? "&" : "?") + h);
406
420
  }
407
421
  const o = {
408
- Accept: "application/json",
409
- "X-Requested-With": "XMLHttpRequest"
422
+ accept: "application/json",
423
+ "x-requested-with": "XMLHttpRequest"
410
424
  };
411
- for (const [h, l] of Object.entries(this.headers)) {
412
- const u = typeof l == "function" ? l() : l;
413
- u != null && (o[h] = u);
425
+ for (const [h, u] of Object.entries(this.headers)) {
426
+ const l = typeof u == "function" ? u() : u;
427
+ l != null && (o[h.toLowerCase()] = l);
414
428
  }
415
- Object.assign(o, e.headers);
416
- const a = { method: t.toUpperCase(), headers: o, signal: e.signal };
417
- this.credentials && (a.credentials = this.credentials), e.data !== void 0 && t !== "get" && (typeof FormData < "u" && e.data instanceof FormData ? a.body = e.data : (o["Content-Type"] = "application/json", a.body = JSON.stringify(e.data)));
418
- const n = { method: t, url: r, options: e };
429
+ for (const [h, u] of Object.entries(s.headers ?? {}))
430
+ o[h.toLowerCase()] = u;
431
+ const a = { method: t.toUpperCase(), headers: o, signal: s.signal };
432
+ this.credentials && (a.credentials = this.credentials), s.data !== void 0 && t !== "get" && (typeof FormData < "u" && s.data instanceof FormData ? (delete o["content-type"], a.body = s.data) : (o["content-type"] ?? (o["content-type"] = "application/json"), a.body = JSON.stringify(s.data)));
433
+ const n = { method: t, url: r, options: s };
419
434
  this.trackStart();
420
435
  try {
421
436
  const h = await fetch(r, a);
422
- let l = await S(h);
423
- if (this.bodyTransformer && (l = this.bodyTransformer(l, n) ?? l), !h.ok) throw new j(h.status, l, h);
424
- return l;
437
+ let u = await T(h);
438
+ if (this.bodyTransformer && (u = this.bodyTransformer(u, n) ?? u), !h.ok) throw new j(h.status, u, h);
439
+ return u;
425
440
  } catch (h) {
426
441
  throw R(h) ? h : this.emitError(h, n);
427
442
  } finally {
428
443
  this.trackEnd();
429
444
  }
430
445
  }
431
- get(t, s, e = {}) {
432
- return this.request("get", t, s ? { ...e, params: s } : e);
446
+ get(t, e, s = {}) {
447
+ return this.request("get", t, e ? { ...s, params: e } : s);
433
448
  }
434
- post(t, s, e = {}) {
435
- return this.request("post", t, s !== void 0 ? { ...e, data: s } : e);
449
+ post(t, e, s = {}) {
450
+ return this.request("post", t, e !== void 0 ? { ...s, data: e } : s);
436
451
  }
437
- put(t, s, e = {}) {
438
- return this.request("put", t, s !== void 0 ? { ...e, data: s } : e);
452
+ put(t, e, s = {}) {
453
+ return this.request("put", t, e !== void 0 ? { ...s, data: e } : s);
439
454
  }
440
- patch(t, s, e = {}) {
441
- return this.request("patch", t, s !== void 0 ? { ...e, data: s } : e);
455
+ patch(t, e, s = {}) {
456
+ return this.request("patch", t, e !== void 0 ? { ...s, data: e } : s);
442
457
  }
443
458
  /** DELETE with an optional body. */
444
- delete(t, s, e = {}) {
445
- return this.request("delete", t, s !== void 0 ? { ...e, data: s } : e);
459
+ delete(t, e, s = {}) {
460
+ return this.request("delete", t, e !== void 0 ? { ...s, data: e } : s);
446
461
  }
447
462
  // --- form models -----------------------------------------------------------
448
463
  /** Create a form model without any request (like Inertia's useForm). */
449
- form(t, s = {}) {
450
- return w(this, { ...s, default: typeof t == "function" ? t : () => c(t) });
464
+ form(t, e = {}) {
465
+ return w(this, { ...e, default: typeof t == "function" ? t : () => c(t) });
451
466
  }
452
467
  /** Create a form model and fill it with a GET request. */
453
- getForm(t, s) {
454
- return this.createFormModel("get", t, s);
468
+ getForm(t, e) {
469
+ return this.createFormModel("get", t, e);
455
470
  }
456
471
  /** Same as getForm, but the fill request is a POST (complex search endpoints etc.). */
457
- postForm(t, s) {
458
- return this.createFormModel("post", t, s);
472
+ postForm(t, e) {
473
+ return this.createFormModel("post", t, e);
459
474
  }
460
- createFormModel(t, s, e) {
461
- const r = typeof e == "string" ? { path: e } : { ...e ?? {} };
462
- return w(this, r, { url: s, method: t });
475
+ createFormModel(t, e, s) {
476
+ const r = typeof s == "string" ? { path: s } : { ...s ?? {} };
477
+ return w(this, r, { url: e, method: t });
463
478
  }
464
479
  // --- internals --------------------------------------------------------------
465
480
  trackStart() {
@@ -469,33 +484,33 @@ class k {
469
484
  --this.active === 0 && this.emitProcessing(!1);
470
485
  }
471
486
  emitProcessing(t) {
472
- for (const s of this.processingHooks)
487
+ for (const e of this.processingHooks)
473
488
  try {
474
- s(t);
489
+ e(t);
475
490
  } catch {
476
491
  }
477
492
  }
478
493
  /** Runs the hooks; a hook returning an Error replaces it for the rest of the chain. */
479
- emitError(t, s) {
480
- let e = t;
494
+ emitError(t, e) {
495
+ let s = t;
481
496
  for (const r of this.errorHooks)
482
497
  try {
483
- const o = r(e, s);
484
- o instanceof Error && (e = o);
498
+ const o = r(s, e);
499
+ o instanceof Error && (s = o);
485
500
  } catch {
486
501
  }
487
- return e;
502
+ return s;
488
503
  }
489
504
  }
490
505
  function U(i = {}) {
491
506
  return new k(i);
492
507
  }
493
- const W = U();
508
+ const F = U();
494
509
  export {
495
510
  k as Apix,
496
511
  j as ApixError,
497
- T as ApixModel,
498
- W as apix,
512
+ S as ApixModel,
513
+ F as apix,
499
514
  U as createApix,
500
- W as default
515
+ F as default
501
516
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@diephp/vue-apix",
3
- "version": "0.1.2",
3
+ "version": "0.1.4",
4
4
  "description": "Tiny form/model/api toolkit for Vue 3 — fetch-based, Laravel-friendly, zero dependencies",
5
5
  "type": "module",
6
6
  "license": "MIT",