@gomeniucivan/ui 1.0.59 → 1.0.60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gomeniucivan/ui",
-  "version": "1.0.59",
+  "version": "1.0.60",
   "private": false,
   "sideEffects": [
     "**/*.css"

package/scripts/stylePathTransform.js

@@ -1,426 +1,229 @@
-'use strict';
-
-/**
- * Functions whose calls get a `{ path }` option injected.
- */
-const TARGET_FNS = ['createStaticStyles', 'createStyles', 'createStylish'];
-const CALL_RE = new RegExp(`(?:${TARGET_FNS.join('|')})\\s*\\(`, 'g');
-
-/**
- * Regex to detect standalone `css` tagged template literals.
- * Matches `css` NOT preceded by `.`, `$`, or word characters (avoids
- * matching `obj.css`, `customCss`, `$css`, etc.) followed by a backtick.
- */
-const CSS_TAG_RE = /(?<![.\w$])css\s*`/g;
-
-/**
- * Inline helper prepended to files that have css tagged template wraps.
- * Attaches __inspPath to SerializedStyles objects (typeof === 'object').
- * Strings (from createStaticStyles css) pass through unchanged.
- */
-const INSP_CSS_HELPER =
-  'var __inspCss__ = function(s, p) { if (s && typeof s === "object") s.__inspPath = p; return s; };\n';
-
-const hasPathProperty = (text) => /\bpath\s*:/.test(text);
-
-const escapePathValue = (value) => value.replace(/\\/g, '/').replace(/'/g, "\\'");
-
-const injectPathIntoObjectLiteral = (objectText, pathValue) => {
-  const trimmed = objectText.trim();
-
-  if (!trimmed.startsWith('{') || !trimmed.endsWith('}')) return null;
-  if (hasPathProperty(trimmed)) return objectText;
-
-  const body = trimmed.slice(1, -1).trim();
-  const injected =
-    body.length === 0
-      ? `{ path: '${escapePathValue(pathValue)}' }`
-      : `{ path: '${escapePathValue(pathValue)}', ${body} }`;
-
-  const leading = objectText.match(/^\s*/)?.[0] ?? '';
-  const trailing = objectText.match(/\s*$/)?.[0] ?? '';
-  return `${leading}${injected}${trailing}`;
-};
-
-/**
- * Find the matching `)` for a call starting right after `(` and collect
- * top-level argument commas.
- */
-const findCallBoundaries = (source, afterParen) => {
-  let depth = 1;
-  let braceDepth = 0;
-  let bracketDepth = 0;
-  let closeIdx = -1;
-  const topLevelCommas = [];
-
-  let inStr = false;
-  let strCh = '';
-  let inTpl = false;
-  let inLineComment = false;
-  let inBlockComment = false;
-
-  for (let i = afterParen; i < source.length; i++) {
-    const ch = source[i];
-    const prev = i > 0 ? source[i - 1] : '';
-    const next = i + 1 < source.length ? source[i + 1] : '';
-
-    if (inLineComment) {
-      if (ch === '\n') inLineComment = false;
-      continue;
-    }
-
-    if (inBlockComment) {
-      if (ch === '*' && next === '/') {
-        inBlockComment = false;
-        i++;
-      }
-      continue;
-    }
-
-    if (inStr) {
-      if (ch === strCh && prev !== '\\') inStr = false;
-      continue;
-    }
-
-    if (inTpl) {
-      if (ch === '`' && prev !== '\\') {
-        inTpl = false;
-      }
-      continue;
-    }
-
-    if (ch === '/' && next === '/') {
-      inLineComment = true;
-      i++;
-      continue;
-    }
-
-    if (ch === '/' && next === '*') {
-      inBlockComment = true;
-      i++;
-      continue;
-    }
-
-    if (ch === '"' || ch === "'") {
-      inStr = true;
-      strCh = ch;
-      continue;
-    }
-
-    if (ch === '`') {
-      inTpl = true;
-      continue;
-    }
-
-    if (ch === '{') {
-      braceDepth++;
-      continue;
-    }
-
-    if (ch === '}') {
-      if (braceDepth > 0) braceDepth--;
-      continue;
-    }
-
-    if (ch === '[') {
-      bracketDepth++;
-      continue;
-    }
-
-    if (ch === ']') {
-      if (bracketDepth > 0) bracketDepth--;
-      continue;
-    }
-
-    if (ch === '(') {
-      depth++;
-      continue;
-    }
-
-    if (ch === ')') {
-      depth--;
-      if (depth === 0) {
-        closeIdx = i;
-        break;
-      }
-      continue;
-    }
-
-    if (ch === ',' && depth === 1 && braceDepth === 0 && bracketDepth === 0) {
-      topLevelCommas.push(i);
-    }
-  }
-
-  if (closeIdx === -1) return null;
-  return { closeIdx, topLevelCommas };
-};
-
-/**
- * Find the closing backtick of a template literal.
- * `afterBacktick` is the index right after the opening backtick.
- * Returns the index of the closing backtick, or -1 if not found.
- */
-const findTemplateLiteralEnd = (source, afterBacktick) => {
-  let i = afterBacktick;
-
-  while (i < source.length) {
-    const ch = source[i];
-
-    // Escaped character
-    if (ch === '\\') {
-      i += 2;
-      continue;
-    }
-
-    // End of template literal
-    if (ch === '`') {
-      return i;
-    }
-
-    // Template expression: ${...}
-    if (ch === '$' && i + 1 < source.length && source[i + 1] === '{') {
-      i += 2; // skip ${
-      let depth = 1;
-
-      while (i < source.length && depth > 0) {
-        const c = source[i];
-
-        if (c === '\\') {
-          i += 2;
-          continue;
-        }
-
-        if (c === '{') {
-          depth++;
-          i++;
-          continue;
-        }
-
-        if (c === '}') {
-          depth--;
-          if (depth === 0) {
-            i++; // skip closing }
-            break;
-          }
-          i++;
-          continue;
-        }
-
-        // Nested template literal inside expression
-        if (c === '`') {
-          i++; // skip opening backtick
-          const nested = findTemplateLiteralEnd(source, i);
-          if (nested === -1) return -1;
-          i = nested + 1; // skip closing backtick
-          continue;
-        }
-
-        // String literal inside expression
-        if (c === '"' || c === "'") {
-          const quote = c;
-          i++; // skip opening quote
-          while (i < source.length && source[i] !== quote) {
-            if (source[i] === '\\') i++;
-            i++;
-          }
-          if (i < source.length) i++; // skip closing quote
-          continue;
-        }
-
-        // Line comment inside expression
-        if (c === '/' && i + 1 < source.length && source[i + 1] === '/') {
-          i += 2;
-          while (i < source.length && source[i] !== '\n') i++;
-          continue;
-        }
-
-        // Block comment inside expression
-        if (c === '/' && i + 1 < source.length && source[i + 1] === '*') {
-          i += 2;
-          while (
-            i < source.length &&
-            !(source[i] === '*' && i + 1 < source.length && source[i + 1] === '/')
-          ) {
-            i++;
-          }
-          if (i < source.length) i += 2; // skip */
-          continue;
-        }
-
-        i++;
-      }
-      continue;
-    }
-
-    i++;
-  }
-
-  return -1; // unclosed template literal
-};
-
-/**
- * Check whether a position in the source is inside a comment or string.
- * Simple heuristic: checks the line text before the match.
- */
-const isInCommentOrString = (source, index) => {
-  const lineStart = source.lastIndexOf('\n', index) + 1;
-  const lineText = source.slice(lineStart, index).trimStart();
-  return lineText.startsWith('*') || lineText.startsWith('//');
-};
-
-/**
- * Wrap standalone `css` tagged template literals with __inspCss__().
- *
- * Transforms: css`color: red;`
- * Into:       __inspCss__(css`color: red;`, 'src/File/path')
- *
- * The wrapper attaches __inspPath to SerializedStyles objects so that
- * createCSS.ts can register the className → path in the source registry.
- */
-const wrapCssTaggedTemplates = (source, filePath) => {
-  CSS_TAG_RE.lastIndex = 0;
-  if (!CSS_TAG_RE.test(source)) return source;
-  CSS_TAG_RE.lastIndex = 0;
-
-  const escapedPath = escapePathValue(filePath);
-
-  // Collect all match positions
-  const positions = [];
-  let match;
-  while ((match = CSS_TAG_RE.exec(source)) !== null) {
-    if (isInCommentOrString(source, match.index)) continue;
-
-    // cssStart = start of "css", backtickIdx = position of the backtick
-    const cssStart = match.index;
-    const backtickIdx = cssStart + match[0].length - 1;
-    positions.push({ cssStart, backtickIdx });
-  }
-
-  if (positions.length === 0) return source;
-
-  // Process from right to left so indices remain valid
-  let result = source;
-  let needsHelper = false;
-
-  for (let pi = positions.length - 1; pi >= 0; pi--) {
-    const { cssStart, backtickIdx } = positions[pi];
-    const afterBacktick = backtickIdx + 1;
-    const endBacktick = findTemplateLiteralEnd(result, afterBacktick);
-    if (endBacktick === -1) continue;
-
-    // Extract the full css`...` expression
-    const beforeCss = result.slice(0, cssStart);
-    const cssExpr = result.slice(cssStart, endBacktick + 1);
-    const afterCss = result.slice(endBacktick + 1);
-
-    result = beforeCss + `__inspCss__(${cssExpr}, '${escapedPath}')` + afterCss;
-    needsHelper = true;
-  }
-
-  if (needsHelper) {
-    result = INSP_CSS_HELPER + result;
-  }
-
-  return result;
-};
-
-/**
- * Inject `{ path: '<file-path>' }` into createStyles/createStaticStyles/createStylish calls.
- *
- * Rules:
- * - One arg call: append second arg `{ path }`
- * - Two+ arg call:
- *   - if second arg is object literal and has no `path`, inject into object
- *   - otherwise append third arg `{ path }` as a fallback
- *
- * Also wraps standalone `css` tagged templates with __inspCss__() for
- * path tracking on SerializedStyles objects.
- */
-const injectStylePath = (source, filePath, resourcePath = '') => {
-  const normalizedResourcePath = resourcePath.replace(/\\/g, '/');
-
-  // Skip the style factory implementation files themselves.
-  if (
-    (normalizedResourcePath.includes('createStaticStyles') ||
-      normalizedResourcePath.includes('createStyles') ||
-      normalizedResourcePath.includes('createStyish') ||
-      normalizedResourcePath.includes('createGlobalStyle')) &&
-    (normalizedResourcePath.endsWith('index.ts') || normalizedResourcePath.endsWith('.ts') || normalizedResourcePath.endsWith('.tsx'))
-  ) {
-    // Still check if we should skip: only skip files inside the antd-style factories
-    if (normalizedResourcePath.includes('antd-style/factories/')) {
-      return source;
-    }
-  }
-
-  let result = source;
-
-  // 1. Inject { path } into createStaticStyles/createStyles/createStylish calls
-  CALL_RE.lastIndex = 0;
-  if (CALL_RE.test(result)) {
-    CALL_RE.lastIndex = 0;
-
-    const positions = [];
-    let match;
-    while ((match = CALL_RE.exec(result)) !== null) {
-      if (isInCommentOrString(result, match.index)) continue;
-      positions.push(match.index + match[0].length);
-    }
-
-    if (positions.length > 0) {
-      const escapedPath = escapePathValue(filePath);
-
-      for (let pi = positions.length - 1; pi >= 0; pi--) {
-        const afterParen = positions[pi];
-        const callInfo = findCallBoundaries(result, afterParen);
-        if (!callInfo) continue;
-
-        const { closeIdx, topLevelCommas } = callInfo;
-
-        // Single-arg call: add options as second arg.
-        if (topLevelCommas.length === 0) {
-          const inner = result.slice(afterParen, closeIdx);
-          const hasTrailingComma = /,\s*$/.test(inner);
-          result =
-            result.slice(0, closeIdx) +
-            (hasTrailingComma ? ` { path: '${escapedPath}' }` : `, { path: '${escapedPath}' }`) +
-            result.slice(closeIdx);
-          continue;
-        }
-
-        // Two+ args: patch second arg when it's an object literal.
-        const secondStart = topLevelCommas[0] + 1;
-        const secondEnd = topLevelCommas[1] ?? closeIdx;
-        const secondArgRaw = result.slice(secondStart, secondEnd);
-
-        if (hasPathProperty(secondArgRaw)) continue;
-
-        const injectedSecondArg = injectPathIntoObjectLiteral(secondArgRaw, filePath);
-        if (injectedSecondArg !== null) {
-          result =
-            result.slice(0, secondStart) +
-            injectedSecondArg +
-            result.slice(secondEnd);
-          continue;
-        }
-
-        // Fallback for non-object second args.
-        const inner = result.slice(afterParen, closeIdx);
-        const hasTrailingComma = /,\s*$/.test(inner);
-        result =
-          result.slice(0, closeIdx) +
-          (hasTrailingComma ? ` { path: '${escapedPath}' }` : `, { path: '${escapedPath}' }`) +
-          result.slice(closeIdx);
-      }
-    }
-  }
-
-  // 2. Wrap standalone css tagged templates with __inspCss__()
-  result = wrapCssTaggedTemplates(result, filePath);
-
-  return result;
-};
-
-module.exports = {
-  injectStylePath,
-};
+'use strict';
+
+/**
+ * Functions whose calls get a `{ path }` option injected.
+ */
+const TARGET_FNS = ['createStaticStyles', 'createStyles'];
+const CALL_RE = new RegExp(`(?:${TARGET_FNS.join('|')})\\s*\\(`, 'g');
+
+const hasPathProperty = (text) => /\bpath\s*:/.test(text);
+
+const escapePathValue = (value) => value.replace(/\\/g, '/').replace(/'/g, "\\'");
+
+const injectPathIntoObjectLiteral = (objectText, pathValue) => {
+  const trimmed = objectText.trim();
+
+  if (!trimmed.startsWith('{') || !trimmed.endsWith('}')) return null;
+  if (hasPathProperty(trimmed)) return objectText;
+
+  const body = trimmed.slice(1, -1).trim();
+  const injected =
+    body.length === 0
+      ? `{ path: '${escapePathValue(pathValue)}' }`
+      : `{ path: '${escapePathValue(pathValue)}', ${body} }`;
+
+  const leading = objectText.match(/^\s*/)?.[0] ?? '';
+  const trailing = objectText.match(/\s*$/)?.[0] ?? '';
+  return `${leading}${injected}${trailing}`;
+};
+
+/**
+ * Find the matching `)` for a call starting right after `(` and collect
+ * top-level argument commas.
+ */
+const findCallBoundaries = (source, afterParen) => {
+  let depth = 1;
+  let braceDepth = 0;
+  let bracketDepth = 0;
+  let closeIdx = -1;
+  const topLevelCommas = [];
+
+  let inStr = false;
+  let strCh = '';
+  let inTpl = false;
+  let inLineComment = false;
+  let inBlockComment = false;
+
+  for (let i = afterParen; i < source.length; i++) {
+    const ch = source[i];
+    const prev = i > 0 ? source[i - 1] : '';
+    const next = i + 1 < source.length ? source[i + 1] : '';
+
+    if (inLineComment) {
+      if (ch === '\n') inLineComment = false;
+      continue;
+    }
+
+    if (inBlockComment) {
+      if (ch === '*' && next === '/') {
+        inBlockComment = false;
+        i++;
+      }
+      continue;
+    }
+
+    if (inStr) {
+      if (ch === strCh && prev !== '\\') inStr = false;
+      continue;
+    }
+
+    if (inTpl) {
+      if (ch === '`' && prev !== '\\') {
+        inTpl = false;
+      }
+      continue;
+    }
+
+    if (ch === '/' && next === '/') {
+      inLineComment = true;
+      i++;
+      continue;
+    }
+
+    if (ch === '/' && next === '*') {
+      inBlockComment = true;
+      i++;
+      continue;
+    }
+
+    if (ch === '"' || ch === "'") {
+      inStr = true;
+      strCh = ch;
+      continue;
+    }
+
+    if (ch === '`') {
+      inTpl = true;
+      continue;
+    }
+
+    if (ch === '{') {
+      braceDepth++;
+      continue;
+    }
+
+    if (ch === '}') {
+      if (braceDepth > 0) braceDepth--;
+      continue;
+    }
+
+    if (ch === '[') {
+      bracketDepth++;
+      continue;
+    }
+
+    if (ch === ']') {
+      if (bracketDepth > 0) bracketDepth--;
+      continue;
+    }
+
+    if (ch === '(') {
+      depth++;
+      continue;
+    }
+
+    if (ch === ')') {
+      depth--;
+      if (depth === 0) {
+        closeIdx = i;
+        break;
+      }
+      continue;
+    }
+
+    if (ch === ',' && depth === 1 && braceDepth === 0 && bracketDepth === 0) {
+      topLevelCommas.push(i);
+    }
+  }
+
+  if (closeIdx === -1) return null;
+  return { closeIdx, topLevelCommas };
+};
+
+/**
+ * Inject `{ path: '<file-path>' }` into createStyles/createStaticStyles calls.
+ *
+ * Rules:
+ * - One arg call: append second arg `{ path }`
+ * - Two+ arg call:
+ *   - if second arg is object literal and has no `path`, inject into object
+ *   - otherwise append third arg `{ path }` as a fallback
+ */
+const injectStylePath = (source, filePath, resourcePath = '') => {
+  if (!CALL_RE.test(source)) return source;
+  CALL_RE.lastIndex = 0;
+
+  const normalizedResourcePath = resourcePath.replace(/\\/g, '/');
+
+  // Skip the style factory implementation files themselves.
+  if (
+    (normalizedResourcePath.includes('createStaticStyles') ||
+      normalizedResourcePath.includes('createStyles')) &&
+    normalizedResourcePath.endsWith('index.ts')
+  ) {
+    return source;
+  }
+
+  const positions = [];
+  let match;
+  while ((match = CALL_RE.exec(source)) !== null) {
+    const lineStart = source.lastIndexOf('\n', match.index) + 1;
+    const lineText = source.slice(lineStart, match.index).trimStart();
+    if (lineText.startsWith('*') || lineText.startsWith('//')) continue;
+    positions.push(match.index + match[0].length);
+  }
+
+  if (positions.length === 0) return source;
+
+  let result = source;
+  const escapedPath = escapePathValue(filePath);
+
+  for (let pi = positions.length - 1; pi >= 0; pi--) {
+    const afterParen = positions[pi];
+    const callInfo = findCallBoundaries(result, afterParen);
+    if (!callInfo) continue;
+
+    const { closeIdx, topLevelCommas } = callInfo;
+
+    // Single-arg call: add options as second arg.
+    if (topLevelCommas.length === 0) {
+      const inner = result.slice(afterParen, closeIdx);
+      const hasTrailingComma = /,\s*$/.test(inner);
+      result =
+        result.slice(0, closeIdx) +
+        (hasTrailingComma ? ` { path: '${escapedPath}' }` : `, { path: '${escapedPath}' }`) +
+        result.slice(closeIdx);
+      continue;
+    }
+
+    // Two+ args: patch second arg when it's an object literal.
+    const secondStart = topLevelCommas[0] + 1;
+    const secondEnd = topLevelCommas[1] ?? closeIdx;
+    const secondArgRaw = result.slice(secondStart, secondEnd);
+
+    if (hasPathProperty(secondArgRaw)) continue;
+
+    const injectedSecondArg = injectPathIntoObjectLiteral(secondArgRaw, filePath);
+    if (injectedSecondArg !== null) {
+      result =
+        result.slice(0, secondStart) +
+        injectedSecondArg +
+        result.slice(secondEnd);
+      continue;
+    }
+
+    // Fallback for non-object second args.
+    const inner = result.slice(afterParen, closeIdx);
+    const hasTrailingComma = /,\s*$/.test(inner);
+    result =
+      result.slice(0, closeIdx) +
+      (hasTrailingComma ? ` { path: '${escapedPath}' }` : `, { path: '${escapedPath}' }`) +
+      result.slice(closeIdx);
+  }
+
+  return result;
+};
+
+module.exports = {
+  injectStylePath,
+};