wormajs 0.2.2 → 0.2.4

package/dist/template/presets/alova/common/helper.cjs.handlebars

@@ -4,10 +4,19 @@ function buildPayload(url, defaultConfig, apiName, config) {
 }
 
 /**
- * @template {Record<string, (config: any) => any>} TagedMap
- * @template \{{ [K in keyof TagedMap]?: Partial<Parameters<TagedMap[K]>[0]> }} ConfigMap
- * @param {TagedMap} _ - tagged api map (unused at runtime)
- * @param {ConfigMap} configMap - default config per api name
+ * @typedef {{#raw "{{" }}{{/raw}}
+{{#each tagedApis}}
+ *  {{{tagName}}}: typeof import('./services/{{{tagName}}}.cjs')
+{{/each}}
+ * {{#raw "}}" }}{{/raw}} ServicesMap
+ */
+
+/**
+ * @template {keyof ServicesMap} T
+ * @template {Record<string, (config: any) => any>} [TagedMap = ServicesMap[T]]
+ * @template [ConfigMap = { [K in keyof TagedMap]?: Partial<Parameters<TagedMap[K]>[0]> }]
+ * @param {T} _
+ * @param {ConfigMap} configMap
  * @returns {ConfigMap}
  */
 const setMethodDefaultConfig = (_, configMap) => configMap;

package/dist/template/presets/alova/common/services/#index.cjs.handlebars

@@ -1,11 +1,8 @@
 {{> comment}}
 const { setMethodDefaultConfig } = require('../helper.cjs');
-{{#each tagedApis}}
-const {{{tagName}}} = require('./{{{tagName}}}.cjs');
-{{/each}}
 
 {{#each tagedApis}}
-const {{{tagName}}}DefaultConfig = setMethodDefaultConfig({{{tagName}}}, {});
+const {{{tagName}}}DefaultConfig = setMethodDefaultConfig('{{{tagName}}}', {});
 {{/each}}
 
 {{#each tagedApis}}

package/dist/template/presets/alova/module/helper.js.handlebars

@@ -4,10 +4,19 @@ export function buildPayload(url, defaultConfig, apiName, config) {
 }
 
 /**
- * @template {Record<string, (config: any) => any>} TagedMap
- * @template \{{ [K in keyof TagedMap]?: Partial<Parameters<TagedMap[K]>[0]> }} ConfigMap
- * @param {TagedMap} _ - tagged api map (unused at runtime)
- * @param {ConfigMap} configMap - default config per api name
+ * @typedef {{#raw "{{" }}{{/raw}}
+{{#each tagedApis}}
+ *  {{{tagName}}}: typeof import('./services/{{{tagName}}}')
+{{/each}}
+ * {{#raw "}}" }}{{/raw}} ServicesMap
+ */
+
+/**
+ * @template {keyof ServicesMap} T
+ * @template {Record<string, (config: any) => any>} [TagedMap = ServicesMap[T]]
+ * @template [ConfigMap = { [K in keyof TagedMap]?: Partial<Parameters<TagedMap[K]>[0]> }]
+ * @param {T} _
+ * @param {ConfigMap} configMap
  * @returns {ConfigMap}
  */
 export const setMethodDefaultConfig = (_, configMap) => configMap;

package/dist/template/presets/alova/module/services/#index.js.handlebars

@@ -1,9 +1,6 @@
 {{> comment}}
 import { setMethodDefaultConfig } from '../helper.js';
-{{#each tagedApis}}
-import * as {{{tagName}}} from './{{{tagName}}}.js';
-{{/each}}
 
 {{#each tagedApis}}
-export const {{{tagName}}}DefaultConfig = setMethodDefaultConfig({{{tagName}}}, {});
+export const {{{tagName}}}DefaultConfig = setMethodDefaultConfig('{{{tagName}}}', {});
 {{/each}}

package/dist/template/presets/alova/typescript/helper.ts.handlebars

@@ -3,7 +3,18 @@ export function buildPayload(url: string, defaultConfig: Record<string, any>, ap
 {{> build-payload-body}}
 }
 
+export type ServicesMap = {
+{{#each tagedApis}}
+  {{{tagName}}}: typeof import('./services/{{{tagName}}}');
+{{/each}}
+};
+
 export const setMethodDefaultConfig = <
-  TagedMap extends Record<string, (config: any) => any>,
-  ConfigMap extends { [K in keyof TagedMap]?: Partial<Parameters<TagedMap[K]>[0]> },
->(_: TagedMap, configMap: ConfigMap) => configMap;
+  T extends keyof ServicesMap,
+  TagedMap extends Record<string, (config: any) => any> = ServicesMap[T],
+  ConfigMap = { [K in keyof TagedMap]?: Partial<Parameters<TagedMap[K]>[0]> }
+>(
+  _: T,
+  configMap: ConfigMap
+) => configMap;
+

package/dist/template/presets/alova/typescript/services/#index.ts.handlebars

@@ -1,9 +1,6 @@
 {{> comment}}
 import { setMethodDefaultConfig } from '../helper';
-{{#each tagedApis}}
-import * as {{{tagName}}} from './{{{tagName}}}';
-{{/each}}
 
 {{#each tagedApis}}
-export const {{{tagName}}}DefaultConfig = setMethodDefaultConfig({{{tagName}}}, {});
+export const {{{tagName}}}DefaultConfig = setMethodDefaultConfig('{{{tagName}}}', {});
 {{/each}}

package/dist/template/presets/alova-globals/common/createApis.cjs.handlebars

@@ -30,7 +30,7 @@ const mountApis = (Apis) => {
 {{> withConfigType-jsdoc}}
 /**
  * @typedef {{#raw "{{ " }}{{/raw}}
- *  [P in keyof typeof import('./apiDefinitions')]?: MethodConfig<
+ *  [P in keyof typeof import('./apiDefinitions.cjs')]?: MethodConfig<
  *    P extends `${infer Tag}.${infer Url}`
  *      ? Parameters<NonNullable<APISofParameters<Tag,Url>[0]>['transform']>[0]
  *      : any

package/dist/template/presets/alova-globals/partials/withConfigType-jsdoc.handlebars

@@ -1,7 +1,7 @@
 /**
  * @template T
  * @typedef {import('alova').AlovaMethodCreateConfig<
- *  typeof import('./index')['alovaInstance'] extends import('alova').Alova<infer AG>
+ *  typeof import('./index{{#if (eq type "commonjs")}}.cjs{{/if}}')['alovaInstance'] extends import('alova').Alova<infer AG>
  *   ? AG
  *   : any,
  *  any,

package/dist/template/presets/axios/common/helper.cjs.handlebars

@@ -23,10 +23,19 @@ function buildPayload(url, defaultConfig, apiName, config) {
 }
 
 /**
- * @template {Record<string, (config: any) => any>} TagedMap
- * @template \{{ [K in keyof TagedMap]?: Partial<Parameters<TagedMap[K]>[0]> }} ConfigMap
- * @param {TagedMap} _ - tagged api map (unused at runtime)
- * @param {ConfigMap} configMap - default config per api name
+ * @typedef {{#raw "{{" }}{{/raw}}
+{{#each tagedApis}}
+ *  {{{tagName}}}: typeof import('./services/{{{tagName}}}.cjs')
+{{/each}}
+ * {{#raw "}}" }}{{/raw}} ServicesMap
+ */
+
+/**
+ * @template {keyof ServicesMap} T
+ * @template {Record<string, (config: any) => any>} [TagedMap = ServicesMap[T]]
+ * @template [ConfigMap = { [K in keyof TagedMap]?: Partial<Parameters<TagedMap[K]>[0]> }]
+ * @param {T} _
+ * @param {ConfigMap} configMap
  * @returns {ConfigMap}
  */
 const setDefaultConfig = (_, configMap) => configMap;

package/dist/template/presets/axios/common/services/#index.cjs.handlebars

@@ -1,11 +1,8 @@
 {{> comment}}
 const { setDefaultConfig } = require('../helper.cjs');
-{{#each tagedApis}}
-const {{{tagName}}} = require('./{{{tagName}}}.cjs');
-{{/each}}
 
 {{#each tagedApis}}
-const {{{tagName}}}DefaultConfig = setDefaultConfig({{{tagName}}}, {});
+const {{{tagName}}}DefaultConfig = setDefaultConfig('{{{tagName}}}', {});
 {{/each}}
 
 {{#each tagedApis}}

package/dist/template/presets/axios/module/helper.js.handlebars

@@ -23,10 +23,19 @@ export function buildPayload(url, defaultConfig, apiName, config) {
 }
 
 /**
- * @template {Record<string, (config: any) => any>} TagedMap
- * @template \{{ [K in keyof TagedMap]?: Partial<Parameters<TagedMap[K]>[0]> }} ConfigMap
- * @param {TagedMap} _ - tagged api map (unused at runtime)
- * @param {ConfigMap} configMap - default config per api name
+ * @typedef {{#raw "{{" }}{{/raw}}
+{{#each tagedApis}}
+ *  {{{tagName}}}: typeof import('./services/{{{tagName}}}')
+{{/each}}
+ * {{#raw "}}" }}{{/raw}} ServicesMap
+ */
+
+/**
+ * @template {keyof ServicesMap} T
+ * @template {Record<string, (config: any) => any>} [TagedMap = ServicesMap[T]]
+ * @template [ConfigMap = { [K in keyof TagedMap]?: Partial<Parameters<TagedMap[K]>[0]> }]
+ * @param {T} _
+ * @param {ConfigMap} configMap
  * @returns {ConfigMap}
  */
 export const setDefaultConfig = (_, configMap) => configMap;

package/dist/template/presets/axios/module/services/#index.js.handlebars

@@ -1,9 +1,6 @@
 {{> comment}}
-import { setDefaultConfig } from '../helper.js';
-{{#each tagedApis}}
-import * as {{{tagName}}} from './{{{tagName}}}.js';
-{{/each}}
+import { setDefaultConfig } from '../helper';
 
 {{#each tagedApis}}
-export const {{{tagName}}}DefaultConfig = setDefaultConfig({{{tagName}}}, {});
+export const {{{tagName}}}DefaultConfig = setDefaultConfig('{{{tagName}}}', {});
 {{/each}}

package/dist/template/presets/axios/typescript/helper.ts.handlebars

@@ -22,7 +22,17 @@ export function buildPayload(url: string, defaultConfig: Record<string, any>, ap
   return { url: resolvedUrl, mergedConfig };
 }
 
+export type ServicesMap = {
+{{#each tagedApis}}
+  {{{tagName}}}: typeof import('./services/{{{tagName}}}');
+{{/each}}
+};
+
 export const setDefaultConfig = <
-  ApiMap extends Record<string, (config: any) => any>,
-  ConfigMap extends { [K in keyof ApiMap]?: Partial<Parameters<ApiMap[K]>[0]> },
->(_: ApiMap, configMap: ConfigMap) => configMap;
+  T extends keyof ServicesMap,
+  TagedMap extends Record<string, (config: any) => any> = ServicesMap[T],
+  ConfigMap = { [K in keyof TagedMap]?: Partial<Parameters<TagedMap[K]>[0]> }
+>(
+  _: T,
+  configMap: ConfigMap
+) => configMap;

package/dist/template/presets/axios/typescript/services/#index.ts.handlebars

@@ -1,9 +1,6 @@
 {{> comment}}
 import { setDefaultConfig } from '../helper';
-{{#each tagedApis}}
-import * as {{{tagName}}} from './{{{tagName}}}';
-{{/each}}
 
 {{#each tagedApis}}
-export const {{{tagName}}}DefaultConfig = setDefaultConfig({{{tagName}}}, {});
+export const {{{tagName}}}DefaultConfig = setDefaultConfig('{{{tagName}}}', {});
 {{/each}}

package/dist/template/presets/axios/typescript/services/{tag}.ts.handlebars

@@ -19,7 +19,7 @@ type {{{name}}}ExtraConfig = Omit<AxiosRequestConfig, 'data' | 'params'> & {
 {{> api-jsdoc}}
 export function {{{name}}}(config: {{{name}}}ExtraConfig): Promise<{{{name}}}Response> {
   const { url, mergedConfig } = buildPayload('{{{path}}}', {{{tag}}}DefaultConfig, {{{name}}}.name, config);
-  return axiosInstance<{{{name}}}Response>({
+  return axiosInstance<unknown, {{{name}}}Response>({
     method: '{{method}}',
     url,
     ...mergedConfig,{{#if (eq response "Blob")}}

package/dist/template/presets/fetch/common/helper.cjs.handlebars

@@ -23,10 +23,19 @@ function buildPayload(url, defaultConfig, apiName, config) {
 }
 
 /**
- * @template {Record<string, (config: any) => any>} TagedMap
- * @template \{{ [K in keyof TagedMap]?: Partial<Parameters<TagedMap[K]>[0]> }} ConfigMap
- * @param {TagedMap} _ - tagged api map (unused at runtime)
- * @param {ConfigMap} configMap - default config per api name
+ * @typedef {{#raw "{{" }}{{/raw}}
+{{#each tagedApis}}
+ *  {{{tagName}}}: typeof import('./services/{{{tagName}}}.cjs')
+{{/each}}
+ * {{#raw "}}" }}{{/raw}} ServicesMap
+ */
+
+/**
+ * @template {keyof ServicesMap} T
+ * @template {Record<string, (config: any) => any>} [TagedMap = ServicesMap[T]]
+ * @template [ConfigMap = { [K in keyof TagedMap]?: Partial<Parameters<TagedMap[K]>[0]> }]
+ * @param {T} _
+ * @param {ConfigMap} configMap
  * @returns {ConfigMap}
  */
 const setDefaultConfig = (_, configMap) => configMap;

package/dist/template/presets/fetch/common/services/#index.cjs.handlebars

@@ -1,11 +1,8 @@
 {{> comment}}
 const { setDefaultConfig } = require('../helper.cjs');
-{{#each tagedApis}}
-const {{{tagName}}} = require('./{{{tagName}}}.cjs');
-{{/each}}
 
 {{#each tagedApis}}
-const {{{tagName}}}DefaultConfig = setDefaultConfig({{{tagName}}}, {});
+const {{{tagName}}}DefaultConfig = setDefaultConfig('{{{tagName}}}', {});
 {{/each}}
 
 {{#each tagedApis}}

package/dist/template/presets/fetch/module/helper.js.handlebars

@@ -23,10 +23,19 @@ export function buildPayload(url, defaultConfig, apiName, config) {
 }
 
 /**
- * @template {Record<string, (config: any) => any>} TagedMap
- * @template \{{ [K in keyof TagedMap]?: Partial<Parameters<TagedMap[K]>[0]> }} ConfigMap
- * @param {TagedMap} _ - tagged api map (unused at runtime)
- * @param {ConfigMap} configMap - default config per api name
+ * @typedef {{#raw "{{" }}{{/raw}}
+{{#each tagedApis}}
+ *  {{{tagName}}}: typeof import('./services/{{{tagName}}}')
+{{/each}}
+ * {{#raw "}}" }}{{/raw}} ServicesMap
+ */
+
+/**
+ * @template {keyof ServicesMap} T
+ * @template {Record<string, (config: any) => any>} [TagedMap = ServicesMap[T]]
+ * @template [ConfigMap = { [K in keyof TagedMap]?: Partial<Parameters<TagedMap[K]>[0]> }]
+ * @param {T} _
+ * @param {ConfigMap} configMap
  * @returns {ConfigMap}
  */
 export const setDefaultConfig = (_, configMap) => configMap;

package/dist/template/presets/fetch/module/services/#index.js.handlebars

@@ -1,9 +1,6 @@
 {{> comment}}
-import { setDefaultConfig } from '../helper.js';
-{{#each tagedApis}}
-import * as {{{tagName}}} from './{{{tagName}}}.js';
-{{/each}}
+import { setDefaultConfig } from '../helper';
 
 {{#each tagedApis}}
-export const {{{tagName}}}DefaultConfig = setDefaultConfig({{{tagName}}}, {});
+export const {{{tagName}}}DefaultConfig = setDefaultConfig('{{{tagName}}}', {});
 {{/each}}

package/dist/template/presets/fetch/typescript/helper.ts.handlebars

@@ -22,7 +22,17 @@ export function buildPayload(url: string, defaultConfig: Record<string, any>, ap
   return { url: resolvedUrl, mergedConfig };
 }
 
+export type ServicesMap = {
+{{#each tagedApis}}
+  {{{tagName}}}: typeof import('./services/{{{tagName}}}');
+{{/each}}
+};
+
 export const setDefaultConfig = <
-  ApiMap extends Record<string, (config: any) => any>,
-  ConfigMap extends { [K in keyof ApiMap]?: Partial<Parameters<ApiMap[K]>[0]> },
->(_: ApiMap, configMap: ConfigMap) => configMap;
+  T extends keyof ServicesMap,
+  TagedMap extends Record<string, (config: any) => any> = ServicesMap[T],
+  ConfigMap = { [K in keyof TagedMap]?: Partial<Parameters<TagedMap[K]>[0]> }
+>(
+  _: T,
+  configMap: ConfigMap
+) => configMap;

package/dist/template/presets/fetch/typescript/services/#index.ts.handlebars

@@ -1,9 +1,6 @@
 {{> comment}}
 import { setDefaultConfig } from '../helper';
-{{#each tagedApis}}
-import * as {{{tagName}}} from './{{{tagName}}}';
-{{/each}}
 
 {{#each tagedApis}}
-export const {{{tagName}}}DefaultConfig = setDefaultConfig({{{tagName}}}, {});
+export const {{{tagName}}}DefaultConfig = setDefaultConfig('{{{tagName}}}', {});
 {{/each}}

package/dist/template/presets/ky/module/helper.js.handlebars

@@ -25,10 +25,19 @@ export function buildPayload(url, defaultConfig, apiName, config) {
 }
 
 /**
- * @template {Record<string, (config: any) => any>} TagedMap
- * @template \{{ [K in keyof TagedMap]?: Partial<Parameters<TagedMap[K]>[0]> }} ConfigMap
- * @param {TagedMap} _ - tagged api map (unused at runtime)
- * @param {ConfigMap} configMap - default config per api name
+ * @typedef {{#raw "{{" }}{{/raw}}
+{{#each tagedApis}}
+ *  {{{tagName}}}: typeof import('./services/{{{tagName}}}')
+{{/each}}
+ * {{#raw "}}" }}{{/raw}} ServicesMap
+ */
+
+/**
+ * @template {keyof ServicesMap} T
+ * @template {Record<string, (config: any) => any>} [TagedMap = ServicesMap[T]]
+ * @template [ConfigMap = { [K in keyof TagedMap]?: Partial<Parameters<TagedMap[K]>[0]> }]
+ * @param {T} _
+ * @param {ConfigMap} configMap
  * @returns {ConfigMap}
  */
 export const setDefaultConfig = (_, configMap) => configMap;

package/dist/template/presets/ky/module/services/#index.js.handlebars

@@ -1,9 +1,6 @@
 {{> comment}}
-import { setDefaultConfig } from '../helper.js';
-{{#each tagedApis}}
-import * as {{{tagName}}} from './{{{tagName}}}.js';
-{{/each}}
+import { setDefaultConfig } from '../helper';
 
 {{#each tagedApis}}
-export const {{{tagName}}}DefaultConfig = setDefaultConfig({{{tagName}}}, {});
+export const {{{tagName}}}DefaultConfig = setDefaultConfig('{{{tagName}}}', {});
 {{/each}}

package/dist/template/presets/ky/typescript/helper.ts.handlebars

@@ -24,7 +24,17 @@ export function buildPayload(url: string, defaultConfig: Record<string, any>, ap
   return { url: resolvedUrl, mergedConfig };
 }
 
+export type ServicesMap = {
+{{#each tagedApis}}
+  {{{tagName}}}: typeof import('./services/{{{tagName}}}');
+{{/each}}
+};
+
 export const setDefaultConfig = <
-  ApiMap extends Record<string, (config: any) => any>,
-  ConfigMap extends { [K in keyof ApiMap]?: Partial<Parameters<ApiMap[K]>[0]> },
->(_: ApiMap, configMap: ConfigMap) => configMap;
+  T extends keyof ServicesMap,
+  TagedMap extends Record<string, (config: any) => any> = ServicesMap[T],
+  ConfigMap = { [K in keyof TagedMap]?: Partial<Parameters<TagedMap[K]>[0]> }
+>(
+  _: T,
+  configMap: ConfigMap
+) => configMap;

package/dist/template/presets/ky/typescript/services/#index.ts.handlebars

@@ -1,9 +1,6 @@
 {{> comment}}
 import { setDefaultConfig } from '../helper';
-{{#each tagedApis}}
-import * as {{{tagName}}} from './{{{tagName}}}';
-{{/each}}
 
 {{#each tagedApis}}
-export const {{{tagName}}}DefaultConfig = setDefaultConfig({{{tagName}}}, {});
+export const {{{tagName}}}DefaultConfig = setDefaultConfig('{{{tagName}}}', {});
 {{/each}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wormajs",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "A modern OpenAPI code generator - Generate type-safe API clients from OpenAPI specs",
   "author": "worma",
   "license": "MIT",