@nordcraft/search 1.0.0

package/dist/rules/workflows/unknownWorkflowParameterRule.js

@@ -0,0 +1,31 @@
+export const unknownWorkflowParameterRule = {
+    code: 'unknown workflow parameter',
+    level: 'error',
+    category: 'Unknown Reference',
+    visit: (report, args) => {
+        const { path, value, nodeType } = args;
+        if (nodeType !== 'formula' ||
+            value.type !== 'path' ||
+            // We want a path that looks like ['components', 'componentName', 'workflows', 'workflowName', ...]
+            path.length < 4 ||
+            path[2] !== 'workflows' ||
+            // The path formula would usually look like ['Parameters', 'parameterName']
+            value.path[0] !== 'Parameters' ||
+            value.path.length < 2) {
+            return;
+        }
+        const component = args.component;
+        if (!component) {
+            return;
+        }
+        const [_components, _componentName, _workflows, workflowName] = path;
+        const [_Parameters, parameterName] = value.path;
+        const workflowParameters = new Set(Object.values(component.workflows?.[workflowName]?.parameters ?? {}).map((p) => p.name));
+        if (!workflowParameters.has(parameterName)) {
+            report(path, {
+                parameter: parameterName,
+            });
+        }
+    },
+};
+//# sourceMappingURL=unknownWorkflowParameterRule.js.map

package/dist/rules/workflows/unknownWorkflowParameterRule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"unknownWorkflowParameterRule.js","sourceRoot":"","sources":["../../../src/rules/workflows/unknownWorkflowParameterRule.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,4BAA4B,GAAgC;IACvE,IAAI,EAAE,4BAA4B;IAClC,KAAK,EAAE,OAAO;IACd,QAAQ,EAAE,mBAAmB;IAC7B,KAAK,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;QACtB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;QACtC,IACE,QAAQ,KAAK,SAAS;YACtB,KAAK,CAAC,IAAI,KAAK,MAAM;YACrB,mGAAmG;YACnG,IAAI,CAAC,MAAM,GAAG,CAAC;YACf,IAAI,CAAC,CAAC,CAAC,KAAK,WAAW;YACvB,2EAA2E;YAC3E,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,YAAY;YAC9B,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EACrB,CAAC;YACD,OAAM;QACR,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAA;QAChC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAM;QACR,CAAC;QACD,MAAM,CAAC,WAAW,EAAE,cAAc,EAAE,UAAU,EAAE,YAAY,CAAC,GAAG,IAAI,CAAA;QACpE,MAAM,CAAC,WAAW,EAAE,aAAa,CAAC,GAAG,KAAK,CAAC,IAAI,CAAA;QAC/C,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAChC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,YAAY,CAAC,EAAE,UAAU,IAAI,EAAE,CAAC,CAAC,GAAG,CACtE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CACd,CACF,CAAA;QACD,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;YAC3C,MAAM,CAAC,IAAI,EAAE;gBACX,SAAS,EAAE,aAAa;aACzB,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;CACF,CAAA"}

package/dist/rules/workflows/unknownWorkflowParameterRule.test.js

@@ -0,0 +1,109 @@
+import { searchProject } from '../../searchProject';
+import { unknownWorkflowParameterRule } from './unknownWorkflowParameterRule';
+describe('unknownWorkflowParameterRule', () => {
+    test('should detect unknown workflow parameters', () => {
+        const problems = Array.from(searchProject({
+            files: {
+                components: {
+                    myComponent: {
+                        name: 'myComponent',
+                        nodes: {},
+                        formulas: {},
+                        apis: {},
+                        attributes: {},
+                        variables: {},
+                        workflows: {
+                            ['my-workflow']: {
+                                name: 'my-workflow',
+                                parameters: [
+                                    {
+                                        name: 'parameter',
+                                        testValue: 4,
+                                    },
+                                ],
+                                actions: [
+                                    {
+                                        name: '@toddle/logToConsole',
+                                        label: 'Log to console',
+                                        arguments: [
+                                            {
+                                                name: 'Label',
+                                                formula: { type: 'value', value: 'first p' },
+                                            },
+                                            {
+                                                name: 'Data',
+                                                formula: {
+                                                    path: ['Parameters', 'unknownParameter'],
+                                                    type: 'path',
+                                                },
+                                            },
+                                        ],
+                                    },
+                                ],
+                                '@toddle/metadata': {
+                                    comments: null,
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+            rules: [unknownWorkflowParameterRule],
+        }));
+        expect(problems).toHaveLength(1);
+        expect(problems[0].code).toBe('unknown workflow parameter');
+        expect(problems[0].details).toEqual({ parameter: 'unknownParameter' });
+    });
+    test('should not detect known workflow parameters', () => {
+        const problems = Array.from(searchProject({
+            files: {
+                components: {
+                    myComponent: {
+                        name: 'myComponent',
+                        nodes: {},
+                        formulas: {},
+                        apis: {},
+                        attributes: {},
+                        variables: {},
+                        workflows: {
+                            ['my-workflow']: {
+                                name: 'my-workflow',
+                                parameters: [
+                                    {
+                                        name: 'parameter',
+                                        testValue: 4,
+                                    },
+                                ],
+                                actions: [
+                                    {
+                                        name: '@toddle/logToConsole',
+                                        label: 'Log to console',
+                                        arguments: [
+                                            {
+                                                name: 'Label',
+                                                formula: { type: 'value', value: 'first p' },
+                                            },
+                                            {
+                                                name: 'Data',
+                                                formula: {
+                                                    path: ['Parameters', 'parameter'],
+                                                    type: 'path',
+                                                },
+                                            },
+                                        ],
+                                    },
+                                ],
+                                '@toddle/metadata': {
+                                    comments: null,
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+            rules: [unknownWorkflowParameterRule],
+        }));
+        expect(problems).toHaveLength(0);
+    });
+});
+//# sourceMappingURL=unknownWorkflowParameterRule.test.js.map

package/dist/rules/workflows/unknownWorkflowParameterRule.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"unknownWorkflowParameterRule.test.js","sourceRoot":"","sources":["../../../src/rules/workflows/unknownWorkflowParameterRule.test.ts"],"names":[],"mappings":"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"}

package/dist/search.worker.js

@@ -0,0 +1,10 @@
+/**
+ * Similar to problems with using rules and returning paths, but for searching the toddle file format instead of searching for problems.
+ *
+ * Great for finding freeform text anywhere in a project, or references, dependencies etc.
+ */
+onmessage = (_event) => {
+    throw new Error('Not yet implemented');
+};
+export {};
+//# sourceMappingURL=search.worker.js.map

package/dist/search.worker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"search.worker.js","sourceRoot":"","sources":["../src/search.worker.ts"],"names":[],"mappings":"AAmCA;;;;GAIG;AACH,SAAS,GAAG,CACV,MAIE,EACF,EAAE;IACF,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;AACxC,CAAC,CAAA"}

package/dist/searchProject.js

@@ -0,0 +1,368 @@
+import { isLegacyApi } from '@nordcraft/core/dist/api/api';
+import { ToddleComponent } from '@nordcraft/core/dist/component/ToddleComponent';
+import { isToddleFormula } from '@nordcraft/core/dist/formula/formulaTypes';
+import { ToddleFormula } from '@nordcraft/core/dist/formula/ToddleFormula';
+import { ToddleApiService } from '@nordcraft/ssr/dist/ToddleApiService';
+import { ToddleRoute } from '@nordcraft/ssr/dist/ToddleRoute';
+import { shouldSearchPath } from './util/helpers';
+/**
+ * Search a project by applying rules to all nodes in the project and returning reported results.
+ *
+ * @param files All files to check against
+ * @param rules All rules to check against
+ * @param pathsToVisit Only visit specific paths. All subpaths are visited as well. For example, ['components', 'test'] would visit everything under the test component. Defaults is `[]` which means all paths are visited.
+ * @returns A generator that yields results as they are found
+ */
+export function* searchProject({ files, rules, pathsToVisit = [], state, }) {
+    const memos = new Map();
+    const memo = (key, fn) => {
+        const stringKey = Array.isArray(key) ? key.join('/') : key;
+        if (memos.has(stringKey)) {
+            return memos.get(stringKey);
+        }
+        const result = fn();
+        memos.set(stringKey, result);
+        return result;
+    };
+    for (const key in files.components) {
+        const component = files.components[key];
+        if (component) {
+            yield* visitNode({
+                nodeType: 'component',
+                value: component,
+                path: ['components', key],
+                rules,
+                files,
+                pathsToVisit,
+                memo,
+            }, state);
+        }
+    }
+    for (const key in files.formulas) {
+        yield* visitNode({
+            nodeType: 'project-formula',
+            value: files.formulas[key],
+            path: ['formulas', key],
+            rules,
+            files,
+            pathsToVisit,
+            memo,
+        }, state);
+    }
+    for (const key in files.actions) {
+        yield* visitNode({
+            nodeType: 'project-action',
+            value: files.actions[key],
+            path: ['actions', key],
+            rules,
+            files,
+            pathsToVisit,
+            memo,
+        }, state);
+    }
+    for (const key in files.themes) {
+        yield* visitNode({
+            nodeType: 'project-theme',
+            value: files.themes[key],
+            path: ['themes', key],
+            rules,
+            files,
+            pathsToVisit,
+            memo,
+        }, state);
+    }
+    if (files.services) {
+        for (const key in files.services) {
+            yield* visitNode({
+                nodeType: 'api-service',
+                value: files.services[key],
+                path: ['services', key],
+                rules,
+                files,
+                pathsToVisit,
+                memo,
+            }, state);
+        }
+    }
+    if (files.routes) {
+        for (const key in files.routes) {
+            yield* visitNode({
+                nodeType: 'project-route',
+                value: files.routes[key],
+                routeName: key,
+                path: ['routes', key],
+                rules,
+                files,
+                pathsToVisit,
+                memo,
+            }, state);
+        }
+    }
+    yield* visitNode({
+        nodeType: 'project-config',
+        value: files.config,
+        path: ['config'],
+        rules,
+        files,
+        pathsToVisit,
+        memo,
+    }, state);
+}
+function* visitNode(args, state) {
+    const { rules, pathsToVisit, ...data } = args;
+    const { files, value, path, memo, nodeType } = data;
+    if (!shouldSearchPath(data.path, pathsToVisit)) {
+        return;
+    }
+    const results = [];
+    for (const rule of rules) {
+        rule.visit((path, details) => {
+            results.push({
+                code: rule.code,
+                category: rule.category,
+                level: rule.level,
+                path,
+                details,
+            });
+        }, data, state);
+    }
+    for (const result of results) {
+        yield result;
+    }
+    switch (nodeType) {
+        case 'component': {
+            const component = new ToddleComponent({
+                component: value,
+                packageName: undefined,
+                getComponent: (name) => files.components[name],
+                globalFormulas: {
+                    formulas: files.formulas,
+                    packages: files.packages,
+                },
+            });
+            for (const key in value.attributes) {
+                yield* visitNode({
+                    nodeType: 'component-attribute',
+                    value: value.attributes[key],
+                    path: [...path, 'attributes', key],
+                    rules,
+                    files,
+                    pathsToVisit,
+                    memo,
+                    component,
+                }, state);
+            }
+            for (const key in value.variables) {
+                yield* visitNode({
+                    nodeType: 'component-variable',
+                    value: value.variables[key],
+                    path: [...path, 'variables', key],
+                    rules,
+                    files,
+                    pathsToVisit,
+                    memo,
+                    component,
+                }, state);
+            }
+            for (const key in value.apis) {
+                const api = value.apis[key];
+                yield* visitNode({
+                    nodeType: 'component-api',
+                    value: api,
+                    component,
+                    path: [...path, 'apis', key],
+                    rules,
+                    files,
+                    pathsToVisit,
+                    memo,
+                }, state);
+                if (!isLegacyApi(api)) {
+                    for (const [inputKey, input] of Object.entries(api.inputs)) {
+                        yield* visitNode({
+                            nodeType: 'component-api-input',
+                            value: input,
+                            api,
+                            component,
+                            path: [...path, 'apis', key, 'inputs', inputKey],
+                            rules,
+                            files,
+                            pathsToVisit,
+                            memo,
+                        }, state);
+                    }
+                }
+            }
+            for (const key in value.formulas) {
+                yield* visitNode({
+                    nodeType: 'component-formula',
+                    value: value.formulas[key],
+                    path: [...path, 'formulas', key],
+                    rules,
+                    files,
+                    pathsToVisit,
+                    memo,
+                    component,
+                }, state);
+            }
+            for (const key in value.workflows) {
+                yield* visitNode({
+                    nodeType: 'component-workflow',
+                    value: value.workflows[key],
+                    path: [...path, 'workflows', key],
+                    rules,
+                    files,
+                    pathsToVisit,
+                    memo,
+                    component,
+                }, state);
+            }
+            for (let i = 0; i < (value.events ?? []).length; i++) {
+                const event = value.events?.[i];
+                if (event) {
+                    yield* visitNode({
+                        nodeType: 'component-event',
+                        path: [...path, 'events', i],
+                        rules,
+                        files,
+                        pathsToVisit,
+                        memo,
+                        value: { component, event },
+                    }, state);
+                }
+            }
+            for (const key in value.contexts) {
+                yield* visitNode({
+                    nodeType: 'component-context',
+                    value: value.contexts[key],
+                    path: [...path, 'contexts', key],
+                    rules,
+                    files,
+                    pathsToVisit,
+                    memo,
+                }, state);
+            }
+            for (const key in value.nodes) {
+                yield* visitNode({
+                    nodeType: 'component-node',
+                    value: value.nodes[key],
+                    path: [...path, 'nodes', key],
+                    rules,
+                    files,
+                    pathsToVisit,
+                    memo,
+                    component,
+                }, state);
+            }
+            for (const [formulaPath, formula] of component.formulasInComponent()) {
+                yield* visitNode({
+                    nodeType: 'formula',
+                    value: formula,
+                    path: [...path, ...formulaPath],
+                    rules,
+                    files,
+                    pathsToVisit,
+                    memo,
+                    component,
+                }, state);
+            }
+            for (const [actionPath, action] of component.actionModelsInComponent()) {
+                yield* visitNode({
+                    nodeType: 'action-model',
+                    value: action,
+                    path: [...path, ...actionPath],
+                    rules,
+                    files,
+                    pathsToVisit,
+                    memo,
+                    component,
+                }, state);
+            }
+            break;
+        }
+        case 'project-formula':
+            if (isToddleFormula(value)) {
+                const formula = new ToddleFormula({
+                    formula: value.formula,
+                    globalFormulas: {
+                        formulas: files.formulas,
+                        packages: files.packages,
+                    },
+                });
+                formula.formulasInFormula();
+                for (const [formulaPath, f] of formula.formulasInFormula()) {
+                    yield* visitNode({
+                        nodeType: 'formula',
+                        value: f,
+                        path: [...path, ...formulaPath],
+                        rules,
+                        files,
+                        pathsToVisit,
+                        memo,
+                    }, state);
+                }
+            }
+            break;
+        case 'component-node':
+            if (value.type === 'element') {
+                const variants = value.variants;
+                if (variants) {
+                    for (let i = 0; i < variants.length; i++) {
+                        const variant = variants[i];
+                        yield* visitNode({
+                            nodeType: 'style-variant',
+                            value: { variant, element: value },
+                            path: [...path, 'variants', i],
+                            rules,
+                            files,
+                            pathsToVisit,
+                            memo,
+                        }, state);
+                    }
+                }
+            }
+            break;
+        case 'api-service': {
+            const apiService = new ToddleApiService({
+                service: value,
+                globalFormulas: {
+                    formulas: files.formulas,
+                    packages: files.packages,
+                },
+            });
+            for (const [formulaPath, formula] of apiService.formulasInService()) {
+                yield* visitNode({
+                    nodeType: 'formula',
+                    value: formula,
+                    path: [...path, ...formulaPath],
+                    rules,
+                    files,
+                    pathsToVisit,
+                    memo,
+                }, state);
+            }
+            break;
+        }
+        case 'project-route': {
+            const projectRoute = new ToddleRoute({
+                route: value,
+                globalFormulas: {
+                    formulas: files.formulas,
+                    packages: files.packages,
+                },
+            });
+            for (const [formulaPath, formula] of projectRoute.formulasInRoute()) {
+                yield* visitNode({
+                    nodeType: 'formula',
+                    value: formula,
+                    path: [...path, ...formulaPath],
+                    rules,
+                    files,
+                    pathsToVisit,
+                    memo,
+                }, state);
+            }
+            break;
+        }
+    }
+}
+//# sourceMappingURL=searchProject.js.map

package/dist/searchProject.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"searchProject.js","sourceRoot":"","sources":["../src/searchProject.ts"],"names":[],"mappings":"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"}

package/dist/util/helpers.js

@@ -0,0 +1,34 @@
+export function shouldSearchPath(path, pathsToVisit = []) {
+    return (pathsToVisit.length === 0 ||
+        pathsToVisit.some((pathToVisit) => pathToVisit.every((p1, i) => path[i] === p1)));
+}
+export const isLegacyAction = (model) => {
+    switch (model.type) {
+        case 'Custom':
+        case undefined:
+            // Legacy action has no version, while newer ones have a version 2+
+            return !model.version && LEGACY_CUSTOM_ACTIONS.has(model.name);
+    }
+    return false;
+};
+const LEGACY_CUSTOM_ACTIONS = new Set([
+    'If',
+    'PreventDefault',
+    'StopPropagation',
+    'Copy To Clipboard',
+    'CopyToClipboard',
+    'UpdateVariable',
+    'Update Variable',
+    'Update URL parameter',
+    'updateUrlParameters',
+    'UpdateQueryParam',
+    'Update Query',
+    'Fetch',
+    'SetTimeout',
+    'SetInterval',
+    'FocusElement',
+    'Debug',
+    'GoToURL',
+    'TriggerEvent',
+]);
+//# sourceMappingURL=helpers.js.map

package/dist/util/helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/util/helpers.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,gBAAgB,CAC9B,IAAyB,EACzB,eAA2B,EAAE;IAE7B,OAAO,CACL,YAAY,CAAC,MAAM,KAAK,CAAC;QACzB,YAAY,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAChC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAC7C,CACF,CAAA;AACH,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,KAAkB,EAAE,EAAE;IACnD,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS;YACZ,mEAAmE;YACnE,OAAO,CAAC,KAAK,CAAC,OAAO,IAAI,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAClE,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAC;IACpC,IAAI;IACJ,gBAAgB;IAChB,iBAAiB;IACjB,mBAAmB;IACnB,iBAAiB;IACjB,gBAAgB;IAChB,iBAAiB;IACjB,sBAAsB;IACtB,qBAAqB;IACrB,kBAAkB;IAClB,cAAc;IACd,OAAO;IACP,YAAY;IACZ,aAAa;IACb,cAAc;IACd,OAAO;IACP,SAAS;IACT,cAAc;CACf,CAAC,CAAA"}

package/package.json

@@ -0,0 +1,21 @@
+{
+"name": "@nordcraft/search",
+"description": "Used for searching and reporting linting problems in toddle projects.",
+"type": "module",
+"license": "Apache-2.0",
+"homepage": "https://github.com/nordcraftengine/nordcraft",
+"dependencies": {
+"@nordcraft/ssr": "1.0.0"
+},
+"scripts": {
+"build": "tsc",
+"npm-publish": "bun run build && bun publish --access public",
+"typecheck": "tsc --noEmit",
+"watch": "tsc -w",
+"test": "bun test",
+"test:watch": "bun test --watch",
+"test:watch:only": "bun test --watch --only"
+},
+"files": ["dist", "src"],
+"version": "1.0.0"
+}