@rogatio/cli 5.20.1 → 6.0.0

package/dist/editor/index.js

@@ -3,7 +3,6 @@ var LIMITS = Object.freeze({
   maxGroups: 64,
   maxRulesPerGroup: 256,
   maxRulesPerProject: 4096,
-  maxOriginsPerScope: 32,
   maxIdLength: 64,
   maxLabelLength: 100,
   maxDescriptionLength: 1e3,
@@ -485,8 +484,12 @@ function createAIAssistPanel(_container, _editor, onApply, onClose, onSend) {
         detail.innerHTML = `<span style="color:#666;">${label}:</span> ${value}`;
         ruleDetails.appendChild(detail);
       };
-      addDetail("Regex", rule.urlRegex);
-      if (rule.origins?.length) addDetail("Origins", rule.origins.join(", "));
+      if (rule.source) {
+        addDetail(
+          "Source",
+          `${rule.source.key} / ${rule.source.operator}: ${rule.source.value}`
+        );
+      }
       if (rule.resourceTypes?.length)
         addDetail("Types", rule.resourceTypes.join(", "));
       if (rule.priority !== void 0)
@@ -1126,7 +1129,8 @@ function createRedirectRuleType() {
     validate(rule, rulePath) {
       const redirect = rule.redirect;
       const destination = redirect !== null && typeof redirect === "object" && typeof redirect.destination === "string" ? redirect.destination : "";
-      const urlRegex = typeof rule.urlRegex === "string" ? rule.urlRegex : "";
+      const source = rule.source;
+      const urlRegex = source !== null && typeof source === "object" && source.key === "url" && typeof source.value === "string" ? source.value : "";
       const issues = validateRedirectDestination(destination, urlRegex);
       return issues.map((issue) => ({
         code: `schema.${issue.code}`,
@@ -1691,8 +1695,7 @@ var HTTP_METHODS2 = [
 var COMMON_RULE_FIELDS = /* @__PURE__ */ new Set([
   "id",
   "name",
-  "urlRegex",
-  "origins",
+  "source",
   "resourceTypes",
   "priority",
   "method",
@@ -2125,6 +2128,7 @@ var EditorControllerImpl = class {
   aiAssistPanel = null;
   aiAssistInFlight = false;
   aiRepairTargets = [];
+  migrationNoticesDismissed = false;
   constructor(options, initial, extensions) {
     this.root = options.root;
     this.document = options.root.ownerDocument;
@@ -2442,31 +2446,8 @@ var EditorControllerImpl = class {
       if (groupId && ruleId) this.copyRule(groupId, ruleId);
       return;
     }
-    if (command === "add-group-origin") {
-      const groupId = element.dataset.groupId;
-      if (groupId) this.addGroupOrigin(groupId);
-      return;
-    }
-    if (command === "remove-group-origin") {
-      const groupId = element.dataset.groupId;
-      const index = Number(element.dataset.index);
-      if (groupId && Number.isSafeInteger(index))
-        this.removeGroupOrigin(groupId, index);
-      return;
-    }
-    if (command === "add-rule-origin") {
-      const groupId = element.dataset.groupId;
-      const ruleId = element.dataset.ruleId;
-      if (groupId && ruleId) this.addRuleOrigin(groupId, ruleId);
-      return;
-    }
-    if (command === "remove-rule-origin") {
-      const groupId = element.dataset.groupId;
-      const ruleId = element.dataset.ruleId;
-      const index = Number(element.dataset.index);
-      if (groupId && ruleId && Number.isSafeInteger(index)) {
-        this.removeRuleOrigin(groupId, ruleId, index);
-      }
+    if (command === "dismiss-migration-notices") {
+      void this.dismissMigrationNotices();
       return;
     }
     if (command === "convert-url") {
@@ -2723,7 +2704,6 @@ var EditorControllerImpl = class {
     this.draft.groups.push({
       id: groupId,
       name: "New group",
-      origins: [],
       rules: []
     });
     this.markChanged();
@@ -2740,8 +2720,7 @@ var EditorControllerImpl = class {
     group.rules.push({
       id: ruleId,
       name: "New rule",
-      urlRegex: "",
-      origins: [],
+      source: { key: "url", operator: "regex", value: "" },
       resourceTypes: ["main_frame"],
       priority: 100
     });
@@ -2983,7 +2962,6 @@ var EditorControllerImpl = class {
         this.draft.groups.push({
           id: groupId,
           name: "AI Group",
-          origins: [],
           rules: []
         });
         group = this.groupById(groupId);
@@ -3005,8 +2983,11 @@ var EditorControllerImpl = class {
       const rule = {
         id: ruleId,
         name: ruleProposal.name,
-        urlRegex: ruleProposal.urlRegex,
-        origins: ruleProposal.origins ? [...ruleProposal.origins] : [],
+        source: {
+          key: ruleProposal.source.key,
+          operator: "regex",
+          value: ruleProposal.source.value
+        },
         resourceTypes: ruleProposal.resourceTypes ? [...ruleProposal.resourceTypes] : ["main_frame"],
         priority: ruleProposal.priority ?? 100
       };
@@ -3128,48 +3109,17 @@ var EditorControllerImpl = class {
     }
     return { proposal: chunk.proposal };
   }
-  addGroupOrigin(groupId) {
-    const group = this.groupById(groupId);
-    if (!group || this.saving) return;
-    group.origins.push("");
-    this.markChanged();
-    this.focusRequest = pointer(
-      "groups",
-      this.groupIndex(groupId),
-      "origins",
-      group.origins.length - 1
-    );
-    this.render();
-  }
-  removeGroupOrigin(groupId, index) {
-    const group = this.groupById(groupId);
-    if (!group || this.saving || index < 0 || index >= group.origins.length)
-      return;
-    group.origins.splice(index, 1);
-    this.markChanged();
-    this.render();
-  }
-  addRuleOrigin(groupId, ruleId) {
-    const rule = this.ruleById(groupId, ruleId);
-    if (!rule || this.saving) return;
-    rule.origins.push("");
-    this.markChanged();
-    this.focusRequest = pointer(
-      "groups",
-      this.groupIndex(groupId),
-      "rules",
-      this.ruleIndex(this.groupById(groupId), ruleId),
-      "origins",
-      rule.origins.length - 1
-    );
-    this.render();
-  }
-  removeRuleOrigin(groupId, ruleId, index) {
-    const rule = this.ruleById(groupId, ruleId);
-    if (!rule || this.saving || index < 0 || index >= rule.origins.length)
+  async dismissMigrationNotices() {
+    if (this.saving || this.migrationNoticesDismissed) return;
+    try {
+      await this.options.onDismissMigrationNotices?.();
+    } catch {
+      this.statusMessage = "Could not dismiss migration notices.";
+      this.render();
       return;
-    rule.origins.splice(index, 1);
-    this.markChanged();
+    }
+    this.migrationNoticesDismissed = true;
+    this.statusMessage = "Migration notices dismissed.";
     this.render();
   }
   convertUrl(groupId, ruleId) {
@@ -3186,7 +3136,7 @@ var EditorControllerImpl = class {
       "rules",
       this.ruleIndex(this.groupById(groupId), ruleId)
     );
-    const path = `${rulePath}/urlRegex`;
+    const path = `${rulePath}/source/value`;
     if (!result.ok) {
       this.conversionDiagnostics.set(
         ruleId,
@@ -3202,6 +3152,12 @@ var EditorControllerImpl = class {
       this.render();
       return;
     }
+    if (setValueAtPath(this.draft, `${rulePath}/source/key`, "url")) {
+      this.markChanged();
+    }
+    if (setValueAtPath(this.draft, `${rulePath}/source/operator`, "regex")) {
+      this.markChanged();
+    }
     if (setValueAtPath(this.draft, path, result.source)) this.markChanged();
     this.statusMessage = "Exact URL regular expression created.";
     this.focusRequest = path;
@@ -3306,8 +3262,7 @@ var EditorControllerImpl = class {
         ruleHeader.append(ruleName, ruleBadge);
         ruleDiv.append(ruleHeader);
         const dims = [
-          { label: "urlRegex", dim: rule.urlRegex },
-          { label: "effectiveOrigin", dim: rule.effectiveOrigin },
+          { label: "source", dim: rule.source },
           { label: "method", dim: rule.method },
           { label: "resourceType", dim: rule.resourceType }
         ];
@@ -3452,6 +3407,7 @@ var EditorControllerImpl = class {
     }
     this.decorateExtensionControls();
     this.renderSummary();
+    this.renderMigrationNotices();
     this.renderSearchResults();
     this.renderConfirmation();
     this.restoreFocus();
@@ -3720,15 +3676,6 @@ var EditorControllerImpl = class {
     );
     settings.append(fields);
     this.form.append(settings);
-    this.renderOrigins(
-      this.form,
-      "Group origins",
-      group.origins,
-      "group",
-      groupId,
-      void 0,
-      groupIndex
-    );
     const rulesSection = this.document.createElement("section");
     rulesSection.dataset.rulesSection = "true";
     const rulesHeadingRow = this.document.createElement("div");
@@ -3929,35 +3876,9 @@ var EditorControllerImpl = class {
     name.maxLength = 100;
     name.value = safeText(rule.name);
     this.renderField(grid, "Rule name", `${rulePath}/name`, name);
-    const regex = this.document.createElement("textarea");
-    regex.maxLength = F2_MAX_URL_REGEX_LENGTH2;
-    regex.value = safeText(rule.urlRegex);
-    this.renderField(
-      grid,
-      "URL regular expression",
-      `${rulePath}/urlRegex`,
-      regex
-    );
-    const convert = this.createCommandButton(
-      "Convert to regex",
-      "convert-url",
-      this.saving,
-      { groupId, ruleId },
-      "secondary"
-    );
-    grid.append(convert);
     fields.append(grid);
+    this.renderSource(fields, rule, rulePath, groupId, ruleId);
     card.append(fields);
-    this.renderOrigins(
-      card,
-      "Rule origins",
-      rule.origins,
-      "rule",
-      groupId,
-      ruleId,
-      groupIndex,
-      ruleIndex
-    );
     this.renderResourceTypes(card, rule, rulePath);
     const matcherFields = this.document.createElement("fieldset");
     const matcherLegend = this.document.createElement("legend");
@@ -4046,48 +3967,89 @@ var EditorControllerImpl = class {
     }
     return card;
   }
-  renderOrigins(parent, label, values, owner, groupId, ruleId, groupIndex, ruleIndex) {
-    const fieldset = this.document.createElement("fieldset");
-    const legend = this.document.createElement("legend");
-    legend.textContent = label;
-    fieldset.append(legend);
-    for (let index = 0; index < values.length; index += 1) {
-      const row = this.document.createElement("div");
-      row.dataset.editorOriginRow = "true";
-      const path = owner === "group" ? pointer("groups", groupIndex, "origins", index) : pointer(
-        "groups",
-        groupIndex,
-        "rules",
-        ruleIndex ?? 0,
-        "origins",
-        index
-      );
-      const input = this.document.createElement("input");
-      input.type = "text";
-      input.maxLength = 2048;
-      input.value = safeText(values[index]);
-      input.disabled = this.saving;
-      this.renderField(row, `Origin ${index + 1}`, path, input);
-      const remove = this.createCommandButton(
-        `Remove ${owner} origin ${index + 1}`,
-        owner === "group" ? "remove-group-origin" : "remove-rule-origin",
-        this.saving,
-        { groupId, ruleId, index: String(index) },
-        "danger"
-      );
-      row.append(remove);
-      fieldset.append(row);
+  renderSource(parent, rule, rulePath, groupId, ruleId) {
+    const sourceFieldset = this.document.createElement("fieldset");
+    const sourceLegend = this.document.createElement("legend");
+    sourceLegend.textContent = "Source condition";
+    sourceFieldset.append(sourceLegend);
+    const sourceGrid = this.document.createElement("div");
+    sourceGrid.dataset.editorFields = "true";
+    const sourceKey = rule.source?.key === "host" ? "host" : "url";
+    const keySelect = this.document.createElement("select");
+    for (const value of ["url", "host"]) {
+      const option = this.document.createElement("option");
+      option.value = value;
+      option.textContent = value === "url" ? "URL (full request URL)" : "Host (hostname only)";
+      keySelect.append(option);
     }
-    fieldset.append(
+    keySelect.value = sourceKey;
+    this.renderField(
+      sourceGrid,
+      "Match key",
+      `${rulePath}/source/key`,
+      keySelect
+    );
+    const operator = this.document.createElement("input");
+    operator.type = "text";
+    operator.value = "regex";
+    operator.readOnly = true;
+    operator.disabled = true;
+    this.renderField(
+      sourceGrid,
+      "Operator",
+      `${rulePath}/source/operator`,
+      operator
+    );
+    const regex = this.document.createElement("textarea");
+    regex.maxLength = F2_MAX_URL_REGEX_LENGTH2;
+    regex.value = safeText(rule.source?.value);
+    this.renderField(
+      sourceGrid,
+      "Regular expression",
+      `${rulePath}/source/value`,
+      regex
+    );
+    sourceFieldset.append(sourceGrid);
+    sourceFieldset.append(
       this.createCommandButton(
-        "Add origin",
-        owner === "group" ? "add-group-origin" : "add-rule-origin",
+        "Convert URL to regex",
+        "convert-url",
         this.saving,
         { groupId, ruleId },
         "secondary"
       )
     );
-    parent.append(fieldset);
+    parent.append(sourceFieldset);
+  }
+  renderMigrationNotices() {
+    const existing = this.host.querySelector("[data-migration-notices]");
+    existing?.remove();
+    if (this.migrationNoticesDismissed || !this.options.migrationNotices || this.options.migrationNotices.length === 0) {
+      return;
+    }
+    const banner = this.document.createElement("section");
+    banner.dataset.migrationNotices = "true";
+    banner.setAttribute("role", "status");
+    const heading = this.document.createElement("h2");
+    heading.textContent = "Migration notices";
+    const list = this.document.createElement("ul");
+    for (const notice of this.options.migrationNotices) {
+      const item = this.document.createElement("li");
+      item.textContent = notice.message;
+      list.append(item);
+    }
+    banner.append(
+      heading,
+      list,
+      this.createCommandButton(
+        "Dismiss notices",
+        "dismiss-migration-notices",
+        this.saving,
+        {},
+        "secondary"
+      )
+    );
+    this.main.prepend(banner);
   }
   renderResourceTypes(parent, rule, rulePath) {
     const fieldset = this.document.createElement("fieldset");