@diephp/vue-apix 0.3.0 → 0.3.3

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
@@ -474,6 +474,22 @@ affects watch-triggered and `refresh()`-triggered fills — the very first load
474
474
  unaffected (there's nothing local to protect yet), and `reset()` is unaffected too (it's
475
475
  an explicit, direct action, not a server response).
476
476
 
477
+ `lock` works even with **no `watch` at all** — a plain search box built with just
478
+ `immediate: false` + `lock` + a manual `refresh()` on submit keeps its typed value across
479
+ that `refresh()` the same way:
480
+
481
+ ```ts
482
+ const searchForm = apix.getForm('?action=search_parcel', {
483
+ default: () => ({ tracking_number: null }),
484
+ lock: ['tracking_number'],
485
+ immediate: false,
486
+ });
487
+
488
+ // <el-input v-model="searchForm.tracking_number" />
489
+ // on submit: searchForm.refresh() — tracking_number survives even if the
490
+ // response doesn't include that field at all
491
+ ```
492
+
477
493
  ### `refresh()` — the "Search" button
478
494
 
479
495
  ```ts
@@ -482,24 +498,29 @@ model.refresh();
482
498
  model.refresh({ ignore: ['paginator.page'], lock: ['trackingNumber'] });
483
499
  ```
484
500
 
485
- - Sends every field except `ignore` (same rule as a watch-triggered request), applies
486
- `lock`, and cancels a pending debounce.
501
+ - Sends every field except `ignore` and applies `lock`, cancelling a pending debounce —
502
+ **`watch` doesn't need to be configured at all** for this: a plain search box with
503
+ `immediate: false` and `lock: ['trackingNumber']`, no `watch`, still keeps its typed
504
+ value across `refresh()` even when the backend doesn't echo it back.
487
505
  - `options.ignore`/`options.lock` **extend** the form-level lists for this call only —
488
506
  handy for "Search resets to page 1": omit `paginator.page` for just this click so the
489
507
  server defaults to page 1, without changing the form's permanent configuration.
490
508
  - `model.reload()` is different: it re-runs the *original* fill request with no
491
- field-derived payload at all — it resets the view rather than searching with the
492
- current state.
493
- - Without `watch` configured, `refresh()` simply behaves like `reload()`.
509
+ field-derived payload and no `lock` at all — it resets the view rather than searching
510
+ with the current state.
494
511
 
495
512
  ### Cleanup — no `unwatch()` needed inside a component
496
513
 
497
- Vue automatically stops a `watch()` effect created synchronously inside a component's
498
- `setup()` (which is exactly when `apix.getForm(...)` runs in `<script setup>`) once that
514
+ Vue automatically stops a `watch()` effect created inside a component's `setup()` once that
499
515
  component unmounts — no manual cleanup call exists or is needed. This only matters if you
500
516
  create a `watch`-enabled model **outside** any component (e.g. a module-level store shared
501
517
  across the whole app) — there it lives for as long as the module does, by design.
502
518
 
519
+ With an automatic initial fill (`immediate` not `false`), the underlying `watch()` is
520
+ registered only once that fill settles — not at construction — so its own response is
521
+ never mistaken for a change to react to. The component's effect scope is still captured
522
+ synchronously at construction, so auto-cleanup on unmount works exactly the same either way.
523
+
503
524
  ### Live search (minimal)
504
525
 
505
526
  ```ts
package/dist/model.d.ts CHANGED
@@ -35,6 +35,15 @@ export declare class ApixFormModel<T = any> {
35
35
  /** @internal */ _fillAbort: AbortController | null;
36
36
  /** @internal */ _transformResponse: ((data: any, response: any) => any) | null;
37
37
  /** @internal */ _transformRequest: ((data: any) => any) | null;
38
+ /**
39
+ * @internal Set only when `watch` must wait for the automatic initial fill
40
+ * to settle — called once, by createModel(), right after it does. Registers
41
+ * the Vue watch() only once the first merge has already happened, so that
42
+ * merge's own data reassignment is never mistaken for a user-driven change
43
+ * in the first place (nothing to de-dupe — the watcher simply doesn't exist
44
+ * yet while the initial fill is in flight).
45
+ */
46
+ _deferredWatchSetup: (() => void) | null;
38
47
  constructor(apix: Apix, options?: FormOptions<T>, source?: FillSource | null);
39
48
  get data(): T | null;
40
49
  set data(value: T | null);
@@ -75,11 +84,11 @@ export declare class ApixFormModel<T = any> {
75
84
  reload(url?: string): Promise<any>;
76
85
  /**
77
86
  * Re-send the fill request with the CURRENT state — a manual trigger for a
78
- * "Search" button. Sends every watched field except `ignore`, and protects
79
- * `lock` fields from being overwritten by the response, exactly like an
80
- * auto watch-triggered request; any pending debounce is cancelled.
81
- * `options.ignore`/`options.lock` extend the form-level lists for this one
82
- * call only. Without `watch` configured, this equals `reload()`.
87
+ * "Search" button. Sends every field except `ignore` (with or without
88
+ * `watch` configured), and protects `lock` fields from being overwritten by
89
+ * the response, exactly like an auto watch-triggered request; any pending
90
+ * debounce is cancelled. `options.ignore`/`options.lock` extend the
91
+ * form-level lists for this one call only.
83
92
  */
84
93
  refresh(options?: RefreshOptions): Promise<any>;
85
94
  /**
@@ -104,7 +113,13 @@ export declare class ApixFormModel<T = any> {
104
113
  private _applyFill;
105
114
  private _applyError;
106
115
  private _submit;
107
- /** @internal Configures auto-refetch-on-change, once, at construction time. */
116
+ /**
117
+ * @internal Computes the trigger/send field sets and registers the Vue
118
+ * watch(). Called either synchronously from the constructor (no automatic
119
+ * initial fill to wait for) or once that fill has settled (see
120
+ * `_deferredWatchSetup`) — `initial` is always `default()`'s shape, since
121
+ * that's what determines which fields exist, regardless of timing.
122
+ */
108
123
  private _setupWatch;
109
124
  private _onWatchTrigger;
110
125
  private _sendWatchRequest;
package/dist/vue-apix.cjs CHANGED
@@ -1 +1 @@
1
- "use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const p=require("vue");function c(i){const t=p.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 m(i){if(i===null||typeof i!="object")return!1;const t=Object.getPrototypeOf(i);return t===Object.prototype||t===null}function E(i,t){if(!m(t))return i===void 0?c(t):i;if(i==null)return c(t);if(!m(i))return i;for(const e of Object.keys(t))i[e]=e in i?E(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 y(i,t,e){const s=t.split(".");let r=i;for(let o=0;o<s.length-1;o++){const n=s[o];(r[n]===null||typeof r[n]!="object")&&(r[n]={}),r=r[n]}r[s[s.length-1]]=e}function x(i,t){const e={};for(const s of t){const r=f(i,s);r!==void 0&&y(e,s,c(r))}return e}function j(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 d(i){return i&&typeof i=="object"&&typeof i.message=="string"?i.message:null}function R(i,t){return t.some(e=>e===i||i.startsWith(`${e}.`))}function w(i,t,e=""){if(e&&R(e,t))return[];if(m(i)){const s=[];for(const r of Object.keys(i))s.push(...w(i[r],t,e?`${e}.${r}`:r));return s}return Array.isArray(i)||!e?[]:[e]}function S(i,t){return t&&i&&typeof i=="object"?f(i,t):i}class g extends Error{constructor(t,e,s){super(d(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 F(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((n,a)=>s(n,`${o}[${a}]`));return}if(typeof r=="object"){for(const[n,a]of Object.entries(r))s(a,`${o}[${n}]`);return}e(o,String(r))}};for(const[r,o]of Object.entries(i))s(o,r);return t.join("&")}async function U(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 A{constructor(t,e={},s=null){this._snapshot=null,this._snapshotLocked=!1,this._ignore=[],this._lock=[],this._triggerFields=null,this._sendFields=null,this._debounce=0,this._debounceTimer=null,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=p.reactive({data:r,errors:{},message:null,processing:!1}),this._snapshot=c(r),this._ignore=e.ignore??[],this._lock=e.lock??[],this._setupWatch(e.watch,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=j(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)y(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(t={}){if(!this._source)return Promise.reject(new Error("[vue-apix] The model has no source URL. Use apix.getForm(url) or model.reload(url)."));if(this._triggerFields===null)return this._fill();this._debounceTimer&&(clearTimeout(this._debounceTimer),this._debounceTimer=null);const e=this._buildFillExtra(t);return this._lastSent=this._payloadJson(),this._fill(e)}transformResponse(t){return this._transformResponse=t,this._proxy}transformRequest(t){return this._transformRequest=t,this._proxy}async _fill(t={}){var o,n,a,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 _=S(u,this._options.path);if(this._transformResponse){const b=c(_);_=this._transformResponse(b,u)??b}return this._applyFill(_,t.preserve??null),this._state.message=d(u),this._state.errors={},(a=(n=this._options).onSuccess)==null||a.call(n,u,this._proxy),u}catch(u){throw F(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=E(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 n=f(this._state.data,o);n!==void 0&&y(s,o,c(n))}this._state.data=s,this._snapshotLocked||(this._snapshot=r,this._snapshotLocked=!0),this._syncLastSent()}_applyError(t){t instanceof g&&(this._state.message=d(t.body)??t.message,t.isValidationError&&(this._state.errors=j(t.errors)))}async _submit(t,e,s={}){var n;const r=e??((n=this._source)==null?void 0:n.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?x(this._state.data,s.only):this._state.data??void 0;if(s.data===void 0&&this._transformRequest&&o!==void 0){const a=c(o);o=this._transformRequest(a)??a}this._state.processing=!0,this._state.errors={},this._state.message=null;try{const a=await this._apix.request(t,r,{data:o,params:s.params,headers:s.headers});return this._state.message=d(a),a}catch(a){throw this._applyError(a),a}finally{this._state.processing=!1}}_setupWatch(t,e){if(!t)return;if(!this._source){console.warn("[vue-apix] `watch` has no effect without a source URL (use apix.getForm/postForm).");return}const s=t===!0?{}:t,r=s.fields;this._sendFields=w(e??{},this._ignore),this._triggerFields=r??this._sendFields,this._debounce=s.debounce??0,this._syncLastSent();const o=this._triggerFields.map(a=>()=>f(this._state.data,a)),n=r?s.deep??!1:!0;p.watch(o,()=>this._onWatchTrigger(),{deep:n})}_onWatchTrigger(){this._payloadJson()!==this._lastSent&&(this._debounceTimer&&clearTimeout(this._debounceTimer),this._debounce>0?this._debounceTimer=setTimeout(()=>this._sendWatchRequest(),this._debounce):this._sendWatchRequest())}_sendWatchRequest(){this._debounceTimer=null,this._source&&(this._lastSent=this._payloadJson(),this._fill(this._buildFillExtra()).catch(()=>{}))}_buildFillExtra(t={}){const e=t.lock?[...this._lock,...t.lock]:this._lock,s=t.ignore?(this._sendFields??[]).filter(o=>!R(o,t.ignore)):this._sendFields??[];let r=x(this._state.data,s);return this._transformRequest&&(r=this._transformRequest(r)??r),this._source.method==="get"?{params:r,preserve:e}:{data:r,preserve:e}}_payloadJson(){const e=(this._triggerFields??[]).map(s=>f(this._state.data,s));return JSON.stringify(e)??"undefined"}_syncLastSent(){this._lastSent=this._payloadJson()}}function k(i,t={},e=null){const s=new A(i,t,e),r=new Proxy(s,{get(o,n){if(typeof n=="symbol"||n in o)return Reflect.get(o,n);const a=o._state.data;if(a&&typeof a=="object")return a[n]},set(o,n,a){if(typeof n=="symbol"||n in o)return Reflect.set(o,n,a);const h=o._state.data;return h&&typeof h=="object"?(h[n]=a,!0):(o._state.data={[n]:a},!0)},has(o,n){if(n in o)return!0;const a=o._state.data;return!!a&&typeof a=="object"&&n in a}});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=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.toLowerCase()]=u)}for(const[h,l]of Object.entries(s.headers??{}))o[h.toLowerCase()]=l;const n={method:t.toUpperCase(),headers:o,signal:s.signal};this.credentials&&(n.credentials=this.credentials),s.data!==void 0&&t!=="get"&&(typeof FormData<"u"&&s.data instanceof FormData?(delete o["content-type"],n.body=s.data):(o["content-type"]??(o["content-type"]="application/json"),n.body=JSON.stringify(s.data)));const a={method:t,url:r,options:s};this.trackStart();try{const h=await fetch(r,n);let l=await U(h);if(this.bodyTransformer&&(l=this.bodyTransformer(l,a)??l),!h.ok)throw new g(h.status,l,h);return l}catch(h){throw F(h)?h:this.emitError(h,a)}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 k(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 k(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=g;exports.ApixFormModel=A;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 m(i){if(i===null||typeof i!="object")return!1;const t=Object.getPrototypeOf(i);return t===Object.prototype||t===null}function E(i,t){if(!m(t))return i===void 0?c(t):i;if(i==null)return c(t);if(!m(i))return i;for(const e of Object.keys(t))i[e]=e in i?E(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 y(i,t,e){const s=t.split(".");let r=i;for(let o=0;o<s.length-1;o++){const n=s[o];(r[n]===null||typeof r[n]!="object")&&(r[n]={}),r=r[n]}r[s[s.length-1]]=e}function j(i,t){const e={};for(const s of t){const r=f(i,s);r!==void 0&&y(e,s,c(r))}return e}function w(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 R(i,t){return t.some(e=>e===i||i.startsWith(`${e}.`))}function g(i,t,e=""){if(e&&R(e,t))return[];if(m(i)){const s=[];for(const r of Object.keys(i))s.push(...g(i[r],t,e?`${e}.${r}`:r));return s}return Array.isArray(i)||!e?[]:[e]}function q(i,t){return t&&i&&typeof i=="object"?f(i,t):i}class b 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 A(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((n,a)=>s(n,`${o}[${a}]`));return}if(typeof r=="object"){for(const[n,a]of Object.entries(r))s(a,`${o}[${n}]`);return}e(o,String(r))}};for(const[r,o]of Object.entries(i))s(o,r);return t.join("&")}async function U(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 F{constructor(t,e={},s=null){this._snapshot=null,this._snapshotLocked=!1,this._ignore=[],this._lock=[],this._triggerFields=null,this._sendFields=null,this._debounce=0,this._debounceTimer=null,this._lastSent=null,this._fillAbort=null,this._transformResponse=null,this._transformRequest=null,this._deferredWatchSetup=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;if(this._state=d.reactive({data:r,errors:{},message:null,processing:!1}),this._snapshot=c(r),this._ignore=e.ignore??[],this._lock=e.lock??[],this._sendFields=g(r??{},this._ignore),e.watch){const o=e.watch;if(!this._source)console.warn("[vue-apix] `watch` has no effect without a source URL (use apix.getForm/postForm).");else if(e.immediate===!1)this._setupWatch(o,r);else{const n=d.getCurrentScope();this._deferredWatchSetup=()=>{n?n.run(()=>this._setupWatch(o,r)):this._setupWatch(o,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=w(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)y(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(t={}){if(!this._source)return Promise.reject(new Error("[vue-apix] The model has no source URL. Use apix.getForm(url) or model.reload(url)."));this._debounceTimer&&(clearTimeout(this._debounceTimer),this._debounceTimer=null);const e=this._buildFillExtra(t);return this._lastSent=this._payloadJson(),this._fill(e)}transformResponse(t){return this._transformResponse=t,this._proxy}transformRequest(t){return this._transformRequest=t,this._proxy}async _fill(t={}){var o,n,a,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=q(l,this._options.path);if(this._transformResponse){const x=c(p);p=this._transformResponse(x,l)??x}return this._applyFill(p,t.preserve??null),this._state.message=_(l),this._state.errors={},(a=(n=this._options).onSuccess)==null||a.call(n,l,this._proxy),l}catch(l){throw A(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=E(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 n=f(this._state.data,o);n!==void 0&&y(s,o,c(n))}this._state.data=s,this._snapshotLocked||(this._snapshot=r,this._snapshotLocked=!0),this._syncLastSent()}_applyError(t){t instanceof b&&(this._state.message=_(t.body)??t.message,t.isValidationError&&(this._state.errors=w(t.errors)))}async _submit(t,e,s={}){var n;const r=e??((n=this._source)==null?void 0:n.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?j(this._state.data,s.only):this._state.data??void 0;if(s.data===void 0&&this._transformRequest&&o!==void 0){const a=c(o);o=this._transformRequest(a)??a}this._state.processing=!0,this._state.errors={},this._state.message=null;try{const a=await this._apix.request(t,r,{data:o,params:s.params,headers:s.headers});return this._state.message=_(a),a}catch(a){throw this._applyError(a),a}finally{this._state.processing=!1}}_setupWatch(t,e){const s=t===!0?{}:t,r=s.fields,o=r??this._sendFields??g(e??{},this._ignore);this._triggerFields=o,this._debounce=s.debounce??0,this._syncLastSent();const n=o.map(h=>()=>f(this._state.data,h)),a=r?s.deep??!1:!0;d.watch(n,()=>this._onWatchTrigger(),{deep:a})}_onWatchTrigger(){this._payloadJson()!==this._lastSent&&(this._debounceTimer&&clearTimeout(this._debounceTimer),this._debounce>0?this._debounceTimer=setTimeout(()=>this._sendWatchRequest(),this._debounce):this._sendWatchRequest())}_sendWatchRequest(){this._debounceTimer=null,this._source&&(this._lastSent=this._payloadJson(),this._fill(this._buildFillExtra()).catch(()=>{}))}_buildFillExtra(t={}){const e=t.lock?[...this._lock,...t.lock]:this._lock,s=t.ignore?(this._sendFields??[]).filter(o=>!R(o,t.ignore)):this._sendFields??[];let r=j(this._state.data,s);return this._transformRequest&&(r=this._transformRequest(r)??r),this._source.method==="get"?{params:r,preserve:e}:{data:r,preserve:e}}_payloadJson(){const e=(this._triggerFields??[]).map(s=>f(this._state.data,s));return JSON.stringify(e)??"undefined"}_syncLastSent(){this._lastSent=this._payloadJson()}}function k(i,t={},e=null){const s=new F(i,t,e),r=new Proxy(s,{get(o,n){if(typeof n=="symbol"||n in o)return Reflect.get(o,n);const a=o._state.data;if(a&&typeof a=="object")return a[n]},set(o,n,a){if(typeof n=="symbol"||n in o)return Reflect.set(o,n,a);const h=o._state.data;return h&&typeof h=="object"?(h[n]=a,!0):(o._state.data={[n]:a},!0)},has(o,n){if(n in o)return!0;const a=o._state.data;return!!a&&typeof a=="object"&&n in a}});return s._proxy=r,e&&t.immediate!==!1&&r.reload().finally(()=>{var o;(o=s._deferredWatchSetup)==null||o.call(s),s._deferredWatchSetup=null}).catch(()=>{}),r}class S{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,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 n={method:t.toUpperCase(),headers:o,signal:s.signal};this.credentials&&(n.credentials=this.credentials),s.data!==void 0&&t!=="get"&&(typeof FormData<"u"&&s.data instanceof FormData?(delete o["content-type"],n.body=s.data):(o["content-type"]??(o["content-type"]="application/json"),n.body=JSON.stringify(s.data)));const a={method:t,url:r,options:s};this.trackStart();try{const h=await fetch(r,n);let u=await U(h);if(this.bodyTransformer&&(u=this.bodyTransformer(u,a)??u),!h.ok)throw new b(h.status,u,h);return u}catch(h){throw A(h)?h:this.emitError(h,a)}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 k(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 k(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 v(i={}){return new S(i)}const O=v();exports.Apix=S;exports.ApixError=b;exports.ApixFormModel=F;exports.apix=O;exports.createApix=v;exports.default=O;
package/dist/vue-apix.js CHANGED
@@ -1,4 +1,4 @@
1
- import { toRaw as F, reactive as O, watch as q } from "vue";
1
+ import { toRaw as F, reactive as O, getCurrentScope as S, watch as q } from "vue";
2
2
  function c(i) {
3
3
  const t = F(i);
4
4
  if (t === null || typeof t != "object") return t;
@@ -17,13 +17,13 @@ function p(i) {
17
17
  const t = Object.getPrototypeOf(i);
18
18
  return t === Object.prototype || t === null;
19
19
  }
20
- function x(i, t) {
20
+ function w(i, t) {
21
21
  if (!p(t))
22
22
  return i === void 0 ? c(t) : i;
23
23
  if (i == null) return c(t);
24
24
  if (!p(i)) return i;
25
25
  for (const e of Object.keys(t))
26
- i[e] = e in i ? x(i[e], t[e]) : c(t[e]);
26
+ i[e] = e in i ? w(i[e], t[e]) : c(t[e]);
27
27
  return i;
28
28
  }
29
29
  function f(i, t) {
@@ -44,7 +44,7 @@ function m(i, t, e) {
44
44
  }
45
45
  r[s[s.length - 1]] = e;
46
46
  }
47
- function g(i, t) {
47
+ function b(i, t) {
48
48
  const e = {};
49
49
  for (const s of t) {
50
50
  const r = f(i, s);
@@ -52,7 +52,7 @@ function g(i, t) {
52
52
  }
53
53
  return e;
54
54
  }
55
- function b(i) {
55
+ function j(i) {
56
56
  const t = {};
57
57
  for (const [e, s] of Object.entries(i ?? {}))
58
58
  s != null && (t[e] = Array.isArray(s) ? String(s[0]) : String(s));
@@ -64,12 +64,12 @@ function d(i) {
64
64
  function k(i, t) {
65
65
  return t.some((e) => e === i || i.startsWith(`${e}.`));
66
66
  }
67
- function R(i, t, e = "") {
67
+ function y(i, t, e = "") {
68
68
  if (e && k(e, t)) return [];
69
69
  if (p(i)) {
70
70
  const s = [];
71
71
  for (const r of Object.keys(i))
72
- s.push(...R(i[r], t, e ? `${e}.${r}` : r));
72
+ s.push(...y(i[r], t, e ? `${e}.${r}` : r));
73
73
  return s;
74
74
  }
75
75
  return Array.isArray(i) || !e ? [] : [e];
@@ -77,7 +77,7 @@ function R(i, t, e = "") {
77
77
  function v(i, t) {
78
78
  return t && i && typeof i == "object" ? f(i, t) : i;
79
79
  }
80
- class w extends Error {
80
+ class R extends Error {
81
81
  constructor(t, e, s) {
82
82
  super(d(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 : {};
83
83
  }
@@ -114,7 +114,7 @@ function A(i) {
114
114
  for (const [r, o] of Object.entries(i)) s(o, r);
115
115
  return t.join("&");
116
116
  }
117
- async function S(i) {
117
+ async function T(i) {
118
118
  if (i.status === 204) return null;
119
119
  const t = await i.text();
120
120
  if (!t) return null;
@@ -124,11 +124,23 @@ async function S(i) {
124
124
  return t;
125
125
  }
126
126
  }
127
- class T {
127
+ class U {
128
128
  constructor(t, e = {}, s = null) {
129
- this._snapshot = null, this._snapshotLocked = !1, this._ignore = [], this._lock = [], this._triggerFields = null, this._sendFields = null, this._debounce = 0, this._debounceTimer = null, 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;
129
+ this._snapshot = null, this._snapshotLocked = !1, this._ignore = [], this._lock = [], this._triggerFields = null, this._sendFields = null, this._debounce = 0, this._debounceTimer = null, this._lastSent = null, this._fillAbort = null, this._transformResponse = null, this._transformRequest = null, this._deferredWatchSetup = null, this._apix = t, this._options = e, this._source = s, this._transformResponse = e.transformResponse ?? null, this._transformRequest = e.transformRequest ?? null;
130
130
  const r = e.default ? e.default() : null;
131
- this._state = O({ data: r, errors: {}, message: null, processing: !1 }), this._snapshot = c(r), this._ignore = e.ignore ?? [], this._lock = e.lock ?? [], this._setupWatch(e.watch, r);
131
+ if (this._state = O({ data: r, errors: {}, message: null, processing: !1 }), this._snapshot = c(r), this._ignore = e.ignore ?? [], this._lock = e.lock ?? [], this._sendFields = y(r ?? {}, this._ignore), e.watch) {
132
+ const o = e.watch;
133
+ if (!this._source)
134
+ console.warn("[vue-apix] `watch` has no effect without a source URL (use apix.getForm/postForm).");
135
+ else if (e.immediate === !1)
136
+ this._setupWatch(o, r);
137
+ else {
138
+ const n = S();
139
+ this._deferredWatchSetup = () => {
140
+ n ? n.run(() => this._setupWatch(o, r)) : this._setupWatch(o, r);
141
+ };
142
+ }
143
+ }
132
144
  }
133
145
  // --- reactive state ---------------------------------------------------------
134
146
  get data() {
@@ -179,7 +191,7 @@ class T {
179
191
  if (r.startsWith(s)) return e[r];
180
192
  }
181
193
  setErrors(t) {
182
- return this._state.errors = b(t), this._proxy;
194
+ return this._state.errors = j(t), this._proxy;
183
195
  }
184
196
  /** Clear all errors, or only the given keys (including their `key.*` sub-errors). */
185
197
  clearErrors(t) {
@@ -228,18 +240,17 @@ class T {
228
240
  }
229
241
  /**
230
242
  * Re-send the fill request with the CURRENT state — a manual trigger for a
231
- * "Search" button. Sends every watched field except `ignore`, and protects
232
- * `lock` fields from being overwritten by the response, exactly like an
233
- * auto watch-triggered request; any pending debounce is cancelled.
234
- * `options.ignore`/`options.lock` extend the form-level lists for this one
235
- * call only. Without `watch` configured, this equals `reload()`.
243
+ * "Search" button. Sends every field except `ignore` (with or without
244
+ * `watch` configured), and protects `lock` fields from being overwritten by
245
+ * the response, exactly like an auto watch-triggered request; any pending
246
+ * debounce is cancelled. `options.ignore`/`options.lock` extend the
247
+ * form-level lists for this one call only.
236
248
  */
237
249
  refresh(t = {}) {
238
250
  if (!this._source)
239
251
  return Promise.reject(
240
252
  new Error("[vue-apix] The model has no source URL. Use apix.getForm(url) or model.reload(url).")
241
253
  );
242
- if (this._triggerFields === null) return this._fill();
243
254
  this._debounceTimer && (clearTimeout(this._debounceTimer), this._debounceTimer = null);
244
255
  const e = this._buildFillExtra(t);
245
256
  return this._lastSent = this._payloadJson(), this._fill(e);
@@ -265,7 +276,7 @@ class T {
265
276
  // --- internals ----------------------------------------------------------------------
266
277
  /** @internal */
267
278
  async _fill(t = {}) {
268
- var o, n, a, h, l;
279
+ var o, n, a, h, u;
269
280
  const e = this._source;
270
281
  (o = this._fillAbort) == null || o.abort();
271
282
  const s = new AbortController();
@@ -273,22 +284,22 @@ class T {
273
284
  const r = { signal: s.signal };
274
285
  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);
275
286
  try {
276
- const u = await this._apix.request(e.method, e.url, r);
277
- let _ = v(u, this._options.path);
287
+ const l = await this._apix.request(e.method, e.url, r);
288
+ let _ = v(l, this._options.path);
278
289
  if (this._transformResponse) {
279
- const y = c(_);
280
- _ = this._transformResponse(y, u) ?? y;
290
+ const g = c(_);
291
+ _ = this._transformResponse(g, l) ?? g;
281
292
  }
282
- return this._applyFill(_, t.preserve ?? null), this._state.message = d(u), this._state.errors = {}, (a = (n = this._options).onSuccess) == null || a.call(n, u, this._proxy), u;
283
- } catch (u) {
284
- throw E(u) || (this._applyError(u), (l = (h = this._options).onError) == null || l.call(h, u, this._proxy)), u;
293
+ return this._applyFill(_, t.preserve ?? null), this._state.message = d(l), this._state.errors = {}, (a = (n = this._options).onSuccess) == null || a.call(n, l, this._proxy), l;
294
+ } catch (l) {
295
+ throw E(l) || (this._applyError(l), (u = (h = this._options).onError) == null || u.call(h, l, this._proxy)), l;
285
296
  } finally {
286
297
  this._fillAbort === s && (this._fillAbort = null, this._state.processing = !1);
287
298
  }
288
299
  }
289
300
  _applyFill(t, e) {
290
301
  let s = c(t);
291
- this._options.mergeDefaults !== !1 && this._options.default && (s = x(s, this._options.default()));
302
+ this._options.mergeDefaults !== !1 && this._options.default && (s = w(s, this._options.default()));
292
303
  const r = this._snapshotLocked ? null : c(s);
293
304
  if (e && e.length && s && typeof s == "object" && this._state.data && typeof this._state.data == "object")
294
305
  for (const o of e) {
@@ -298,14 +309,14 @@ class T {
298
309
  this._state.data = s, this._snapshotLocked || (this._snapshot = r, this._snapshotLocked = !0), this._syncLastSent();
299
310
  }
300
311
  _applyError(t) {
301
- t instanceof w && (this._state.message = d(t.body) ?? t.message, t.isValidationError && (this._state.errors = b(t.errors)));
312
+ t instanceof R && (this._state.message = d(t.body) ?? t.message, t.isValidationError && (this._state.errors = j(t.errors)));
302
313
  }
303
314
  async _submit(t, e, s = {}) {
304
315
  var n;
305
316
  const r = e ?? ((n = this._source) == null ? void 0 : n.url);
306
317
  if (!r)
307
318
  throw new Error(`[vue-apix] The model has no URL. Pass one explicitly: model.${t}(url).`);
308
- let o = s.data !== void 0 ? s.data : s.only ? g(this._state.data, s.only) : this._state.data ?? void 0;
319
+ let o = s.data !== void 0 ? s.data : s.only ? b(this._state.data, s.only) : this._state.data ?? void 0;
309
320
  if (s.data === void 0 && this._transformRequest && o !== void 0) {
310
321
  const a = c(o);
311
322
  o = this._transformRequest(a) ?? a;
@@ -324,17 +335,18 @@ class T {
324
335
  this._state.processing = !1;
325
336
  }
326
337
  }
327
- /** @internal Configures auto-refetch-on-change, once, at construction time. */
338
+ /**
339
+ * @internal Computes the trigger/send field sets and registers the Vue
340
+ * watch(). Called either synchronously from the constructor (no automatic
341
+ * initial fill to wait for) or once that fill has settled (see
342
+ * `_deferredWatchSetup`) — `initial` is always `default()`'s shape, since
343
+ * that's what determines which fields exist, regardless of timing.
344
+ */
328
345
  _setupWatch(t, e) {
329
- if (!t) return;
330
- if (!this._source) {
331
- console.warn("[vue-apix] `watch` has no effect without a source URL (use apix.getForm/postForm).");
332
- return;
333
- }
334
- const s = t === !0 ? {} : t, r = s.fields;
335
- this._sendFields = R(e ?? {}, this._ignore), this._triggerFields = r ?? this._sendFields, this._debounce = s.debounce ?? 0, this._syncLastSent();
336
- const o = this._triggerFields.map((a) => () => f(this._state.data, a)), n = r ? s.deep ?? !1 : !0;
337
- q(o, () => this._onWatchTrigger(), { deep: n });
346
+ const s = t === !0 ? {} : t, r = s.fields, o = r ?? this._sendFields ?? y(e ?? {}, this._ignore);
347
+ this._triggerFields = o, this._debounce = s.debounce ?? 0, this._syncLastSent();
348
+ const n = o.map((h) => () => f(this._state.data, h)), a = r ? s.deep ?? !1 : !0;
349
+ q(n, () => this._onWatchTrigger(), { deep: a });
338
350
  }
339
351
  _onWatchTrigger() {
340
352
  this._payloadJson() !== this._lastSent && (this._debounceTimer && clearTimeout(this._debounceTimer), this._debounce > 0 ? this._debounceTimer = setTimeout(() => this._sendWatchRequest(), this._debounce) : this._sendWatchRequest());
@@ -346,7 +358,7 @@ class T {
346
358
  /** Build the fill() extra for a watch/refresh request from the current state. */
347
359
  _buildFillExtra(t = {}) {
348
360
  const e = t.lock ? [...this._lock, ...t.lock] : this._lock, s = t.ignore ? (this._sendFields ?? []).filter((o) => !k(o, t.ignore)) : this._sendFields ?? [];
349
- let r = g(this._state.data, s);
361
+ let r = b(this._state.data, s);
350
362
  return this._transformRequest && (r = this._transformRequest(r) ?? r), this._source.method === "get" ? { params: r, preserve: e } : { data: r, preserve: e };
351
363
  }
352
364
  _payloadJson() {
@@ -357,8 +369,8 @@ class T {
357
369
  this._lastSent = this._payloadJson();
358
370
  }
359
371
  }
360
- function j(i, t = {}, e = null) {
361
- const s = new T(i, t, e), r = new Proxy(s, {
372
+ function x(i, t = {}, e = null) {
373
+ const s = new U(i, t, e), r = new Proxy(s, {
362
374
  get(o, n) {
363
375
  if (typeof n == "symbol" || n in o) return Reflect.get(o, n);
364
376
  const a = o._state.data;
@@ -375,10 +387,13 @@ function j(i, t = {}, e = null) {
375
387
  return !!a && typeof a == "object" && n in a;
376
388
  }
377
389
  });
378
- return s._proxy = r, e && t.immediate !== !1 && r.reload().catch(() => {
390
+ return s._proxy = r, e && t.immediate !== !1 && r.reload().finally(() => {
391
+ var o;
392
+ (o = s._deferredWatchSetup) == null || o.call(s), s._deferredWatchSetup = null;
393
+ }).catch(() => {
379
394
  }), r;
380
395
  }
381
- class U {
396
+ class W {
382
397
  constructor(t = {}) {
383
398
  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);
384
399
  }
@@ -428,21 +443,21 @@ class U {
428
443
  accept: "application/json",
429
444
  "x-requested-with": "XMLHttpRequest"
430
445
  };
431
- for (const [h, l] of Object.entries(this.headers)) {
432
- const u = typeof l == "function" ? l() : l;
433
- u != null && (o[h.toLowerCase()] = u);
446
+ for (const [h, u] of Object.entries(this.headers)) {
447
+ const l = typeof u == "function" ? u() : u;
448
+ l != null && (o[h.toLowerCase()] = l);
434
449
  }
435
- for (const [h, l] of Object.entries(s.headers ?? {}))
436
- o[h.toLowerCase()] = l;
450
+ for (const [h, u] of Object.entries(s.headers ?? {}))
451
+ o[h.toLowerCase()] = u;
437
452
  const n = { method: t.toUpperCase(), headers: o, signal: s.signal };
438
453
  this.credentials && (n.credentials = this.credentials), s.data !== void 0 && t !== "get" && (typeof FormData < "u" && s.data instanceof FormData ? (delete o["content-type"], n.body = s.data) : (o["content-type"] ?? (o["content-type"] = "application/json"), n.body = JSON.stringify(s.data)));
439
454
  const a = { method: t, url: r, options: s };
440
455
  this.trackStart();
441
456
  try {
442
457
  const h = await fetch(r, n);
443
- let l = await S(h);
444
- if (this.bodyTransformer && (l = this.bodyTransformer(l, a) ?? l), !h.ok) throw new w(h.status, l, h);
445
- return l;
458
+ let u = await T(h);
459
+ if (this.bodyTransformer && (u = this.bodyTransformer(u, a) ?? u), !h.ok) throw new R(h.status, u, h);
460
+ return u;
446
461
  } catch (h) {
447
462
  throw E(h) ? h : this.emitError(h, a);
448
463
  } finally {
@@ -468,7 +483,7 @@ class U {
468
483
  // --- form models -----------------------------------------------------------
469
484
  /** Create a form model without any request (like Inertia's useForm). */
470
485
  form(t, e = {}) {
471
- return j(this, { ...e, default: typeof t == "function" ? t : () => c(t) });
486
+ return x(this, { ...e, default: typeof t == "function" ? t : () => c(t) });
472
487
  }
473
488
  /** Create a form model and fill it with a GET request. */
474
489
  getForm(t, e) {
@@ -480,7 +495,7 @@ class U {
480
495
  }
481
496
  createFormModel(t, e, s) {
482
497
  const r = typeof s == "string" ? { path: s } : { ...s ?? {} };
483
- return j(this, r, { url: e, method: t });
498
+ return x(this, r, { url: e, method: t });
484
499
  }
485
500
  // --- internals --------------------------------------------------------------
486
501
  trackStart() {
@@ -509,13 +524,13 @@ class U {
509
524
  }
510
525
  }
511
526
  function L(i = {}) {
512
- return new U(i);
527
+ return new W(i);
513
528
  }
514
529
  const P = L();
515
530
  export {
516
- U as Apix,
517
- w as ApixError,
518
- T as ApixFormModel,
531
+ W as Apix,
532
+ R as ApixError,
533
+ U as ApixFormModel,
519
534
  P as apix,
520
535
  L as createApix,
521
536
  P as default
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@diephp/vue-apix",
3
- "version": "0.3.0",
3
+ "version": "0.3.3",
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",