@velarscript/web 0.32.0 → 0.33.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/README.md +1 -1
- package/dist/analysis/calls/intrinsics/storage.d.ts +5 -1
- package/dist/analysis/calls/intrinsics/storage.d.ts.map +1 -1
- package/dist/analysis/calls/intrinsics/storage.js +19 -14
- package/dist/analysis/calls/intrinsics/storage.js.map +1 -1
- package/dist/analysis/inference.d.ts +8 -0
- package/dist/analysis/inference.d.ts.map +1 -1
- package/dist/analysis/inference.js +21 -0
- package/dist/analysis/inference.js.map +1 -1
- package/dist/analysis/look/builders.d.ts.map +1 -1
- package/dist/analysis/look/builders.js +7 -1
- package/dist/analysis/look/builders.js.map +1 -1
- package/dist/analysis/look/edits.d.ts +13 -2
- package/dist/analysis/look/edits.d.ts.map +1 -1
- package/dist/analysis/look/edits.js +30 -7
- package/dist/analysis/look/edits.js.map +1 -1
- package/dist/analysis/look/tokens.d.ts +2 -2
- package/dist/analysis/look/tokens.d.ts.map +1 -1
- package/dist/analysis/look/tokens.js +13 -8
- package/dist/analysis/look/tokens.js.map +1 -1
- package/dist/analysis/look-sites.d.ts +8 -0
- package/dist/analysis/look-sites.d.ts.map +1 -1
- package/dist/analysis/look-sites.js +19 -2
- package/dist/analysis/look-sites.js.map +1 -1
- package/dist/analysis/look-values.d.ts +19 -0
- package/dist/analysis/look-values.d.ts.map +1 -1
- package/dist/analysis/look-values.js +38 -0
- package/dist/analysis/look-values.js.map +1 -1
- package/dist/analyzer.d.ts.map +1 -1
- package/dist/analyzer.js +3 -0
- package/dist/analyzer.js.map +1 -1
- package/dist/compiler.d.ts.map +1 -1
- package/dist/compiler.js +2 -0
- package/dist/compiler.js.map +1 -1
- package/dist/emit/runtime-imports.d.ts.map +1 -1
- package/dist/emit/runtime-imports.js +5 -1
- package/dist/emit/runtime-imports.js.map +1 -1
- package/dist/runtime-sources.generated.d.ts +1 -1
- package/dist/runtime-sources.generated.d.ts.map +1 -1
- package/dist/runtime-sources.generated.js +4 -4
- package/dist/runtime-sources.generated.js.map +1 -1
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# @velarscript/web
|
|
2
2
|
|
|
3
|
-
**VelarScript 0.
|
|
3
|
+
**VelarScript 0.33.0 · Web surface `web@0.14`.** The counter is what a project
|
|
4
4
|
declares in `velar.json`'s `surfaces` and what a mismatch is refused by; the
|
|
5
5
|
release number every toolchain package steps to says only what you installed.
|
|
6
6
|
|
|
@@ -7,6 +7,10 @@
|
|
|
7
7
|
* names — with the sentence a read without its type reads, which nothing else
|
|
8
8
|
* asks for.
|
|
9
9
|
*/
|
|
10
|
-
import { type CompilerIntrinsicAnalysisContext, type ValueType } from "@velarscript/compiler/extension";
|
|
10
|
+
import { type CompilerIntrinsicAnalysisContext, type Expression, type ValueType } from "@velarscript/compiler/extension";
|
|
11
|
+
/** The shape refusal may teach this read without entering value inference. */
|
|
12
|
+
export declare function storageIntrinsicArityGuidance(intrinsic: Extract<ValueType, {
|
|
13
|
+
kind: "intrinsic";
|
|
14
|
+
}>, arguments_: readonly Expression[]): string | undefined;
|
|
11
15
|
export declare function inferStorageIntrinsic(context: CompilerIntrinsicAnalysisContext): ValueType | undefined;
|
|
12
16
|
//# sourceMappingURL=storage.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../../../src/analysis/calls/intrinsics/storage.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,
|
|
1
|
+
{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../../../src/analysis/calls/intrinsics/storage.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAQL,KAAK,gCAAgC,EACrC,KAAK,UAAU,EACf,KAAK,SAAS,EACf,MAAM,iCAAiC,CAAC;AAsBzC,8EAA8E;AAC9E,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC,EACpD,UAAU,EAAE,SAAS,UAAU,EAAE,GAChC,MAAM,GAAG,SAAS,CAEpB;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,gCAAgC,GAAG,SAAS,GAAG,SAAS,CA8CtG"}
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
* names — with the sentence a read without its type reads, which nothing else
|
|
8
8
|
* asks for.
|
|
9
9
|
*/
|
|
10
|
-
import { describeType, nullType, numberType, optionalOf, stringType, unknownType, } from "@velarscript/compiler/extension";
|
|
10
|
+
import { describeType, invalidType, nullType, numberType, optionalOf, stringType, unknownType, } from "@velarscript/compiler/extension";
|
|
11
11
|
/**
|
|
12
12
|
* The whole read, from the module name to a working line. A blind model needed
|
|
13
13
|
* five guesses to get here because each diagnostic answered only the step it
|
|
@@ -16,11 +16,28 @@ import { describeType, nullType, numberType, optionalOf, stringType, unknownType
|
|
|
16
16
|
* value. Storage already parses and validates the stored JSON, so the one thing
|
|
17
17
|
* still missing is the named type to validate against.
|
|
18
18
|
*/
|
|
19
|
-
|
|
19
|
+
const storageReadCalls = new Map([
|
|
20
|
+
["storage.get", "storage.get(key, Type)"],
|
|
21
|
+
["storage.databaseGet", "database(name).get(key, Type)"],
|
|
22
|
+
["storage.watch", "storage.watch(key, Type, callback)"],
|
|
23
|
+
]);
|
|
24
|
+
function storageReadGuidance(name) {
|
|
25
|
+
const call = storageReadCalls.get(name);
|
|
26
|
+
if (call === undefined)
|
|
27
|
+
return undefined;
|
|
20
28
|
return `${call} validates what it reads and parses the stored JSON itself, so its second argument is a named runtime type: declare one — 'type SavedItems = List<Item>' — then read with 'storage.get("items", SavedItems, [])', whose third argument is the fallback for missing or invalid data, and write it back with 'storage.set("items", items)'. A primitive spelling ('string') and a generic spelling ('List<Item>') are types, not values; only a declared type, enum, or alias name is one.`;
|
|
21
29
|
}
|
|
30
|
+
/** The shape refusal may teach this read without entering value inference. */
|
|
31
|
+
export function storageIntrinsicArityGuidance(intrinsic, arguments_) {
|
|
32
|
+
return arguments_.length < 2 ? storageReadGuidance(intrinsic.name) : undefined;
|
|
33
|
+
}
|
|
22
34
|
export function inferStorageIntrinsic(context) {
|
|
23
35
|
const { intrinsic, argumentAt, callSpan, arity, inferAt, callbackAt, runtimeTypeAt } = context;
|
|
36
|
+
const guidance = argumentAt(1) ? undefined : storageReadGuidance(intrinsic.name);
|
|
37
|
+
if (guidance !== undefined) {
|
|
38
|
+
context.typeError(guidance, callSpan);
|
|
39
|
+
return invalidType;
|
|
40
|
+
}
|
|
24
41
|
switch (intrinsic.name) {
|
|
25
42
|
case "storage.set": {
|
|
26
43
|
arity(2, 3);
|
|
@@ -35,10 +52,6 @@ export function inferStorageIntrinsic(context) {
|
|
|
35
52
|
return intrinsic.result;
|
|
36
53
|
}
|
|
37
54
|
case "storage.get": {
|
|
38
|
-
if (!argumentAt(1)) {
|
|
39
|
-
context.typeError(storageReadGuidance("storage.get(key, Type)"), callSpan);
|
|
40
|
-
return unknownType;
|
|
41
|
-
}
|
|
42
55
|
arity(2, 4);
|
|
43
56
|
inferAt(0, stringType);
|
|
44
57
|
const parsed = runtimeTypeAt(1);
|
|
@@ -51,10 +64,6 @@ export function inferStorageIntrinsic(context) {
|
|
|
51
64
|
return optionalOf(parsed);
|
|
52
65
|
}
|
|
53
66
|
case "storage.databaseGet": {
|
|
54
|
-
if (!argumentAt(1)) {
|
|
55
|
-
context.typeError(storageReadGuidance("database(name).get(key, Type)"), callSpan);
|
|
56
|
-
return { kind: "promise", value: unknownType };
|
|
57
|
-
}
|
|
58
67
|
arity(2, 4);
|
|
59
68
|
inferAt(0, stringType);
|
|
60
69
|
const parsed = runtimeTypeAt(1);
|
|
@@ -67,10 +76,6 @@ export function inferStorageIntrinsic(context) {
|
|
|
67
76
|
return { kind: "promise", value: optionalOf(parsed) };
|
|
68
77
|
}
|
|
69
78
|
case "storage.watch": {
|
|
70
|
-
if (!argumentAt(1)) {
|
|
71
|
-
context.typeError(storageReadGuidance("storage.watch(key, Type, callback)"), callSpan);
|
|
72
|
-
return { kind: "function", parameters: [], requiredParameters: 0, result: nullType };
|
|
73
|
-
}
|
|
74
79
|
arity(3, 4);
|
|
75
80
|
inferAt(0, stringType);
|
|
76
81
|
const parsed = runtimeTypeAt(1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../../../src/analysis/calls/intrinsics/storage.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EACL,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,UAAU,EACV,UAAU,EACV,WAAW,
|
|
1
|
+
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../../../src/analysis/calls/intrinsics/storage.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,14 @@ import { type ReactiveNamesHost } from "./reactivity/host.ts";
|
|
|
18
18
|
import { type RetiredAccessorHost } from "./reactivity/retired-accessors.ts";
|
|
19
19
|
/** The state the inference rules own: the probe cache, and the two module inputs a call is proved against. */
|
|
20
20
|
export interface ExpressionInferenceHost {
|
|
21
|
+
constantValue(expression: Expression): string | number | boolean | null | undefined;
|
|
22
|
+
importedMemberOf(name: string): {
|
|
23
|
+
readonly source: string;
|
|
24
|
+
readonly imported: string | null;
|
|
25
|
+
} | null;
|
|
26
|
+
resolvedCallArgument(expression: Extract<Expression, {
|
|
27
|
+
kind: "CallExpression";
|
|
28
|
+
}>, index: number): Expression | null;
|
|
21
29
|
/** The Look-arithmetic hints this walk records for the emitter, keyed by expression span. */
|
|
22
30
|
readonly extensionCalls: Map<string, string>;
|
|
23
31
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inference.d.ts","sourceRoot":"","sources":["../../src/analysis/inference.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAOL,KAAK,UAAU,EACf,KAAK,kBAAkB,EACvB,KAAK,aAAa,EAClB,KAAK,UAAU,EACf,KAAK,SAAS,EACf,MAAM,iCAAiC,CAAC;AAMzC,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAMvD,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAoD,KAAK,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAG/H,8GAA8G;AAC9G,MAAM,WAAW,uBAAuB;IACtC,6FAA6F;IAC7F,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7C;;;;;OAKG;IACH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpD,oHAAoH;IACpH,QAAQ,CAAC,iBAAiB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAChD,gHAAgH;IAChH,QAAQ,CAAC,eAAe,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IACnE,+FAA+F;IAC/F,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAE/B,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC;IAClE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,GAAG,IAAI,CAAC;CACnD;AAED;;;;;GAKG;AACH,MAAM,MAAM,aAAa,GAAG,uBAAuB,GAAG,gBAAgB,GAAG,iBAAiB,GAAG,mBAAmB,CAAC;AAEjH;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,GAAG,SAAS,GAAG,SAAS,CAoF7G;AAED,8GAA8G;AAC9G,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,GAAG,SAAS,GAAG,SAAS,CAWxG;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,GAAG,SAAS,GAAG,IAAI,CAwBrG;AAED,8FAA8F;AAC9F,wBAAgB,eAAe,CAAC,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,GAAG,SAAS,GAAG,IAAI,CAG7F;AAED,iHAAiH;AACjH,wBAAgB,cAAc,CAAC,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,UAAU,GAAG,SAAS,CAInF;AAED,6EAA6E;AAC7E,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"inference.d.ts","sourceRoot":"","sources":["../../src/analysis/inference.ts"],"names":[],"mappings":"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"}
|
|
@@ -167,11 +167,32 @@ export function reportInferredWebCall(host, expression, result) {
|
|
|
167
167
|
if (expression.kind !== "CallExpression")
|
|
168
168
|
return;
|
|
169
169
|
checkLookBuilderCall(host, expression);
|
|
170
|
+
checkDomIdPrefix(host, expression);
|
|
170
171
|
// D114 0.29.0 LC-D1: the manifest this build bakes in, proved against the declared type.
|
|
171
172
|
const report = publicConfigDiagnostic(expression, result, host.publicConfigNames, host.webPublicConfig, { expandAliases: (type) => host.expandAliases(type), fieldsOf: (identity) => host.fieldsOf(identity), describeType });
|
|
172
173
|
if (report)
|
|
173
174
|
host.diagnostics.push(report);
|
|
174
175
|
}
|
|
176
|
+
/** A target-owned contract consuming Core's lexical scalar facts. */
|
|
177
|
+
function checkDomIdPrefix(host, expression) {
|
|
178
|
+
if (expression.callee.kind !== "IdentifierExpression")
|
|
179
|
+
return;
|
|
180
|
+
const origin = host.importedMemberOf(expression.callee.name);
|
|
181
|
+
if (origin?.source !== "velar/web" || origin.imported !== "domId")
|
|
182
|
+
return;
|
|
183
|
+
const argument = host.resolvedCallArgument(expression, 0);
|
|
184
|
+
if (!argument)
|
|
185
|
+
return;
|
|
186
|
+
const prefix = host.constantValue(argument);
|
|
187
|
+
if (typeof prefix !== "string")
|
|
188
|
+
return;
|
|
189
|
+
const message = prefix.length > 64 ? "DOM ID prefixes cannot exceed 64 characters"
|
|
190
|
+
: !/^[A-Za-z][A-Za-z0-9_-]*$/u.test(prefix)
|
|
191
|
+
? "DOM ID prefixes must start with a letter and contain only letters, numbers, underscores, or hyphens"
|
|
192
|
+
: null;
|
|
193
|
+
if (message)
|
|
194
|
+
host.typeError(message, argument.span);
|
|
195
|
+
}
|
|
175
196
|
export function inferWebExtensionCall(host, callee, arguments_, argumentNames, callSpan) {
|
|
176
197
|
if (!isWebComponentType(callee))
|
|
177
198
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inference.js","sourceRoot":"","sources":["../../src/analysis/inference.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"inference.js","sourceRoot":"","sources":["../../src/analysis/inference.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builders.d.ts","sourceRoot":"","sources":["../../../src/analysis/look/builders.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,KAAK,UAAU,EAAgB,MAAM,iCAAiC,CAAC;AAMhF,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAIlD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,gBAAgB,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"builders.d.ts","sourceRoot":"","sources":["../../../src/analysis/look/builders.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,KAAK,UAAU,EAAgB,MAAM,iCAAiC,CAAC;AAMhF,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAIlD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,gBAAgB,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC,GAAG,IAAI,CA8F9H;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,gBAAgB,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC,GAAG,IAAI,CAgCjI;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,IAAI,CAK3I;AAED,iGAAiG;AACjG,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,gBAAgB,EAAE,UAAU,EAAE,IAAI,GAAG,OAAO,CAE1F"}
|
|
@@ -12,7 +12,7 @@ import {} from "@velarscript/compiler";
|
|
|
12
12
|
import { spanIdentity } from "@velarscript/compiler/extension";
|
|
13
13
|
import { evaluateLookStaticExpression } from "../../look-static.js";
|
|
14
14
|
import { LOOK_ANIMATION_DIRECTIONS, LOOK_ANIMATION_EASINGS, LOOK_ANIMATION_FILLS, LOOK_BORDER_STYLE_NAMES, LOOK_BUILDER_NUMERIC_RANGES, LOOK_BUILDER_SIGNATURES, LOOK_LENGTH_BUILDERS } from "../../look.js";
|
|
15
|
-
import { teachLookLengthSlot, teachLookPercentageSlot } from "../look-values.js";
|
|
15
|
+
import { teachLookFilterSlot, teachLookLengthSlot, teachLookPercentageSlot } from "../look-values.js";
|
|
16
16
|
import { lookDurationLiteral, numericLiteral } from "../look-vocabulary-guidance.js";
|
|
17
17
|
import { diagnostic } from "../web-types.js";
|
|
18
18
|
import {} from "./host.js";
|
|
@@ -91,6 +91,12 @@ export function checkLookBuilderCall(host, expression) {
|
|
|
91
91
|
if (LOOK_LENGTH_BUILDERS.has(builder) && literal !== null
|
|
92
92
|
&& teachLookLengthSlot(host.diagnostics, builder, position, declared, argument, literal, host.lookStatic.sites))
|
|
93
93
|
taught = true;
|
|
94
|
+
// WB-I1: and a slot whose published type is a `Filter` — `filters`, at
|
|
95
|
+
// every position its rest parameter collects — teaches the vocabulary that
|
|
96
|
+
// makes one instead of leaving core's bare refusal to name a type the
|
|
97
|
+
// author has no way to construct from the message.
|
|
98
|
+
if (teachLookFilterSlot(host.diagnostics, builder, position, declared, argument))
|
|
99
|
+
taught = true;
|
|
94
100
|
if (builder === "border" && position === 2 && argument.kind === "LiteralExpression" && typeof argument.value === "string"
|
|
95
101
|
&& !LOOK_BORDER_STYLE_NAMES.has(argument.value)) {
|
|
96
102
|
host.diagnostics.push(diagnostic("VEL5042", `Border style '${argument.value}' is not a CSS border style; use one of ${[...LOOK_BORDER_STYLE_NAMES].join(", ")}`, argument.span));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builders.js","sourceRoot":"","sources":["../../../src/analysis/look/builders.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAa,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAmB,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAChF,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,2BAA2B,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAC7M,OAAO,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"builders.js","sourceRoot":"","sources":["../../../src/analysis/look/builders.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,17 @@ export declare function localizeLookBuilderCall(host: LookAnalysisHost, rewrite:
|
|
|
20
20
|
};
|
|
21
21
|
/** Rewrites either a Look entry expression or the synthetic value of a JSX Look directive. */
|
|
22
22
|
export declare function lookBuilderRewrite(host: LookAnalysisHost, value: Expression, call: string, site: LookValueSite, missingImports: readonly string[]): readonly DiagnosticEdit[];
|
|
23
|
-
/**
|
|
24
|
-
|
|
23
|
+
/**
|
|
24
|
+
* The one import edit a Look rewrite needs, or none when the import line it
|
|
25
|
+
* would write is the line already there.
|
|
26
|
+
*
|
|
27
|
+
* D114 WB-I2: a rewrite gives a module a name and can equally take one away.
|
|
28
|
+
* `color("var(--brand)")` becomes `token("--brand")`, and the run that made that
|
|
29
|
+
* edit knew both that `token` had to arrive and that this was the module's last
|
|
30
|
+
* read of `color` — yet it left the dead specifier behind, so `velar fix`
|
|
31
|
+
* finished by writing an import of a builder the file no longer calls. `retiring`
|
|
32
|
+
* names the locals the rewrite consumes the last read of; a name still read
|
|
33
|
+
* somewhere else keeps its specifier.
|
|
34
|
+
*/
|
|
35
|
+
export declare function lookImportEdits(host: LookAnalysisHost, builders: readonly string[], retiring?: readonly string[]): readonly DiagnosticEdit[];
|
|
25
36
|
//# sourceMappingURL=edits.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edits.d.ts","sourceRoot":"","sources":["../../../src/analysis/look/edits.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAElD,uFAAuF;AACvF,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,iBAAiB,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,cAAc,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAUjK;AAED,8FAA8F;AAC9F,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,gBAAgB,EACtB,KAAK,EAAE,UAAU,EACjB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,aAAa,EACnB,cAAc,EAAE,SAAS,MAAM,EAAE,GAChC,SAAS,cAAc,EAAE,CAQ3B;AAED
|
|
1
|
+
{"version":3,"file":"edits.d.ts","sourceRoot":"","sources":["../../../src/analysis/look/edits.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAElD,uFAAuF;AACvF,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,iBAAiB,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,cAAc,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAUjK;AAED,8FAA8F;AAC9F,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,gBAAgB,EACtB,KAAK,EAAE,UAAU,EACjB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,aAAa,EACnB,cAAc,EAAE,SAAS,MAAM,EAAE,GAChC,SAAS,cAAc,EAAE,CAQ3B;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,gBAAgB,EACtB,QAAQ,EAAE,SAAS,MAAM,EAAE,EAC3B,QAAQ,GAAE,SAAS,MAAM,EAAO,GAC/B,SAAS,cAAc,EAAE,CAyB3B"}
|
|
@@ -35,23 +35,46 @@ export function lookBuilderRewrite(host, value, call, site, missingImports) {
|
|
|
35
35
|
span: value.span,
|
|
36
36
|
text: wholeAttribute ? `${site.directive}:${site.property}={${call}}` : call,
|
|
37
37
|
};
|
|
38
|
-
return
|
|
38
|
+
return [...lookImportEdits(host, missingImports), edit];
|
|
39
39
|
}
|
|
40
|
-
/**
|
|
41
|
-
|
|
40
|
+
/**
|
|
41
|
+
* The one import edit a Look rewrite needs, or none when the import line it
|
|
42
|
+
* would write is the line already there.
|
|
43
|
+
*
|
|
44
|
+
* D114 WB-I2: a rewrite gives a module a name and can equally take one away.
|
|
45
|
+
* `color("var(--brand)")` becomes `token("--brand")`, and the run that made that
|
|
46
|
+
* edit knew both that `token` had to arrive and that this was the module's last
|
|
47
|
+
* read of `color` — yet it left the dead specifier behind, so `velar fix`
|
|
48
|
+
* finished by writing an import of a builder the file no longer calls. `retiring`
|
|
49
|
+
* names the locals the rewrite consumes the last read of; a name still read
|
|
50
|
+
* somewhere else keeps its specifier.
|
|
51
|
+
*/
|
|
52
|
+
export function lookImportEdits(host, builders, retiring = []) {
|
|
42
53
|
const site = host.lookImport ?? { declaration: null, insertAt: 0, leadingBlankLine: true };
|
|
43
54
|
const existing = site.declaration?.specifiers ?? [];
|
|
44
55
|
const imported = new Set(existing.map((specifier) => specifier.imported));
|
|
56
|
+
const dropped = new Set(existing.filter((specifier) => retiring.includes(specifier.local) && specifier.reads <= 1));
|
|
57
|
+
const additions = builders.filter((builder) => !imported.has(builder));
|
|
58
|
+
if (additions.length === 0 && dropped.size === 0)
|
|
59
|
+
return [];
|
|
45
60
|
const specifiers = [
|
|
46
|
-
...existing,
|
|
47
|
-
...
|
|
61
|
+
...existing.filter((specifier) => !dropped.has(specifier)),
|
|
62
|
+
...additions.map((builder) => ({ imported: builder, local: builder })),
|
|
48
63
|
];
|
|
64
|
+
// A module whose only look import was the name this rewrite retired keeps no
|
|
65
|
+
// empty import line: `import {} from "velar/look"` imports nothing and is not
|
|
66
|
+
// what the file should hold. The trailing character is the line break the
|
|
67
|
+
// declaration ends before, which is how the retired-import migration removes
|
|
68
|
+
// an import statement as well.
|
|
69
|
+
if (specifiers.length === 0 && site.declaration) {
|
|
70
|
+
return [{ span: { start: site.declaration.span.start, end: site.declaration.span.end + 1 }, text: "" }];
|
|
71
|
+
}
|
|
49
72
|
const line = `import {${specifiers
|
|
50
73
|
.sort((left, right) => byCodeUnit(left.imported, right.imported))
|
|
51
74
|
.map((specifier) => specifier.imported === specifier.local ? specifier.imported : `${specifier.imported} as ${specifier.local}`)
|
|
52
75
|
.join(", ")}} from "velar/look"`;
|
|
53
76
|
if (site.declaration)
|
|
54
|
-
return { span: site.declaration.span, text: line };
|
|
55
|
-
return { span: { start: site.insertAt, end: site.insertAt }, text: site.leadingBlankLine ? `${line}\n\n` : `\n${line}` };
|
|
77
|
+
return [{ span: site.declaration.span, text: line }];
|
|
78
|
+
return [{ span: { start: site.insertAt, end: site.insertAt }, text: site.leadingBlankLine ? `${line}\n\n` : `\n${line}` }];
|
|
56
79
|
}
|
|
57
80
|
//# sourceMappingURL=edits.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edits.js","sourceRoot":"","sources":["../../../src/analysis/look/edits.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAuB,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAmB,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAsB,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAA0B,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAyB,MAAM,WAAW,CAAC;AAElD,uFAAuF;AACvF,MAAM,UAAU,uBAAuB,CAAC,IAAsB,EAAE,OAA0B;IACxF,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IACxB,MAAM,cAAc,GAAa,EAAE,CAAC;IACpC,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACvC,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,SAAS,KAAK,OAAO,CAAC,CAAC;QAC3F,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC;QACvC,IAAI,CAAC,QAAQ;YAAE,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5C,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,MAAM,OAAO,SAAS,EAAE,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;AAClC,CAAC;AAED,8FAA8F;AAC9F,MAAM,UAAU,kBAAkB,CAChC,IAAsB,EACtB,KAAiB,EACjB,IAAY,EACZ,IAAmB,EACnB,cAAiC;IAEjC,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,KAAK,IAAI;WACzC,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC;IACxF,MAAM,IAAI,GAAmB;QAC3B,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,SAAU,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI;KAC9E,CAAC;IACF,OAAO,
|
|
1
|
+
{"version":3,"file":"edits.js","sourceRoot":"","sources":["../../../src/analysis/look/edits.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,8 +38,8 @@ export declare function checkLookTokenCall(host: LookAnalysisHost, expression: E
|
|
|
38
38
|
export declare function reportLookColorVarReference(host: LookAnalysisHost, expression: Extract<Expression, {
|
|
39
39
|
kind: "CallExpression";
|
|
40
40
|
}>, argument: Expression): void;
|
|
41
|
-
/** The
|
|
42
|
-
export declare function lookTokenImportEdit(host: LookAnalysisHost): DiagnosticEdit;
|
|
41
|
+
/** The import edit that gives this module a `token` import and takes back what the rewrite retired. */
|
|
42
|
+
export declare function lookTokenImportEdit(host: LookAnalysisHost, retiring?: readonly string[]): readonly DiagnosticEdit[];
|
|
43
43
|
/** Whether this value is written as a call to the module's `token` builder, alias included. */
|
|
44
44
|
export declare function isLookTokenCall(host: LookAnalysisHost, value: Expression): boolean;
|
|
45
45
|
/** How this module spells a call to the token builder, honouring an aliased import. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../../src/analysis/look/tokens.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,KAAK,cAAc,EAAkC,MAAM,uBAAuB,CAAC;AAC5F,OAAO,EAAE,KAAK,UAAU,EAAgB,MAAM,iCAAiC,CAAC;AAEhF,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGtD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAElD;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC,GAAG,IAAI,CA8C5H;AAED;;;;;;;;GAQG;AACH,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,gBAAgB,EACtB,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC,EAC3D,QAAQ,EAAE,UAAU,GACnB,IAAI,
|
|
1
|
+
{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../../src/analysis/look/tokens.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,KAAK,cAAc,EAAkC,MAAM,uBAAuB,CAAC;AAC5F,OAAO,EAAE,KAAK,UAAU,EAAgB,MAAM,iCAAiC,CAAC;AAEhF,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGtD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAElD;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC,GAAG,IAAI,CA8C5H;AAED;;;;;;;;GAQG;AACH,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,gBAAgB,EACtB,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC,EAC3D,QAAQ,EAAE,UAAU,GACnB,IAAI,CAyBN;AAED,uGAAuG;AACvG,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,gBAAgB,EAAE,QAAQ,GAAE,SAAS,MAAM,EAAO,GAAG,SAAS,cAAc,EAAE,CAEvH;AAED,+FAA+F;AAC/F,wBAAgB,eAAe,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAGlF;AAED,uFAAuF;AACvF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,CAGnI;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,GAAG,SAAS,cAAc,EAAE,CAS9I;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,GAAG,IAAI,CAa1H"}
|
|
@@ -12,7 +12,7 @@ import { spanIdentity } from "@velarscript/compiler/extension";
|
|
|
12
12
|
import { isLookTokenName, isLookVarReference, LOOK_PROPERTY_VALUE_KINDS, LOOK_TOKEN_NAME_RULE, LOOK_TOKEN_NO_FALLBACK_GUIDANCE, lookTokenReference, lookVarReferenceName } from "../../look.js";
|
|
13
13
|
import {} from "../look-sites.js";
|
|
14
14
|
import { diagnostic } from "../web-types.js";
|
|
15
|
-
import {
|
|
15
|
+
import { lookImportEdits } from "./edits.js";
|
|
16
16
|
import {} from "./host.js";
|
|
17
17
|
/**
|
|
18
18
|
* D103 rules 1 and 5 — what a checked token reference has to be at the site
|
|
@@ -85,13 +85,18 @@ export function reportLookColorVarReference(host, expression, argument) {
|
|
|
85
85
|
host.diagnostics.push(diagnostic("VEL5042", `A design token reference is written token("--name"), and it carries no fallback: ${LOOK_TOKEN_NO_FALLBACK_GUIDANCE}`, argument.span));
|
|
86
86
|
return;
|
|
87
87
|
}
|
|
88
|
-
const { call
|
|
88
|
+
const { call } = lookTokenCallText(host, referenced);
|
|
89
89
|
const rewrite = { span: expression.span, text: call };
|
|
90
|
-
|
|
90
|
+
// WB-I2: the rewrite replaces this whole call, so the builder it was written
|
|
91
|
+
// through loses a read. When it was the last one, the specifier goes with it
|
|
92
|
+
// in the same edit — `velar fix` used to leave the module importing a `color`
|
|
93
|
+
// it no longer calls.
|
|
94
|
+
const retiring = expression.callee.kind === "IdentifierExpression" ? [expression.callee.name] : [];
|
|
95
|
+
host.diagnostics.push(diagnostic("VEL5042", `Write a design token reference as ${call}; color("var(...)") passed the reference through as text nothing checked, and token() is the one checked spelling — legal in every Look property, not only the colour ones`, expression.span, mechanicalEdits([...lookTokenImportEdit(host, retiring), rewrite], `Use ${call}`)));
|
|
91
96
|
}
|
|
92
|
-
/** The
|
|
93
|
-
export function lookTokenImportEdit(host) {
|
|
94
|
-
return
|
|
97
|
+
/** The import edit that gives this module a `token` import and takes back what the rewrite retired. */
|
|
98
|
+
export function lookTokenImportEdit(host, retiring = []) {
|
|
99
|
+
return lookImportEdits(host, ["token"], retiring);
|
|
95
100
|
}
|
|
96
101
|
/** Whether this value is written as a call to the module's `token` builder, alias included. */
|
|
97
102
|
export function isLookTokenCall(host, value) {
|
|
@@ -115,14 +120,14 @@ export function lookTokenCallText(host, referenced) {
|
|
|
115
120
|
* rewritten in place like a block entry.
|
|
116
121
|
*/
|
|
117
122
|
export function lookTokenRewrite(host, value, referenced, site) {
|
|
118
|
-
const { call
|
|
123
|
+
const { call } = lookTokenCallText(host, referenced);
|
|
119
124
|
const wholeAttribute = site.directive !== null
|
|
120
125
|
&& value.span.start === site.entrySpan.start && value.span.end === site.entrySpan.end;
|
|
121
126
|
const edit = {
|
|
122
127
|
span: value.span,
|
|
123
128
|
text: wholeAttribute ? `${site.directive}:${site.property}={${call}}` : call,
|
|
124
129
|
};
|
|
125
|
-
return
|
|
130
|
+
return [...lookTokenImportEdit(host), edit];
|
|
126
131
|
}
|
|
127
132
|
/**
|
|
128
133
|
* D103 rule 4, free-text half — an advisory rather than a refusal.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../../src/analysis/look/tokens.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAuB,eAAe,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC5F,OAAO,EAAmB,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,+BAA+B,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAChM,OAAO,EAAsB,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../../src/analysis/look/tokens.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,9 +30,17 @@ export interface LookValueSite {
|
|
|
30
30
|
export interface LookImportSite {
|
|
31
31
|
readonly declaration: {
|
|
32
32
|
readonly span: Span;
|
|
33
|
+
/**
|
|
34
|
+
* D114 WB-I2: `reads` is how many times this module names the specifier's
|
|
35
|
+
* local — every identifier read of it, the import line itself excluded. A
|
|
36
|
+
* rewrite that consumes the last one leaves the specifier behind naming
|
|
37
|
+
* nothing, so the import edit needs the count to know whether the name it
|
|
38
|
+
* is replacing still has a reader.
|
|
39
|
+
*/
|
|
33
40
|
readonly specifiers: readonly {
|
|
34
41
|
readonly imported: string;
|
|
35
42
|
readonly local: string;
|
|
43
|
+
readonly reads: number;
|
|
36
44
|
}[];
|
|
37
45
|
} | null;
|
|
38
46
|
readonly insertAt: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"look-sites.d.ts","sourceRoot":"","sources":["../../src/analysis/look-sites.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAwB,KAAK,IAAI,EAAE,MAAM,uBAAuB,CAAC;AACxE,OAAO,
|
|
1
|
+
{"version":3,"file":"look-sites.d.ts","sourceRoot":"","sources":["../../src/analysis/look-sites.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAwB,KAAK,IAAI,EAAE,MAAM,uBAAuB,CAAC;AACxE,OAAO,EAAkB,KAAK,UAAU,EAAE,KAAK,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAOhH;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC;CAC7C;AAED;;;;;;GAMG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,WAAW,EAAE;QACpB,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;QACpB;;;;;;WAMG;QACH,QAAQ,CAAC,UAAU,EAAE,SAAS;YAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;KAC/G,GAAG,IAAI,CAAC;IACT,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;CACpC;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,cAAc,CAuBtE;AAeD,4EAA4E;AAC5E,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAUrF;AAED,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,UAAQ,GAAG,MAAM,CAUtF;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAWvH;AAED,kFAAkF;AAClF,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAK7D;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAI/D;AAED,eAAO,MAAM,QAAQ,SAAU,SAAS,SAAS,SAAS,KAAG,SAAS,GAAG,IACkB,CAAC;AAE5F,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAKzD"}
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
* the analyzer, so they read as a module.
|
|
9
9
|
*/
|
|
10
10
|
import { semanticTypeIdentity } from "@velarscript/compiler";
|
|
11
|
-
import {} from "@velarscript/compiler/extension";
|
|
11
|
+
import { astNodesOfKind } from "@velarscript/compiler/extension";
|
|
12
12
|
import { isWebUnit } from "../ast.js";
|
|
13
13
|
import { cssTokens } from "../css-tokens.js";
|
|
14
14
|
import { LOOK_BUILDERS, LOOK_NUMERIC_TYPE_NAMES } from "../look.js";
|
|
@@ -22,10 +22,15 @@ export function collectLookImportSite(program) {
|
|
|
22
22
|
lastImportEnd = statement.span.end;
|
|
23
23
|
if (statement.source !== "velar/look" || statement.javascript || statement.specifiers.some((specifier) => specifier.namespace))
|
|
24
24
|
continue;
|
|
25
|
+
const reads = lookIdentifierReadCounts(program);
|
|
25
26
|
return {
|
|
26
27
|
declaration: {
|
|
27
28
|
span: statement.span,
|
|
28
|
-
specifiers: statement.specifiers.map((specifier) => ({
|
|
29
|
+
specifiers: statement.specifiers.map((specifier) => ({
|
|
30
|
+
imported: specifier.imported,
|
|
31
|
+
local: specifier.local,
|
|
32
|
+
reads: reads.get(specifier.local) ?? 0,
|
|
33
|
+
})),
|
|
29
34
|
},
|
|
30
35
|
insertAt: statement.span.end,
|
|
31
36
|
leadingBlankLine: false,
|
|
@@ -35,6 +40,18 @@ export function collectLookImportSite(program) {
|
|
|
35
40
|
? { declaration: null, insertAt: program.body[0]?.span.start ?? 0, leadingBlankLine: true }
|
|
36
41
|
: { declaration: null, insertAt: lastImportEnd, leadingBlankLine: false };
|
|
37
42
|
}
|
|
43
|
+
/**
|
|
44
|
+
* How often each name is read as a value in this module. An import specifier is
|
|
45
|
+
* a declaration rather than an expression, so the import line does not count
|
|
46
|
+
* itself, and a builder passed around (`const make = rgb`) counts like a call.
|
|
47
|
+
*/
|
|
48
|
+
function lookIdentifierReadCounts(program) {
|
|
49
|
+
const counts = new Map();
|
|
50
|
+
for (const read of astNodesOfKind(program, "IdentifierExpression")) {
|
|
51
|
+
counts.set(read.name, (counts.get(read.name) ?? 0) + 1);
|
|
52
|
+
}
|
|
53
|
+
return counts;
|
|
54
|
+
}
|
|
38
55
|
/** Local names bound to a velar/look builder, including aliased imports. */
|
|
39
56
|
export function collectLookBuilderNames(program) {
|
|
40
57
|
const names = new Map();
|