canvasengine 2.0.0-beta.1 → 2.0.0-beta.2

package/src/compiler/grammar.pegjs

@@ -1,180 +0,0 @@
-{
-  function generateError(message, location) {
-    const { start, end } = location;
-    const errorMessage = `${message}\n` +
-      `at line ${start.line}, column ${start.column} to line ${end.line}, column ${end.column}`;
-    throw new Error(errorMessage);
-  }
-}
-
-start
-  = _ elements:(element)* _ {
-    if (elements.length === 1) {
-      return elements[0];
-    }
-    return `[${elements.join(',')}]`;
-  }
-
-element
-  = forLoop
-  / ifCondition
-  / selfClosingElement
-  / openCloseElement
-  / comment 
-
-selfClosingElement
-  = _ "<" _ tagName:tagName _ attributes:attributes _ "/>" _ {
-      const attrs = attributes.length > 0 ? `{ ${attributes.join(', ')} }` : null;
-      return attrs ? `h(${tagName}, ${attrs})` : `h(${tagName})`;
-    }
-
-openCloseElement
-  = "<" _ tagName:tagName _ attributes:attributes _ ">" _ content:content _ "</" _ closingTagName:tagName _ ">" {
-      if (tagName !== closingTagName) {
-        error("Mismatched opening and closing tags");
-      }
-      const attrs = attributes.length > 0 ? `{ ${attributes.join(', ')} }` : null;
-      const children = content ? content : null;
-      if (attrs && children) {
-        return `h(${tagName}, ${attrs}, ${children})`;
-      } else if (attrs) {
-        return `h(${tagName}, ${attrs})`;
-      } else if (children) {
-        return `h(${tagName}, null, ${children})`;
-      } else {
-        return `h(${tagName})`;
-      }
-    }
-
-  / "<" _ tagName:tagName _ attributes:attributes _ {
-      generateError("Syntaxe d'élément invalide", location());
-    }
-
-attributes
-  = attrs:(attribute (_ attribute)*)? {
-      return attrs
-        ? [attrs[0]].concat(attrs[1].map(a => a[1]))
-        : [];
-    }
-
-attribute
-  = staticAttribute
-  / dynamicAttribute
-  / eventHandler
-
-eventHandler
-  = "@" eventName:identifier _ "=" _ "{" _ handlerName:attributeValue _ "}" {
-      return `${eventName}: ${handlerName}`;
-    }
-     / "@" eventName:attributeName _ {
-      return eventName;
-    }
-
-dynamicAttribute
-  = attributeName:attributeName _ "=" _ "{" _ attributeValue:attributeValue _ "}" {
-      if (attributeValue.trim().match(/^[a-zA-Z_]\w*$/)) {
-        return `${attributeName}: ${attributeValue}`;
-      } else {
-        return `${attributeName}: computed(() => ${attributeValue.replace(/@?[a-zA-Z_][a-zA-Z0-9_]*(?!:)/g, (match) => {
-          if (match.startsWith('@')) {
-            return match.substring(1);
-          }
-          return `${match}()`;
-        })})`;
-      }
-    }
-  / attributeName:attributeName _ {
-      return attributeName;
-    }
-
-attributeValue
-  = $([^{}]* ("{" [^{}]* "}" [^{}]*)*) {
-    const t = text().trim()
-    if (t.startsWith("{") && t.endsWith("}")) {
-      return `(${t})`;
-    }
-    return t
-  }
-
-staticAttribute
-  = attributeName:attributeName _ "=" _ "\"" attributeValue:staticValue "\"" {
-      return `${attributeName}: ${attributeValue}`;
-    }
-
-eventAttribute
-  = "(" _ eventName:eventName _ ")" _ "=" _ "\"" eventAction:eventAction "\"" {
-      return `${eventName}: () => { ${eventAction} }`;
-    }
-
-staticValue
-  = [^"]+ {
-      var val = text();
-      return isNaN(val) ? `'${val}'` : val;
-    }
-
-content
-  = elements:(element)* {
-      const filteredElements = elements.filter(el => el !== null);
-      if (filteredElements.length === 0) return null;
-      if (filteredElements.length === 1) return filteredElements[0];
-      return `[${filteredElements.join(', ')}]`;
-    }
-
-textNode
-  = text:$([^<]+) {
-      const trimmed = text.trim();
-      return trimmed ? `'${trimmed}'` : null;
-    }
-
-textElement
-  = text:[^<>]+ {
-      const trimmed = text.join('').trim();
-      return trimmed ? JSON.stringify(trimmed) : null;
-    }
-
-forLoop
-  = _ "@for" _ "(" _ variableName:identifier _ "of" _ iterable:identifier _ ")" _ "{" _ content:content _ "}" _ {
-      return `loop(${iterable}, (${variableName}) => ${content})`;
-    }
-
-ifCondition
-  = _ "@if" _ "(" _ condition:condition _ ")" _ "{" _ content:content _ "}" _ {
-      return `cond(${condition}, () => ${content})`;
-    }
-
-tagName
-  = [a-zA-Z][a-zA-Z0-9]* { return text(); }
-
-attributeName
-  = [a-zA-Z][a-zA-Z0-9-]* { return text(); }
-
-eventName
-  = [a-zA-Z][a-zA-Z0-9-]* { return text(); }
-
-variableName
-  = [a-zA-Z_][a-zA-Z0-9_]* { return text(); }
-
-iterable
-  = [a-zA-Z_][a-zA-Z0-9_]* { return text(); }
-
-condition
-  = $([^)]*) { return text().trim(); }
-
-eventAction
-  = [^"]* { return text(); }
-
-_ 'whitespace'
-  = [ \t\n\r]* 
-
-identifier
-  = [a-zA-Z_][a-zA-Z0-9_]* { return text(); }
-
-comment
-  = singleComment+ {
-    return null
-  }
-
-singleComment
-  = "<!--" _ content:((!("-->") .)* "-->") _ {
-      return null;
-    }

package/src/compiler/vite.ts

@@ -1,166 +0,0 @@
-import { createFilter } from "vite";
-import { parse } from "acorn";
-import fs from "fs";
-import pkg from "peggy";
-import path from "path";
-import * as ts from "typescript"; // Import TypeScript package
-import { fileURLToPath } from 'url';
-
-const { generate } = pkg;
-
-const DEV_SRC = "../../src"
-
-export default function canvasengine() {
-  const filter = createFilter("**/*.ce");
-
-  // Convert import.meta.url to a file path
-  const __filename = fileURLToPath(import.meta.url);
-  const __dirname = path.dirname(__filename);
-
-  const grammar = fs.readFileSync(
-    path.join(__dirname, "grammar.pegjs").replace("dist/compiler/grammar.pegjs", "src/compiler/grammar.pegjs"), 
-  "utf8");
-  const parser = generate(grammar);
-  const isDev = process.env.NODE_ENV === "development";
-  const FLAG_COMMENT = "/*--[TPL]--*/";
-
-  const PRIMITIVE_COMPONENTS = [
-    "Canvas",
-    "Sprite",
-    "Text",
-    "Joystick",
-    "Viewport",
-    "Graphics",
-    "Container",
-    "ImageMap",
-    "NineSliceSprite",
-    "Rect",
-    "Circle",
-    "svg"
-  ];
-
-  return {
-    name: "vite-plugin-ce",
-    transform(code: string, id: string) {
-      if (!filter(id)) return;
-
-      // Extract the script content
-      const scriptMatch = code.match(/<script>([\s\S]*?)<\/script>/);
-      let scriptContent = scriptMatch ? scriptMatch[1].trim() : "";
-      
-      // Transform SVG tags to Svg components
-      let template = code.replace(/<script>[\s\S]*?<\/script>/, "")
-        .replace(/^\s+|\s+$/g, '');
-      
-      // Add SVG transformation
-      template = template.replace(/<svg>([\s\S]*?)<\/svg>/g, (match, content) => {
-        return `<Svg content="${content.trim()}" />`;
-      });
-      
-      const parsedTemplate = parser.parse(template);
-
-      // trick to avoid typescript remove imports in scriptContent
-      scriptContent += FLAG_COMMENT + parsedTemplate
-
-      let transpiledCode = ts.transpileModule(scriptContent, {
-        compilerOptions: {
-          module: ts.ModuleKind.Preserve,
-        },
-      }).outputText;
-
-      // remove code after /*---*/
-      transpiledCode = transpiledCode.split(FLAG_COMMENT)[0]
-
-      // Use Acorn to parse the script content
-      const parsed = parse(transpiledCode, {
-        sourceType: "module",
-        ecmaVersion: 2020,
-      });
-
-      // Extract imports
-      const imports = parsed.body.filter(
-        (node) => node.type === "ImportDeclaration"
-      );
-
-      // Extract non-import statements from scriptContent
-      const nonImportCode = parsed.body
-        .filter((node) => node.type !== "ImportDeclaration")
-        .map((node) => transpiledCode.slice(node.start, node.end))
-        .join("\n");
-
-      let importsCode = imports
-        .map((imp) => {
-          let importCode = transpiledCode.slice(imp.start, imp.end);
-          if (isDev && importCode.includes("from 'canvasengine'")) {
-            importCode = importCode.replace(
-              "from 'canvasengine'",
-              `from '${DEV_SRC}'`
-            );
-          }
-          return importCode;
-        })
-        .join("\n");
-
-      // Define an array for required imports
-      const requiredImports = ["h", "computed", "cond", "loop"];
-
-      // Check for missing imports
-      const missingImports = requiredImports.filter(
-        (importName) =>
-          !imports.some(
-            (imp) =>
-              imp.specifiers &&
-              imp.specifiers.some(
-                (spec) =>
-                  spec.type === "ImportSpecifier" &&
-                  spec.imported && 
-                  'name' in spec.imported &&
-                  spec.imported.name === importName
-              )
-          )
-      );
-
-      // Add missing imports
-      if (missingImports.length > 0) {
-        const additionalImportCode = `import { ${missingImports.join(
-          ", "
-        )} } from ${isDev ? `'${DEV_SRC}'` : "'canvasengine'"};`;
-        importsCode = `${additionalImportCode}\n${importsCode}`;
-      }
-
-      // Check for primitive components in parsedTemplate
-      const primitiveImports = PRIMITIVE_COMPONENTS.filter((component) =>
-        parsedTemplate.includes(`h(${component}`)
-      );
-
-      // Add missing imports for primitive components
-      primitiveImports.forEach((component) => {
-        const importStatement = `import { ${component} } from ${
-          isDev ? `'${DEV_SRC}'` : "'canvasengine'"
-        };`;
-        if (!importsCode.includes(importStatement)) {
-          importsCode = `${importStatement}\n${importsCode}`;
-        }
-      });
-
-      // Generate the output
-      const output = String.raw`
-      ${importsCode}
-      import { useProps, useDefineProps } from ${isDev ? `'${DEV_SRC}'` : "'canvasengine'"}
-
-      export default function component($$props) {
-        const $props = useProps($$props)
-        const defineProps = useDefineProps($$props)
-        ${nonImportCode}
-        let $this = ${parsedTemplate}
-        return $this
-      }
-      `;
-
-      return {
-        code: output,
-        map: null,
-      };
-    },
-  };
-}

package/src/presets/Bar.ts

@@ -1,89 +0,0 @@
-import { Graphics } from "../components";
-import { h } from "../engine/signal";
-import * as PIXI from "pixi.js";
-import { useProps } from "../hooks/useProps";
-
-interface BarProps {
-  backgroundColor?: string;
-  foregroundColor?: string;
-  value: number;
-  maxValue: number;
-  width: number;
-  height: number;
-}
-
-function componentToHex(c) {
-  var hex = c.toString(16);
-  return hex.length == 1 ? "0" + hex : hex;
-}
-
-function rgbToHex(r, g, b) {
-  return "#" + componentToHex(r) + componentToHex(g) + componentToHex(b);
-}
-
-export function Bar(opts: BarProps) {
-  const {
-    width,
-    height,
-    value,
-    maxValue,
-    backgroundColor,
-    foregroundColor,
-    border,
-    innerMargin,
-    borderRadius,
-  } = useProps(opts, {
-    backgroundColor: "#000000",
-    foregroundColor: "#FFFFFF",
-    innerMargin: 0,
-    borderRadius: 0,
-  });
-
-  return h(
-    Graphics,
-    {
-      ...opts,
-      width,
-      height,
-      draw(g: PIXI.Graphics) {
-        if (borderRadius()) {
-          g.roundRect(0, 0, width(), height(), borderRadius());
-        } else {
-          g.rect(0, 0, width(), height());
-        }
-        if (border) {
-          g.stroke(border);
-        }
-        g.fill(backgroundColor());
-      },
-    },
-    h(Graphics, {
-      width,
-      height,
-      draw(g: PIXI.Graphics) {
-        const margin = innerMargin();
-        const _borderRadius = borderRadius();
-        const w = Math.max(
-          0,
-          Math.min(
-            width() - 2 * margin,
-            (value() / maxValue()) * (width() - 2 * margin)
-          )
-        );
-        const h = height() - 2 * margin;
-        if (borderRadius) {
-          g.roundRect(margin, margin, w, h, _borderRadius);
-        } else {
-          g.rect(margin, margin, w, h);
-        }
-        const color = foregroundColor();
-        if (color.startsWith("rgba")) {
-          const [r, g, b, a] = color.match(/\d+(\.\d+)?/g).map(Number);
-          g.fill({ color: rgbToHex(r, g, b), alpha: a });
-        } else {
-          g.fill(color);
-        }
-      },
-    })
-  );
-}