coralite 0.38.4 → 0.38.6

package/dist/lib/component-setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component-setup.d.ts","sourceRoot":"","sources":["../../lib/component-setup.js"],"names":[],"mappings":"AAWA;;;;;GAKG;AAEH;;;;;;GAMG;AACH,mDAHG;IAAuC,GAAG,EAAlC,gBAAgB;CACxB,YA6MF;AA2FD;;;;;;;;;;;GAWG;AACH,mGAPG;IAAqB,SAAS,EAAtB,GAAG;IACe,QAAQ;IACb,aAAa,EAA1B,GAAG;IACe,aAAa;IACf,IAAI,EAApB,MAAM;CACd,GAAU,OAAO,CAAC,IAAI,CAAC,CAwCzB;sCAlWS,mBAAmB"}
+{"version":3,"file":"component-setup.d.ts","sourceRoot":"","sources":["../../lib/component-setup.js"],"names":[],"mappings":"AAWA;;;;;GAKG;AAEH;;;;;;GAMG;AACH,mDAHG;IAAuC,GAAG,EAAlC,gBAAgB;CACxB,YA+MF;AA2ID;;;;;;;;;;;GAWG;AACH,mGAPG;IAAqB,SAAS,EAAtB,GAAG;IACe,QAAQ;IACb,aAAa,EAA1B,GAAG;IACe,aAAa;IACf,IAAI,EAApB,MAAM;CACd,GAAU,OAAO,CAAC,IAAI,CAAC,CAwCzB;sCApZS,mBAAmB"}

package/dist/lib/index.js

@@ -2300,7 +2300,7 @@ function findAndExtractScript(code) {
   }
   return result;
 }
-function findAndExtractProperties(code) {
+function extractComponentProperty(code, propertyName) {
   const ast = getAST(code, true);
   let result = null;
   walkJS(ast, {
@@ -2308,11 +2308,11 @@ function findAndExtractProperties(code) {
       if (node.callee && node.callee.type === "Identifier" && node.callee.name === "defineComponent") {
         const firstArg = node.arguments[0];
         if (firstArg && firstArg.type === "ObjectExpression") {
-          const stateProp = firstArg.properties.find(
-            (prop) => prop.type === "Property" && prop.key && prop.key.type === "Identifier" && prop.key.name === "server"
+          const prop = firstArg.properties.find(
+            (p) => p.type === "Property" && p.key && p.key.type === "Identifier" && p.key.name === propertyName
           );
-          if (stateProp && stateProp.type === "Property") {
-            const { value, method } = stateProp;
+          if (prop && prop.type === "Property") {
+            const { value, method } = prop;
             let startLine = value.loc.start.line - 1;
             let prefix = "";
             let content = "";
@@ -2323,15 +2323,22 @@ function findAndExtractProperties(code) {
             } else if (value.type === "FunctionExpression") {
               if (method) {
                 const isAsync = value.async;
-                prefix += (isAsync ? "async " : "") + "function server";
+                prefix += (isAsync ? "async " : "") + "function " + propertyName;
                 content = prefix + source;
-                startLine = stateProp.key.loc.start.line - 1;
+                startLine = prop.key.loc.start.line - 1;
               } else {
                 content = prefix + source;
                 startLine = value.loc.start.line - 1;
               }
             } else if (value.type === "ObjectExpression") {
-              content = `() => (${source})`;
+              if (propertyName === "server") {
+                content = `() => (${source})`;
+              } else {
+                content = source;
+              }
+              startLine = value.loc.start.line - 1;
+            } else if (value.type === "Literal" || value.type === "Identifier") {
+              content = source;
               startLine = value.loc.start.line - 1;
             }
             result = {
@@ -2750,7 +2757,11 @@ ScriptManager.prototype.compileAllInstances = async function(instances, mode) {
       const defaults = serialize(normalizedDefaults);
       const attributes = serialize(sharedFn.script?.attributes || {});
       const hydrationMap = serialize(generateHydrationMap(sharedFn.templateAST, sharedFn.templateValues));
-      const getters = serialize(sharedFn.getters || sharedFn.script?.getters || {});
+      let normalizedGetters = sharedFn.getters || sharedFn.script?.getters || {};
+      if (normalizedGetters) {
+        normalizedGetters = normalizeObjectFunctions(normalizedGetters, astTransformer);
+      }
+      const getters = serialize(normalizedGetters);
       const dependencies = JSON.stringify(sharedFn.components || []);
       let normalizedSlots = sharedFn.slots || {};
       if (sharedFn.slots) {
@@ -4067,8 +4078,9 @@ function createComponentDefinition({ app }) {
     const serializableAttributes = {};
     if (attributes) {
       for (const [key, schema] of Object.entries(attributes)) {
+        const type = schema.type || schema;
         serializableAttributes[key] = {
-          type: schema.type.name || schema.type,
+          type: type.name || type,
           default: schema.default
         };
       }
@@ -4090,7 +4102,8 @@ function createComponentDefinition({ app }) {
     };
     if (attributes) {
       for (const [key, schema] of Object.entries(attributes)) {
-        const typeName = schema.type.name || schema.type;
+        const type = schema.type || schema;
+        const typeName = type.name || type;
         if (state[key] !== void 0) {
           const value = state[key];
           if (typeName === "Number") {
@@ -4260,13 +4273,51 @@ async function _safeRegister(component, scriptManager, scriptResultMeta = null)
       extractedComponents = extractedClient.components || [];
     }
     if (!component._extractedServer) {
-      component._extractedServer = findAndExtractProperties(component.script);
+      component._extractedServer = extractComponentProperty(component.script, "server");
     }
     const extractedServer = component._extractedServer;
     if (extractedServer) {
       scriptObj.stateContent = extractedServer.content;
       scriptObj.stateLineOffset = (component.lineOffset || 0) + extractedServer.lineOffset;
     }
+    if (!scriptResultMeta) {
+      const extractedGetters = extractComponentProperty(component.script, "getters");
+      if (extractedGetters) {
+        try {
+          if (extractedGetters.content.trim().startsWith("{")) {
+            scriptObj.getters = new Function(`return ${extractedGetters.content}`)();
+          }
+        } catch {
+        }
+      }
+      const extractedAttributes = extractComponentProperty(component.script, "attributes");
+      if (extractedAttributes) {
+        try {
+          if (extractedAttributes.content.trim().startsWith("{")) {
+            const attrs = new Function(`return ${extractedAttributes.content}`)();
+            const serializableAttributes = {};
+            for (const [key, schema] of Object.entries(attrs)) {
+              const type = schema.type || schema;
+              serializableAttributes[key] = {
+                type: type.name || type,
+                default: schema.default
+              };
+            }
+            scriptObj.attributes = serializableAttributes;
+          }
+        } catch {
+        }
+      }
+      const extractedSlots = extractComponentProperty(component.script, "slots");
+      if (extractedSlots) {
+        try {
+          if (extractedSlots.content.trim().startsWith("{")) {
+            scriptObj.slots = new Function(`return ${extractedSlots.content}`)();
+          }
+        } catch {
+        }
+      }
+    }
   }
   const declarativeComponents = (component.customElements || []).map((el) => el.name);
   const nestedComponents = [.../* @__PURE__ */ new Set([...declarativeComponents, ...extractedComponents])];
@@ -5286,7 +5337,7 @@ function createRenderer({
           extractedComponents = extractedScript.components || [];
         }
         if (!moduleComponent.result._extractedProperties) {
-          moduleComponent.result._extractedProperties = findAndExtractProperties(module.script);
+          moduleComponent.result._extractedProperties = extractComponentProperty(module.script, "server");
         }
         const extractedProperties = moduleComponent.result._extractedProperties;
         if (extractedProperties) {
@@ -5830,6 +5881,44 @@ function createRenderer({
           mappedSessionObject,
           pageContext
         });
+        const componentsToInclude = /* @__PURE__ */ new Set();
+        const addComponentAndDependencies2 = (id) => {
+          if (componentsToInclude.has(id)) {
+            return;
+          }
+          componentsToInclude.add(id);
+          const sharedFn = scriptManager.sharedFunctions[id];
+          if (sharedFn && sharedFn.components) {
+            const components = sharedFn.components;
+            for (let i = 0; i < components.length; i++) {
+              addComponentAndDependencies2(components[i]);
+            }
+          }
+        };
+        for (const tag of mappedSessionObject.componentTags) {
+          addComponentAndDependencies2(tag);
+        }
+        if (mappedSessionObject.scripts.content[mappedComponent.path.pathname]) {
+          const scripts = mappedSessionObject.scripts.content[mappedComponent.path.pathname];
+          for (const instanceId in scripts) {
+            const script = scripts[instanceId];
+            addComponentAndDependencies2(script.componentId);
+            if (script.components) {
+              const components = script.components;
+              for (let i = 0; i < components.length; i++) {
+                addComponentAndDependencies2(components[i]);
+              }
+            }
+          }
+        }
+        for (const module of scriptManager.scriptModules) {
+          const extractedComponents = module.client?._extractedComponents || module._extractedComponents;
+          if (extractedComponents) {
+            for (const tag of extractedComponents) {
+              addComponentAndDependencies2(tag);
+            }
+          }
+        }
         const { head: headElement, body: bodyElement } = findHeadAndBody(mappedComponent.root);
         if (normalizedOptions.externalStyles && normalizedOptions.externalStyles.length > 0) {
           injectExternalStyles(mappedComponent.root, headElement, normalizedOptions.externalStyles);
@@ -5857,7 +5946,7 @@ function createRenderer({
             injectStyles(mappedComponent.root, headElement, mappedSessionObject.styles);
           }
         }
-        if (mappedSessionObject.componentTags.size > 0) {
+        if (componentsToInclude.size > 0) {
           const targetElement = headElement || bodyElement || mappedComponent.root;
           const layoutStyleElement = createCoraliteElement({
             type: "tag",
@@ -5866,7 +5955,7 @@ function createRenderer({
             attribs: { id: "coralite-components" },
             children: []
           });
-          const selectors = Array.from(mappedSessionObject.componentTags);
+          const selectors = Array.from(componentsToInclude);
           selectors.push("c-token");
           layoutStyleElement.children.push(createCoraliteTextNode({
             type: "text",
@@ -5902,44 +5991,6 @@ function createRenderer({
             });
           }
           const chunkManifest = {};
-          const componentsToInclude = /* @__PURE__ */ new Set();
-          const addComponentAndDependencies2 = (id) => {
-            if (componentsToInclude.has(id)) {
-              return;
-            }
-            componentsToInclude.add(id);
-            const sharedFn = scriptManager.sharedFunctions[id];
-            if (sharedFn && sharedFn.components) {
-              const components = sharedFn.components;
-              for (let i = 0; i < components.length; i++) {
-                addComponentAndDependencies2(components[i]);
-              }
-            }
-          };
-          for (const instanceId in scripts) {
-            const script = scripts[instanceId];
-            addComponentAndDependencies2(script.componentId);
-            if (script.components) {
-              const components = script.components;
-              for (let i = 0; i < components.length; i++) {
-                addComponentAndDependencies2(components[i]);
-              }
-            }
-          }
-          for (const tag of declarativeTags) {
-            addComponentAndDependencies2(tag);
-          }
-          for (const module of scriptManager.scriptModules) {
-            if (module.client?._extractedComponents) {
-              for (const tag of module.client._extractedComponents) {
-                addComponentAndDependencies2(tag);
-              }
-            } else if (module._extractedComponents) {
-              for (const tag of module._extractedComponents) {
-                addComponentAndDependencies2(tag);
-              }
-            }
-          }
           for (const tag of componentsToInclude) {
             if (scriptResult.manifest[tag]) {
               chunkManifest[tag] = scriptResult.manifest[tag];
@@ -6782,9 +6833,9 @@ export {
   definePlugin,
   discoverHtmlFiles,
   enhanceNode,
+  extractComponentProperty,
   extractGlobals,
   findAndExtractImperativeComponents,
-  findAndExtractProperties,
   findAndExtractScript,
   findHeadAndBody,
   generateHydrationMap,