@cluesurf/form 0.6.10 → 0.6.22
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/host/code/form.d.ts +1 -0
- package/host/make/flow.js +5 -7
- package/host/make/flow.js.map +1 -1
- package/host/make/index.d.ts +1 -1
- package/host/make/index.js +7 -7
- package/host/make/index.js.map +1 -1
- package/package.json +1 -1
package/host/code/form.d.ts
CHANGED
package/host/make/flow.js
CHANGED
|
@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
import os from 'os';
|
|
11
11
|
import pLimit from 'p-limit';
|
|
12
12
|
import prettier from 'prettier';
|
|
13
|
-
import { ESLint } from 'eslint';
|
|
14
13
|
import { Project } from 'ts-morph'; // npm i ts-morph
|
|
15
14
|
// 1. Create a single ts-morph project once (cheap to reuse)
|
|
16
15
|
const project = new Project({
|
|
@@ -47,18 +46,17 @@ export function washFileList(fileList) {
|
|
|
47
46
|
sourceFile.organizeImports();
|
|
48
47
|
}
|
|
49
48
|
// 5. Create ESLint instance
|
|
50
|
-
const eslint = new ESLint({ fix: true })
|
|
49
|
+
// const eslint = new ESLint({ fix: true })
|
|
51
50
|
// 6. Read back, ESLint + Prettier format in parallel (in-memory)
|
|
52
51
|
const taskList = fileList.map(({ file }) => limit(() => __awaiter(this, void 0, void 0, function* () {
|
|
53
|
-
var _a;
|
|
54
52
|
const sf = project.getSourceFileOrThrow(file);
|
|
55
53
|
const organized = sf.getFullText();
|
|
56
|
-
// Apply ESLint fixes for spacing
|
|
57
|
-
const eslintResults =
|
|
58
|
-
const eslintFixed =
|
|
54
|
+
// // Apply ESLint fixes for spacing
|
|
55
|
+
// const eslintResults = await eslint.lintText(organized, { filePath: file })
|
|
56
|
+
// const eslintFixed = eslintResults[0]?.output || organized
|
|
59
57
|
// Load prettier config from project
|
|
60
58
|
const prettierConfig = (yield prettier.resolveConfig(process.cwd())) || PRETTIER;
|
|
61
|
-
const formatted = yield prettier.format(
|
|
59
|
+
const formatted = yield prettier.format(organized, Object.assign(Object.assign({}, prettierConfig), { parser: 'typescript' }));
|
|
62
60
|
return {
|
|
63
61
|
file,
|
|
64
62
|
text: formatted,
|
package/host/make/flow.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flow.js","sourceRoot":"","sources":["../../make/flow.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,MAAM,MAAM,SAAS,CAAA;AAC5B,OAAO,QAAQ,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"flow.js","sourceRoot":"","sources":["../../make/flow.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,MAAM,MAAM,SAAS,CAAA;AAC5B,OAAO,QAAQ,MAAM,UAAU,CAAA;AAG/B,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA,CAAC,iBAAiB;AAEpD,4DAA4D;AAC5D,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC;IAC1B,qBAAqB,EAAE,IAAI;IAC3B,8CAA8C;IAC9C,eAAe,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE;CACxD,CAAC,CAAA;AAEF,yDAAyD;AACzD,MAAM,QAAQ,GAAqB;IACjC,WAAW,EAAE,OAAO;IACpB,cAAc,EAAE,IAAI;IACpB,SAAS,EAAE,IAAI;IACf,UAAU,EAAE,EAAE;IACd,SAAS,EAAE,QAAQ;IACnB,UAAU,EAAE,WAAW;IACvB,IAAI,EAAE,KAAK;IACX,sBAAsB,EAAE,IAAI;IAC5B,WAAW,EAAE,IAAI;IACjB,QAAQ,EAAE,CAAC;IACX,aAAa,EAAE,KAAK;IACpB,OAAO,EAAE,KAAK;IACd,MAAM,EAAE,YAAY;CACrB,CAAA;AAED,MAAM,UAAgB,YAAY,CAChC,QAA+C;;QAE/C,mCAAmC;QACnC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;QAEhE,oDAAoD;QACpD,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;YACzB,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAC/D,CAAC;QAED,uDAAuD;QACvD,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC;YAClD,UAAU,CAAC,eAAe,EAAE,CAAA;QAC9B,CAAC;QAED,4BAA4B;QAC5B,2CAA2C;QAE3C,iEAAiE;QACjE,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CACzC,KAAK,CAAC,GAAS,EAAE;YACf,MAAM,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAA;YAC7C,MAAM,SAAS,GAAG,EAAE,CAAC,WAAW,EAAE,CAAA;YAElC,oCAAoC;YACpC,6EAA6E;YAC7E,4DAA4D;YAE5D,oCAAoC;YACpC,MAAM,cAAc,GAClB,CAAC,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,QAAQ,CAAA;YAC3D,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,SAAS,kCAC5C,cAAc,KACjB,MAAM,EAAE,YAAY,IACpB,CAAA;YACF,OAAO;gBACL,IAAI;gBACJ,IAAI,EAAE,SAAS;aAChB,CAAA;QACH,CAAC,CAAA,CAAC,CACH,CAAA;QAED,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAC9B,CAAC;CAAA"}
|
package/host/make/index.d.ts
CHANGED
package/host/make/index.js
CHANGED
|
@@ -24,7 +24,7 @@ import make_constants from './base';
|
|
|
24
24
|
import { washFileList } from './flow';
|
|
25
25
|
export default function make(_a) {
|
|
26
26
|
return __awaiter(this, void 0, void 0, function* () {
|
|
27
|
-
var { testLink } = _a, baseMesh = __rest(_a, ["testLink"]);
|
|
27
|
+
var { testLink, codeLink } = _a, baseMesh = __rest(_a, ["testLink", "codeLink"]);
|
|
28
28
|
const hold = { load: {}, save: {} };
|
|
29
29
|
const type_list_hash = make_types(baseMesh, hold);
|
|
30
30
|
const parser_list_hash = make_parsers(baseMesh, hold);
|
|
@@ -60,25 +60,25 @@ export default function make(_a) {
|
|
|
60
60
|
take[file] = castList.join('\n');
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
|
-
return wash({ form, take, base });
|
|
63
|
+
return wash({ form, take, base, codeLink });
|
|
64
64
|
});
|
|
65
65
|
}
|
|
66
66
|
function wash(take) {
|
|
67
67
|
return __awaiter(this, void 0, void 0, function* () {
|
|
68
68
|
const make = {
|
|
69
|
-
form: yield washList(take.form),
|
|
70
|
-
take: yield washList(take.take),
|
|
71
|
-
base: yield washList(take.base),
|
|
69
|
+
form: yield washList(take.form, take.codeLink),
|
|
70
|
+
take: yield washList(take.take, take.codeLink),
|
|
71
|
+
base: yield washList(take.base, take.codeLink),
|
|
72
72
|
};
|
|
73
73
|
return make;
|
|
74
74
|
});
|
|
75
75
|
}
|
|
76
|
-
function washList(mesh) {
|
|
76
|
+
function washList(mesh, codeLink) {
|
|
77
77
|
return __awaiter(this, void 0, void 0, function* () {
|
|
78
78
|
const list = yield washFileList(Object.keys(mesh).map(file => {
|
|
79
79
|
const text = mesh[file];
|
|
80
80
|
// Convert ~ paths to valid file paths for ts-morph
|
|
81
|
-
const virtualPath = file.replace(/^~/,
|
|
81
|
+
const virtualPath = file.replace(/^~/, codeLink) + '.ts';
|
|
82
82
|
return { file: virtualPath, text };
|
|
83
83
|
}));
|
|
84
84
|
// Map back to original keys
|
package/host/make/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../make/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,OAAO,UAAoB,MAAM,QAAQ,CAAA;AACzC,OAAO,YAAY,MAAM,QAAQ,CAAA;AACjC,OAAO,cAAc,MAAM,QAAQ,CAAA;AAEnC,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAUrC,MAAM,CAAC,OAAO,UAAgB,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../make/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,OAAO,UAAoB,MAAM,QAAQ,CAAA;AACzC,OAAO,YAAY,MAAM,QAAQ,CAAA;AACjC,OAAO,cAAc,MAAM,QAAQ,CAAA;AAEnC,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAUrC,MAAM,CAAC,OAAO,UAAgB,IAAI,CAAC,EAI5B;;YAJ4B,EACjC,QAAQ,EACR,QAAQ,OAEH,EADF,QAAQ,cAHsB,wBAIlC,CADY;QAEX,MAAM,IAAI,GAAS,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAA;QAEzC,MAAM,cAAc,GAAG,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;QACjD,MAAM,gBAAgB,GAAG,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;QACrD,MAAM,kBAAkB,GAAG,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;QAEzD,MAAM,IAAI,GAA2B,EAAE,CAAA;QACvC,MAAM,IAAI,GAA2B,EAAE,CAAA;QACvC,MAAM,IAAI,GAA2B,EAAE,CAAA;QAEvC,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;YAClC,MAAM,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC,CAAA;YACjC,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,EAAE,CAAC;gBACjB,MAAM,QAAQ,GAAG,CAAC,GAAG,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,CAAA;gBACvD,IAAI,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAClC,CAAC;QACH,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,kBAAkB,EAAE,CAAC;YACtC,MAAM,IAAI,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAA;YACrC,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,EAAE,CAAC;gBACjB,MAAM,QAAQ,GAAG,CAAC,GAAG,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,CAAA;gBAEvD,IAAI,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAClC,CAAC;QACH,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,gBAAgB,EAAE,CAAC;YACpC,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAA;YACnC,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,EAAE,CAAC;gBACjB,MAAM,QAAQ,GAAG;oBACf,yBAAyB;oBACzB,mDAAmD;oBACnD,0BAA0B,QAAQ,GAAG;oBACrC,EAAE;oBACF,GAAG,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC;oBAC3B,GAAG,IAAI;iBACR,CAAA;gBAED,IAAI,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAClC,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAA;IAC7C,CAAC;CAAA;AAED,SAAe,IAAI,CACjB,IAAqC;;QAErC,MAAM,IAAI,GAAa;YACrB,IAAI,EAAE,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC;YAC9C,IAAI,EAAE,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC;YAC9C,IAAI,EAAE,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC;SAC/C,CAAA;QAED,OAAO,IAAI,CAAA;IACb,CAAC;CAAA;AAED,SAAe,QAAQ,CACrB,IAA4B,EAC5B,QAAgB;;QAEhB,MAAM,IAAI,GAAG,MAAM,YAAY,CAC7B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAE,CAAA;YACxB,mDAAmD;YACnD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAA;YACxD,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAA;QACpC,CAAC,CAAC,CACH,CAAA;QAED,4BAA4B;QAC5B,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACtC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;YAC1C,MAAM,WAAW,GAAG,YAAY,CAAC,KAAK,CAAE,CAAA;YACxC,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,IAAK,CAAA;YACjC,OAAO,OAAO,CAAA;QAChB,CAAC,EAAE,EAAE,CAAC,CAAA;IACR,CAAC;CAAA;AAED,SAAS,YAAY,CAAC,IAAU,EAAE,IAAY;;IAC5C,MAAM,IAAI,GAA6B,EAAE,CAAA;IACzC,MAAM,IAAI,GAAa,EAAE,CAAA;IACzB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAE,CAAA;IAE7B,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;QACxB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAChC,MAAM,QAAQ,GAAG,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,CAAA;QAC/B,IAAI,CAAC,QAAQ,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;YACnC,SAAQ;QACV,CAAC;QACD,MAAM,IAAI,GAAG,OAAC,IAAI,CAAC,QAAQ,qCAAb,IAAI,CAAC,QAAQ,IAAM,EAAE,EAAC,CAAA;QACpC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACjB,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;QACxB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAE,CAAA;QAExB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACtC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;YAC9B,CAAC,CAAC,IAAI,CAAA;QAER,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,QAAQ,GAAG,CAAC,CAAA;IACtE,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAEb,OAAO,IAAI,CAAA;AACb,CAAC"}
|