@wix/origami-lint 1.34.10 → 1.34.12

package/dist/page-model/index.js

@@ -1,5 +1,5 @@
 // Part 2 — page model: which pages to lint, and one page's model (its components, each with its CSS).
 export * from "./model.js";
 export { buildPageModel } from "./build-page-model.js";
-export { findPagesToLint, JSX_FILES } from "./pages.js";
+export { findPages, findPagesToLint, JSX_FILES } from "./pages.js";
 export { readPage } from "./read-page.js";

package/dist/rules/index.js

@@ -1,17 +1,17 @@
-import allowedImports from "./allowed-imports.js";
-import applyAndPresets from "./apply-and-presets.js";
-import bindings from "./bindings.js";
-import breakpoints from "./breakpoints.js";
-import cssFileNesting from "./css-file-nesting.js";
-import cssLayoutProperties from "./css-layout-properties.js";
-import cssSelectors from "./css-selectors.js";
-import dataValues from "./data-values.js";
-import globalStyles from "./global-styles.js";
-import noAbsoluteSection from "./no-absolute-section.js";
-import pageStructure from "./page-structure.js";
-import slotAttributes from "./slot-attributes.js";
-import themeFontIds from "./theme-font-ids.js";
-import themeRoot from "./theme-root.js";
-import noFreeCode from "./no-free-code.js";
+import allowedImports from "./site-app/allowed-imports.js";
+import applyAndPresets from "./site-app/apply-and-presets.js";
+import bindings from "./site-app/bindings.js";
+import breakpoints from "./site-app/breakpoints.js";
+import cssFileNesting from "./site-app/css-file-nesting.js";
+import cssLayoutProperties from "./site-app/css-layout-properties.js";
+import cssSelectors from "./site-app/css-selectors.js";
+import dataValues from "./site-app/data-values.js";
+import globalStyles from "./site-app/global-styles.js";
+import noAbsoluteSection from "./site-app/no-absolute-section.js";
+import pageStructure from "./site-app/page-structure.js";
+import slotAttributes from "./site-app/slot-attributes.js";
+import themeFontIds from "./site-app/theme-font-ids.js";
+import themeRoot from "./site-app/theme-root.js";
+import noFreeCode from "./site-app/no-free-code.js";
 export const ruleRegistry = [allowedImports, noFreeCode, pageStructure, noAbsoluteSection, themeFontIds, slotAttributes, themeRoot, breakpoints, cssFileNesting, globalStyles, applyAndPresets, bindings, dataValues, cssLayoutProperties, cssSelectors];
-export { defineRule } from "./define-rule.js";
+export { defineRule } from "./site-app/define-rule.js";

package/dist/rules/project/home-page-folder.js

@@ -0,0 +1,54 @@
+// The home page folder (tracker OUR-035, CONV-unitPath.ts:89): exactly one folder in parentheses, pages/(<slug>), directly
+// under pages/, and no other folder in parentheses in pages/ or popups/. `origami import-site` stops without exactly one
+// home folder and refuses a nested one; the converter refuses a popup folder in parentheses.
+import { findPages } from "../../page-model/index.js";
+import { PAGES_FOLDER, POPUPS_FOLDER } from "../../shared/site-files-tree-mapping.js";
+import { defineProjectRule } from "./define-project-rule.js";
+const EXPECTED_ONE_HOME = `Expected exactly one home page folder "pages/(<slug>)" in ${PAGES_FOLDER}`;
+export const NO_HOME = `${EXPECTED_ONE_HOME}; found 0. Name the home page's folder in parentheses, directly under ${PAGES_FOLDER}, like ${PAGES_FOLDER}/(home) (rule P2-R01; tracker OUR-035). The import stops without it.`;
+export const moreHomes = (count, folder) => `${EXPECTED_ONE_HOME}; found ${count}. Keep the parentheses on the home page's folder only: rename ${folder} to ${withoutParentheses(folder)} (rule P2-R01; tracker OUR-035).`;
+export const onlyHomeInParentheses = (folder) => `Only the home page is written in parentheses, directly under ${PAGES_FOLDER}/. Rename ${folder} to ${withoutParentheses(folder)} (rule P2-R23; tracker CONV-unitPath.ts:89).`;
+/** A home page's folder: its name in parentheses, `(home)`. */
+const HOME_FOLDER = /^\(.+\)$/;
+export default defineProjectRule({
+    name: 'home-page-folder',
+    editors: ['studio2'],
+    check: (project) => [...checkOneHome(project), ...checkNoNestedHome(project), ...checkNoPopupInParentheses(project)],
+});
+// ── the steps ──
+/** Reports no home folder at the top of pages/, or more than one (each after the first). */
+function checkOneHome(project) {
+    const homes = getPages(project).filter((page) => page.folders.length === 1 && HOME_FOLDER.test(page.folders[0]));
+    if (homes.length === 0)
+        return [{ file: PAGES_FOLDER, message: NO_HOME }];
+    return homes.slice(1).map((home) => ({ file: home.jsxFile, message: moreHomes(homes.length, home.folders[0]) }));
+}
+/** Reports every page with a folder in parentheses below the top of pages/ on its path, as import-site refuses them. */
+function checkNoNestedHome(project) {
+    return getPages(project).flatMap((page) => {
+        const nested = page.folders.slice(1).find((folder) => HOME_FOLDER.test(folder));
+        return nested ? [{ file: page.jsxFile, message: onlyHomeInParentheses(nested) }] : [];
+    });
+}
+/** Reports each folder in parentheses under popups/, once, as the converter refuses them. */
+function checkNoPopupInParentheses(project) {
+    const folders = new Set();
+    for (const file of project.files.filter((file) => file.startsWith(`${POPUPS_FOLDER}/`))) {
+        const segments = file.slice(`${POPUPS_FOLDER}/`.length).split('/').slice(0, -1);
+        const index = segments.findIndex((segment) => HOME_FOLDER.test(segment));
+        if (index !== -1)
+            folders.add(`${POPUPS_FOLDER}/${segments.slice(0, index + 1).join('/')}`);
+    }
+    return [...folders].sort().map((folder) => ({ file: folder, message: onlyHomeInParentheses(folder.slice(folder.lastIndexOf('/') + 1)) }));
+}
+/** The site's pages under pages/, sorted by path. */
+function getPages(project) {
+    return findPages([...project.files], [...project.files])
+        .filter((jsxFile) => jsxFile.startsWith(`${PAGES_FOLDER}/`))
+        .sort()
+        .map((jsxFile) => ({ jsxFile, folders: jsxFile.slice(`${PAGES_FOLDER}/`.length).split('/').slice(0, -1) }));
+}
+/** '(team)' → 'team'. */
+function withoutParentheses(folder) {
+    return folder.slice(1, -1);
+}

package/dist/rules/project/index.js

@@ -1,2 +1,3 @@
+import homePageFolder from "./home-page-folder.js";
 export { defineProjectRule } from "./define-project-rule.js";
-export const projectRuleRegistry = [];
+export const projectRuleRegistry = [homePageFolder];

package/dist/rules/rule-base.js

@@ -0,0 +1,2 @@
+// What every rule has, whatever it runs on: a page rule (`Rule`, in site-app/) or a project rule (`ProjectRule`, in project/).
+export {};

package/dist/rules/{allowed-imports.js → site-app/allowed-imports.js}

@@ -2,9 +2,9 @@
 // converter 0.80 a page's interactions live in servicesConfigs/interactions.ts, and structure.jsx can't use these packages (0.86
 // refuses a tag from them, parseJsx.ts:471, identity.ts:80; a call is free code, and fn() / ctx() refuse them as a source).
 import path from 'node:path';
-import { CSS_FILES, JSX_FILES } from "../page-model/index.js";
-import { BUILDERS, RUNTIME_ONLY_BUILDERS, RUNTIME_PACKAGE } from "../rules-api/index.js";
-import { GLOBAL_COMPONENTS, GLOBAL_COMPONENTS_FOLDER, GLOBAL_FOLDER, SITE_SRC } from "../shared/site-files-tree-mapping.js";
+import { CSS_FILES, JSX_FILES } from "../../page-model/index.js";
+import { BUILDERS, RUNTIME_ONLY_BUILDERS, RUNTIME_PACKAGE } from "../../rules-api/index.js";
+import { GLOBAL_COMPONENTS, GLOBAL_COMPONENTS_FOLDER, GLOBAL_FOLDER, SITE_SRC } from "../../shared/site-files-tree-mapping.js";
 import { defineRule } from "./define-rule.js";
 /** The interactions packages, which the import reserves: structure.jsx imports nothing from them. Matched by source, not by name: `Interact` from @site/site-code is the site's own. */
 const INTERACTIONS_PACKAGES = ['interactReact', 'interact', 'motionPresets'];

package/dist/rules/{apply-and-presets.js → site-app/apply-and-presets.js}

@@ -1,4 +1,4 @@
-import { createCssFileReporter, describeAtRule, getCssChildren, getDashedId, getSegmentClass, getSelectorSegments, isPresetProperty, isSafeCssIdentifier } from "../rules-api/index.js";
+import { createCssFileReporter, describeAtRule, getCssChildren, getDashedId, getSegmentClass, getSelectorSegments, isPresetProperty, isSafeCssIdentifier } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 export default defineRule({
     name: 'apply-and-presets',

package/dist/rules/{bindings.js → site-app/bindings.js}

@@ -1,4 +1,4 @@
-import { BUILDERS, CALLBACK_PROP, EVENT_ATTRIBUTE, RESERVED_ENTRY_KEYS, RUNTIME_PACKAGE, TRANSFORM_BUILDERS, TYPED_BUILDERS, bare, getAttribute, getExpression, getKey, getCallbackKind, getName, getObject, getParamReadKind, getProperties, getProperty, isBound, isReservedAttribute, isStructure, ownerOf, } from "../rules-api/index.js";
+import { BUILDERS, CALLBACK_PROP, EVENT_ATTRIBUTE, RESERVED_ENTRY_KEYS, RUNTIME_PACKAGE, TRANSFORM_BUILDERS, TYPED_BUILDERS, bare, getAttribute, getExpression, getKey, getCallbackKind, getName, getObject, getParamReadKind, getProperties, getProperty, isBound, isReservedAttribute, isStructure, ownerOf, } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 /** The converter's reserved sources (identity.ts `isReservedRegistry`) and the DM's own `document`: no fn()/ctx() names. */
 const RESERVED_FOR_BINDINGS = ['runtime', 'interactReact', 'interact', 'motionPresets', 'menu', 'document', 'core'];

package/dist/rules/{breakpoints.js → site-app/breakpoints.js}

@@ -1,4 +1,4 @@
-import { describeAtRule, reportCssProblem } from "../rules-api/index.js";
+import { describeAtRule, reportCssProblem } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 /** The converter's shape for a declaration's name: a dashed identifier. */
 const DASHED_NAME = /^--[A-Za-z0-9_-]+$/;

package/dist/rules/{css-file-nesting.js → site-app/css-file-nesting.js}

@@ -1,4 +1,4 @@
-import { BREAKPOINT_AT_RULES, createCssFileReporter, describeAtRule, getCssChildren, ORIGAMI_TARGETS, PREAMBLE_LAYER } from "../rules-api/index.js";
+import { BREAKPOINT_AT_RULES, createCssFileReporter, describeAtRule, getCssChildren, ORIGAMI_TARGETS, PREAMBLE_LAYER } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 /** The import's leading-import line (cssFileParser.ts `IMPORT_LINE_PATTERN`). */
 const IMPORT_LINE = /^@import '([^']+)';$/;

package/dist/rules/{css-layout-properties.js → site-app/css-layout-properties.js}

@@ -1,4 +1,4 @@
-import { CONTENT_TARGET, createCssFileReporter, getName, LAYER_ATTRIBUTES, OVERFLOW_TARGET } from "../rules-api/index.js";
+import { CONTENT_TARGET, createCssFileReporter, getName, LAYER_ATTRIBUTES, OVERFLOW_TARGET } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 // ── the tables (propSpecs.ts) ──
 const keywords = (...values) => ({ values, allowed: values.join(', ') });

package/dist/rules/{css-selectors.js → site-app/css-selectors.js}

@@ -1,4 +1,4 @@
-import { BREAKPOINT_AT_RULES, createCssFileReporter, getSelectorSegments, isCssIdentifier, isSafeCssIdentifier, PREAMBLE_LAYER, readSegment } from "../rules-api/index.js";
+import { BREAKPOINT_AT_RULES, createCssFileReporter, getSelectorSegments, isCssIdentifier, isSafeCssIdentifier, PREAMBLE_LAYER, readSegment } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 /** The at-rules whose rules the import reads: breakpoint blocks, and a `@mixin`'s `@result`. */
 const READ_AT_RULES = [...BREAKPOINT_AT_RULES, 'result'];

package/dist/rules/{data-values.js → site-app/data-values.js}

@@ -2,7 +2,7 @@
 // 1227, 1231, 1235, 1255, 1268, 1289, 1697; projectData.ts 214, 225, 281, 435, 443; enrichImage.ts 94, 105.
 // Converter 0.81 (checked at 0.84, 2c0e21c): the tag's import, not a `type` attr, decides if a component takes data attributes; `type` is data.
 import { isDeepStrictEqual } from 'node:util';
-import { DATA_KEY, EVENT_ATTRIBUTE, RESERVED_ATTRIBUTES, RESERVED_ENTRY_KEYS, bare, getAttribute, getExpression, getKey, getName, getObject, getProperties, getCallbackKind, getProperty, isBound, isOneEditAway, isReservedAttribute, isStructure, ownerOf, } from "../rules-api/index.js";
+import { DATA_KEY, EVENT_ATTRIBUTE, RESERVED_ATTRIBUTES, RESERVED_ENTRY_KEYS, bare, getAttribute, getExpression, getKey, getName, getObject, getProperties, getCallbackKind, getProperty, isBound, isOneEditAway, isReservedAttribute, isStructure, ownerOf, } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 /** The names the import never reads as data (dataKeys.ts). The React name is joined as the converter does: Wix Standards fails the build on it in any file. */
 const EXCLUDED_DATA_KEYS = [

package/dist/rules/{global-styles.js → site-app/global-styles.js}

@@ -1,4 +1,4 @@
-import { BREAKPOINT_AT_RULES, createCssFileReporter, describeAtRule, getCssChildren, getDashedId, getSegmentClass, getSelectorSegments, isCssIdentifier, isSafeCssIdentifier } from "../rules-api/index.js";
+import { BREAKPOINT_AT_RULES, createCssFileReporter, describeAtRule, getCssChildren, getDashedId, getSegmentClass, getSelectorSegments, isCssIdentifier, isSafeCssIdentifier } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 export default defineRule({
     name: 'global-styles',

package/dist/rules/{no-absolute-section.js → site-app/no-absolute-section.js}

@@ -1,4 +1,4 @@
-import { SECTIONS } from "../rules-api/index.js";
+import { SECTIONS } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 export default defineRule({
     name: 'no-absolute-section',

package/dist/rules/{no-free-code.js → site-app/no-free-code.js}

@@ -1,4 +1,4 @@
-import { STRUCTURE } from "../rules-api/index.js";
+import { STRUCTURE } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 const FREE_CODE = 'The import refuses this statement: a structure file holds only imports, `const` / `let` / `var` declarations and `export const Structure = () => …` (tracker CONV-parseJsx.ts:287).';
 const STRUCTURE_SHAPE = 'Declare Structure once, as `export const Structure = () => ( <Page …/> )`: an exported const arrow that returns the root element directly, with no `{ return … }`, fragment or condition around it (tracker CONV-parseJsx.ts:335).';

package/dist/rules/{page-structure.js → site-app/page-structure.js}

@@ -19,8 +19,8 @@
 // <Interaction> is no wrapper since converter 0.80 (interactions live in servicesConfigs/interactions.ts): allowed-imports
 // reports the tag, and it stays transparent here so the elements inside it aren't reported too. Context-provider wrappers join
 // once the page model lists the providers.
-import { FILE_START } from "../page-model/index.js";
-import { LAYER_ATTRIBUTES, SECTIONS, WRAPPERS } from "../rules-api/index.js";
+import { FILE_START } from "../../page-model/index.js";
+import { LAYER_ATTRIBUTES, SECTIONS, WRAPPERS } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 export default defineRule({
     name: 'page-structure',

package/dist/rules/{slot-attributes.js → site-app/slot-attributes.js}

@@ -5,7 +5,7 @@
 // - the root element has no `slot=`: it has no owner to be a slot of (CONV-fromBundle.ts:1312);
 // - two children of one owner don't share a slot key (CONV-slots.ts:555).
 // Children are the element children and the layer elements (backgroundLayer, pinnedLayer); <Remove> and <Interaction> are transparent.
-import { LAYER_ATTRIBUTES, WRAPPERS } from "../rules-api/index.js";
+import { LAYER_ATTRIBUTES, WRAPPERS } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 export default defineRule({
     name: 'slot-attributes',

package/dist/rules/{theme-font-ids.js → site-app/theme-font-ids.js}

@@ -5,7 +5,7 @@
 // theme.css isn't a file oxlint lints, so the rule runs on each linted page (a theme change lints every page) and
 // marks the page's start; the message names the token's line in theme.css.
 import { fonts } from '@wix/origami-fonts';
-import { reportCssProblem } from "../rules-api/index.js";
+import { reportCssProblem } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 const FONT_TOKEN = /^--wst-[\w-]+-font$/;
 // The size in a `font` shorthand, with its optional line height: the family follows it. The number's quantifiers

package/dist/rules/{theme-root.js → site-app/theme-root.js}

@@ -1,4 +1,4 @@
-import { describeAtRule, isPresetProperty, PREAMBLE_LAYER, reportCssProblem } from "../rules-api/index.js";
+import { describeAtRule, isPresetProperty, PREAMBLE_LAYER, reportCssProblem } from "../../rules-api/index.js";
 import { defineRule } from "./define-rule.js";
 const SPX_PROPS = ['--spx-ref-width', '--spx-resolver-type'];
 const SPX_RESOLVERS = ['scale', 'fixed'];

package/dist/shared/site-files-tree-mapping.js

@@ -2,6 +2,8 @@
 export const SITE_SRC = 'packages/site-app/src';
 /** One page per folder; routes can be nested (about-us/team). */
 export const PAGES_FOLDER = `${SITE_SRC}/pages`;
+/** One popup per folder, directly under it (popups have no url, so no nesting). */
+export const POPUPS_FOLDER = `${SITE_SRC}/popups`;
 /** What every page shares: the global components, the menus, the theme. */
 export const GLOBAL_FOLDER = `${SITE_SRC}/global`;
 /** Inside src/: one global component per folder (the header, the footer, any other shared section). A page imports one from here. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/origami-lint",
-  "version": "1.34.10",
+  "version": "1.34.12",
   "description": "Offline lint for an exported Origami site: lints the pages that changed since the last passing run",
   "type": "module",
   "bin": {
@@ -52,5 +52,5 @@
       ]
     }
   },
-  "falconPackageHash": "df5ca3b838244854a52ae4013469c645c6bd6d3e1651ee3702545903"
+  "falconPackageHash": "c50f6ccef419b969c9a223c3355e8bf3623b41236d615b837ffd5283"
 }