@based/type-gen 0.0.1 → 0.0.3

package/dist/index.d.ts

@@ -9,5 +9,5 @@ export declare const updateTypes: (fns: ({
 })[], opts?: {
     extraImports?: string[];
     basedPath?: string;
-}) => Promise<boolean>;
+}) => Promise<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,OAAO,CA8FjB,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,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,KACA,QAAQ,MAAM,GAAG,IAAI,CA6GvB,CAAA"}

package/dist/index.js

@@ -4,7 +4,8 @@ exports.updateTypes = void 0;
 const fs_extra_1 = require("fs-extra");
 const updateTypes = async (fns, opts = {}) => {
     // check if client is correct version
-    const basedClientPath = opts.basedPath || require.resolve('@based/client');
+    const basedClientPath = opts.basedPath ||
+        require.resolve('@based/client', { paths: [process.cwd()] });
     if (!basedClientPath) {
         throw new Error('Cannot find basedClient');
     }
@@ -23,6 +24,7 @@ const updateTypes = async (fns, opts = {}) => {
     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') {
@@ -54,11 +56,13 @@ const updateTypes = async (fns, opts = {}) => {
             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}>;
     `;
@@ -72,11 +76,12 @@ const updateTypes = async (fns, opts = {}) => {
         }
         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 true;
+        return decPath;
     }
-    return false;
 };
 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":"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"}

package/package.json

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

package/src/index.ts

@@ -10,10 +10,12 @@ export const updateTypes = async (
     extraImports?: string[]
     basedPath?: string
   } = {}
-): Promise<boolean> => {
+): Promise<string | void> => {
   // check if client is correct version
 
-  const basedClientPath = opts.basedPath || require.resolve('@based/client')
+  const basedClientPath =
+    opts.basedPath ||
+    require.resolve('@based/client', { paths: [process.cwd()] })
 
   if (!basedClientPath) {
     throw new Error('Cannot find basedClient')
@@ -44,6 +46,8 @@ export const updateTypes = async (
   let fnCnt = 0
   let queryCnt = 0
 
+  let queryMap = '\n'
+
   let needsParsing = opts.extraImports ?? false
 
   for (const fn of fns) {
@@ -71,13 +75,19 @@ export const updateTypes = async (
       }
     } 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}>;
     `
@@ -98,10 +108,15 @@ export const updateTypes = async (
         `query(name: string, payload?: any, opts?: QueryOptions): BasedQuery;`,
         queryFns
       )
+
+      console.info('fix')
+
+      x = x.replace(
+        /export type QueryMap = ([^@]*?)\};([^@]*?)\};/,
+        `export type QueryMap = {${queryMap}}`
+      )
     }
     await writeFile(decPath, x)
-    return true
+    return decPath
   }
-
-  return false
 }

package/test/types.ts

@@ -1,10 +1,9 @@
 import test from 'ava'
 import { updateTypes } from '../src'
 import { join } from 'path'
-import based from '@based/client'
 import { readFile } from 'fs-extra'
 
-test.serial('Generare types file from examples', async (t) => {
+test.serial('Generate types file from examples', async (t) => {
   const result = await updateTypes([
     {
       config: require('./examples/helloWorld/based.config.json'),
@@ -40,7 +39,7 @@ test.serial('Generare types file from examples', async (t) => {
     encoding: 'utf-8',
   })
 
-  t.true(result)
+  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'))