@based/type-gen 0.0.6 → 0.1.0
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/LICENSE +21 -0
- package/dist/src/index.d.ts +1 -1
- package/dist/src/index.js +13 -13
- package/dist/src/index.js.map +1 -1
- package/dist/src/updateTypesPath.d.ts +1 -1
- package/dist/src/updateTypesPath.js +6 -6
- package/dist/src/updateTypesPath.js.map +1 -1
- package/package.json +5 -6
package/LICENSE
ADDED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
MIT License
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2020 SAULX
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
+
in the Software without restriction, including without limitation the rights
|
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
+
furnished to do so, subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
+
SOFTWARE.
|
package/dist/src/index.d.ts
CHANGED
package/dist/src/index.js
CHANGED
|
@@ -1,39 +1,39 @@
|
|
|
1
|
-
import { updateTypesPath } from
|
|
2
|
-
import { createRequire } from
|
|
1
|
+
import { updateTypesPath } from "./updateTypesPath.js";
|
|
2
|
+
import { createRequire } from "node:module";
|
|
3
3
|
const require = createRequire(import.meta.url);
|
|
4
4
|
export const updateTypes = async (fns, opts = {}) => {
|
|
5
5
|
const inputClientPath = opts.clientPath ||
|
|
6
|
-
require.resolve(
|
|
6
|
+
require.resolve("@based/client", { paths: [process.cwd()] });
|
|
7
7
|
const inputFunctionPath = opts.functionPath ||
|
|
8
|
-
require.resolve(
|
|
8
|
+
require.resolve("@based/functions", { paths: [process.cwd()] });
|
|
9
9
|
let clientPath;
|
|
10
10
|
let functionPath;
|
|
11
11
|
if (inputClientPath) {
|
|
12
|
-
const declarationPath = inputClientPath.replace(
|
|
13
|
-
const
|
|
12
|
+
const declarationPath = inputClientPath.replace("/index.js", "/index.d.ts");
|
|
13
|
+
const originalDeclartionPath = inputClientPath.replace("/index.js", "/index_original.d.ts");
|
|
14
14
|
clientPath = await updateTypesPath(fns, {
|
|
15
15
|
imports: opts.imports,
|
|
16
|
-
|
|
16
|
+
originalDeclartionPath,
|
|
17
17
|
declarationPath,
|
|
18
18
|
}).catch((e) => {
|
|
19
19
|
console.error(e, {
|
|
20
20
|
imports: opts.imports,
|
|
21
|
-
|
|
21
|
+
originalDeclartionPath,
|
|
22
22
|
declarationPath,
|
|
23
23
|
});
|
|
24
|
-
console.error(
|
|
24
|
+
console.error("Cannot find original declaration file - you may need to upgrade to @based/client ^4.8.8");
|
|
25
25
|
});
|
|
26
26
|
}
|
|
27
27
|
if (inputFunctionPath) {
|
|
28
|
-
const declarationPath = inputFunctionPath.replace(
|
|
29
|
-
const
|
|
28
|
+
const declarationPath = inputFunctionPath.replace("/index.js", "/client.d.ts");
|
|
29
|
+
const originalDeclartionPath = inputFunctionPath.replace("/index.js", "/client_original.d.ts");
|
|
30
30
|
functionPath = await updateTypesPath(fns, {
|
|
31
31
|
imports: opts.imports,
|
|
32
|
-
|
|
32
|
+
originalDeclartionPath,
|
|
33
33
|
declarationPath,
|
|
34
34
|
isAbstract: true,
|
|
35
35
|
}).catch(() => {
|
|
36
|
-
console.error(
|
|
36
|
+
console.error("Cannot find original declaration file - you may need to upgrade to @based/functions ^2.2.4");
|
|
37
37
|
});
|
|
38
38
|
}
|
|
39
39
|
return {
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAE3C,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAE9C,MAAM,CAAC,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,CAAC;QACpB,MAAM,eAAe,GAAG,eAAe,CAAC,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,CAAA;QAC3E,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAE3C,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAE9C,MAAM,CAAC,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,CAAC;QACpB,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,eAAe,CAAC,GAAG,EAAE;YACtC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,sBAAsB;YACtB,eAAe;SAChB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACb,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE;gBACf,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,sBAAsB;gBACtB,eAAe;aAChB,CAAC,CAAA;YACF,OAAO,CAAC,KAAK,CACX,yFAAyF,CAC1F,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,iBAAiB,EAAE,CAAC;QACtB,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,eAAe,CAAC,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;IACJ,CAAC;IAED,OAAO;QACL,YAAY;QACZ,UAAU;KACX,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -2,10 +2,10 @@ import { readFile, writeFile } from "fs/promises";
|
|
|
2
2
|
export const updateTypesPath = async (fns, opts) => {
|
|
3
3
|
let decFile = "";
|
|
4
4
|
try {
|
|
5
|
-
decFile = (await readFile(opts.
|
|
5
|
+
decFile = (await readFile(opts.originalDeclartionPath)).toString("utf-8");
|
|
6
6
|
}
|
|
7
7
|
catch (err) {
|
|
8
|
-
throw new Error(`Cannot find ${opts.
|
|
8
|
+
throw new Error(`Cannot find ${opts.originalDeclartionPath}`);
|
|
9
9
|
}
|
|
10
10
|
let imports = opts.imports ? opts.imports.join("\n") + "\n" : "\n";
|
|
11
11
|
let callFns = "\n";
|
|
@@ -26,7 +26,7 @@ export const updateTypesPath = async (fns, opts) => {
|
|
|
26
26
|
${abstractPrefix}call(
|
|
27
27
|
name: '${fn.config.name}',
|
|
28
28
|
payload: Parameters<typeof ${name}>[1],
|
|
29
|
-
${opts.isAbstract ? "ctx?:
|
|
29
|
+
${opts.isAbstract ? "ctx?: Context" : "opts?: CallOptions"}
|
|
30
30
|
): ReturnType<typeof ${name}>;
|
|
31
31
|
`;
|
|
32
32
|
}
|
|
@@ -35,7 +35,7 @@ export const updateTypesPath = async (fns, opts) => {
|
|
|
35
35
|
${abstractPrefix}call(
|
|
36
36
|
name: '${fn.config.name}',
|
|
37
37
|
payload: ${fn.payload},
|
|
38
|
-
${opts.isAbstract ? "ctx?:
|
|
38
|
+
${opts.isAbstract ? "ctx?: Context" : "opts?: CallOptions"}
|
|
39
39
|
): Promise<${fn.result}>
|
|
40
40
|
`;
|
|
41
41
|
}
|
|
@@ -62,7 +62,7 @@ export const updateTypesPath = async (fns, opts) => {
|
|
|
62
62
|
let x = imports + decFile;
|
|
63
63
|
if (fnCnt > 0) {
|
|
64
64
|
if (opts.isAbstract) {
|
|
65
|
-
x = x.replace("abstract call(name: string, payload?: any, ctx?:
|
|
65
|
+
x = x.replace("abstract call(name: string, payload?: any, ctx?: Context): Promise<any>;", callFns);
|
|
66
66
|
}
|
|
67
67
|
else {
|
|
68
68
|
x = x.replace("call(name: string, payload?: any, opts?: CallOptions): Promise<any>;", callFns);
|
|
@@ -75,7 +75,7 @@ export const updateTypesPath = async (fns, opts) => {
|
|
|
75
75
|
else {
|
|
76
76
|
x = x.replace(`query(name: string, payload?: any, opts?: QueryOptions): BasedQuery;`, queryFns);
|
|
77
77
|
}
|
|
78
|
-
x = x.replace(/export type QueryMap = ([^@]*?)\};?([^@]*?)\};?\s*\};?/gm, `export type QueryMap = {${queryMap}`);
|
|
78
|
+
x = x.replace(/export type QueryMap = ([^@]*?)\};?([^@]*?)\};?\s*\};?/gm, `export type QueryMap = {${queryMap}}`);
|
|
79
79
|
}
|
|
80
80
|
await writeFile(opts.declarationPath, x);
|
|
81
81
|
return opts.declarationPath;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateTypesPath.js","sourceRoot":"","sources":["../../src/updateTypesPath.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEjD,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAClC,GAGG,EACH,IAKC,EACuB,EAAE;IAC1B,IAAI,OAAO,GAAG,EAAE,CAAA;IAEhB,IAAI,CAAC;QACH,OAAO,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"updateTypesPath.js","sourceRoot":"","sources":["../../src/updateTypesPath.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@based/type-gen",
|
|
3
|
-
"version": "0.0
|
|
3
|
+
"version": "0.1.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/src/index.js",
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
"test": "npx ava",
|
|
9
9
|
"build": "npx tsc",
|
|
10
10
|
"watch": "npx tsc --watch",
|
|
11
|
-
"clean": "
|
|
11
|
+
"clean": "rm -rf ./dist ./node_modules"
|
|
12
12
|
},
|
|
13
13
|
"sideEffects": false,
|
|
14
14
|
"dependencies": {
|
|
@@ -16,15 +16,14 @@
|
|
|
16
16
|
"@babel/parser": "^7.18.6",
|
|
17
17
|
"@babel/traverse": "^7.18.6",
|
|
18
18
|
"utility-types": "^3.10.0",
|
|
19
|
-
"@
|
|
20
|
-
"@based/functions": "
|
|
19
|
+
"@based/utils": "1.1.1",
|
|
20
|
+
"@based/functions": "3.3.2"
|
|
21
21
|
},
|
|
22
22
|
"devDependencies": {
|
|
23
23
|
"@types/fs-extra": "11.0.3",
|
|
24
24
|
"ts-node": "10.9.1",
|
|
25
25
|
"typescript": "^5.2.2",
|
|
26
|
-
"
|
|
27
|
-
"@based/client": "^6.1.0",
|
|
26
|
+
"@based/client": "8.2.2",
|
|
28
27
|
"ava": "5.3.1"
|
|
29
28
|
},
|
|
30
29
|
"ava": {
|