@shing.wong/sure-factor 0.6.1 → 0.6.2
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/CHANGELOG.md +19 -0
- package/README.md +21 -5
- package/dist/catalog.d.ts +2 -2
- package/dist/catalog.d.ts.map +1 -1
- package/dist/catalog.js +85 -33
- package/dist/catalog.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -5,6 +5,25 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
|
|
|
5
5
|
|
|
6
6
|
## [Unreleased]
|
|
7
7
|
|
|
8
|
+
### Changed — strict guard grammar (slated for 0.6.2; version not bumped here)
|
|
9
|
+
|
|
10
|
+
- Guard validation now follows the closed scope grammar locked for
|
|
11
|
+
sure-document: `.field` / `row.field` / `rows.field` (row scope, requires an
|
|
12
|
+
active row context — `data.shape` `rows`/`series`), `@field` / `root.field`
|
|
13
|
+
(root scope), `totals.field` (server totals), raw numeric literals,
|
|
14
|
+
aggregates `sum:` / `sub:` / `mul:` / `div:` / `avg:` with comma-separated
|
|
15
|
+
operands (`rows.amount` is a valid array-range operand; `count` is a tolerated
|
|
16
|
+
legacy alias), and `ifpresent:Condition->Then`.
|
|
17
|
+
- Removed the `P:` and `F:` forms. A bare identifier, an unknown namespace, or a
|
|
18
|
+
row-scoped token with no active row context now fails closed with the new
|
|
19
|
+
`SCOPE_INVALID` validation issue naming the offending token — sure-factor's
|
|
20
|
+
mirror of sure-document's `E_SCOPE_INVALID`. `UNKNOWN_PROJECTION`,
|
|
21
|
+
`GUARD_WITHOUT_PROJECTION`, `BAD_FAMILY`, `BAD_SHAPE` and `BAD_FIXTURE` are
|
|
22
|
+
unchanged.
|
|
23
|
+
- The five published sure-store entries stay valid: their legacy `sum(...)`,
|
|
24
|
+
`count(...)` and `ifpresent(...)` call forms and `record.*` / `rows.*` bindings
|
|
25
|
+
are still accepted, and a test replays each entry's exact guards.
|
|
26
|
+
|
|
8
27
|
### Changed
|
|
9
28
|
|
|
10
29
|
- Bumped `@shing.wong/sure-ui` to `^0.3.6` (publishes the `document` and
|
package/README.md
CHANGED
|
@@ -248,11 +248,27 @@ if (isDocumentPart(component)) {
|
|
|
248
248
|
}
|
|
249
249
|
```
|
|
250
250
|
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
251
|
+
Guards follow a **closed scope grammar** with no implicit fallback:
|
|
252
|
+
|
|
253
|
+
- `.field` / `row.field` / `rows.field` — row scope, only when `data.shape` is
|
|
254
|
+
`rows` (or `series`); an explicit array range such as `rows.amount` is a valid
|
|
255
|
+
aggregate operand.
|
|
256
|
+
- `record.field` (and the legacy `data`/`series`/`item`/`fields`/`input`
|
|
257
|
+
bindings) — the current record, available in any shape.
|
|
258
|
+
- `@field` / `root.field` — root (document/header) scope; `totals.field` is an
|
|
259
|
+
explicit root namespace for server-recomputed totals. Neither is a projection.
|
|
260
|
+
- Raw numeric literals (`100`, `0.05`, `-3`); aggregates `sum:`, `sub:`, `mul:`,
|
|
261
|
+
`div:`, `avg:` with comma-separated operands (`count` is a tolerated legacy
|
|
262
|
+
alias, not one of the canonical five); and `ifpresent:Condition->Then` as the
|
|
263
|
+
existence guard. The published entries' `sum(...)` / `count(...)` /
|
|
264
|
+
`ifpresent(...)` call forms remain valid.
|
|
265
|
+
|
|
266
|
+
`P:` and `F:` are removed. A bare identifier, an unknown namespace, or a
|
|
267
|
+
row-scoped token without an active row context fails validation with
|
|
268
|
+
`SCOPE_INVALID` naming the offending token — sure-factor's mirror of
|
|
269
|
+
sure-document's `E_SCOPE_INVALID`. **A guard that references an undeclared
|
|
270
|
+
projection still fails loudly** with `UNKNOWN_PROJECTION`, naming the guard and
|
|
271
|
+
the missing name.
|
|
256
272
|
|
|
257
273
|
A report entry is a document part semantically, **not** a form — but the
|
|
258
274
|
template generator still emits a form wrapper and a submit button for every
|
package/dist/catalog.d.ts
CHANGED
|
@@ -29,8 +29,8 @@ export declare function unpublishedBlocks(component: Pick<CatalogComponent, 'nam
|
|
|
29
29
|
/** True when an entry opts into the document-part extension. */
|
|
30
30
|
export declare function isDocumentPart(component: Partial<CatalogComponent>): boolean;
|
|
31
31
|
export interface DocumentPartIssue {
|
|
32
|
-
/** Short machine-readable reason. */
|
|
33
|
-
code: 'BAD_FAMILY' | 'BAD_SHAPE' | 'GUARD_WITHOUT_PROJECTION' | 'UNKNOWN_PROJECTION' | 'BAD_FIXTURE';
|
|
32
|
+
/** Short machine-readable reason. `SCOPE_INVALID` mirrors sure-document's E_SCOPE_INVALID. */
|
|
33
|
+
code: 'BAD_FAMILY' | 'BAD_SHAPE' | 'GUARD_WITHOUT_PROJECTION' | 'UNKNOWN_PROJECTION' | 'BAD_FIXTURE' | 'SCOPE_INVALID';
|
|
34
34
|
/** Human-readable, names the offending value. */
|
|
35
35
|
message: string;
|
|
36
36
|
}
|
package/dist/catalog.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../src/catalog.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,OAAO,KAAK,EACV,gBAAgB,EAEhB,eAAe,EAChB,MAAM,YAAY,CAAA;AAEnB,gDAAgD;AAChD,eAAO,MAAM,kBAAkB,EAAE,SAAS,eAAe,EAA6C,CAAA;AAEtG;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC,EACrD,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,GAC/B,MAAM,EAAE,CAKV;
|
|
1
|
+
{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../src/catalog.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,OAAO,KAAK,EACV,gBAAgB,EAEhB,eAAe,EAChB,MAAM,YAAY,CAAA;AAEnB,gDAAgD;AAChD,eAAO,MAAM,kBAAkB,EAAE,SAAS,eAAe,EAA6C,CAAA;AAEtG;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC,EACrD,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,GAC/B,MAAM,EAAE,CAKV;AAkBD,gEAAgE;AAChE,wBAAgB,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAM5E;AA8FD,MAAM,WAAW,iBAAiB;IAChC,8FAA8F;IAC9F,IAAI,EAAE,YAAY,GAAG,WAAW,GAAG,0BAA0B,GAAG,oBAAoB,GAAG,aAAa,GAAG,eAAe,CAAA;IACtH,iDAAiD;IACjD,OAAO,EAAE,MAAM,CAAA;CAChB;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,gBAAgB,GAAG,iBAAiB,EAAE,CAiDrF;AAED,+EAA+E;AAC/E,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,gBAAgB,GAAG,IAAI,CAKzE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,gBAAgB,GAAG,MAAM,CAiCxE"}
|
package/dist/catalog.js
CHANGED
|
@@ -17,13 +17,16 @@ export function unpublishedBlocks(component, knownBlocks) {
|
|
|
17
17
|
.map((block) => `${label}: ${block}`);
|
|
18
18
|
}
|
|
19
19
|
const DATA_SHAPES = ['record', 'rows', 'series', 'none', 'derived'];
|
|
20
|
-
/** Bindings whose dotted leaves are
|
|
20
|
+
/** Bindings whose dotted leaves are row/record projections. */
|
|
21
21
|
const ROW_BINDINGS = new Set(['rows', 'row', 'record', 'data', 'series', 'item', 'fields', 'input']);
|
|
22
|
-
/**
|
|
23
|
-
|
|
22
|
+
/** The canonical aggregates of the strict grammar. `count` is a tolerated
|
|
23
|
+
* legacy alias kept so the published sure-store entries still validate; it is
|
|
24
|
+
* not one of the canonical five. */
|
|
25
|
+
const AGGREGATES = new Set(['sum', 'sub', 'mul', 'div', 'avg', 'count']);
|
|
26
|
+
/** Operators, literals and keywords that are never references. */
|
|
27
|
+
const NON_REFERENCES = new Set([
|
|
24
28
|
'true', 'false', 'null', 'undefined', 'and', 'or', 'not', 'in',
|
|
25
|
-
'
|
|
26
|
-
'totals', 'F', 'P',
|
|
29
|
+
'ifpresent',
|
|
27
30
|
]);
|
|
28
31
|
/** True when an entry opts into the document-part extension. */
|
|
29
32
|
export function isDocumentPart(component) {
|
|
@@ -34,41 +37,85 @@ export function isDocumentPart(component) {
|
|
|
34
37
|
|| component.fixture !== undefined;
|
|
35
38
|
}
|
|
36
39
|
/**
|
|
37
|
-
*
|
|
40
|
+
* Scan a guard without evaluating it. The strict, closed grammar has exactly
|
|
41
|
+
* these reference forms:
|
|
38
42
|
*
|
|
39
|
-
*
|
|
40
|
-
*
|
|
43
|
+
* - `.field` / `row.field` / `rows.field` — row scope (needs an active row context)
|
|
44
|
+
* - `record.field` (and the legacy `data`/`series`/… bindings) — the current record
|
|
45
|
+
* - `@field` / `root.field` — root (document/header) scope
|
|
46
|
+
* - `totals.field` — explicit root namespace for server totals
|
|
47
|
+
* - raw numeric literals, aggregates (`sum:` / `sum(...)`, …) and `ifpresent:`
|
|
48
|
+
* operators — never references
|
|
41
49
|
*
|
|
42
|
-
*
|
|
43
|
-
*
|
|
44
|
-
*
|
|
45
|
-
* - `name` — a bare identifier used as a value
|
|
46
|
-
*
|
|
47
|
-
* `P:name` names a parameter, not a projection, and is ignored; so are
|
|
48
|
-
* function names, keywords and computed namespaces such as `totals`. This is
|
|
49
|
-
* a scanner, not an evaluator — no dynamic code execution of guard strings.
|
|
50
|
+
* Removed forms (`F:`, `P:`) and bare identifiers fail closed as SCOPE_INVALID,
|
|
51
|
+
* matching sure-document's `E_SCOPE_INVALID`. This is a scanner, not an
|
|
52
|
+
* evaluator — no dynamic code execution of guard strings.
|
|
50
53
|
*/
|
|
51
|
-
function
|
|
52
|
-
const
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
const
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
54
|
+
function scanGuard(expr, hasRowContext) {
|
|
55
|
+
const text = expr.replace(/'(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*"/g, (s) => ' '.repeat(s.length));
|
|
56
|
+
const projections = new Set();
|
|
57
|
+
const scopeErrors = new Map();
|
|
58
|
+
const addError = (token, reason) => {
|
|
59
|
+
if (!scopeErrors.has(token))
|
|
60
|
+
scopeErrors.set(token, { token, reason });
|
|
61
|
+
};
|
|
62
|
+
// F: and P: are removed outright; flag them before the general scan and
|
|
63
|
+
// skip their leaves when it runs.
|
|
64
|
+
for (const m of text.matchAll(/\b([FP]):([A-Za-z_]\w*)/g)) {
|
|
65
|
+
addError(`${m[1]}:${m[2]}`, 'removed');
|
|
59
66
|
}
|
|
60
|
-
for (const m of
|
|
61
|
-
const
|
|
62
|
-
|
|
67
|
+
for (const m of text.matchAll(/([@.]?)([A-Za-z_]\w*)(?:(\s*\.\s*)([A-Za-z_]\w*))?/g)) {
|
|
68
|
+
const sigil = m[1] ?? '';
|
|
69
|
+
const id = m[2];
|
|
70
|
+
const leaf = m[4];
|
|
71
|
+
const idx = m.index;
|
|
72
|
+
const before = text.slice(Math.max(0, idx - 2), idx);
|
|
73
|
+
const after = text.slice(idx + m[0].length, idx + m[0].length + 1);
|
|
74
|
+
// The leaf / sigil of an already-reported F:x or P:x form.
|
|
75
|
+
if (before === 'F:' || before === 'P:')
|
|
76
|
+
continue;
|
|
77
|
+
if (after === ':' && (id === 'F' || id === 'P'))
|
|
63
78
|
continue;
|
|
64
|
-
// A
|
|
65
|
-
if (
|
|
79
|
+
// A trailing colon marks a colon-form operator (`sum:`, `ifpresent:`).
|
|
80
|
+
if (after === ':' && (AGGREGATES.has(id) || id === 'ifpresent'))
|
|
66
81
|
continue;
|
|
67
|
-
if (
|
|
82
|
+
if (sigil === '@')
|
|
83
|
+
continue; // root scope field — a parameter, not a projection
|
|
84
|
+
if (sigil === '.') {
|
|
85
|
+
if (!hasRowContext)
|
|
86
|
+
addError(`.${id}`, 'no-row-context');
|
|
87
|
+
else if (leaf === undefined)
|
|
88
|
+
projections.add(id);
|
|
89
|
+
continue;
|
|
90
|
+
}
|
|
91
|
+
if (leaf !== undefined) {
|
|
92
|
+
if (id === 'root' || id === 'totals')
|
|
93
|
+
continue; // root namespaces, not projections
|
|
94
|
+
if (ROW_BINDINGS.has(id)) {
|
|
95
|
+
if ((id === 'row' || id === 'rows') && !hasRowContext)
|
|
96
|
+
addError(`${id}.${leaf}`, 'no-row-context');
|
|
97
|
+
else
|
|
98
|
+
projections.add(leaf);
|
|
99
|
+
continue;
|
|
100
|
+
}
|
|
101
|
+
addError(id, 'namespace'); // unknown namespace is a bare identifier prefix
|
|
68
102
|
continue;
|
|
69
|
-
|
|
103
|
+
}
|
|
104
|
+
// A bare, sigil-less identifier. Operators, function names and literals
|
|
105
|
+
// are fine; everything else fails closed.
|
|
106
|
+
if (!AGGREGATES.has(id) && !NON_REFERENCES.has(id))
|
|
107
|
+
addError(id, 'bare');
|
|
108
|
+
}
|
|
109
|
+
return { projections: [...projections], scopeErrors: [...scopeErrors.values()] };
|
|
110
|
+
}
|
|
111
|
+
function scopeErrorMessage(label, guard, err) {
|
|
112
|
+
const base = `${label}: guard "${guard}" uses scope-invalid token "${err.token}"`;
|
|
113
|
+
switch (err.reason) {
|
|
114
|
+
case 'removed': return `${base}: F: and P: forms are removed; use .field/row.field, @field/root.field, or totals.field`;
|
|
115
|
+
case 'bare': return `${base}: a bare identifier has no scope; use .field/row.field, @field/root.field, totals.field, or a numeric literal`;
|
|
116
|
+
case 'no-row-context': return `${base}: row scope requires an active row context (data.shape "rows" or "series")`;
|
|
117
|
+
case 'namespace': return `${base}: "${err.token}" is not a declared namespace or row binding`;
|
|
70
118
|
}
|
|
71
|
-
return [...refs];
|
|
72
119
|
}
|
|
73
120
|
/**
|
|
74
121
|
* Validate the document-part keys of a catalog entry. Returns all issues;
|
|
@@ -99,6 +146,7 @@ export function validateDocumentPart(component) {
|
|
|
99
146
|
}
|
|
100
147
|
const guards = component.guards ?? [];
|
|
101
148
|
const projection = component.data?.projection ?? [];
|
|
149
|
+
const hasRowContext = component.data?.shape === 'rows' || component.data?.shape === 'series';
|
|
102
150
|
if (guards.length > 0 && projection.length === 0) {
|
|
103
151
|
issues.push({
|
|
104
152
|
code: 'GUARD_WITHOUT_PROJECTION',
|
|
@@ -106,7 +154,11 @@ export function validateDocumentPart(component) {
|
|
|
106
154
|
});
|
|
107
155
|
}
|
|
108
156
|
for (const guard of guards) {
|
|
109
|
-
|
|
157
|
+
const { projections, scopeErrors } = scanGuard(guard, hasRowContext);
|
|
158
|
+
for (const err of scopeErrors) {
|
|
159
|
+
issues.push({ code: 'SCOPE_INVALID', message: scopeErrorMessage(label, guard, err) });
|
|
160
|
+
}
|
|
161
|
+
for (const ref of projections) {
|
|
110
162
|
if (!projection.includes(ref)) {
|
|
111
163
|
issues.push({
|
|
112
164
|
code: 'UNKNOWN_PROJECTION',
|
package/dist/catalog.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../src/catalog.ts"],"names":[],"mappings":"AAoBA,gDAAgD;AAChD,MAAM,CAAC,MAAM,kBAAkB,GAA+B,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAU,CAAA;AAEtG;;;;;;;;;GASG;AACH,MAAM,UAAU,iBAAiB,CAC/B,SAAqD,EACrD,WAAgC;IAEhC,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,IAAI,mBAAmB,CAAA;IACnD,OAAO,CAAC,SAAS,CAAC,OAAO,IAAI,EAAE,CAAC;SAC7B,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SAC1C,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,KAAK,KAAK,EAAE,CAAC,CAAA;AACzC,CAAC;AAED,MAAM,WAAW,GAAkC,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAU,CAAA;AAE3G
|
|
1
|
+
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../src/catalog.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED