@based/type-gen 0.0.3 → 0.0.4

package/dist/index.d.ts

@@ -7,7 +7,11 @@ export declare const updateTypes: (fns: ({
     payload: string;
     result: string;
 })[], opts?: {
-    extraImports?: string[];
-    basedPath?: string;
-}) => Promise<string | void>;
+    imports?: string[];
+    clientPath?: string;
+    functionPath?: string;
+}) => Promise<{
+    clientPath: string | void;
+    functionPath: string | void;
+}>;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AAGtD,eAAO,MAAM,WAAW,QACjB,CACD;IAAE,MAAM,EAAE,mBAAmB,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC7C;IAAE,MAAM,EAAE,mBAAmB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CACnE,EAAE,SACG;IACJ,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,KACA,QAAQ,MAAM,GAAG,IAAI,CA6GvB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AAGtD,eAAO,MAAM,WAAW,QACjB,CACD;IAAE,MAAM,EAAE,mBAAmB,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC7C;IAAE,MAAM,EAAE,mBAAmB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CACnE,EAAE,SACG;IACJ,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;gBAEW,MAAM,GAAG,IAAI;kBACX,MAAM,GAAG,IAAI;EAwD5B,CAAA"}

package/dist/index.js

@@ -1,87 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTypes = void 0;
-const fs_extra_1 = require("fs-extra");
+const updateTypesPath_1 = require("./updateTypesPath");
 const updateTypes = async (fns, opts = {}) => {
-    // check if client is correct version
-    const basedClientPath = opts.basedPath ||
+    const inputClientPath = opts.clientPath ||
         require.resolve('@based/client', { paths: [process.cwd()] });
-    if (!basedClientPath) {
-        throw new Error('Cannot find basedClient');
+    const inputFunctionPath = opts.functionPath ||
+        require.resolve('@based/functions', { paths: [process.cwd()] });
+    let clientPath;
+    let functionPath;
+    if (inputClientPath) {
+        const declarationPath = inputClientPath.replace('/index.js', '/index.d.ts');
+        const originalDeclartionPath = inputClientPath.replace('/index.js', '/index_original.d.ts');
+        clientPath = await (0, updateTypesPath_1.updateTypesPath)(fns, {
+            imports: opts.imports,
+            originalDeclartionPath,
+            declarationPath,
+        }).catch(() => {
+            console.error('Cannot find original declaration file - you may need to upgrade to @based/client ^4.8.8');
+        });
     }
-    // original
-    const decPath = basedClientPath.replace('/index.js', '/index.d.ts');
-    const decPathOriginal = basedClientPath.replace('/index.js', '/index_original.d.ts');
-    let decFile = '';
-    try {
-        decFile = (await (0, fs_extra_1.readFile)(decPathOriginal)).toString('utf-8');
-    }
-    catch (err) {
-        throw new Error('Cannot find original declaration file - you may need to upgrade to @based/client ^4.8.8');
-    }
-    let imports = opts.extraImports ? opts.extraImports.join('\n') + '\n' : '\n';
-    let callFns = '\n';
-    let queryFns = '\n';
-    let fnCnt = 0;
-    let queryCnt = 0;
-    let queryMap = '\n';
-    let needsParsing = opts.extraImports ?? false;
-    for (const fn of fns) {
-        if (fn.config.type === 'function') {
-            needsParsing = true;
-            fnCnt++;
-            if ('path' in fn) {
-                const name = 'FN_Type_' + fnCnt;
-                imports += `import type ${name} from '${fn.path}';\n`;
-                callFns += `
-      call(
-        name: '${fn.config.name}',
-        payload: Parameters<typeof ${name}>[1],
-        opts?: CallOptions
-      ): ReturnType<typeof ${name}>;      
-    `;
-            }
-            else {
-                callFns += `
-        call(
-          name: '${fn.config.name}',
-          payload: ${fn.payload},
-          opts?: CallOptions
-        ): Promise<${fn.result}>      
-      `;
-            }
-        }
-        else if (fn.config.type === 'query') {
-            queryCnt++;
-            if ('path' in fn) {
-                const name = 'Q_Type_' + queryCnt;
-                imports += `import type ${name} from '${fn.path}';\n`;
-                queryMap += `'${fn.config.name}': { payload: Parameters<typeof ${name}>[1], result: Parameters<Parameters<typeof ${name}>[2]>[0] },`;
-                queryFns += `
-        query(name: '${fn.config.name}', payload: Parameters<typeof ${name}>[1], opts?: QueryOptions): BasedQuery<Parameters<typeof ${name}>[1],Parameters<Parameters<typeof ${name}>[2]>[0]>;
-    `;
-            }
-            else {
-                queryMap += `'${fn.config.name}': { payload: ${fn.payload}, result: ${fn.result} },`;
-                queryFns += `
-        query(name: '${fn.config.name}', payload: ${fn.payload}, opts?: QueryOptions): BasedQuery<${fn.payload},${fn.result}>;
-    `;
-            }
-        }
-    }
-    if (needsParsing) {
-        let x = imports + decFile;
-        if (fnCnt > 0) {
-            x = x.replace('call(name: string, payload?: any, opts?: CallOptions): Promise<any>;', callFns);
-        }
-        if (queryCnt > 0) {
-            x = x.replace(`query(name: string, payload?: any, opts?: QueryOptions): BasedQuery;`, queryFns);
-            console.info('fix');
-            x = x.replace(/export type QueryMap = ([^@]*?)\};([^@]*?)\};/, `export type QueryMap = {${queryMap}}`);
-        }
-        await (0, fs_extra_1.writeFile)(decPath, x);
-        return decPath;
+    if (inputFunctionPath) {
+        const declarationPath = inputFunctionPath.replace('/index.js', '/client.d.ts');
+        const originalDeclartionPath = inputFunctionPath.replace('/index.js', '/client_original.d.ts');
+        functionPath = await (0, updateTypesPath_1.updateTypesPath)(fns, {
+            imports: opts.imports,
+            originalDeclartionPath,
+            declarationPath,
+            isAbstract: true,
+        }).catch(() => {
+            console.error('Cannot find original declaration file - you may need to upgrade to @based/functions ^2.2.4');
+        });
     }
+    return {
+        functionPath,
+        clientPath,
+    };
 };
 exports.updateTypes = updateTypes;
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AACA,uDAAmD;AAE5C,MAAM,WAAW,GAAG,KAAK,EAC9B,GAGG,EACH,OAII,EAAE,EAIL,EAAE;IACH,MAAM,eAAe,GACnB,IAAI,CAAC,UAAU;QACf,OAAO,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,KAAK,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAA;IAE9D,MAAM,iBAAiB,GACrB,IAAI,CAAC,YAAY;QACjB,OAAO,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,KAAK,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAA;IAEjE,IAAI,UAAyB,CAAA;IAC7B,IAAI,YAA2B,CAAA;IAE/B,IAAI,eAAe,EAAE;QACnB,MAAM,eAAe,GAAG,eAAe,CAAC,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,CAAA;QAC3E,MAAM,sBAAsB,GAAG,eAAe,CAAC,OAAO,CACpD,WAAW,EACX,sBAAsB,CACvB,CAAA;QAED,UAAU,GAAG,MAAM,IAAA,iCAAe,EAAC,GAAG,EAAE;YACtC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,sBAAsB;YACtB,eAAe;SAChB,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YACZ,OAAO,CAAC,KAAK,CACX,yFAAyF,CAC1F,CAAA;QACH,CAAC,CAAC,CAAA;KACH;IAED,IAAI,iBAAiB,EAAE;QACrB,MAAM,eAAe,GAAG,iBAAiB,CAAC,OAAO,CAC/C,WAAW,EACX,cAAc,CACf,CAAA;QACD,MAAM,sBAAsB,GAAG,iBAAiB,CAAC,OAAO,CACtD,WAAW,EACX,uBAAuB,CACxB,CAAA;QACD,YAAY,GAAG,MAAM,IAAA,iCAAe,EAAC,GAAG,EAAE;YACxC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,sBAAsB;YACtB,eAAe;YACf,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YACZ,OAAO,CAAC,KAAK,CACX,4FAA4F,CAC7F,CAAA;QACH,CAAC,CAAC,CAAA;KACH;IAED,OAAO;QACL,YAAY;QACZ,UAAU;KACX,CAAA;AACH,CAAC,CAAA;AApEY,QAAA,WAAW,eAoEvB"}

package/dist/updateTypesPath.d.ts

@@ -0,0 +1,15 @@
+import { BasedFunctionConfig } from '@based/functions';
+export declare const updateTypesPath: (fns: ({
+    config: BasedFunctionConfig;
+    path: string;
+} | {
+    config: BasedFunctionConfig;
+    payload: string;
+    result: string;
+})[], opts: {
+    isAbstract?: boolean;
+    imports?: string[];
+    originalDeclartionPath: string;
+    declarationPath: string;
+}) => Promise<string | void>;
+//# sourceMappingURL=updateTypesPath.d.ts.map

package/dist/updateTypesPath.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"updateTypesPath.d.ts","sourceRoot":"","sources":["../src/updateTypesPath.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AAGtD,eAAO,MAAM,eAAe,QACrB,CACD;IAAE,MAAM,EAAE,mBAAmB,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC7C;IAAE,MAAM,EAAE,mBAAmB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CACnE,EAAE,QACG;IACJ,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,sBAAsB,EAAE,MAAM,CAAA;IAC9B,eAAe,EAAE,MAAM,CAAA;CACxB,KACA,QAAQ,MAAM,GAAG,IAAI,CA8FvB,CAAA"}

package/dist/updateTypesPath.js

@@ -0,0 +1,88 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateTypesPath = void 0;
+const fs_extra_1 = require("fs-extra");
+const updateTypesPath = async (fns, opts) => {
+    let decFile = '';
+    try {
+        decFile = (await (0, fs_extra_1.readFile)(opts.originalDeclartionPath)).toString('utf-8');
+    }
+    catch (err) {
+        throw new Error(`Cannot find ${opts.originalDeclartionPath}`);
+    }
+    let imports = opts.imports ? opts.imports.join('\n') + '\n' : '\n';
+    let callFns = '\n';
+    let queryFns = '\n';
+    let fnCnt = 0;
+    let queryCnt = 0;
+    let queryMap = '\n';
+    let needsParsing = opts.imports ?? false;
+    const abstractPrefix = opts.isAbstract ? 'abstract ' : '';
+    for (const fn of fns) {
+        if (fn.config.type === 'function') {
+            needsParsing = true;
+            fnCnt++;
+            if ('path' in fn) {
+                const name = 'FN_Type_' + fnCnt;
+                imports += `import type ${name} from '${fn.path}';\n`;
+                callFns += `
+      ${abstractPrefix}call(
+        name: '${fn.config.name}',
+        payload: Parameters<typeof ${name}>[1],
+        ${opts.isAbstract ? 'ctx?: Context' : 'opts?: CallOptions'}
+      ): ReturnType<typeof ${name}>;      
+    `;
+            }
+            else {
+                callFns += `
+        ${abstractPrefix}call(
+          name: '${fn.config.name}',
+          payload: ${fn.payload},
+          ${opts.isAbstract ? 'ctx?: Context' : 'opts?: CallOptions'}
+        ): Promise<${fn.result}>      
+      `;
+            }
+        }
+        else if (fn.config.type === 'query') {
+            queryCnt++;
+            if ('path' in fn) {
+                const name = 'Q_Type_' + queryCnt;
+                imports += `import type ${name} from '${fn.path}';\n`;
+                queryMap += `'${fn.config.name}': { payload: Parameters<typeof ${name}>[1], result: Parameters<Parameters<typeof ${name}>[2]>[0] },`;
+                queryFns += `
+        ${abstractPrefix}query(name: '${fn.config.name}', payload: Parameters<typeof ${name}>[1], opts?: QueryOptions): BasedQuery<Parameters<typeof ${name}>[1],Parameters<Parameters<typeof ${name}>[2]>[0]>;
+    `;
+            }
+            else {
+                queryMap += `'${fn.config.name}': { payload: ${fn.payload}, result: ${fn.result} },`;
+                queryFns += `
+        ${abstractPrefix}query(name: '${fn.config.name}', payload: ${fn.payload}, opts?: QueryOptions): BasedQuery<${fn.payload},${fn.result}>;
+    `;
+            }
+        }
+    }
+    if (needsParsing) {
+        let x = imports + decFile;
+        if (fnCnt > 0) {
+            if (opts.isAbstract) {
+                x = x.replace('abstract call(name: string, payload?: any, ctx?: Context): Promise<any>;', callFns);
+            }
+            else {
+                x = x.replace('call(name: string, payload?: any, opts?: CallOptions): Promise<any>;', callFns);
+            }
+        }
+        if (queryCnt > 0) {
+            if (opts.isAbstract) {
+                x = x.replace(`abstract query(name: string, payload?: any): BasedQuery;`, queryFns);
+            }
+            else {
+                x = x.replace(`query(name: string, payload?: any, opts?: QueryOptions): BasedQuery;`, queryFns);
+            }
+            x = x.replace(/export type QueryMap = ([^@]*?)\};([^@]*?)\};/, `export type QueryMap = {${queryMap}}`);
+        }
+        await (0, fs_extra_1.writeFile)(opts.declarationPath, x);
+        return opts.declarationPath;
+    }
+};
+exports.updateTypesPath = updateTypesPath;
+//# sourceMappingURL=updateTypesPath.js.map

package/dist/updateTypesPath.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"updateTypesPath.js","sourceRoot":"","sources":["../src/updateTypesPath.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@based/type-gen",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "license": "MIT",
   "main": "dist/index.js",
   "scripts": {

package/src/index.ts

@@ -1,5 +1,5 @@
 import { BasedFunctionConfig } from '@based/functions'
-import { readFile, writeFile } from 'fs-extra'
+import { updateTypesPath } from './updateTypesPath'
 
 export const updateTypes = async (
   fns: (
@@ -7,116 +7,66 @@ export const updateTypes = async (
     | { config: BasedFunctionConfig; payload: string; result: string }
   )[],
   opts: {
-    extraImports?: string[]
-    basedPath?: string
+    imports?: string[]
+    clientPath?: string
+    functionPath?: string
   } = {}
-): Promise<string | void> => {
-  // check if client is correct version
-
-  const basedClientPath =
-    opts.basedPath ||
+): Promise<{
+  clientPath: string | void
+  functionPath: string | void
+}> => {
+  const inputClientPath =
+    opts.clientPath ||
     require.resolve('@based/client', { paths: [process.cwd()] })
 
-  if (!basedClientPath) {
-    throw new Error('Cannot find basedClient')
-  }
-
-  // original
-  const decPath = basedClientPath.replace('/index.js', '/index.d.ts')
-  const decPathOriginal = basedClientPath.replace(
-    '/index.js',
-    '/index_original.d.ts'
-  )
+  const inputFunctionPath =
+    opts.functionPath ||
+    require.resolve('@based/functions', { paths: [process.cwd()] })
 
-  let decFile = ''
+  let clientPath: string | void
+  let functionPath: string | void
 
-  try {
-    decFile = (await readFile(decPathOriginal)).toString('utf-8')
-  } catch (err) {
-    throw new Error(
-      'Cannot find original declaration file - you may need to upgrade to @based/client ^4.8.8'
+  if (inputClientPath) {
+    const declarationPath = inputClientPath.replace('/index.js', '/index.d.ts')
+    const originalDeclartionPath = inputClientPath.replace(
+      '/index.js',
+      '/index_original.d.ts'
     )
-  }
-
-  let imports = opts.extraImports ? opts.extraImports.join('\n') + '\n' : '\n'
-
-  let callFns = '\n'
-  let queryFns = '\n'
-
-  let fnCnt = 0
-  let queryCnt = 0
-
-  let queryMap = '\n'
-
-  let needsParsing = opts.extraImports ?? false
-
-  for (const fn of fns) {
-    if (fn.config.type === 'function') {
-      needsParsing = true
-      fnCnt++
-      if ('path' in fn) {
-        const name = 'FN_Type_' + fnCnt
-        imports += `import type ${name} from '${fn.path}';\n`
-        callFns += `
-      call(
-        name: '${fn.config.name}',
-        payload: Parameters<typeof ${name}>[1],
-        opts?: CallOptions
-      ): ReturnType<typeof ${name}>;      
-    `
-      } else {
-        callFns += `
-        call(
-          name: '${fn.config.name}',
-          payload: ${fn.payload},
-          opts?: CallOptions
-        ): Promise<${fn.result}>      
-      `
-      }
-    } else if (fn.config.type === 'query') {
-      queryCnt++
 
-      if ('path' in fn) {
-        const name = 'Q_Type_' + queryCnt
-        imports += `import type ${name} from '${fn.path}';\n`
-
-        queryMap += `'${fn.config.name}': { payload: Parameters<typeof ${name}>[1], result: Parameters<Parameters<typeof ${name}>[2]>[0] },`
-
-        queryFns += `
-        query(name: '${fn.config.name}', payload: Parameters<typeof ${name}>[1], opts?: QueryOptions): BasedQuery<Parameters<typeof ${name}>[1],Parameters<Parameters<typeof ${name}>[2]>[0]>;
-    `
-      } else {
-        queryMap += `'${fn.config.name}': { payload: ${fn.payload}, result: ${fn.result} },`
-
-        queryFns += `
-        query(name: '${fn.config.name}', payload: ${fn.payload}, opts?: QueryOptions): BasedQuery<${fn.payload},${fn.result}>;
-    `
-      }
-    }
+    clientPath = await updateTypesPath(fns, {
+      imports: opts.imports,
+      originalDeclartionPath,
+      declarationPath,
+    }).catch(() => {
+      console.error(
+        'Cannot find original declaration file - you may need to upgrade to @based/client ^4.8.8'
+      )
+    })
   }
 
-  if (needsParsing) {
-    let x = imports + decFile
-    if (fnCnt > 0) {
-      x = x.replace(
-        'call(name: string, payload?: any, opts?: CallOptions): Promise<any>;',
-        callFns
-      )
-    }
-    if (queryCnt > 0) {
-      x = x.replace(
-        `query(name: string, payload?: any, opts?: QueryOptions): BasedQuery;`,
-        queryFns
+  if (inputFunctionPath) {
+    const declarationPath = inputFunctionPath.replace(
+      '/index.js',
+      '/client.d.ts'
+    )
+    const originalDeclartionPath = inputFunctionPath.replace(
+      '/index.js',
+      '/client_original.d.ts'
+    )
+    functionPath = await updateTypesPath(fns, {
+      imports: opts.imports,
+      originalDeclartionPath,
+      declarationPath,
+      isAbstract: true,
+    }).catch(() => {
+      console.error(
+        'Cannot find original declaration file - you may need to upgrade to @based/functions ^2.2.4'
       )
+    })
+  }
 
-      console.info('fix')
-
-      x = x.replace(
-        /export type QueryMap = ([^@]*?)\};([^@]*?)\};/,
-        `export type QueryMap = {${queryMap}}`
-      )
-    }
-    await writeFile(decPath, x)
-    return decPath
+  return {
+    functionPath,
+    clientPath,
   }
 }

package/src/updateTypesPath.ts

@@ -0,0 +1,109 @@
+import { BasedFunctionConfig } from '@based/functions'
+import { readFile, writeFile } from 'fs-extra'
+
+export const updateTypesPath = async (
+  fns: (
+    | { config: BasedFunctionConfig; path: string }
+    | { config: BasedFunctionConfig; payload: string; result: string }
+  )[],
+  opts: {
+    isAbstract?: boolean
+    imports?: string[]
+    originalDeclartionPath: string
+    declarationPath: string
+  }
+): Promise<string | void> => {
+  let decFile = ''
+
+  try {
+    decFile = (await readFile(opts.originalDeclartionPath)).toString('utf-8')
+  } catch (err) {
+    throw new Error(`Cannot find ${opts.originalDeclartionPath}`)
+  }
+
+  let imports = opts.imports ? opts.imports.join('\n') + '\n' : '\n'
+  let callFns = '\n'
+  let queryFns = '\n'
+  let fnCnt = 0
+  let queryCnt = 0
+  let queryMap = '\n'
+  let needsParsing = opts.imports ?? false
+
+  const abstractPrefix = opts.isAbstract ? 'abstract ' : ''
+
+  for (const fn of fns) {
+    if (fn.config.type === 'function') {
+      needsParsing = true
+      fnCnt++
+      if ('path' in fn) {
+        const name = 'FN_Type_' + fnCnt
+        imports += `import type ${name} from '${fn.path}';\n`
+        callFns += `
+      ${abstractPrefix}call(
+        name: '${fn.config.name}',
+        payload: Parameters<typeof ${name}>[1],
+        ${opts.isAbstract ? 'ctx?: Context' : 'opts?: CallOptions'}
+      ): ReturnType<typeof ${name}>;      
+    `
+      } else {
+        callFns += `
+        ${abstractPrefix}call(
+          name: '${fn.config.name}',
+          payload: ${fn.payload},
+          ${opts.isAbstract ? 'ctx?: Context' : 'opts?: CallOptions'}
+        ): Promise<${fn.result}>      
+      `
+      }
+    } else if (fn.config.type === 'query') {
+      queryCnt++
+      if ('path' in fn) {
+        const name = 'Q_Type_' + queryCnt
+        imports += `import type ${name} from '${fn.path}';\n`
+        queryMap += `'${fn.config.name}': { payload: Parameters<typeof ${name}>[1], result: Parameters<Parameters<typeof ${name}>[2]>[0] },`
+        queryFns += `
+        ${abstractPrefix}query(name: '${fn.config.name}', payload: Parameters<typeof ${name}>[1], opts?: QueryOptions): BasedQuery<Parameters<typeof ${name}>[1],Parameters<Parameters<typeof ${name}>[2]>[0]>;
+    `
+      } else {
+        queryMap += `'${fn.config.name}': { payload: ${fn.payload}, result: ${fn.result} },`
+        queryFns += `
+        ${abstractPrefix}query(name: '${fn.config.name}', payload: ${fn.payload}, opts?: QueryOptions): BasedQuery<${fn.payload},${fn.result}>;
+    `
+      }
+    }
+  }
+  if (needsParsing) {
+    let x = imports + decFile
+    if (fnCnt > 0) {
+      if (opts.isAbstract) {
+        x = x.replace(
+          'abstract call(name: string, payload?: any, ctx?: Context): Promise<any>;',
+          callFns
+        )
+      } else {
+        x = x.replace(
+          'call(name: string, payload?: any, opts?: CallOptions): Promise<any>;',
+          callFns
+        )
+      }
+    }
+    if (queryCnt > 0) {
+      if (opts.isAbstract) {
+        x = x.replace(
+          `abstract query(name: string, payload?: any): BasedQuery;`,
+          queryFns
+        )
+      } else {
+        x = x.replace(
+          `query(name: string, payload?: any, opts?: QueryOptions): BasedQuery;`,
+          queryFns
+        )
+      }
+      x = x.replace(
+        /export type QueryMap = ([^@]*?)\};([^@]*?)\};/,
+        `export type QueryMap = {${queryMap}}`
+      )
+    }
+    await writeFile(opts.declarationPath, x)
+    return opts.declarationPath
+  }
+}

package/test/types.ts

@@ -35,14 +35,22 @@ test.serial('Generate types file from examples', async (t) => {
     },
   ])
 
-  const file = await readFile(join(__dirname, '../../client/dist/index.d.ts'), {
-    encoding: 'utf-8',
-  })
+  const files = await Promise.all(
+    ['client/dist/index.d.ts', 'functions/dist/client.d.ts'].map((f) =>
+      readFile(join(__dirname, '../../' + f), {
+        encoding: 'utf-8',
+      })
+    )
+  )
 
-  t.is(result, join(__dirname, '../../client/dist/index.d.ts'))
-  t.true(file.includes('counter'))
-  t.true(file.includes('db:schema'))
-  t.true(file.includes('db:update-schema'))
-  t.true(file.includes('db:set'))
-  t.true(file.includes('hello-world'))
+  t.is(result.clientPath, join(__dirname, '../../client/dist/index.d.ts'))
+  t.is(result.functionPath, join(__dirname, '../../functions/dist/client.d.ts'))
+
+  for (const file of files) {
+    t.true(file.includes('counter'))
+    t.true(file.includes('db:schema'))
+    t.true(file.includes('db:update-schema'))
+    t.true(file.includes('db:set'))
+    t.true(file.includes('hello-world'))
+  }
 })

package/dist/auth.d.ts

@@ -1,16 +0,0 @@
-import { BasedFunctionClient } from './client';
-import { HttpRequest } from './uws';
-import { Context, WebSocketSession, HttpSession } from './context';
-export type AuthState = {
-    token?: string;
-    userId?: string;
-    refreshToken?: string;
-    error?: string;
-    persistent?: boolean;
-    type?: string;
-};
-export type Authorize = (based: BasedFunctionClient, context: Context<HttpSession | WebSocketSession>, name: string, // name as generic dope
-payload?: any) => Promise<boolean>;
-export type VerifyAuthState = (based: BasedFunctionClient, context: Context<HttpSession | WebSocketSession>, authState: AuthState) => Promise<true | AuthState>;
-export type AuthorizeConnection = (based: BasedFunctionClient, req: HttpRequest, ip: string) => Promise<boolean>;
-//# sourceMappingURL=auth.d.ts.map

package/dist/auth.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AACnC,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAElE,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,SAAS,GAAG,CACtB,KAAK,EAAE,mBAAmB,EAC1B,OAAO,EAAE,OAAO,CAAC,WAAW,GAAG,gBAAgB,CAAC,EAChD,IAAI,EAAE,MAAM,EAAE,uBAAuB;AACrC,OAAO,CAAC,EAAE,GAAG,KACV,OAAO,CAAC,OAAO,CAAC,CAAA;AAKrB,MAAM,MAAM,eAAe,GAAG,CAC5B,KAAK,EAAE,mBAAmB,EAC1B,OAAO,EAAE,OAAO,CAAC,WAAW,GAAG,gBAAgB,CAAC,EAChD,SAAS,EAAE,SAAS,KACjB,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC,CAAA;AAE9B,MAAM,MAAM,mBAAmB,GAAG,CAChC,KAAK,EAAE,mBAAmB,EAC1B,GAAG,EAAE,WAAW,EAChB,EAAE,EAAE,MAAM,KACP,OAAO,CAAC,OAAO,CAAC,CAAA"}

package/dist/auth.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=auth.js.map

package/dist/auth.js.map

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

package/dist/channel.d.ts

@@ -1,6 +0,0 @@
-import { ChannelMessageFunction } from './functions';
-export declare abstract class BasedChannel<K = any> {
-    abstract subscribe(onMessage: ChannelMessageFunction<K>, onError?: (err: any) => void): () => void;
-    abstract publish(message: K): void;
-}
-//# sourceMappingURL=channel.d.ts.map

package/dist/channel.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../src/channel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAA;AAEpD,8BAAsB,YAAY,CAAC,CAAC,GAAG,GAAG;IACxC,QAAQ,CAAC,SAAS,CAChB,SAAS,EAAE,sBAAsB,CAAC,CAAC,CAAC,EACpC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,GAC3B,MAAM,IAAI;IAEb,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI;CACnC"}

package/dist/channel.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BasedChannel = void 0;
-class BasedChannel {
-}
-exports.BasedChannel = BasedChannel;
-//# sourceMappingURL=channel.js.map

package/dist/channel.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"channel.js","sourceRoot":"","sources":["../src/channel.ts"],"names":[],"mappings":";;;AAEA,MAAsB,YAAY;CAOjC;AAPD,oCAOC"}