@genart-dev/core 0.1.2 → 0.2.0

package/dist/index.cjs

@@ -22,6 +22,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var index_exports = {};
 __export(index_exports, {
   COLOR_SKILLS: () => COLOR_SKILLS,
+  COMPONENT_REGISTRY: () => import_components.COMPONENT_REGISTRY,
   COMPOSITION_SKILLS: () => COMPOSITION_SKILLS,
   Canvas2DRendererAdapter: () => Canvas2DRendererAdapter,
   GLSLRendererAdapter: () => GLSLRendererAdapter,
@@ -32,10 +33,27 @@ __export(index_exports, {
   ThreeRendererAdapter: () => ThreeRendererAdapter,
   createDefaultRegistry: () => createDefaultRegistry,
   createDefaultSkillRegistry: () => createDefaultSkillRegistry,
-  hexToVec3: () => hexToVec3
+  hexToVec3: () => hexToVec3,
+  resolveComponents: () => import_components.resolveComponents
 });
 module.exports = __toCommonJS(index_exports);
 __reExport(index_exports, require("@genart-dev/format"), module.exports);
+var import_components = require("@genart-dev/components");
+
+// src/sketch/adapters/component-utils.ts
+function extractComponentCode(components) {
+  if (!components) return "";
+  const blocks = [];
+  for (const [name, value] of Object.entries(components)) {
+    if (typeof value === "string") continue;
+    if (value.code) {
+      const ver = value.version ? ` v${value.version}` : "";
+      blocks.push(`// --- ${name}${ver} ---
+${value.code}`);
+    }
+  }
+  return blocks.join("\n\n");
+}
 
 // src/sketch/adapters/p5.ts
 var P5_CDN_VERSION = "1.11.3";
@@ -61,15 +79,20 @@ var P5RendererAdapter = class {
     }
     return { valid: errors.length === 0, errors };
   }
-  async compile(algorithm) {
+  async compile(algorithm, components) {
     const validation = this.validate(algorithm);
     if (!validation.valid) {
       throw new Error(
         `p5 compilation failed: ${validation.errors.join("; ")}`
       );
     }
+    const componentCode = components?.map(
+      (c) => `// --- ${c.name} v${c.version} ---
+${c.code}`
+    ).join("\n\n") ?? "";
     const wrappedSource = `
       return (function() {
+        ${componentCode}
         ${algorithm}
         return sketch;
       })();
@@ -223,6 +246,7 @@ var P5RendererAdapter = class {
     state.PARAMS = state.params;
     state.COLORS = ${colorsJson};
 
+    ${extractComponentCode(sketch.components)}
     ${sketch.algorithm}
 
     new p5(function(p) {
@@ -278,15 +302,20 @@ var Canvas2DRendererAdapter = class {
     }
     return { valid: errors.length === 0, errors };
   }
-  async compile(algorithm) {
+  async compile(algorithm, components) {
     const validation = this.validate(algorithm);
     if (!validation.valid) {
       throw new Error(
         `Canvas 2D compilation failed: ${validation.errors.join("; ")}`
       );
     }
+    const componentCode = components?.map(
+      (c) => `// --- ${c.name} v${c.version} ---
+${c.code}`
+    ).join("\n\n") ?? "";
     const wrappedSource = `
       return (function() {
+        ${componentCode}
         ${algorithm}
         return sketch;
       })();
@@ -446,6 +475,7 @@ var Canvas2DRendererAdapter = class {
       const state = ${stateJson};
       state.canvas = { width: ${width}, height: ${height}, pixelDensity: ${pixelDensity} };
 
+      ${extractComponentCode(sketch.components)}
       ${sketch.algorithm}
 
       const canvas = document.getElementById('canvas');
@@ -505,15 +535,20 @@ var ThreeRendererAdapter = class {
     }
     return { valid: true, errors: [] };
   }
-  async compile(algorithm) {
+  async compile(algorithm, components) {
     const validation = this.validate(algorithm);
     if (!validation.valid) {
       throw new Error(
         `Three.js compilation failed: ${validation.errors.join("; ")}`
       );
     }
+    const componentCode = components?.map(
+      (c) => `// --- ${c.name} v${c.version} ---
+${c.code}`
+    ).join("\n\n") ?? "";
     const wrappedSource = `
       return (function() {
+        ${componentCode}
         ${algorithm}
         return sketch;
       })();
@@ -656,6 +691,7 @@ var ThreeRendererAdapter = class {
     const state = ${stateJson};
     state.canvas = { width: ${width}, height: ${height}, pixelDensity: ${pixelDensity} };
 
+    ${extractComponentCode(sketch.components)}
     ${sketch.algorithm}
 
     sketch(THREE, state, document.getElementById('canvas-container'));
@@ -760,6 +796,41 @@ function extractUniforms(source) {
   }
   return { params, colors };
 }
+function injectGLSLSource(algorithm, codeToInject) {
+  if (!codeToInject) return algorithm;
+  const trimmed = algorithm.trimStart();
+  const versionMatch = trimmed.match(/^(#version\s+\S+[^\n]*\n)/);
+  const versionLine = versionMatch?.[1] ?? "";
+  let shaderBody = versionMatch ? trimmed.slice(versionLine.length) : trimmed;
+  const precisionLines = [];
+  let precisionMatch;
+  while ((precisionMatch = shaderBody.match(/^\s*(precision\s+\w+\s+\w+;\s*\n)/)) !== null) {
+    precisionLines.push(precisionMatch[1]);
+    shaderBody = shaderBody.slice(precisionMatch[0].length);
+  }
+  return versionLine + precisionLines.join("") + "\n" + codeToInject + "\n\n" + shaderBody;
+}
+function injectGLSLComponents(algorithm, components) {
+  if (!components || components.length === 0) return algorithm;
+  const componentCode = components.map(
+    (c) => `// --- ${c.name} v${c.version} ---
+${c.code}`
+  ).join("\n\n");
+  return injectGLSLSource(algorithm, componentCode);
+}
+function extractGLSLComponentCode(components) {
+  if (!components) return "";
+  const blocks = [];
+  for (const [name, value] of Object.entries(components)) {
+    if (typeof value === "string") continue;
+    if (value.code) {
+      const ver = value.version ? ` v${value.version}` : "";
+      blocks.push(`// --- ${name}${ver} ---
+${value.code}`);
+    }
+  }
+  return blocks.join("\n\n");
+}
 var GLSLRendererAdapter = class {
   type = "glsl";
   displayName = "GLSL Shader";
@@ -783,16 +854,17 @@ var GLSLRendererAdapter = class {
     }
     return { valid: errors.length === 0, errors };
   }
-  async compile(algorithm) {
+  async compile(algorithm, components) {
     const validation = this.validate(algorithm);
     if (!validation.valid) {
       throw new Error(
         `GLSL compilation failed: ${validation.errors.join("; ")}`
       );
     }
-    const uniforms = extractUniforms(algorithm);
+    const fragmentSource = injectGLSLComponents(algorithm, components);
+    const uniforms = extractUniforms(fragmentSource);
     const compiled = {
-      fragmentSource: algorithm,
+      fragmentSource,
       vertexSource: FULLSCREEN_QUAD_VERTEX,
       uniformNames: uniforms
     };
@@ -1038,7 +1110,9 @@ var GLSLRendererAdapter = class {
     const { width, height } = sketch.canvas;
     const pixelDensity = sketch.canvas.pixelDensity ?? 1;
     const stateJson = JSON.stringify(sketch.state, null, 2);
-    const uniforms = extractUniforms(sketch.algorithm);
+    const glslComponentCode = extractGLSLComponentCode(sketch.components);
+    const fullAlgorithm = glslComponentCode ? injectGLSLSource(sketch.algorithm, glslComponentCode) : sketch.algorithm;
+    const uniforms = extractUniforms(fullAlgorithm);
     const paramBindings = uniforms.params.map((u) => {
       const key = u.substring(2);
       return `    { const loc = gl.getUniformLocation(program, "${u}"); if (loc && state.params["${key}"] !== undefined) gl.uniform1f(loc, state.params["${key}"]); }`;
@@ -1072,7 +1146,7 @@ var GLSLRendererAdapter = class {
     const vertSrc = \`${FULLSCREEN_QUAD_VERTEX}\`;
 
     // Fragment shader
-    const fragSrc = \`${sketch.algorithm.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$/g, "\\$")}\`;
+    const fragSrc = \`${fullAlgorithm.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$/g, "\\$")}\`;
 
     function createShader(type, src) {
       const s = gl.createShader(type);
@@ -1169,15 +1243,20 @@ var SVGRendererAdapter = class {
     }
     return { valid: true, errors: [] };
   }
-  async compile(algorithm) {
+  async compile(algorithm, components) {
     const validation = this.validate(algorithm);
     if (!validation.valid) {
       throw new Error(
         `SVG compilation failed: ${validation.errors.join("; ")}`
       );
     }
+    const componentCode = components?.map(
+      (c) => `// --- ${c.name} v${c.version} ---
+${c.code}`
+    ).join("\n\n") ?? "";
     const wrappedSource = `
       return (function() {
+        ${componentCode}
         ${algorithm}
         return sketch;
       })();
@@ -1307,6 +1386,7 @@ var SVGRendererAdapter = class {
     const state = ${stateJson};
     state.canvas = { width: ${width}, height: ${height} };
 
+    ${extractComponentCode(sketch.components)}
     ${sketch.algorithm}
 
     const module = sketch(state);
@@ -1841,6 +1921,7 @@ function createDefaultSkillRegistry() {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   COLOR_SKILLS,
+  COMPONENT_REGISTRY,
   COMPOSITION_SKILLS,
   Canvas2DRendererAdapter,
   GLSLRendererAdapter,
@@ -1852,6 +1933,7 @@ function createDefaultSkillRegistry() {
   createDefaultRegistry,
   createDefaultSkillRegistry,
   hexToVec3,
+  resolveComponents,
   ...require("@genart-dev/format")
 });
 //# sourceMappingURL=index.cjs.map