mobx-tanstack-query-api 0.0.28 → 0.0.30

package/cli/bin.d.ts

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+export {};
+//# sourceMappingURL=bin.d.ts.map

package/cli/bin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bin.d.ts","sourceRoot":"","sources":["../../src/cli/bin.ts"],"names":[],"mappings":""}

package/cli/bin.js

@@ -0,0 +1,26 @@
+#!/usr/bin/env node
+import { existsSync } from 'node:fs';
+import path from 'node:path';
+import { generateApi } from '../codegen/index.js';
+const projectDir = process.cwd();
+let generateApiParams;
+let module;
+if (existsSync(path.resolve(projectDir, 'api-codegen.config.js'))) {
+    module = await import(path.resolve(projectDir, 'api-codegen.config.js'));
+}
+else if (existsSync(path.resolve(projectDir, 'api-codegen.config.mjs'))) {
+    module = await import(path.resolve(projectDir, 'api-codegen.config.mjs'));
+}
+else if (existsSync(path.resolve(projectDir, 'api-codegen.config.json'))) {
+    module = await import(path.resolve(projectDir, 'api-codegen.config.json'));
+}
+else {
+    throw new Error('api-codegen.config.(js|mjs|json) not found');
+}
+if (module.default && 'links' in module.default) {
+    generateApiParams = module.default;
+}
+else {
+    throw new Error('api-codegen.config.(js|mjs|json) is not valid');
+}
+generateApi(generateApiParams);

package/cli/bin.mjs

@@ -0,0 +1,26 @@
+#!/usr/bin/env node
+import { existsSync } from 'node:fs';
+import path from 'node:path';
+import { generateApi } from '../codegen/index.js';
+const projectDir = process.cwd();
+let generateApiParams;
+let module;
+if (existsSync(path.resolve(projectDir, 'api-codegen.config.js'))) {
+    module = await import(path.resolve(projectDir, 'api-codegen.config.js'));
+}
+else if (existsSync(path.resolve(projectDir, 'api-codegen.config.mjs'))) {
+    module = await import(path.resolve(projectDir, 'api-codegen.config.mjs'));
+}
+else if (existsSync(path.resolve(projectDir, 'api-codegen.config.json'))) {
+    module = await import(path.resolve(projectDir, 'api-codegen.config.json'));
+}
+else {
+    throw new Error('api-codegen.config.(js|mjs|json) not found');
+}
+if (module.default && 'links' in module.default) {
+    generateApiParams = module.default;
+}
+else {
+    throw new Error('api-codegen.config.(js|mjs|json) is not valid');
+}
+generateApi(generateApiParams);

package/cli/define-config.d.ts

@@ -0,0 +1,3 @@
+import { GenerateApiParams } from '../codegen/index.js';
+export declare const defineConfig: (config: GenerateApiParams) => GenerateApiParams;
+//# sourceMappingURL=define-config.d.ts.map

package/cli/define-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"define-config.d.ts","sourceRoot":"","sources":["../../src/cli/define-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,eAAO,MAAM,YAAY,WAAY,iBAAiB,sBAErD,CAAC"}

package/cli/define-config.js

@@ -0,0 +1,3 @@
+export const defineConfig = (config) => {
+    return config;
+};

package/cli/index.d.ts

@@ -0,0 +1,2 @@
+export * from './define-config.js';
+//# sourceMappingURL=index.d.ts.map

package/cli/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC"}

package/cli/index.js

@@ -0,0 +1 @@
+export * from './define-config.js';

package/codegen/index.d.ts

@@ -27,10 +27,9 @@ export interface QueryApiParams {
     };
 }
 export type AllImportFileParams = Record<KeyOfByValue<Required<QueryApiParams>, 'builtin' | ImportFileParams>, ImportFileParams>;
-type GenerateApiParams = Omit<GenerateApiParamsFromSwagger, 'output' | 'moduleNameFirstTag' | 'moduleNameIndex' | 'url' | 'input' | 'spec'> & {
+export type GenerateApiParams = Omit<GenerateApiParamsFromSwagger, 'output' | 'moduleNameFirstTag' | 'moduleNameIndex' | 'url' | 'input' | 'spec'> & {
     output: string;
     input: string | AnyObject;
 } & QueryApiParams;
 export declare const generateApi: (inputParams: GenerateApiParams) => Promise<void>;
-export {};
 //# sourceMappingURL=index.d.ts.map

package/codegen/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/codegen/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,IAAI,4BAA4B,EACjD,WAAW,EAEZ,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAa9D,MAAM,MAAM,cAAc,GAAG,UAAU,CACrC,OAAO,CACL,QAAQ,CAAC,OAAO,CAAC,4BAA4B,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,OAAO,CAAC,CAAC,EAC3E,SAAS,CACV,CAAC,QAAQ,CAAC,CACZ,CAAC,CAAC,CAAC,CAAC;AAEL,MAAM,MAAM,gBAAgB,GAAG,UAAU,CACvC,cAAc,CAAC,uBAAuB,CAAC,CACxC,CAAC,OAAO,CAAC,CAAC;AAEX,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,EAAE,uBAAuB,CAAC;IACpC,yBAAyB,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAE7C,WAAW,EAAE,SAAS,GAAG,gBAAgB,CAAC;IAE1C,QAAQ,EAAE,SAAS,GAAG,gBAAgB,CAAC;IAEvC,UAAU,EAAE,SAAS,GAAG,gBAAgB,CAAC;IAEzC,eAAe,CAAC,EAAE,CAChB,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,gBAAgB,KACpB;QACH,QAAQ,EAAE,MAAM,CAAC;QACjB,cAAc,EAAE,MAAM,CAAC;QACvB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,cAAc,CAAC,EAAE,CACf,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,gBAAgB,KACpB;QACH,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;CACH;AAED,MAAM,MAAM,mBAAmB,GAAG,MAAM,CACtC,YAAY,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,SAAS,GAAG,gBAAgB,CAAC,EACpE,gBAAgB,CACjB,CAAC;AAEF,KAAK,iBAAiB,GAAG,IAAI,CAC3B,4BAA4B,EAC5B,QAAQ,GAAG,oBAAoB,GAAG,iBAAiB,GAAG,KAAK,GAAG,OAAO,GAAG,MAAM,CAC/E,GAAG;IACF,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B,GAAG,cAAc,CAAC;AAEnB,eAAO,MAAM,WAAW,gBAAuB,iBAAiB,kBAgO/D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/codegen/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,IAAI,4BAA4B,EACjD,WAAW,EAEZ,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAa9D,MAAM,MAAM,cAAc,GAAG,UAAU,CACrC,OAAO,CACL,QAAQ,CAAC,OAAO,CAAC,4BAA4B,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,OAAO,CAAC,CAAC,EAC3E,SAAS,CACV,CAAC,QAAQ,CAAC,CACZ,CAAC,CAAC,CAAC,CAAC;AAEL,MAAM,MAAM,gBAAgB,GAAG,UAAU,CACvC,cAAc,CAAC,uBAAuB,CAAC,CACxC,CAAC,OAAO,CAAC,CAAC;AAEX,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,EAAE,uBAAuB,CAAC;IACpC,yBAAyB,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAE7C,WAAW,EAAE,SAAS,GAAG,gBAAgB,CAAC;IAE1C,QAAQ,EAAE,SAAS,GAAG,gBAAgB,CAAC;IAEvC,UAAU,EAAE,SAAS,GAAG,gBAAgB,CAAC;IAEzC,eAAe,CAAC,EAAE,CAChB,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,gBAAgB,KACpB;QACH,QAAQ,EAAE,MAAM,CAAC;QACjB,cAAc,EAAE,MAAM,CAAC;QACvB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,cAAc,CAAC,EAAE,CACf,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,gBAAgB,KACpB;QACH,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;CACH;AAED,MAAM,MAAM,mBAAmB,GAAG,MAAM,CACtC,YAAY,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,SAAS,GAAG,gBAAgB,CAAC,EACpE,gBAAgB,CACjB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAClC,4BAA4B,EAC5B,QAAQ,GAAG,oBAAoB,GAAG,iBAAiB,GAAG,KAAK,GAAG,OAAO,GAAG,MAAM,CAC/E,GAAG;IACF,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B,GAAG,cAAc,CAAC;AAEnB,eAAO,MAAM,WAAW,gBAAuB,iBAAiB,kBAgO/D,CAAC"}

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "mobx-tanstack-query-api",
-  "version": "0.0.28",
+  "version": "0.0.30",
   "keywords": [],
   "author": "js2me",
   "license": "MIT",
   "description": "",
   "type": "module",
+  "bin": "cli/bin.mjs",
   "bugs": {
     "url": "https://github.com/js2me/mobx-tanstack-query-api/issues"
   },
@@ -40,6 +41,21 @@
       "default": "./builtin/index.js",
       "types": "./builtin/index.d.ts"
     },
+    "./cli/bin": {
+      "import": "./cli/bin.js",
+      "default": "./cli/bin.js",
+      "types": "./cli/bin.d.ts"
+    },
+    "./cli/define-config": {
+      "import": "./cli/define-config.js",
+      "default": "./cli/define-config.js",
+      "types": "./cli/define-config.d.ts"
+    },
+    "./cli": {
+      "import": "./cli/index.js",
+      "default": "./cli/index.js",
+      "types": "./cli/index.d.ts"
+    },
     "./codegen": {
       "import": "./codegen/index.js",
       "default": "./codegen/index.js",

package/runtime/endpoint-query.d.ts

@@ -2,13 +2,13 @@ import { QueryClient, QueryFunctionContext } from '@tanstack/query-core';
 import { MobxQuery, MobxQueryConfig, MobxQueryDynamicOptions } from 'mobx-tanstack-query';
 import { MaybeFalsy, Unpromise } from 'yummies/utils/types';
 import { AnyEndpoint, InferEndpointError, InferEndpointInput, InferEndpointResponse } from './endpoint.types.js';
-export interface EndpointQueryOptions<TEndpoint extends AnyEndpoint> extends Omit<MobxQueryConfig<Unpromise<InferEndpointResponse<TEndpoint>>, InferEndpointError<TEndpoint>>, 'options' | 'queryFn' | 'queryClient'> {
+export interface EndpointQueryOptions<TEndpoint extends AnyEndpoint> extends Omit<MobxQueryConfig<Unpromise<InferEndpointResponse<TEndpoint>>['data'], InferEndpointError<TEndpoint>>, 'options' | 'queryFn' | 'queryClient'> {
     input: () => MaybeFalsy<InferEndpointInput<TEndpoint>>;
 }
-export declare class EndpointQuery<TEndpoint extends AnyEndpoint> extends MobxQuery<Unpromise<InferEndpointResponse<TEndpoint>>, InferEndpointError<TEndpoint>> {
+export declare class EndpointQuery<TEndpoint extends AnyEndpoint> extends MobxQuery<Unpromise<InferEndpointResponse<TEndpoint>>['data'], InferEndpointError<TEndpoint>> {
     private endpoint;
+    response: Unpromise<InferEndpointResponse<TEndpoint>> | null;
     constructor(endpoint: TEndpoint, queryClient: QueryClient, { input: getInput, ...queryOptions }: EndpointQueryOptions<TEndpoint>);
-    get response(): Unpromise<InferEndpointResponse<TEndpoint>> | null;
     setInput(input: MaybeFalsy<InferEndpointInput<TEndpoint>>): Promise<Unpromise<InferEndpointResponse<TEndpoint>>>;
     static buildOptionsFromInput(endpoint: AnyEndpoint, input: any): {
         enabled: boolean;

package/runtime/endpoint-query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"endpoint-query.d.ts","sourceRoot":"","sources":["../../src/runtime/endpoint-query.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEzE,OAAO,EACL,SAAS,EACT,eAAe,EACf,uBAAuB,EACxB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,EACL,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,WAAW,oBAAoB,CAAC,SAAS,SAAS,WAAW,CACjE,SAAQ,IAAI,CACV,eAAe,CACb,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,EAC3C,kBAAkB,CAAC,SAAS,CAAC,CAC9B,EACD,SAAS,GAAG,SAAS,GAAG,aAAa,CACtC;IACD,KAAK,EAAE,MAAM,UAAU,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC;CACxD;AAED,qBAAa,aAAa,CAAC,SAAS,SAAS,WAAW,CAAE,SAAQ,SAAS,CACzE,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,EAC3C,kBAAkB,CAAC,SAAS,CAAC,CAC9B;IAEG,OAAO,CAAC,QAAQ;gBAAR,QAAQ,EAAE,SAAS,EAC3B,WAAW,EAAE,WAAW,EACxB,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,YAAY,EAAE,EAAE,oBAAoB,CAAC,SAAS,CAAC;IAuCvE,IAAI,QAAQ,IAAI,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,GAAG,IAAI,CAKjE;IAEK,QAAQ,CACZ,KAAK,EAAE,UAAU,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,GAC/C,OAAO,CAAC,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAAC;IAMvD,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG;;;;IAO9D,SAAS,CAAC,qBAAqB,CAC7B,KAAK,EAAE,UAAU,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,GAC/C,uBAAuB,CACxB,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,EAC3C,kBAAkB,CAAC,SAAS,CAAC,CAC9B;IAID,SAAS,CAAC,sBAAsB,CAAC,GAAG,EAAE,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC;CAIrE"}
+{"version":3,"file":"endpoint-query.d.ts","sourceRoot":"","sources":["../../src/runtime/endpoint-query.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEzE,OAAO,EACL,SAAS,EACT,eAAe,EACf,uBAAuB,EACxB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,EACL,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,WAAW,oBAAoB,CAAC,SAAS,SAAS,WAAW,CACjE,SAAQ,IAAI,CACV,eAAe,CACb,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,EACnD,kBAAkB,CAAC,SAAS,CAAC,CAC9B,EACD,SAAS,GAAG,SAAS,GAAG,aAAa,CACtC;IACD,KAAK,EAAE,MAAM,UAAU,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC;CACxD;AAED,qBAAa,aAAa,CAAC,SAAS,SAAS,WAAW,CAAE,SAAQ,SAAS,CACzE,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,EACnD,kBAAkB,CAAC,SAAS,CAAC,CAC9B;IAIG,OAAO,CAAC,QAAQ;IAHlB,QAAQ,EAAE,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,GAAG,IAAI,CAAQ;gBAG1D,QAAQ,EAAE,SAAS,EAC3B,WAAW,EAAE,WAAW,EACxB,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,YAAY,EAAE,EAAE,oBAAoB,CAAC,SAAS,CAAC;IAsDjE,QAAQ,CACZ,KAAK,EAAE,UAAU,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,GAC/C,OAAO,CAAC,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAAC;IAMvD,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG;;;;IAO9D,SAAS,CAAC,qBAAqB,CAC7B,KAAK,EAAE,UAAU,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,GAC/C,uBAAuB,CACxB,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,EAC3C,kBAAkB,CAAC,SAAS,CAAC,CAC9B;IAID,SAAS,CAAC,sBAAsB,CAAC,GAAG,EAAE,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC;CAIrE"}

package/runtime/endpoint-query.js

@@ -1,7 +1,8 @@
-import { when } from 'mobx';
+import { makeObservable, observable, runInAction, when } from 'mobx';
 import { MobxQuery, } from 'mobx-tanstack-query';
 export class EndpointQuery extends MobxQuery {
     endpoint;
+    response = null;
     constructor(endpoint, queryClient, { input: getInput, ...queryOptions }) {
         super({
             ...queryOptions,
@@ -19,6 +20,9 @@ export class EndpointQuery extends MobxQuery {
                 return EndpointQuery.buildOptionsFromInput(endpoint, willEnableManually && input);
             },
             queryFn: async (ctx) => {
+                runInAction(() => {
+                    this.response = null;
+                });
                 const args = this.buildParamsFromContext(ctx);
                 const requestParamsIndex = args.length - 1;
                 if (args[requestParamsIndex]) {
@@ -31,16 +35,15 @@ export class EndpointQuery extends MobxQuery {
                 }
                 // @ts-ignore
                 const response = await endpoint.request(...args);
-                return response;
+                runInAction(() => {
+                    this.response = response;
+                });
+                return response.data;
             },
         });
         this.endpoint = endpoint;
-    }
-    get response() {
-        if (this.options.queryKey[0] === '__SKIP__') {
-            return null;
-        }
-        return this.result.data?.data ?? null;
+        observable.ref(this, 'lastResponse');
+        makeObservable(this);
     }
     async setInput(input) {
         this.update(this.buildOptionsFromInput(input));