@rettangoli/fe 1.0.3 → 1.1.0

package/README.md

@@ -35,7 +35,6 @@ rtgl fe watch     # Start dev server
 - [Snabbdom](https://github.com/snabbdom/snabbdom) - Virtual DOM
 - [Immer](https://github.com/immerjs/immer) - Immutable state management
 - [Jempl](https://github.com/yuusoft-org/jempl) - Template engine
-- [RxJS](https://github.com/ReactiveX/rxjs) - Reactive programming
 
 **Build & Development:**
 - [Vite](https://vite.dev/) - Dev server and production bundling
@@ -196,7 +195,7 @@ Use this workflow:
 Docker image:
 
 ```bash
-IMAGE="han4wluc/rtgl:playwright-v1.57.0-rtgl-v1.0.0-rc27"
+IMAGE="han4wluc/rtgl:playwright-v1.57.0-rtgl-v1.0.12"
 ```
 
 Dashboard suite:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rettangoli/fe",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "Frontend framework for building reactive web components",
   "type": "module",
   "main": "./src/index.js",
@@ -18,7 +18,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/yuusoft-org/rettangoli.git"
+    "url": "https://github.com/yuusoft-org/rettangoli",
+    "directory": "packages/rettangoli-fe"
   },
   "license": "MIT",
   "exports": {
@@ -32,9 +33,8 @@
   },
   "dependencies": {
     "immer": "^10.1.1",
-    "jempl": "0.3.2-rc2",
+    "jempl": "1.0.1",
     "js-yaml": "^4.1.0",
-    "rxjs": "^7.8.2",
     "snabbdom": "^3.6.2",
     "vite": "^6.3.5"
   },

package/src/cli/examples.js

@@ -3,9 +3,7 @@ import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { load as loadYaml, loadAll } from "js-yaml";
 import { render, parse } from "jempl";
 
-import {
-  flattenArrays,
-} from "../common.js";
+import { flattenArrays } from "../utils/flattenArrays.js";
 import { extractCategoryAndComponent } from "../commonBuild.js";
 import { getAllFiles } from "../commonBuild.js";
 import path, { dirname } from "node:path";

package/src/cli/frontendEntrySource.js

@@ -113,6 +113,10 @@ export const generateFrontendEntrySource = ({
     } else if (YAML_FILE_TYPES.has(fileType)) {
       const yamlObject = readYamlObject(filePath);
 
+      if (fileType === "view" || fileType === "schema") {
+        componentContractEntry.yamlObject = structuredClone(yamlObject);
+      }
+
       if (fileType === "view") {
         try {
           yamlObject.template = parseTemplate(yamlObject.template);
@@ -127,10 +131,6 @@ export const generateFrontendEntrySource = ({
         validateConstantsRoot({ filePath, yamlObject, errorPrefix });
       }
 
-      if (fileType === "view" || fileType === "schema") {
-        componentContractEntry.yamlObject = yamlObject;
-      }
-
       declarationLines.push(
         `const ${declarationName} = ${JSON.stringify(yamlObject)};`,
       );

package/src/common.js

@@ -1,36 +1,3 @@
-import { Subject } from "rxjs";
-
-/**
- * A custom subject that can be used to dispatch actions and subscribe to them
- * You can think of this as a bus for all frontend events and communication
- *
- * Example:
- * const subject = new CustomSubject();
- *
- * const subscription = subject.subscribe(({ action, payload }) => {
- *   // handle action and payload
- * });
- *
- * subject.dispatch("action", { payload: "payload" });
- *
- * subscription.unsubscribe();
- */
-export class CustomSubject {
-  _subject = new Subject();
-  pipe = (...args) => {
-    return this._subject.pipe(...args);
-  };
-  dispatch = (action, payload) => {
-    this._subject.next({
-      action,
-      payload: payload || {},
-    });
-  };
-  dispatchCall = (action, payload) => {
-    return () => this.dispatch(action, payload || {});
-  };
-}
-
 const getQueryParamsObject = () => {
   const queryParams = new URLSearchParams(window.location.search + "");
   const paramsObject = {};
@@ -164,34 +131,4 @@ export function createHttpClient(config) {
   return httpClient;
 }
 
-
-
-
-
-
-// Helper function to flatten arrays while preserving object structure
-export const flattenArrays = (items) => {
-  if (!Array.isArray(items)) {
-    return items;
-  }
-
-  return items.reduce((acc, item) => {
-    if (Array.isArray(item)) {
-      // Recursively flatten nested arrays
-      acc.push(...flattenArrays(item));
-    } else {
-      // If it's an object with nested arrays, process those too
-      if (item && typeof item === "object") {
-        const entries = Object.entries(item);
-        if (entries.length > 0) {
-          const [key, value] = entries[0];
-          if (Array.isArray(value)) {
-            item = { [key]: flattenArrays(value) };
-          }
-        }
-      }
-      acc.push(item);
-    }
-    return acc;
-  }, []);
-};
+export { flattenArrays } from "./utils/flattenArrays.js";

package/src/core/contracts/componentFiles.js

@@ -1,3 +1,5 @@
+import { findUnsupportedTemplatePropertyBindingSyntax } from "../view/templatePropertyBindings.js";
+
 export const FORBIDDEN_VIEW_KEYS = Object.freeze([
   "elementName",
   "viewDataSchema",
@@ -7,24 +9,6 @@ export const FORBIDDEN_VIEW_KEYS = Object.freeze([
   "attrsSchema",
 ]);
 
-const LEGACY_PROP_BINDING_REGEX = /(^|\s)\.[A-Za-z_][A-Za-z0-9_-]*\s*=/;
-
-const hasLegacyDotPropBinding = (node) => {
-  if (Array.isArray(node)) {
-    return node.some((item) => hasLegacyDotPropBinding(item));
-  }
-  if (!node || typeof node !== "object") {
-    return false;
-  }
-
-  return Object.entries(node).some(([key, value]) => {
-    if (LEGACY_PROP_BINDING_REGEX.test(key)) {
-      return true;
-    }
-    return hasLegacyDotPropBinding(value);
-  });
-};
-
 export const buildComponentContractIndex = (entries = []) => {
   const index = {};
 
@@ -99,10 +83,10 @@ export const validateComponentContractIndex = (index = {}) => {
         });
       });
 
-      if (hasLegacyDotPropBinding(viewYaml.template)) {
+      if (findUnsupportedTemplatePropertyBindingSyntax(viewYaml.template)) {
         errors.push({
           code: "RTGL-CONTRACT-003",
-          message: `${componentLabel}: legacy '.prop=' binding is not supported. Use ':prop=' in .view.yaml.`,
+          message: `${componentLabel}: legacy property binding syntax is not supported. Use ':prop=\${value}' in .view.yaml.`,
           filePath: viewFilePath || representativeFile,
         });
       }

package/src/core/view/bindings.js

@@ -149,7 +149,7 @@ export const parseNodeBindings = ({
     }
     if (Object.prototype.hasOwnProperty.call(props, normalizedPropName)) {
       throw new Error(
-        `[Parser] Duplicate prop binding '${normalizedPropName}' on '${tagName}'. Use only one of 'name=value' or ':name=value'.`,
+        `[Parser] Duplicate prop binding '${normalizedPropName}' on '${tagName}'. Use only one of 'name=value' or ':name=\${expr}'.`,
       );
     }
     props[normalizedPropName] = propValue;

package/src/core/view/templatePropertyBindings.js

@@ -0,0 +1,276 @@
+import { parse as parseTemplate } from "jempl";
+import { NodeType } from "jempl/src/parse/constants.js";
+
+const ATTR_ASSIGNMENT_REGEX = /(\S+?)=(?:\"([^\"]*)\"|\'([^\']*)\'|([^\s]*))/g;
+const LOOP_DIRECTIVE_REGEX = /^\$for\s+([A-Za-z_][A-Za-z0-9_]*)(?:\s*,\s*([A-Za-z_][A-Za-z0-9_]*))?\s+in\s+.+$/;
+const INTERPOLATION_ONLY_REGEX = /^\$\{([^{}]+)\}$/;
+const SIMPLE_PATH_REGEX = /^[A-Za-z_][A-Za-z0-9_]*(?:(?:\.[A-Za-z_][A-Za-z0-9_]*)|\[(?:\d+|"(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*')\])*$/;
+
+const normalizedTemplateCache = new WeakSet();
+
+const extendScopeVars = (scopeVars, itemVar, indexVar) => {
+  const nextScopeVars = new Set(scopeVars);
+  if (itemVar) {
+    nextScopeVars.add(itemVar);
+  }
+  if (indexVar) {
+    nextScopeVars.add(indexVar);
+  }
+  return nextScopeVars;
+};
+
+const getLoopScopeVarsFromRawKey = (key, scopeVars) => {
+  if (typeof key !== "string") {
+    return scopeVars;
+  }
+
+  const loopMatch = key.match(LOOP_DIRECTIVE_REGEX);
+  if (!loopMatch) {
+    return scopeVars;
+  }
+
+  return extendScopeVars(scopeVars, loopMatch[1], loopMatch[2]);
+};
+
+const getPropertyBindingViolationForKey = (key) => {
+  if (typeof key !== "string" || (!key.includes(":") && !key.includes("."))) {
+    return null;
+  }
+
+  ATTR_ASSIGNMENT_REGEX.lastIndex = 0;
+  let match;
+  while ((match = ATTR_ASSIGNMENT_REGEX.exec(key)) !== null) {
+    const rawBindingName = match[1];
+    if (rawBindingName.startsWith(".")) {
+      return {
+        bindingName: rawBindingName,
+        rawValue: match[2] ?? match[3] ?? match[4] ?? "",
+        key,
+      };
+    }
+
+    if (!rawBindingName.startsWith(":")) {
+      continue;
+    }
+
+    const isQuoted = match[2] !== undefined || match[3] !== undefined;
+    const rawValue = match[2] ?? match[3] ?? match[4] ?? "";
+    if (isQuoted || !INTERPOLATION_ONLY_REGEX.test(rawValue)) {
+      return {
+        bindingName: rawBindingName,
+        rawValue,
+        key,
+      };
+    }
+  }
+
+  return null;
+};
+
+const walkRawTemplateForViolation = (node, scopeVars = new Set()) => {
+  if (Array.isArray(node)) {
+    for (const item of node) {
+      const violation = walkRawTemplateForViolation(item, scopeVars);
+      if (violation) {
+        return violation;
+      }
+    }
+    return null;
+  }
+
+  if (!node || typeof node !== "object") {
+    return null;
+  }
+
+  for (const [key, value] of Object.entries(node)) {
+    const violation = getPropertyBindingViolationForKey(key);
+    if (violation) {
+      return violation;
+    }
+
+    const nextScopeVars = getLoopScopeVarsFromRawKey(key, scopeVars);
+    const nestedViolation = walkRawTemplateForViolation(value, nextScopeVars);
+    if (nestedViolation) {
+      return nestedViolation;
+    }
+  }
+
+  return null;
+};
+
+const walkAstTemplateForViolation = (node, scopeVars = new Set()) => {
+  if (!node || typeof node !== "object") {
+    return null;
+  }
+
+  if (Array.isArray(node)) {
+    for (const item of node) {
+      const violation = walkAstTemplateForViolation(item, scopeVars);
+      if (violation) {
+        return violation;
+      }
+    }
+    return null;
+  }
+
+  if (node.type === NodeType.LOOP) {
+    const nextScopeVars = extendScopeVars(scopeVars, node.itemVar, node.indexVar);
+    return walkAstTemplateForViolation(node.body, nextScopeVars);
+  }
+
+  if (node.type === NodeType.ARRAY && Array.isArray(node.items)) {
+    return walkAstTemplateForViolation(node.items, scopeVars);
+  }
+
+  if (node.type === NodeType.OBJECT && Array.isArray(node.properties)) {
+    for (const property of node.properties) {
+      const violation = getPropertyBindingViolationForKey(property.key);
+      if (violation) {
+        return violation;
+      }
+      const nestedViolation = walkAstTemplateForViolation(property.value, scopeVars);
+      if (nestedViolation) {
+        return nestedViolation;
+      }
+    }
+    return null;
+  }
+
+  for (const value of Object.values(node)) {
+    const violation = walkAstTemplateForViolation(value, scopeVars);
+    if (violation) {
+      return violation;
+    }
+  }
+
+  return null;
+};
+
+const deriveParsedKey = (key) => {
+  const parsed = parseTemplate([{ [key]: "" }]);
+  const property = parsed?.items?.[0]?.properties?.[0];
+  return property?.parsedKey;
+};
+
+const getInterpolationExpression = (rawValue) => {
+  const match = rawValue.match(INTERPOLATION_ONLY_REGEX);
+  return match ? match[1].trim() : null;
+};
+
+const getBaseIdentifier = (expression) => {
+  const match = expression.match(/^([A-Za-z_][A-Za-z0-9_]*)/);
+  return match ? match[1] : null;
+};
+
+const normalizePropertyBindingsInKey = (key, scopeVars) => {
+  let changed = false;
+
+  const normalizedKey = key.replace(
+    ATTR_ASSIGNMENT_REGEX,
+    (fullMatch, rawBindingName, doubleQuotedValue, singleQuotedValue, bareValue) => {
+      if (!rawBindingName.startsWith(":")) {
+        return fullMatch;
+      }
+
+      const rawValue = doubleQuotedValue ?? singleQuotedValue ?? bareValue ?? "";
+      const expression = getInterpolationExpression(rawValue);
+      if (!expression || !SIMPLE_PATH_REGEX.test(expression)) {
+        return fullMatch;
+      }
+
+      const baseIdentifier = getBaseIdentifier(expression);
+      if (!baseIdentifier) {
+        return fullMatch;
+      }
+
+      const internalValue = scopeVars.has(baseIdentifier)
+        ? `#{${expression}}`
+        : expression;
+
+      if (internalValue === rawValue) {
+        return fullMatch;
+      }
+
+      changed = true;
+      return `${rawBindingName}=${internalValue}`;
+    },
+  );
+
+  return changed ? normalizedKey : key;
+};
+
+const normalizeAstTemplate = (node, scopeVars = new Set()) => {
+  if (!node || typeof node !== "object") {
+    return;
+  }
+
+  if (Array.isArray(node)) {
+    node.forEach((item) => normalizeAstTemplate(item, scopeVars));
+    return;
+  }
+
+  if (node.type === NodeType.LOOP) {
+    const nextScopeVars = extendScopeVars(scopeVars, node.itemVar, node.indexVar);
+    normalizeAstTemplate(node.body, nextScopeVars);
+    return;
+  }
+
+  if (node.type === NodeType.ARRAY && Array.isArray(node.items)) {
+    node.items.forEach((item) => normalizeAstTemplate(item, scopeVars));
+    return;
+  }
+
+  if (node.type === NodeType.OBJECT && Array.isArray(node.properties)) {
+    node.properties.forEach((property) => {
+      const normalizedKey = normalizePropertyBindingsInKey(property.key, scopeVars);
+      if (normalizedKey !== property.key) {
+        property.key = normalizedKey;
+        const parsedKey = deriveParsedKey(normalizedKey);
+        if (parsedKey) {
+          property.parsedKey = parsedKey;
+        } else {
+          delete property.parsedKey;
+        }
+      }
+
+      normalizeAstTemplate(property.value, scopeVars);
+    });
+    return;
+  }
+
+  Object.values(node).forEach((value) => {
+    normalizeAstTemplate(value, scopeVars);
+  });
+};
+
+export const findUnsupportedTemplatePropertyBindingSyntax = (template) => {
+  if (!template) {
+    return null;
+  }
+
+  if (template.type && typeof template.type === "number") {
+    return walkAstTemplateForViolation(template);
+  }
+
+  return walkRawTemplateForViolation(template);
+};
+
+export const ensureNormalizedTemplatePropertyBindings = (template) => {
+  if (!template || typeof template !== "object") {
+    return;
+  }
+
+  if (normalizedTemplateCache.has(template)) {
+    return;
+  }
+
+  const violation = findUnsupportedTemplatePropertyBindingSyntax(template);
+  if (violation) {
+    throw new Error(
+      `Property-form bindings must use ':prop=\${value}' syntax. Found '${violation.bindingName}=${violation.rawValue}' in '${violation.key}'.`,
+    );
+  }
+
+  normalizeAstTemplate(template);
+  normalizedTemplateCache.add(template);
+};

package/src/parser.js

@@ -1,7 +1,8 @@
 import { parseAndRender as jemplParseAndRender, render as jemplRender } from "jempl";
 
-import { flattenArrays } from './common.js';
+import { flattenArrays } from "./utils/flattenArrays.js";
 import { parseNodeBindings } from './core/view/bindings.js';
+import { ensureNormalizedTemplatePropertyBindings } from "./core/view/templatePropertyBindings.js";
 import {
   createRefMatchers,
   resolveBestRefMatcher,
@@ -20,6 +21,7 @@ export const parseView = ({
   handlers,
   createComponentUpdateHook,
 }) => {
+  ensureNormalizedTemplatePropertyBindings(template);
   const result = jemplRender(template, viewData, {});
 
   // Flatten the array carefully to maintain structure

package/src/utils/flattenArrays.js

@@ -0,0 +1,23 @@
+export const flattenArrays = (items) => {
+  if (!Array.isArray(items)) {
+    return items;
+  }
+
+  return items.reduce((acc, item) => {
+    if (Array.isArray(item)) {
+      acc.push(...flattenArrays(item));
+    } else {
+      if (item && typeof item === "object") {
+        const entries = Object.entries(item);
+        if (entries.length > 0) {
+          const [key, value] = entries[0];
+          if (Array.isArray(value)) {
+            item = { [key]: flattenArrays(value) };
+          }
+        }
+      }
+      acc.push(item);
+    }
+    return acc;
+  }, []);
+};