tutuca 0.9.51 → 0.9.52

package/dist/tutuca-cli.js

@@ -4317,7 +4317,15 @@ var init_value = __esm(() => {
         vals[i] = val;
         allConsts &&= val instanceof ConstVal;
       }
-      return allConsts ? new ConstVal(vals.map((v) => v.val).join("")) : new StrTplVal(vals);
+      if (allConsts)
+        return new ConstVal(vals.map((v) => v.val).join(""));
+      let lo = 0;
+      let hi = vals.length;
+      while (lo < hi && vals[lo] instanceof ConstVal && vals[lo].val === "")
+        lo++;
+      while (hi > lo && vals[hi - 1] instanceof ConstVal && vals[hi - 1].val === "")
+        hi--;
+      return new StrTplVal(lo === 0 && hi === vals.length ? vals : vals.slice(lo, hi));
     }
   };
   NameVal = class NameVal extends VarVal {
@@ -5472,8 +5480,10 @@ class ComponentStack {
 function defaultOnStackEnter() {
   return null;
 }
+var _rawSpecKeys = "name view style commonStyle globalStyle input receive bubble response alter on views dynamic fields methods statics", KNOWN_SPEC_KEYS;
 var init_components = __esm(() => {
   init_attribute();
+  KNOWN_SPEC_KEYS = new Set(_rawSpecKeys.split(" "));
 });
 
 // tools/core/html-tokenizer.js
@@ -7771,8 +7781,9 @@ function classifyBadValue(value) {
     return "call-with-args";
   return null;
 }
-function checkComponent(Comp, lx = new LintContext) {
+function checkComponent(Comp, lx = new LintContext, { wellKnownExtras = EMPTY_SET } = {}) {
   return lx.push({ componentName: Comp.name }, () => {
+    checkUnknownSpecKeys(lx, Comp, wellKnownExtras);
     const referencedAlters = new Set;
     const referencedInputs = new Set;
     checkEventHandlersHaveImpls(lx, Comp, referencedInputs);
@@ -7993,7 +8004,12 @@ function checkConsistentAttrVal(lx, val, fields, proto, scope, alter, referenced
       lx.error(UNKNOWN_HANDLER_ARG_NAME, { ...errCtx, name: val.name }, replaceNameSuggestion(val.name, KNOWN_HANDLER_NAMES));
     }
   } else if (valName === "StrTplVal") {
-    for (const subVal of val.vals) {
+    const vs = val.vals;
+    if (vs.length === 1) {
+      const simpler = String(vs[0]);
+      lx.warn(REDUNDANT_TEMPLATE_STRING, { ...errCtx, simpler }, { kind: "rewrite", from: `{${simpler}}`, to: simpler });
+    }
+    for (const subVal of vs) {
       checkConsistentAttrVal(lx, subVal, fields, proto, scope, alter, referencedAlters, skipNameVal, errCtx);
     }
   } else if (valName === "AlterHandlerNameVal") {
@@ -8107,6 +8123,18 @@ function checkConsistentAttrs(lx, Comp, referencedAlters) {
     });
   }
 }
+function checkUnknownSpecKeys(lx, Comp, wellKnownExtras) {
+  const extra = Comp.extra;
+  if (!extra)
+    return;
+  let candidates = null;
+  for (const key of Object.keys(extra)) {
+    if (wellKnownExtras.has(key))
+      continue;
+    candidates ??= [...KNOWN_COMPONENT_SPEC_KEYS, ...wellKnownExtras];
+    lx.warn(UNKNOWN_COMPONENT_SPEC_KEY, { key }, replaceNameSuggestion(key, candidates));
+  }
+}
 function checkUnreferencedAlterHandlers(lx, Comp, referencedAlters) {
   for (const name in Comp.alter) {
     if (!referencedAlters.has(name)) {
@@ -8149,10 +8177,12 @@ class LintContext {
     this.reports.push({ id, info, level, context: { ...this.frame }, suggestion });
   }
 }
-var KNOWN_DIRECTIVE_NAMES, ALT_HANDLER_NOT_DEFINED = "ALT_HANDLER_NOT_DEFINED", ALT_HANDLER_NOT_REFERENCED = "ALT_HANDLER_NOT_REFERENCED", RENDER_IT_OUTSIDE_OF_LOOP = "RENDER_IT_OUTSIDE_OF_LOOP", UNKNOWN_EVENT_MODIFIER = "UNKNOWN_EVENT_MODIFIER", UNKNOWN_HANDLER_ARG_NAME = "UNKNOWN_HANDLER_ARG_NAME", INPUT_HANDLER_NOT_IMPLEMENTED = "INPUT_HANDLER_NOT_IMPLEMENTED", INPUT_HANDLER_NOT_REFERENCED = "INPUT_HANDLER_NOT_REFERENCED", INPUT_HANDLER_METHOD_NOT_IMPLEMENTED = "INPUT_HANDLER_METHOD_NOT_IMPLEMENTED", INPUT_HANDLER_FOR_INPUT_HANDLER_METHOD = "INPUT_HANDLER_FOR_INPUT_HANDLER_METHOD", INPUT_HANDLER_METHOD_FOR_INPUT_HANDLER = "INPUT_HANDLER_METHOD_FOR_INPUT_HANDLER", FIELD_VAL_NOT_DEFINED = "FIELD_VAL_NOT_DEFINED", DUPLICATE_ATTR_DEFINITION = "DUPLICATE_ATTR_DEFINITION", IF_NO_BRANCH_SET = "IF_NO_BRANCH_SET", UNKNOWN_REQUEST_NAME = "UNKNOWN_REQUEST_NAME", UNKNOWN_COMPONENT_NAME = "UNKNOWN_COMPONENT_NAME", UNKNOWN_MACRO_ARG = "UNKNOWN_MACRO_ARG", UNKNOWN_DIRECTIVE = "UNKNOWN_DIRECTIVE", UNKNOWN_X_OP = "UNKNOWN_X_OP", UNKNOWN_X_ATTR = "UNKNOWN_X_ATTR", MAYBE_DROP_AT_PREFIX = "MAYBE_DROP_AT_PREFIX", BAD_VALUE = "BAD_VALUE", UNSUPPORTED_EXPR_SYNTAX = "UNSUPPORTED_EXPR_SYNTAX", PARSE_ISSUE_KIND_TO_LINT_ID, X_KNOWN_OP_NAMES, X_KNOWN_ATTR_NAMES, AT_PREFIX_HINT_KNOWN_BY_KIND, LEVEL_WARN2 = "warn", LEVEL_ERROR2 = "error", LEVEL_HINT = "hint", PARSE_ISSUE_KIND_TO_KNOWN_NAMES, UNSUPPORTED_EXPR_GUIDANCE, HTML_LINT_OPTS, NO_WRAPPERS, KNOWN_HANDLER_NAMES, NODE_KIND_TO_CTX, LintParseContext;
+var KNOWN_COMPONENT_SPEC_KEYS, EMPTY_SET, KNOWN_DIRECTIVE_NAMES, ALT_HANDLER_NOT_DEFINED = "ALT_HANDLER_NOT_DEFINED", ALT_HANDLER_NOT_REFERENCED = "ALT_HANDLER_NOT_REFERENCED", RENDER_IT_OUTSIDE_OF_LOOP = "RENDER_IT_OUTSIDE_OF_LOOP", UNKNOWN_EVENT_MODIFIER = "UNKNOWN_EVENT_MODIFIER", UNKNOWN_HANDLER_ARG_NAME = "UNKNOWN_HANDLER_ARG_NAME", INPUT_HANDLER_NOT_IMPLEMENTED = "INPUT_HANDLER_NOT_IMPLEMENTED", INPUT_HANDLER_NOT_REFERENCED = "INPUT_HANDLER_NOT_REFERENCED", INPUT_HANDLER_METHOD_NOT_IMPLEMENTED = "INPUT_HANDLER_METHOD_NOT_IMPLEMENTED", INPUT_HANDLER_FOR_INPUT_HANDLER_METHOD = "INPUT_HANDLER_FOR_INPUT_HANDLER_METHOD", INPUT_HANDLER_METHOD_FOR_INPUT_HANDLER = "INPUT_HANDLER_METHOD_FOR_INPUT_HANDLER", FIELD_VAL_NOT_DEFINED = "FIELD_VAL_NOT_DEFINED", DUPLICATE_ATTR_DEFINITION = "DUPLICATE_ATTR_DEFINITION", IF_NO_BRANCH_SET = "IF_NO_BRANCH_SET", UNKNOWN_REQUEST_NAME = "UNKNOWN_REQUEST_NAME", UNKNOWN_COMPONENT_NAME = "UNKNOWN_COMPONENT_NAME", UNKNOWN_MACRO_ARG = "UNKNOWN_MACRO_ARG", UNKNOWN_DIRECTIVE = "UNKNOWN_DIRECTIVE", UNKNOWN_X_OP = "UNKNOWN_X_OP", UNKNOWN_X_ATTR = "UNKNOWN_X_ATTR", MAYBE_DROP_AT_PREFIX = "MAYBE_DROP_AT_PREFIX", BAD_VALUE = "BAD_VALUE", UNSUPPORTED_EXPR_SYNTAX = "UNSUPPORTED_EXPR_SYNTAX", REDUNDANT_TEMPLATE_STRING = "REDUNDANT_TEMPLATE_STRING", UNKNOWN_COMPONENT_SPEC_KEY = "UNKNOWN_COMPONENT_SPEC_KEY", PARSE_ISSUE_KIND_TO_LINT_ID, X_KNOWN_OP_NAMES, X_KNOWN_ATTR_NAMES, AT_PREFIX_HINT_KNOWN_BY_KIND, LEVEL_WARN2 = "warn", LEVEL_ERROR2 = "error", LEVEL_HINT = "hint", PARSE_ISSUE_KIND_TO_KNOWN_NAMES, UNSUPPORTED_EXPR_GUIDANCE, HTML_LINT_OPTS, NO_WRAPPERS, KNOWN_HANDLER_NAMES, NODE_KIND_TO_CTX, LintParseContext;
 var init_lint_check = __esm(() => {
   init_anode();
   init_htmllinter();
+  KNOWN_COMPONENT_SPEC_KEYS = new Set("name view style commonStyle globalStyle input receive bubble response alter on views dynamic fields methods statics".split(" "));
+  EMPTY_SET = new Set;
   KNOWN_DIRECTIVE_NAMES = new Set([
     "dangerouslysetinnerhtml",
     "slot",
@@ -8249,7 +8279,7 @@ var init_lint_check = __esm(() => {
 });
 
 // tools/core/lint.js
-function lintComponents(normalized, { name = null, LintParseContextClass }) {
+function lintComponents(normalized, { name = null, LintParseContextClass, wellKnownExtras = new Set }) {
   const comps = normalized.components;
   const picked = name === null ? comps : comps.filter((c) => c.name === name);
   const stack = new ComponentStack;
@@ -8261,7 +8291,7 @@ function lintComponents(normalized, { name = null, LintParseContextClass }) {
   const results = [];
   for (const comp of picked) {
     comp.compile(LintParseContextClass);
-    const lx = checkComponent(comp);
+    const lx = checkComponent(comp, undefined, { wellKnownExtras });
     results.push(new LintComponentResult({
       componentName: comp.name,
       findings: lx.reports.map((r) => new LintFinding(r))
@@ -11177,7 +11207,7 @@ var keyMapper = (v, k) => k, entryMapper = (v, k) => [k, v], not = (predicate) =
   const iter = SetCollection(value);
   assertNotInfinite(iter.size);
   iter.forEach((v) => set3.add(v));
-}), SetImpl, makeSet = (map, ownerID) => new SetImpl(map, ownerID), EMPTY_SET, emptySet = () => EMPTY_SET || (EMPTY_SET = makeSet(emptyMap())), OrderedSet = (value) => value === undefined || value === null ? emptyOrderedSet() : isOrderedSet(value) ? value : emptyOrderedSet().withMutations((set3) => {
+}), SetImpl, makeSet = (map, ownerID) => new SetImpl(map, ownerID), EMPTY_SET2, emptySet = () => EMPTY_SET2 || (EMPTY_SET2 = makeSet(emptyMap())), OrderedSet = (value) => value === undefined || value === null ? emptyOrderedSet() : isOrderedSet(value) ? value : emptyOrderedSet().withMutations((set3) => {
   const iter = SetCollection(value);
   assertNotInfinite(iter.size);
   iter.forEach((v) => set3.add(v));
@@ -14622,6 +14652,10 @@ function lintIdToMessage(id, info) {
       return `${badValueMessage(info)}${fmtTagSuffix(info)}`;
     case "UNSUPPORTED_EXPR_SYNTAX":
       return `${unsupportedExprMessage(info)}${fmtTagSuffix(info)}`;
+    case "REDUNDANT_TEMPLATE_STRING":
+      return `Redundant template string — '{${info.simpler}}' should be just '${info.simpler}'${fmtOriginSuffix(info)}`;
+    case "UNKNOWN_COMPONENT_SPEC_KEY":
+      return `Unknown component spec key '${info.key}' — value will be ignored at runtime`;
     case "HTML_TAG_NAME_HAS_UPPERCASE":
       return `Tag <${info.raw}> will be lowercased to <${info.lowercased}>${fmtLocationSuffix(info)}`;
     case "HTML_SVG_TAG_WILL_LOWERCASE":

package/dist/tutuca-dev.js

@@ -3792,7 +3792,15 @@ class StrTplVal extends VarVal {
       vals[i] = val;
       allConsts &&= val instanceof ConstVal;
     }
-    return allConsts ? new ConstVal(vals.map((v) => v.val).join("")) : new StrTplVal(vals);
+    if (allConsts)
+      return new ConstVal(vals.map((v) => v.val).join(""));
+    let lo = 0;
+    let hi = vals.length;
+    while (lo < hi && vals[lo] instanceof ConstVal && vals[lo].val === "")
+      lo++;
+    while (hi > lo && vals[hi - 1] instanceof ConstVal && vals[hi - 1].val === "")
+      hi--;
+    return new StrTplVal(lo === 0 && hi === vals.length ? vals : vals.slice(lo, hi));
   }
 }
 
@@ -7275,6 +7283,8 @@ function closestName(name, candidates, maxDistance = 2) {
 }
 
 // tools/core/lint-check.js
+var KNOWN_COMPONENT_SPEC_KEYS = new Set("name view style commonStyle globalStyle input receive bubble response alter on views dynamic fields methods statics".split(" "));
+var EMPTY_SET = new Set;
 var KNOWN_DIRECTIVE_NAMES = new Set([
   "dangerouslysetinnerhtml",
   "slot",
@@ -7311,6 +7321,8 @@ var UNKNOWN_X_ATTR = "UNKNOWN_X_ATTR";
 var MAYBE_DROP_AT_PREFIX = "MAYBE_DROP_AT_PREFIX";
 var BAD_VALUE = "BAD_VALUE";
 var UNSUPPORTED_EXPR_SYNTAX = "UNSUPPORTED_EXPR_SYNTAX";
+var REDUNDANT_TEMPLATE_STRING = "REDUNDANT_TEMPLATE_STRING";
+var UNKNOWN_COMPONENT_SPEC_KEY = "UNKNOWN_COMPONENT_SPEC_KEY";
 var PARSE_ISSUE_KIND_TO_LINT_ID = {
   "unknown-directive": UNKNOWN_DIRECTIVE,
   "unknown-x-op": UNKNOWN_X_OP,
@@ -7389,8 +7401,9 @@ var UNSUPPORTED_EXPR_GUIDANCE = {
   logical: "Logical operators aren't supported in dynamic attributes. Combine the conditions in a method on the component and reference it as '.methodName'.",
   "call-with-args": "Method calls with arguments aren't supported here. Reference a no-arg method ('.methodName') and read what you need from component state, or split into per-case methods."
 };
-function checkComponent(Comp, lx = new LintContext) {
+function checkComponent(Comp, lx = new LintContext, { wellKnownExtras = EMPTY_SET } = {}) {
   return lx.push({ componentName: Comp.name }, () => {
+    checkUnknownSpecKeys(lx, Comp, wellKnownExtras);
     const referencedAlters = new Set;
     const referencedInputs = new Set;
     checkEventHandlersHaveImpls(lx, Comp, referencedInputs);
@@ -7636,7 +7649,12 @@ function checkConsistentAttrVal(lx, val, fields, proto, scope, alter, referenced
       lx.error(UNKNOWN_HANDLER_ARG_NAME, { ...errCtx, name: val.name }, replaceNameSuggestion(val.name, KNOWN_HANDLER_NAMES));
     }
   } else if (valName === "StrTplVal") {
-    for (const subVal of val.vals) {
+    const vs = val.vals;
+    if (vs.length === 1) {
+      const simpler = String(vs[0]);
+      lx.warn(REDUNDANT_TEMPLATE_STRING, { ...errCtx, simpler }, { kind: "rewrite", from: `{${simpler}}`, to: simpler });
+    }
+    for (const subVal of vs) {
       checkConsistentAttrVal(lx, subVal, fields, proto, scope, alter, referencedAlters, skipNameVal, errCtx);
     }
   } else if (valName === "AlterHandlerNameVal") {
@@ -7759,6 +7777,18 @@ function checkConsistentAttrs(lx, Comp, referencedAlters) {
     });
   }
 }
+function checkUnknownSpecKeys(lx, Comp, wellKnownExtras) {
+  const extra = Comp.extra;
+  if (!extra)
+    return;
+  let candidates = null;
+  for (const key of Object.keys(extra)) {
+    if (wellKnownExtras.has(key))
+      continue;
+    candidates ??= [...KNOWN_COMPONENT_SPEC_KEYS, ...wellKnownExtras];
+    lx.warn(UNKNOWN_COMPONENT_SPEC_KEY, { key }, replaceNameSuggestion(key, candidates));
+  }
+}
 function checkUnreferencedAlterHandlers(lx, Comp, referencedAlters) {
   for (const name in Comp.alter) {
     if (!referencedAlters.has(name)) {
@@ -8372,6 +8402,10 @@ function lintIdToMessage(id, info) {
       return `${badValueMessage(info)}${fmtTagSuffix(info)}`;
     case "UNSUPPORTED_EXPR_SYNTAX":
       return `${unsupportedExprMessage(info)}${fmtTagSuffix(info)}`;
+    case "REDUNDANT_TEMPLATE_STRING":
+      return `Redundant template string — '{${info.simpler}}' should be just '${info.simpler}'${fmtOriginSuffix(info)}`;
+    case "UNKNOWN_COMPONENT_SPEC_KEY":
+      return `Unknown component spec key '${info.key}' — value will be ignored at runtime`;
     case "HTML_TAG_NAME_HAS_UPPERCASE":
       return `Tag <${info.raw}> will be lowercased to <${info.lowercased}>${fmtLocationSuffix(info)}`;
     case "HTML_SVG_TAG_WILL_LOWERCASE":
@@ -8578,6 +8612,8 @@ class DynamicAlias extends Dynamic {
   }
 }
 var isString = (v) => typeof v === "string";
+var _rawSpecKeys = "name view style commonStyle globalStyle input receive bubble response alter on views dynamic fields methods statics";
+var KNOWN_SPEC_KEYS = new Set(_rawSpecKeys.split(" "));
 var _compId = 0;
 
 class Component {
@@ -8602,6 +8638,10 @@ class Component {
     this._rawDynamic = o.dynamic ?? {};
     this.dynamic = {};
     this.scope = null;
+    this.extra = {};
+    for (const key of Object.keys(o))
+      if (!KNOWN_SPEC_KEYS.has(key))
+        this.extra[key] = o[key];
   }
   compile(ParseContext2) {
     for (const key in this._rawDynamic) {
@@ -13491,8 +13531,8 @@ class SetImpl extends SetCollectionImpl {
 }
 Set2.isSet = isSet;
 var makeSet = (map, ownerID) => new SetImpl(map, ownerID);
-var EMPTY_SET;
-var emptySet = () => EMPTY_SET || (EMPTY_SET = makeSet(emptyMap()));
+var EMPTY_SET2;
+var emptySet = () => EMPTY_SET2 || (EMPTY_SET2 = makeSet(emptyMap()));
 function filterByIters(set3, iters, shouldRemove) {
   if (iters.length === 0) {
     return set3;
@@ -14339,16 +14379,16 @@ function extendProtoTruthy(proto, name, uname) {
     return !this.get(name);
   };
 }
-var EMPTY_SET2 = Set2();
+var EMPTY_SET3 = Set2();
 var isetCoercer = (v) => Array.isArray(v) ? Set2(v) : v instanceof Set ? Set2(v) : null;
 
 class FieldSet extends Field {
-  constructor(name, defaultValue = EMPTY_SET2) {
+  constructor(name, defaultValue = EMPTY_SET3) {
     super("set", name, CHECK_TYPE_SET, isetCoercer, defaultValue);
   }
   extendProtoForType(proto, uname) {
     const { name } = this;
-    extendProtoSized(proto, name, uname, EMPTY_SET2);
+    extendProtoSized(proto, name, uname, EMPTY_SET3);
     proto[`addIn${uname}`] = function(v) {
       return this.set(name, this.get(name).add(v));
     };
@@ -15126,6 +15166,7 @@ export {
   UNKNOWN_HANDLER_ARG_NAME,
   UNKNOWN_EVENT_MODIFIER,
   UNKNOWN_DIRECTIVE,
+  UNKNOWN_COMPONENT_SPEC_KEY,
   UNKNOWN_COMPONENT_NAME,
   TestResult,
   TestReport,
@@ -15142,6 +15183,7 @@ export {
   Record,
   Range,
   RENDER_IT_OUTSIDE_OF_LOOP,
+  REDUNDANT_TEMPLATE_STRING,
   ParseContext,
   PairSorting,
   OrderedSet,