@protontech/autofill 0.0.33690782 → 0.0.35059265

package/features/feature.d.ts

@@ -12,6 +12,7 @@ type FlatFeatures<F extends AbstractFeatures> = {
     [K in keyof F]: FlatFeature<F[K]>;
 };
 export declare const flattenFeatures: <F extends AbstractFeatures>(features: F) => FlatFeatures<F>;
-export declare const getComputerForFeatures: <F extends AbstractFeatures>(features: F) => FeatureComputer<FlatFeatures<F>>;
+export declare const getComputerForFeatures: (sorted: readonly AbstractFeature[], outputNames: readonly string[]) => FeatureComputer;
 export declare const topologicalSort: (features: AbstractFeatures) => AbstractFeature<unknown>[];
+export declare const computeFeatures: <F extends AbstractFeatures>(featureComputer: FeatureComputer<F>, fnode: Fnode) => import("@protontech/autofill/types").ComputedFeatures<F>;
 export {};

package/features/feature.js

@@ -7,21 +7,25 @@ export const feature = (name, parents, compute) => ({
 });
 export const featureCount = (feat) => feature(`${feat.name}Count`, { [feat.name]: feat }, (parents) => parents[feat.name].length);
 export const featureScaled = (feat, min, max) => feature(`${feat.name}Scaled`, { [feat.name]: feat }, (parents) => linearScale(parents[feat.name], min, max));
-export const featuresInnerProduct = (feat1, feat2) => feature(`${feat1.name},${feat2.name}`, { [feat1.name]: feat1, [feat2.name]: feat2 }, (parents) => Math.sqrt(Number(parents[feat1.name]) * Number(parents[feat2.name])));
-export const featuresProduct = (feat1, feat2) => feature(`${feat1.name},${feat2.name}`, { [feat1.name]: feat1, [feat2.name]: feat2 }, (parents) => Number(parents[feat1.name]) * Number(parents[feat2.name]));
+export const featuresInnerProduct = (feat1, feat2) => feature(`${feat1.name},${feat2.name}`, {
+    [feat1.name]: feat1,
+    [feat2.name]: feat2,
+}, (parents) => Math.sqrt(Number(parents[feat1.name]) * Number(parents[feat2.name])));
+export const featuresProduct = (feat1, feat2) => feature(`${feat1.name},${feat2.name}`, {
+    [feat1.name]: feat1,
+    [feat2.name]: feat2,
+}, (parents) => Number(parents[feat1.name]) * Number(parents[feat2.name]));
 export const flattenFeatures = (features) => features;
-export const getComputerForFeatures = (features) => {
-    const sorted = topologicalSort(features);
+export const getComputerForFeatures = (sorted, outputNames) => {
+    const outputSet = new Set(outputNames);
     return {
         compute: (fnode) => {
             const computed_parents = {};
-            sorted.forEach((feature) => {
-                const feature_val = feature.compute(computed_parents, fnode);
-                computed_parents[feature.name] = feature_val;
-            });
-            return Object.fromEntries(Object.values(features).map(({ name }) => [name, computed_parents[name]]));
+            for (const feature of sorted)
+                computed_parents[feature.name] = feature.compute(computed_parents, fnode);
+            return Object.fromEntries(outputNames.map((n) => [n, computed_parents[n]]));
         },
-        features: Array.from(Object.values(features)).filter((feat) => !feat.name.startsWith("__")),
+        features: sorted.filter((f) => outputSet.has(f.name) && !f.name.startsWith("__")),
     };
 };
 export const topologicalSort = (features) => {
@@ -70,3 +74,4 @@ export const topologicalSort = (features) => {
     }
     return sorted;
 };
+export const computeFeatures = (featureComputer, fnode) => featureComputer.compute(fnode);

package/features/feature.spec.js

@@ -44,12 +44,16 @@ describe("Feature engineering", () => {
         const A = feature("A", {}, () => 2);
         const B = feature("B", { A }, () => 4);
         const C = featuresProduct(A, B);
-        expect(getComputerForFeatures({ A, B, C }).compute({})).toStrictEqual({ A: 2, B: 4, "A,B": 8 });
+        const features = { A, B, C };
+        const outputNames = Object.values(features).map((f) => f.name);
+        expect(getComputerForFeatures(topologicalSort(features), outputNames).compute({})).toStrictEqual({ A: 2, B: 4, "A,B": 8 });
     });
     test("feature name re-mapping", () => {
         const A = feature("A", {}, () => 2);
         const B = feature("_B", { A }, () => 4);
         const C = feature("C", { A, B }, (p) => p.A + p._B);
-        expect(getComputerForFeatures({ A, B, C }).compute({})).toStrictEqual({ A: 2, _B: 4, C: 6 });
+        const features = { A, B, C };
+        const outputNames = Object.values(features).map((f) => f.name);
+        expect(getComputerForFeatures(topologicalSort(features), outputNames).compute({})).toStrictEqual({ A: 2, _B: 4, C: 6 });
     });
 });

package/features/registry.d.ts

@@ -0,0 +1,3 @@
+import type { FeatureComputer } from "@protontech/autofill/types";
+export declare const setFormFeaturesComputer: (c: FeatureComputer) => void;
+export declare const getFormFeaturesComputer: () => FeatureComputer;

package/features/registry.js

@@ -0,0 +1,9 @@
+let formFeaturesComputer;
+export const setFormFeaturesComputer = (c) => {
+    formFeaturesComputer = c;
+};
+export const getFormFeaturesComputer = () => {
+    if (!formFeaturesComputer)
+        throw new Error("formFeaturesComputer accessed before registration; features/v1 must be initialised first");
+    return formFeaturesComputer;
+};

package/features/sorted.gen.d.ts

@@ -0,0 +1,14 @@
+export declare const sortedFieldFeatures: import("..").AbstractFeature<unknown>[];
+export declare const fieldFeatureNames: ("text" | "label" | "autocomplete" | "visible" | "attrs" | "isCC" | "isFormLogin" | "parentFormFnode" | "isFormNoop" | "isFormPasswordChange" | "isFormRecovery" | "isFormRegister" | "isIdentity" | "searchField" | "nextField" | "parentFormFeatures" | "prevField" | "prevInput")[];
+export declare const sortedFormFeatures: import("..").AbstractFeature<unknown>[];
+export declare const formFeatureNames: ("__formInputMFACandidates" | "__formMFA" | "formTextMFA" | "formAttrsMFA" | "__formOTPOutlier" | "__formTextAuthenticator" | "inputsMFA" | "__headingsOTPOutlier" | "__inputIterator" | "__linkOTPOutlier" | "visibleFieldsCountScaled" | "visibleInputsCountScaled" | "fieldsetsCountScaled" | "textsCountScaled" | "textareasCountScaled" | "selectsCountScaled" | "disabledCountScaled" | "radiosCountScaled" | "readOnlyCountScaled" | "formComplexityScaled" | "visibleIdentifiersCountScaled" | "hiddenIdentifiersCountScaled" | "usernamesCountScaled" | "emailsCountScaled" | "hiddenCountScaled" | "hiddenPasswordsCountScaled" | "submitsCountScaled" | "identitiesCountScaled" | "ccsCountScaled" | "hasTels" | "hasOAuth" | "hasCaptchas" | "hasFiles" | "hasDate" | "hasNumber" | "oneVisibleField" | "twoVisibleFields" | "threeOrMoreVisibleFields" | "noPasswords" | "onePassword" | "twoPasswords" | "threeOrMorePasswords" | "noIdentifiers" | "oneIdentifier" | "twoIdentifiers" | "threeOrMoreIdentifiers" | "autofocusedIsIdentifier" | "autofocusedIsPassword" | "visibleRatio" | "inputRatio" | "hiddenRatio" | "identifierRatio" | "emailRatio" | "usernameRatio" | "passwordRatio" | "disabledRatio" | "requiredRatio" | "checkboxRatio" | "hiddenIdentifierRatio" | "hiddenPasswordRatio" | "pageLogin" | "formTextLogin" | "formAttrsLogin" | "headingsLogin" | "layoutLogin" | "rememberMeCheckbox" | "troubleLink" | "submitLogin" | "pageRegister" | "formTextRegister" | "formAttrsRegister" | "headingsRegister" | "layoutRegister" | "pwNewRegister" | "pwConfirmRegister" | "submitRegister" | "TOSRef" | "pagePwReset" | "formTextPwReset" | "formAttrsPwReset" | "headingsPwReset" | "layoutPwReset" | "pageRecovery" | "formTextRecovery" | "formAttrsRecovery" | "headingsRecovery" | "layoutRecovery" | "identifierRecovery" | "submitRecovery" | "newsletterForm" | "searchForm" | "multistepForm" | "multiAuthForm" | "multistepForm,multiAuthForm" | "visibleRatio,visibleFieldsCountScaled" | "visibleRatio,visibleIdentifiersCountScaled" | "visibleRatio,visiblePasswordsCountScaled" | "visibleRatio,hiddenIdentifiersCountScaled" | "visibleRatio,hiddenPasswordsCountScaled" | "visibleRatio,multiAuthForm" | "visibleRatio,multistepForm" | "identifierRatio,visibleFieldsCountScaled" | "identifierRatio,visibleIdentifiersCountScaled" | "identifierRatio,visiblePasswordsCountScaled" | "identifierRatio,hiddenIdentifiersCountScaled" | "identifierRatio,hiddenPasswordsCountScaled" | "identifierRatio,multiAuthForm" | "identifierRatio,multistepForm" | "passwordRatio,visibleFieldsCountScaled" | "passwordRatio,visibleIdentifiersCountScaled" | "passwordRatio,visiblePasswordsCountScaled" | "passwordRatio,hiddenIdentifiersCountScaled" | "passwordRatio,hiddenPasswordsCountScaled" | "passwordRatio,multiAuthForm" | "passwordRatio,multistepForm" | "requiredRatio,visibleFieldsCountScaled" | "requiredRatio,visibleIdentifiersCountScaled" | "requiredRatio,visiblePasswordsCountScaled" | "requiredRatio,hiddenIdentifiersCountScaled" | "requiredRatio,hiddenPasswordsCountScaled" | "requiredRatio,multiAuthForm" | "requiredRatio,multistepForm")[];
+export declare const sortedEmailFeatures: import("..").AbstractFeature<unknown>[];
+export declare const emailFeatureNames: ("fieldCC" | "fieldIdentity" | "isSearchField" | "attrEmail" | "autocompleteEmail" | "autocompleteOff" | "typeEmail" | "exactAttrEmail" | "textEmail" | "labelEmail" | "placeholderEmail" | "mfaOutlier")[];
+export declare const sortedOtpFeatures: import("..").AbstractFeature<unknown>[];
+export declare const otpFeatureNames: ("formComplexity" | "fieldCC" | "fieldIdentity" | "formMFA" | "formAuthenticator" | "outlierForm" | "outlierLink" | "outlierHeadings" | "numericMode" | "patternOTP" | "nameMatch" | "idMatch" | "autocompleteOTC" | "singleInput" | "siblingOfInterest" | "attrOTP" | "attrMFA" | "textMFA" | "textAuthenticator" | "labelOTP" | "labelMFA" | "labelAuthenticator" | "outlierMaxLength" | "outlierInputCount" | "outlierEmailMatchScaled" | "outlierField" | "outlierSearch" | "outlierAutocomplete")[];
+export declare const sortedPasswordFeatures: import("..").AbstractFeature<unknown>[];
+export declare const passwordFeatureNames: ("fieldCC" | "fieldIdentity" | "autocompleteOff" | "fieldLogin" | "fieldRegister" | "fieldExotic" | "passwordOutlier" | "autocompleteNew" | "autocompleteCurrent" | "autocompleteOTP" | "attrCurrent" | "textCurrent" | "labelCurrent" | "attrCreate" | "textCreate" | "labelCreate" | "attrConfirm" | "textConfirm" | "labelConfirm" | "attrReset" | "prevPwField" | "prevPwNew" | "prevPwCurrent" | "nextPwField" | "nextPwNew" | "nextPwConfirm" | "nextPwCurrent" | "fieldLogin,autocompleteNew" | "fieldLogin,maybeNew" | "fieldRegister,autocompleteCurrent" | "fieldRegister,maybeCurrent" | "prevPwCurrent,nextPwNew")[];
+export declare const sortedUsernameFeatures: import("..").AbstractFeature<unknown>[];
+export declare const usernameFeatureNames: ("fieldCC" | "fieldIdentity" | "isSearchField" | "autocompleteUsername" | "attrUsername" | "autocompleteEmail" | "autocompleteOff" | "textUsername" | "labelUsername" | "outlierAttrs" | "outlierText" | "outlierLabel" | "outlierEmail" | "firstLoginFormField")[];
+export declare const sortedUsernameHiddenFeatures: import("..").AbstractFeature<unknown>[];
+export declare const usernameHiddenFeatureNames: ("fieldCC" | "fieldIdentity" | "autocompleteUsername" | "attrEmail" | "attrUsername" | "autocompleteEmail" | "fieldExotic" | "visibleReadonly" | "attrMatch" | "valueEmail" | "valueTel" | "valueUsername")[];

package/features/sorted.gen.js

@@ -0,0 +1,22 @@
+import { topologicalSort } from "@protontech/autofill/features/feature";
+import { fieldFeatures } from "./v1/abstract.field";
+import { formFeatures } from "./v1/abstract.form";
+import { emailFeatures } from "./v1/field.email";
+import { otpFeatures } from "./v1/field.otp";
+import { passwordFeatures } from "./v1/field.password";
+import { usernameFeatures } from "./v1/field.username";
+import { usernameHiddenFeatures } from "./v1/field.username-hidden";
+export const sortedFieldFeatures = topologicalSort(fieldFeatures);
+export const fieldFeatureNames = Object.values(fieldFeatures).map((f) => f.name);
+export const sortedFormFeatures = topologicalSort(formFeatures);
+export const formFeatureNames = Object.values(formFeatures).map((f) => f.name);
+export const sortedEmailFeatures = topologicalSort(emailFeatures);
+export const emailFeatureNames = Object.values(emailFeatures).map((f) => f.name);
+export const sortedOtpFeatures = topologicalSort(otpFeatures);
+export const otpFeatureNames = Object.values(otpFeatures).map((f) => f.name);
+export const sortedPasswordFeatures = topologicalSort(passwordFeatures);
+export const passwordFeatureNames = Object.values(passwordFeatures).map((f) => f.name);
+export const sortedUsernameFeatures = topologicalSort(usernameFeatures);
+export const usernameFeatureNames = Object.values(usernameFeatures).map((f) => f.name);
+export const sortedUsernameHiddenFeatures = topologicalSort(usernameHiddenFeatures);
+export const usernameHiddenFeatureNames = Object.values(usernameHiddenFeatures).map((f) => f.name);

package/features/v1/abstract.field.js

@@ -1,6 +1,6 @@
 import { kEmailSelector } from "@protontech/autofill/constants/selectors";
 import { feature, flattenFeatures } from "@protontech/autofill/features/feature";
-import { formFeaturesComputer } from "@protontech/autofill/features/v1/abstract.form";
+import { getFormFeaturesComputer } from "@protontech/autofill/features/registry";
 import { any } from "@protontech/autofill/utils/combinators";
 import { matchCCFieldCandidate } from "@protontech/autofill/utils/credit-card";
 import { getFieldHaystacks } from "@protontech/autofill/utils/extract";
@@ -25,7 +25,7 @@ const parentFormFnode = feature("parentFormFnode", {}, (_, fnode) => getParentFo
 const parentFormFeatures = feature("parentFormFeatures", { parentFormFnode }, (p) => {
     const parent = p.parentFormFnode;
     if (parent && !parent.hasNoteFor("form"))
-        parent.setNoteFor("form", formFeaturesComputer.compute(parent));
+        parent.setNoteFor("form", getFormFeaturesComputer().compute(parent));
     return parent === null || parent === void 0 ? void 0 : parent.noteFor("form");
 });
 const parentFormInputIterator = feature("parentFormInputIterator", { parentFormFeatures }, (p) => { var _a, _b; return (_b = (_a = p.parentFormFeatures) === null || _a === void 0 ? void 0 : _a.__inputIterator) !== null && _b !== void 0 ? _b : null; });