0.0.1

bahrus · Dec 10, 2023 · 2dfe502 · 2dfe502
1 parent 34aaf76
commit 2dfe502
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -153,7 +153,7 @@ Advantages of using script element -- less issues with characters that cause pro
 
 Since the expression starts with open parenthesis, wrapping is more lightweight.  Just adds export const default.
 
-## Example 1g [TODO]
+## Example 1g
 
 Specify export symbol
 

diff --git a/be-computed.js b/be-computed.js
@@ -35,7 +35,7 @@ export class BeComputed extends BE {
     async hydrate(self) {
         const { fromStatements, enhancedElement } = self;
         for (const fromStatement of fromStatements) {
-            let { attrContainingExpression, args, previousElementScriptElement, onloadOrPreviousElementScriptElement } = fromStatement;
+            let { attrContainingExpression, args, previousElementScriptElement, onloadOrPreviousElementScriptElement, importName } = fromStatement;
             if (args === undefined)
                 throw 'NI';
             let scriptText = null;
@@ -66,7 +66,7 @@ export class BeComputed extends BE {
             }
             const rewritten = rewrite(scriptText, args.map(x => x.remoteProp));
             const parsedJavaScript = await parse(rewritten);
-            const expr = parsedJavaScript['expr'];
+            const expr = parsedJavaScript[importName || 'expr'];
             this.#computationObservers.push(new ComputationObserver(expr, fromStatement, args, enhancedElement, self));
         }
         return {

diff --git a/be-computed.ts b/be-computed.ts
@@ -45,7 +45,10 @@ export class BeComputed extends BE<AP, Actions> implements Actions{
     async hydrate(self: this){
         const {fromStatements, enhancedElement} = self;
         for(const fromStatement of fromStatements!){
-            let {attrContainingExpression, args, previousElementScriptElement, onloadOrPreviousElementScriptElement} = fromStatement;
+            let {
+                attrContainingExpression, args, previousElementScriptElement, 
+                onloadOrPreviousElementScriptElement, importName
+            } = fromStatement;
             if(args === undefined) throw 'NI';
             let scriptText: string | null = null;
             if(attrContainingExpression === undefined && !previousElementScriptElement){
@@ -73,7 +76,7 @@ export class BeComputed extends BE<AP, Actions> implements Actions{
 
             const rewritten = rewrite(scriptText!, args.map(x => x.remoteProp!));
             const parsedJavaScript = await parse(rewritten);
-            const expr = parsedJavaScript['expr'];
+            const expr = parsedJavaScript[importName || 'expr'];
             this.#computationObservers.push(
                 new ComputationObserver(expr, fromStatement, args, enhancedElement, self
             ));

diff --git a/rewrite.js b/rewrite.js
@@ -14,14 +14,17 @@
 // }
 export function rewrite(script, names) {
     const trimmedScript = script.trim();
+    if (trimmedScript.includes('export const')) {
+        return trimmedScript;
+    }
     if (trimmedScript[0] === '(') {
         const newScript2 = `export const expr = async ${trimmedScript}`;
         return newScript2;
     }
-    const newScript = `
+    const newScript3 = `
         export const expr = async ({${names.join(', ')}}) => {
             return ${trimmedScript};
         }
     `;
-    return newScript;
+    return newScript3;
 }
diff --git a/rewrite.ts b/rewrite.ts
@@ -17,14 +17,17 @@ import {AP} from './types';
 
 export function rewrite(script: string, names: Array<string>): string{
     const trimmedScript = script.trim();
+    if(trimmedScript.includes('export const')){
+        return trimmedScript;
+    }
     if(trimmedScript[0] === '('){
         const newScript2 = `export const expr = async ${trimmedScript}`;
         return newScript2;
     }
-    const newScript = `
+    const newScript3 = `
         export const expr = async ({${names.join(', ')}}) => {
             return ${trimmedScript};
         }
     `;
-    return newScript;
+    return newScript3;
 }