@nordcraft/search 1.0.39 → 1.0.41

package/src/rules/formulas/noReferenceProjectFormulaRule.ts

@@ -1,92 +1,106 @@
 import { ToddleComponent } from '@nordcraft/core/dist/component/ToddleComponent'
 import type { Formula } from '@nordcraft/core/dist/formula/formula'
 import { isToddleFormula } from '@nordcraft/core/dist/formula/formulaTypes'
+import { omit } from '@nordcraft/core/dist/utils/collections'
 import { ToddleApiService } from '@nordcraft/ssr/dist/ToddleApiService'
 import { ToddleRoute } from '@nordcraft/ssr/dist/ToddleRoute'
-import type { Rule } from '../../types'
+import type { NodeType, Rule } from '../../types'
 
 export const noReferenceProjectFormulaRule: Rule<void> = {
   code: 'no-reference project formula',
   level: 'warning',
   category: 'No References',
-  visit: (report, { path, files, value, nodeType, memo }) => {
-    if (nodeType !== 'project-formula' || value.exported === true) {
+  visit: (report, details) => {
+    if (hasReferences(details)) {
       return
     }
+    report(details.path, undefined, ['delete-project-formula'])
+  },
+  fixes: {
+    'delete-project-formula': (data) => {
+      if (hasReferences(data)) {
+        return
+      }
+      return omit(data.files, data.path)
+    },
+  },
+}
 
-    // Check in all API services first, since that should be quick
-    for (const apiService of Object.values(files.services ?? {})) {
-      const service = new ToddleApiService({
-        service: apiService,
-        globalFormulas: { formulas: files.formulas, packages: files.packages },
-      })
-      const formulas = service.formulasInService()
-      for (const { path: _formulaPath, formula } of formulas) {
-        // Check if the formula is used in the formula
-        if (checkFormula(formula, value.name)) {
-          return
-        }
+export type NoReferenceProjectFormulaRuleFix = 'delete-project-formula'
+
+const hasReferences = ({ value, files, nodeType, memo }: NodeType) => {
+  if (nodeType !== 'project-formula' || value.exported === true) {
+    return true
+  }
+
+  // Check in all API services first, since that should be quick
+  for (const apiService of Object.values(files.services ?? {})) {
+    const service = new ToddleApiService({
+      service: apiService,
+      globalFormulas: { formulas: files.formulas, packages: files.packages },
+    })
+    const formulas = service.formulasInService()
+    for (const { path: _formulaPath, formula } of formulas) {
+      // Check if the formula is used in the formula
+      if (checkFormula(formula, value.name)) {
+        return true
       }
     }
+  }
 
-    // Check routes before components, since they should be quicker
-    for (const projectRoute of Object.values(files.routes ?? {})) {
-      const route = new ToddleRoute({
-        route: projectRoute,
-        globalFormulas: { formulas: files.formulas, packages: files.packages },
-      })
-      const formulas = route.formulasInRoute()
-      for (const { path: _formulaPath, formula } of formulas) {
-        // Check if the formula is used in the formula
-        if (checkFormula(formula, value.name)) {
-          return
-        }
+  // Check routes before components, since they should be quicker
+  for (const projectRoute of Object.values(files.routes ?? {})) {
+    const route = new ToddleRoute({
+      route: projectRoute,
+      globalFormulas: { formulas: files.formulas, packages: files.packages },
+    })
+    const formulas = route.formulasInRoute()
+    for (const { path: _formulaPath, formula } of formulas) {
+      // Check if the formula is used in the formula
+      if (checkFormula(formula, value.name)) {
+        return true
       }
     }
+  }
 
-    const componentFormulaReferences = memo(
-      'componentFormulaReferences',
-      () => {
-        const usedFormulas = new Set<string>()
-        for (const component of Object.values(files.components)) {
-          const c = new ToddleComponent({
-            // Enforce that the component is not undefined since we're iterating
-            component: component!,
-            getComponent: (name) => files.components[name],
-            packageName: undefined,
-            globalFormulas: {
-              formulas: files.formulas,
-              packages: files.packages,
-            },
-          })
-          for (const { formula } of c.formulasInComponent()) {
-            if (formula.type === 'function') {
-              usedFormulas.add(formula.name)
-            }
-          }
+  const componentFormulaReferences = memo('componentFormulaReferences', () => {
+    const usedFormulas = new Set<string>()
+    for (const component of Object.values(files.components)) {
+      const c = new ToddleComponent({
+        // Enforce that the component is not undefined since we're iterating
+        component: component!,
+        getComponent: (name) => files.components[name],
+        packageName: undefined,
+        globalFormulas: {
+          formulas: files.formulas,
+          packages: files.packages,
+        },
+      })
+      for (const { formula } of c.formulasInComponent()) {
+        if (formula.type === 'function') {
+          usedFormulas.add(formula.name)
         }
-        return usedFormulas
-      },
-    )
-
-    if (componentFormulaReferences.has(value.name)) {
-      return
+      }
     }
+    return usedFormulas
+  })
 
-    // TODO: Memoize similar to above. We need have a helper class `ToddleFormula` with `ToddleFormula.normalizeFormulas()`
-    for (const f of Object.values(files.formulas ?? {})) {
-      if (f.name === value.name) {
-        continue
-      }
+  if (componentFormulaReferences.has(value.name)) {
+    return true
+  }
 
-      // Check if the formula is used in the formula
-      if (isToddleFormula(f) && checkFormula(f.formula, value.name)) {
-        return
-      }
+  // TODO: Memoize similar to above. We need have a helper class `ToddleFormula` with `ToddleFormula.normalizeFormulas()`
+  for (const f of Object.values(files.formulas ?? {})) {
+    if (f.name === value.name) {
+      continue
     }
 
-    report(path)
-  },
+    // Check if the formula is used in the formula
+    if (isToddleFormula(f) && checkFormula(f.formula, value.name)) {
+      return true
+    }
+  }
+  return false
 }
 
 const checkArguments = (

package/src/types.d.ts

@@ -21,8 +21,10 @@ import type {
   Route,
   ToddleProject,
 } from '@nordcraft/ssr/dist/ssr.types'
+import type { LegacyActionRuleFix } from './rules/actions/legacyActionRule'
 import type { NoReferenceComponentRuleFix } from './rules/components/noReferenceComponentRule'
 import type { LegacyFormulaRuleFix } from './rules/formulas/legacyFormulaRule'
+import type { NoReferenceProjectFormulaRuleFix } from './rules/formulas/noReferenceProjectFormulaRule'
 
 type Code =
   | 'ambiguous style variable syntax'
@@ -311,7 +313,11 @@ export type NodeType =
   | ProjectRoute
   | StyleVariantNode
 
-type FixType = LegacyFormulaRuleFix | NoReferenceComponentRuleFix
+type FixType =
+  | LegacyFormulaRuleFix
+  | LegacyActionRuleFix
+  | NoReferenceComponentRuleFix
+  | NoReferenceProjectFormulaRuleFix
 
 export interface Rule<T = unknown, V = NodeType> {
   category: Category

package/src/util/helpers.ts

@@ -1,7 +1,10 @@
 import type {
   ActionModel,
+  CustomActionArgument,
+  CustomActionModel,
   ElementNodeModel,
 } from '@nordcraft/core/dist/component/component.types'
+import type { FunctionArgument } from '@nordcraft/core/dist/formula/formula'
 import { isDefined } from '@nordcraft/core/dist/utils/util'
 
 /**
@@ -44,7 +47,9 @@ export function shouldSearchExactPath({
   )
 }
 
-export const isLegacyAction = (model: ActionModel) => {
+export const isLegacyAction = (
+  model: ActionModel,
+): model is CustomActionModel => {
   switch (model.type) {
     case 'Custom':
     case undefined:
@@ -58,14 +63,12 @@ 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',
@@ -74,6 +77,7 @@ const LEGACY_CUSTOM_ACTIONS = new Set([
   'GoToURL',
   'TriggerEvent',
   'Set session cookies',
+  '@toddle/setSessionCookies',
 ])
 
 interface BaseInteractiveContent {
@@ -130,3 +134,24 @@ export const interactiveContentElementDefinition = (
     }
     return true
   })
+
+export const ARRAY_ARGUMENT_MAPPINGS = { List: 'Array' }
+export const PREDICATE_ARGUMENT_MAPPINGS = {
+  ...ARRAY_ARGUMENT_MAPPINGS,
+  'Predicate fx': 'Formula',
+}
+
+export const renameArguments = <
+  T extends FunctionArgument | CustomActionArgument,
+>(
+  mappings: Record<string, string>,
+  args: T[] | undefined,
+): T[] =>
+  args?.map((arg) => ({
+    ...arg,
+    // Let's adjust the names
+    name:
+      typeof arg.name === 'string'
+        ? (mappings[arg.name] ?? arg.name)
+        : arg.name,
+  })) ?? []