@open-feishu-card/cli 0.1.15 → 0.1.17

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/dist/cli.cjs CHANGED
@@ -48,21 +48,28 @@ function cmdLint(files, schemaOnly) {
48
48
  }
49
49
  function cmdClean(file, out, check) {
50
50
  const src = loadSource(file);
51
- const { data } = parser.parse(src);
52
- const { card, stripped } = compiler.sanitize(data, { mode: "strip" });
51
+ const parsed = parser.parse(src);
52
+ const resolved = parser.resolveCardDocument(parsed);
53
+ if (!resolved) {
54
+ console.error(`${file}: \u4E0D\u662F\u6709\u6548\u7684\u5361\u7247 JSON \u6587\u6863`);
55
+ return 1;
56
+ }
57
+ const { card, stripped } = compiler.sanitize(resolved.cardData, { mode: "strip" });
58
+ const paths = stripped.map((p) => parser.joinCardPointer(resolved.pathPrefix, p));
53
59
  if (check) {
54
- if (stripped.length > 0) {
55
- console.error(`${file}: \u53D1\u73B0 ${stripped.length} \u4E2A\u975E\u6807\u5C5E\u6027:`);
56
- for (const p of stripped) console.error(` - ${p}`);
60
+ if (paths.length > 0) {
61
+ console.error(`${file}: \u53D1\u73B0 ${paths.length} \u4E2A\u975E\u6807\u5C5E\u6027:`);
62
+ for (const p of paths) console.error(` - ${p}`);
57
63
  return 1;
58
64
  }
59
65
  console.error(`${file}: \u5E72\u51C0\uFF0C\u65E0\u975E\u6807\u5C5E\u6027`);
60
66
  return 0;
61
67
  }
62
68
  const target = out ?? file;
63
- fs.writeFileSync(target, JSON.stringify(card, null, 2) + "\n");
64
- console.error(`\u5DF2\u51C0\u5316 ${stripped.length} \u4E2A\u975E\u6807\u5C5E\u6027 \u2192 ${target}`);
65
- for (const p of stripped) console.error(` - \u5265\u79BB ${p}`);
69
+ const output = parser.serializeCardDocument(resolved, card);
70
+ fs.writeFileSync(target, JSON.stringify(output, null, 2) + "\n");
71
+ console.error(`\u5DF2\u51C0\u5316 ${paths.length} \u4E2A\u975E\u6807\u5C5E\u6027 \u2192 ${target}`);
72
+ for (const p of paths) console.error(` - \u5265\u79BB ${p}`);
66
73
  return 0;
67
74
  }
68
75
  function cmdFormat(file, out) {
@@ -77,12 +84,17 @@ function cmdFormat(file, out) {
77
84
  return 0;
78
85
  }
79
86
  function cmdBuild(file, out) {
80
- const { data, errors } = parser.parse(loadSource(file));
81
- if (errors.length) {
82
- for (const e of errors) console.error(`${file}:${fmtPos(e.range.start)} error ${e.message}`);
87
+ const parsed = parser.parse(loadSource(file));
88
+ if (parsed.errors.length) {
89
+ for (const e of parsed.errors) console.error(`${file}:${fmtPos(e.range.start)} error ${e.message}`);
90
+ return 1;
91
+ }
92
+ const resolved = parser.resolveCardDocument(parsed);
93
+ if (!resolved) {
94
+ console.error(`${file}: \u4E0D\u662F\u6709\u6548\u7684\u5361\u7247 JSON \u6587\u6863`);
83
95
  return 1;
84
96
  }
85
- const { raw } = compiler.compile(data);
97
+ const { raw } = compiler.compile(resolved.cardData);
86
98
  if (out) {
87
99
  fs.writeFileSync(out, JSON.stringify(raw, null, 2) + "\n");
88
100
  console.error(`\u5DF2\u7F16\u8BD1 RAW \u2192 ${out}`);
package/dist/cli.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAmHA,wBAAgB,GAAG,CAAC,IAAI,GAAE,MAAM,EAA0B,GAAG,MAAM,CAqBlE"}
1
+ {"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAoIA,wBAAgB,GAAG,CAAC,IAAI,GAAE,MAAM,EAA0B,GAAG,MAAM,CAqBlE"}
package/dist/cli.js CHANGED
@@ -1,6 +1,6 @@
1
1
  #!/usr/bin/env node
2
2
  import { writeFileSync, readFileSync } from 'fs';
3
- import { parse } from '@open-feishu-card/parser';
3
+ import { parse, resolveCardDocument, joinCardPointer, serializeCardDocument } from '@open-feishu-card/parser';
4
4
  import { validateAst } from '@open-feishu-card/validator';
5
5
  import { lintAst } from '@open-feishu-card/linter';
6
6
  import { compile, sanitize } from '@open-feishu-card/compiler';
@@ -46,21 +46,28 @@ function cmdLint(files, schemaOnly) {
46
46
  }
47
47
  function cmdClean(file, out, check) {
48
48
  const src = loadSource(file);
49
- const { data } = parse(src);
50
- const { card, stripped } = sanitize(data, { mode: "strip" });
49
+ const parsed = parse(src);
50
+ const resolved = resolveCardDocument(parsed);
51
+ if (!resolved) {
52
+ console.error(`${file}: \u4E0D\u662F\u6709\u6548\u7684\u5361\u7247 JSON \u6587\u6863`);
53
+ return 1;
54
+ }
55
+ const { card, stripped } = sanitize(resolved.cardData, { mode: "strip" });
56
+ const paths = stripped.map((p) => joinCardPointer(resolved.pathPrefix, p));
51
57
  if (check) {
52
- if (stripped.length > 0) {
53
- console.error(`${file}: \u53D1\u73B0 ${stripped.length} \u4E2A\u975E\u6807\u5C5E\u6027:`);
54
- for (const p of stripped) console.error(` - ${p}`);
58
+ if (paths.length > 0) {
59
+ console.error(`${file}: \u53D1\u73B0 ${paths.length} \u4E2A\u975E\u6807\u5C5E\u6027:`);
60
+ for (const p of paths) console.error(` - ${p}`);
55
61
  return 1;
56
62
  }
57
63
  console.error(`${file}: \u5E72\u51C0\uFF0C\u65E0\u975E\u6807\u5C5E\u6027`);
58
64
  return 0;
59
65
  }
60
66
  const target = out ?? file;
61
- writeFileSync(target, JSON.stringify(card, null, 2) + "\n");
62
- console.error(`\u5DF2\u51C0\u5316 ${stripped.length} \u4E2A\u975E\u6807\u5C5E\u6027 \u2192 ${target}`);
63
- for (const p of stripped) console.error(` - \u5265\u79BB ${p}`);
67
+ const output = serializeCardDocument(resolved, card);
68
+ writeFileSync(target, JSON.stringify(output, null, 2) + "\n");
69
+ console.error(`\u5DF2\u51C0\u5316 ${paths.length} \u4E2A\u975E\u6807\u5C5E\u6027 \u2192 ${target}`);
70
+ for (const p of paths) console.error(` - \u5265\u79BB ${p}`);
64
71
  return 0;
65
72
  }
66
73
  function cmdFormat(file, out) {
@@ -75,12 +82,17 @@ function cmdFormat(file, out) {
75
82
  return 0;
76
83
  }
77
84
  function cmdBuild(file, out) {
78
- const { data, errors } = parse(loadSource(file));
79
- if (errors.length) {
80
- for (const e of errors) console.error(`${file}:${fmtPos(e.range.start)} error ${e.message}`);
85
+ const parsed = parse(loadSource(file));
86
+ if (parsed.errors.length) {
87
+ for (const e of parsed.errors) console.error(`${file}:${fmtPos(e.range.start)} error ${e.message}`);
88
+ return 1;
89
+ }
90
+ const resolved = resolveCardDocument(parsed);
91
+ if (!resolved) {
92
+ console.error(`${file}: \u4E0D\u662F\u6709\u6548\u7684\u5361\u7247 JSON \u6587\u6863`);
81
93
  return 1;
82
94
  }
83
- const { raw } = compile(data);
95
+ const { raw } = compile(resolved.cardData);
84
96
  if (out) {
85
97
  writeFileSync(out, JSON.stringify(raw, null, 2) + "\n");
86
98
  console.error(`\u5DF2\u7F16\u8BD1 RAW \u2192 ${out}`);
package/dist/index.cjs CHANGED
@@ -48,21 +48,28 @@ function cmdLint(files, schemaOnly) {
48
48
  }
49
49
  function cmdClean(file, out, check) {
50
50
  const src = loadSource(file);
51
- const { data } = parser.parse(src);
52
- const { card, stripped } = compiler.sanitize(data, { mode: "strip" });
51
+ const parsed = parser.parse(src);
52
+ const resolved = parser.resolveCardDocument(parsed);
53
+ if (!resolved) {
54
+ console.error(`${file}: \u4E0D\u662F\u6709\u6548\u7684\u5361\u7247 JSON \u6587\u6863`);
55
+ return 1;
56
+ }
57
+ const { card, stripped } = compiler.sanitize(resolved.cardData, { mode: "strip" });
58
+ const paths = stripped.map((p) => parser.joinCardPointer(resolved.pathPrefix, p));
53
59
  if (check) {
54
- if (stripped.length > 0) {
55
- console.error(`${file}: \u53D1\u73B0 ${stripped.length} \u4E2A\u975E\u6807\u5C5E\u6027:`);
56
- for (const p of stripped) console.error(` - ${p}`);
60
+ if (paths.length > 0) {
61
+ console.error(`${file}: \u53D1\u73B0 ${paths.length} \u4E2A\u975E\u6807\u5C5E\u6027:`);
62
+ for (const p of paths) console.error(` - ${p}`);
57
63
  return 1;
58
64
  }
59
65
  console.error(`${file}: \u5E72\u51C0\uFF0C\u65E0\u975E\u6807\u5C5E\u6027`);
60
66
  return 0;
61
67
  }
62
68
  const target = out ?? file;
63
- fs.writeFileSync(target, JSON.stringify(card, null, 2) + "\n");
64
- console.error(`\u5DF2\u51C0\u5316 ${stripped.length} \u4E2A\u975E\u6807\u5C5E\u6027 \u2192 ${target}`);
65
- for (const p of stripped) console.error(` - \u5265\u79BB ${p}`);
69
+ const output = parser.serializeCardDocument(resolved, card);
70
+ fs.writeFileSync(target, JSON.stringify(output, null, 2) + "\n");
71
+ console.error(`\u5DF2\u51C0\u5316 ${paths.length} \u4E2A\u975E\u6807\u5C5E\u6027 \u2192 ${target}`);
72
+ for (const p of paths) console.error(` - \u5265\u79BB ${p}`);
66
73
  return 0;
67
74
  }
68
75
  function cmdFormat(file, out) {
@@ -77,12 +84,17 @@ function cmdFormat(file, out) {
77
84
  return 0;
78
85
  }
79
86
  function cmdBuild(file, out) {
80
- const { data, errors } = parser.parse(loadSource(file));
81
- if (errors.length) {
82
- for (const e of errors) console.error(`${file}:${fmtPos(e.range.start)} error ${e.message}`);
87
+ const parsed = parser.parse(loadSource(file));
88
+ if (parsed.errors.length) {
89
+ for (const e of parsed.errors) console.error(`${file}:${fmtPos(e.range.start)} error ${e.message}`);
90
+ return 1;
91
+ }
92
+ const resolved = parser.resolveCardDocument(parsed);
93
+ if (!resolved) {
94
+ console.error(`${file}: \u4E0D\u662F\u6709\u6548\u7684\u5361\u7247 JSON \u6587\u6863`);
83
95
  return 1;
84
96
  }
85
- const { raw } = compiler.compile(data);
97
+ const { raw } = compiler.compile(resolved.cardData);
86
98
  if (out) {
87
99
  fs.writeFileSync(out, JSON.stringify(raw, null, 2) + "\n");
88
100
  console.error(`\u5DF2\u7F16\u8BD1 RAW \u2192 ${out}`);
package/dist/index.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { writeFileSync, readFileSync } from 'fs';
2
- import { parse } from '@open-feishu-card/parser';
2
+ import { parse, resolveCardDocument, joinCardPointer, serializeCardDocument } from '@open-feishu-card/parser';
3
3
  import { validateAst } from '@open-feishu-card/validator';
4
4
  import { lintAst } from '@open-feishu-card/linter';
5
5
  import { compile, sanitize } from '@open-feishu-card/compiler';
@@ -46,21 +46,28 @@ function cmdLint(files, schemaOnly) {
46
46
  }
47
47
  function cmdClean(file, out, check) {
48
48
  const src = loadSource(file);
49
- const { data } = parse(src);
50
- const { card, stripped } = sanitize(data, { mode: "strip" });
49
+ const parsed = parse(src);
50
+ const resolved = resolveCardDocument(parsed);
51
+ if (!resolved) {
52
+ console.error(`${file}: \u4E0D\u662F\u6709\u6548\u7684\u5361\u7247 JSON \u6587\u6863`);
53
+ return 1;
54
+ }
55
+ const { card, stripped } = sanitize(resolved.cardData, { mode: "strip" });
56
+ const paths = stripped.map((p) => joinCardPointer(resolved.pathPrefix, p));
51
57
  if (check) {
52
- if (stripped.length > 0) {
53
- console.error(`${file}: \u53D1\u73B0 ${stripped.length} \u4E2A\u975E\u6807\u5C5E\u6027:`);
54
- for (const p of stripped) console.error(` - ${p}`);
58
+ if (paths.length > 0) {
59
+ console.error(`${file}: \u53D1\u73B0 ${paths.length} \u4E2A\u975E\u6807\u5C5E\u6027:`);
60
+ for (const p of paths) console.error(` - ${p}`);
55
61
  return 1;
56
62
  }
57
63
  console.error(`${file}: \u5E72\u51C0\uFF0C\u65E0\u975E\u6807\u5C5E\u6027`);
58
64
  return 0;
59
65
  }
60
66
  const target = out ?? file;
61
- writeFileSync(target, JSON.stringify(card, null, 2) + "\n");
62
- console.error(`\u5DF2\u51C0\u5316 ${stripped.length} \u4E2A\u975E\u6807\u5C5E\u6027 \u2192 ${target}`);
63
- for (const p of stripped) console.error(` - \u5265\u79BB ${p}`);
67
+ const output = serializeCardDocument(resolved, card);
68
+ writeFileSync(target, JSON.stringify(output, null, 2) + "\n");
69
+ console.error(`\u5DF2\u51C0\u5316 ${paths.length} \u4E2A\u975E\u6807\u5C5E\u6027 \u2192 ${target}`);
70
+ for (const p of paths) console.error(` - \u5265\u79BB ${p}`);
64
71
  return 0;
65
72
  }
66
73
  function cmdFormat(file, out) {
@@ -75,12 +82,17 @@ function cmdFormat(file, out) {
75
82
  return 0;
76
83
  }
77
84
  function cmdBuild(file, out) {
78
- const { data, errors } = parse(loadSource(file));
79
- if (errors.length) {
80
- for (const e of errors) console.error(`${file}:${fmtPos(e.range.start)} error ${e.message}`);
85
+ const parsed = parse(loadSource(file));
86
+ if (parsed.errors.length) {
87
+ for (const e of parsed.errors) console.error(`${file}:${fmtPos(e.range.start)} error ${e.message}`);
88
+ return 1;
89
+ }
90
+ const resolved = resolveCardDocument(parsed);
91
+ if (!resolved) {
92
+ console.error(`${file}: \u4E0D\u662F\u6709\u6548\u7684\u5361\u7247 JSON \u6587\u6863`);
81
93
  return 1;
82
94
  }
83
- const { raw } = compile(data);
95
+ const { raw } = compile(resolved.cardData);
84
96
  if (out) {
85
97
  writeFileSync(out, JSON.stringify(raw, null, 2) + "\n");
86
98
  console.error(`\u5DF2\u7F16\u8BD1 RAW \u2192 ${out}`);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@open-feishu-card/cli",
3
- "version": "0.1.15",
3
+ "version": "0.1.17",
4
4
  "description": "飞书卡片命令行工具:lint 校验、validate、clean 净化非标属性、format 格式化",
5
5
  "type": "module",
6
6
  "bin": {
@@ -20,10 +20,10 @@
20
20
  "dist"
21
21
  ],
22
22
  "dependencies": {
23
- "@open-feishu-card/compiler": "0.1.15",
24
- "@open-feishu-card/linter": "0.1.2",
25
- "@open-feishu-card/parser": "0.1.2",
26
- "@open-feishu-card/validator": "0.1.4"
23
+ "@open-feishu-card/compiler": "0.1.16",
24
+ "@open-feishu-card/linter": "0.1.3",
25
+ "@open-feishu-card/parser": "0.1.3",
26
+ "@open-feishu-card/validator": "0.1.6"
27
27
  },
28
28
  "devDependencies": {
29
29
  "tsup": "^8.3.5",