0.0.4

bahrus · May 14, 2023 · d9e1ef4 · d9e1ef4
1 parent e8a743b
commit d9e1ef4
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 27 deletions.
diff --git a/be-derived2.js b/be-derived2.js
@@ -10,7 +10,8 @@ export class BeDerived extends BE {
             parseAndCamelize: true,
             camelizeOptions: {
                 doSets: true,
-                simpleSets: ['Affect', 'Survey', 'Target']
+                simpleSets: ['Affect', 'Survey', 'Target'],
+                booleans: ['Itemize'],
             }
         };
     }
@@ -45,8 +46,11 @@ export class BeDerived extends BE {
         let affected = await findRealm(enhancedElement, affect);
         let split;
         if (target !== undefined) {
-            const { beSplit } = await import('be-enhanced/cpu.js');
-            split = await beSplit(target);
+            // const {beSplit} = await import('be-enhanced/cpu.js');
+            // split = await beSplit(target);
+            const { getVal } = await import('trans-render/lib/getVal.js');
+            const dotTarget = target[0] === '.' ? target : '.' + target;
+            affected = await getVal({ host: affected }, dotTarget);
         }
         const derivedVals = {};
         if (itemize) {
@@ -67,13 +71,12 @@ export class BeDerived extends BE {
             const { script } = await import('./script.js');
             await script(enhancedElement, realmToSurvey, derivedVals);
         }
-        if (split !== undefined) {
-            const { setProp } = await import('trans-render/lib/setProp.js');
-            await setProp(affected, split.path, derivedVals);
-        }
-        else {
-            Object.assign(affected, derivedVals);
-        }
+        Object.assign(affected, derivedVals);
+        // if(split !== undefined){
+        //     const {setProp} = await import('trans-render/lib/setProp.js');
+        //     await setProp(affected, split.path, derivedVals);
+        // }else{
+        // }
         return {
             resolved: true
         };

diff --git a/be-derived2.ts b/be-derived2.ts
@@ -13,7 +13,8 @@ export class BeDerived extends BE<AP, Actions, HTMLTemplateElement | HTMLScriptE
             parseAndCamelize: true,
             camelizeOptions: {
                 doSets: true,
-                simpleSets: ['Affect', 'Survey', 'Target']
+                simpleSets: ['Affect', 'Survey', 'Target'],
+                booleans: ['Itemize'],
             }
         } as BEConfig<CamelConfig>
     }
@@ -55,9 +56,11 @@ export class BeDerived extends BE<AP, Actions, HTMLTemplateElement | HTMLScriptE
         let split: BeSplitOutput | undefined;
 
         if(target !== undefined){
-            const {beSplit} = await import('be-enhanced/cpu.js');
-            split = await beSplit(target);
-
+            // const {beSplit} = await import('be-enhanced/cpu.js');
+            // split = await beSplit(target);
+            const {getVal} = await import('trans-render/lib/getVal.js');
+            const dotTarget = target[0] === '.' ? target : '.' + target;
+            affected = await getVal({host: affected}, dotTarget);
         }
         const derivedVals = {} as any;
         if(itemize){
@@ -77,13 +80,14 @@ export class BeDerived extends BE<AP, Actions, HTMLTemplateElement | HTMLScriptE
             const {script} = await import('./script.js');
             await script(enhancedElement, realmToSurvey, derivedVals);
         }
-        if(split !== undefined){
-            const {setProp} = await import('trans-render/lib/setProp.js');
-            await setProp(affected, split.path, derivedVals);
+        Object.assign(affected as any, derivedVals);
+        // if(split !== undefined){
+        //     const {setProp} = await import('trans-render/lib/setProp.js');
+        //     await setProp(affected, split.path, derivedVals);
 
-        }else{
-            Object.assign(affected as any, derivedVals);
-        }
+        // }else{
+
+        // }
         return {
             resolved: true
         } as PAP;

diff --git a/be-enhanced b/be-enhanced
diff --git a/demo/heminway2.html b/demo/heminway2.html
@@ -7,7 +7,7 @@
     <title>Document</title>
 </head>
 <body>
-    <div>
+    <div be-scoped>
         <button>30</button>
         <time datetime="2018-07-07T20:00:00">20:00</time>
         <span itemprop="greeting">Hello</span>
@@ -19,7 +19,7 @@
     </div>
     <template  be-derived='
         Affect previous element sibling. //This is set by default.
-        Target beScoped:scope. //Not set by default.
+        Target beEnhanced:whenResolved|be-scoped:scope. //Not set by default.
         Survey previous element sibling. //This is set by default.
         Derive count as number from button.
         Derive day of event as date from datetime attribute.
@@ -39,7 +39,7 @@
                 "be-hive/": "../node_modules/be-hive/",
                 "be-scoped/": "../node_modules/be-scoped/",
                 "obj-ml/": "../node_modules/obj-ml/",
-                "trans-render/": "../node_modules/trans-render/",
+                "trans-render/": "../trans-render/",
                 "xtal-element/": "../node_modules/xtal-element/"
             }
         }

diff --git a/derive.js b/derive.js
@@ -31,7 +31,7 @@ export async function derive(deriveRules, realmToSurvey, derivedVals) {
     }
 }
 export async function toCanonical(Derive) {
-    const { tryParse } = await import('be-decorated/cpu.js');
+    const { tryParse } = await import('be-enhanced/cpu.js');
     const returnObj = [];
     for (const deriveStatement of Derive) {
         const parsed = tryParse(deriveStatement, reDeriveMediumKey);

diff --git a/derive.ts b/derive.ts
@@ -1,5 +1,5 @@
 
-import { camelQry } from '../trans-render/lib/types';
+import { camelQry } from 'trans-render/lib/types';
 import {DeriveRule} from './types';
 
 export async function derive(deriveRules: DeriveRule[], realmToSurvey: Element, derivedVals: any){
@@ -33,7 +33,7 @@ export async function derive(deriveRules: DeriveRule[], realmToSurvey: Element,
 }
 
 export async function toCanonical(Derive: string[]): Promise<DeriveRule[]>{
-    const {tryParse} = await import('be-decorated/cpu.js');
+    const {tryParse} = await import('be-enhanced/cpu.js');
     const returnObj: DeriveRule[] = [];
     for(const deriveStatement of Derive){
         const parsed = tryParse(deriveStatement, reDeriveMediumKey) as ParsedDeriveMediumKey;

diff --git a/trans-render b/trans-render