Moves scope functions to scope/

stephband · Jul 27, 2024 · 4a21095 · 4a21095
1 parent aab80e9
commit 4a21095
Show file tree

Hide file tree

Showing 31 changed files with 55 additions and 55 deletions.
diff --git a/deno/scope.js b/deno/scope.js
@@ -20,8 +20,8 @@ import parseMarkdown   from './parse-markdown.js';
 
 import { red, yellow }     from './log.js';
 
-export * from '../modules/scope/scope-fns.js';
-export * from '../modules/scope/scope-fns-ext.js';
+export * from '../scope/scope-fns.js';
+export * from '../scope/scope-fns-ext.js';
 export { px, em, rem } from './parse-length.js';
 export const vw = () => { throw new Error('Literal scope function vw() not available in Deno') }
 export const vh = () => { throw new Error('Literal scope function vh() not available in Deno') }

diff --git a/literal-html/module.js b/literal-html/module.js
@@ -12,7 +12,7 @@ import element, { getInternals as Internals } from '../../dom/modules/element.js
 import assignDataset    from '../modules/dom/assign-dataset.js';
 import requestData      from '../modules/request-data.js';
 import DOMRenderer      from '../modules/template.js';
-import { printError }   from '../modules/scope/print.js';
+import { printError }   from '../modules/print.js';
 
 const assign  = Object.assign;
 const rpath   = /^(\.+|https?:\/)?\//;

diff --git a/module.css b/module.css
@@ -1 +1 @@
-@import './modules/scope/print.css';
+@import './modules/print.css';
diff --git a/modules/compile/compile-attribute.js b/modules/compile/compile-attribute.js
@@ -11,7 +11,7 @@ import R                 from '../renderer/renderer.js';
 import isLiteralString   from './is-literal-string.js';
 import truncate          from './truncate.js';
 import compile           from './compile.js';
-import { printError } from '../scope/print.js';
+import { printError }    from '../print.js';
 
 
 const assign = Object.assign;

diff --git a/modules/compile/compile-node.js b/modules/compile/compile-node.js
@@ -5,7 +5,7 @@ import toType               from '../../../dom/modules/to-type.js';
 import decode               from '../../../dom/modules/decode.js';
 import indexOf              from '../dom/index-of.js';
 import TextRenderer         from '../renderer/renderer-text.js';
-import { printError }       from '../scope/print.js';
+import { printError }       from '../print.js';
 import scope                from '../scope.js';
 import compile              from './compile.js';
 import { pathSeparator }    from './constants.js';

diff --git a/modules/scope/include.js → modules/include.js b/modules/scope/include.js → modules/include.js
@@ -18,11 +18,11 @@ ${ data.array.map(include('#list-item')) }
 ```
 **/
 
-import Data            from '../../../fn/modules/data.js';
-import getById         from '../dom/get-by-id.js';
-import Literal         from '../template.js';
-import requestTemplate from '../request-template.js';
-import requestData     from '../request-data.js';
+import Data            from '../../fn/modules/data.js';
+import getById         from './dom/get-by-id.js';
+import Literal         from './template.js';
+import requestTemplate from './request-template.js';
+import requestData     from './request-data.js';
 
 function pipe(template, data, element, consts) {
     const renderer = Literal.fromTemplate(template, element, consts, data);

diff --git a/modules/scope/print.css → modules/print.css b/modules/scope/print.css → modules/print.css
diff --git a/modules/scope/print.js → modules/print.js b/modules/scope/print.js → modules/print.js
@@ -19,15 +19,15 @@ Renders as:
 Messages should be styled with the print stylesheet:
 
 ```css
-@import "http://stephen.band/literal/modules/scope/print.css";
+@import "http://stephen.band/literal/modules/print.css";
 ```-->
 
 **/
 
-import noop    from '../../../fn/modules/noop.js';
-import Data    from '../../../fn/modules/data.js';
-import create  from '../../../dom/modules/create.js';
-import { log } from '../log.js';
+import noop    from '../../fn/modules/noop.js';
+import Data    from '../../fn/modules/data.js';
+import create  from '../../dom/modules/create.js';
+import { log } from './log.js';
 
 const linkHTML = '<a class="literal-link" href="https://stephen.band/literal/literal-html/">literal</literal>';
 

diff --git a/modules/renderer/renderer-attribute.js b/modules/renderer/renderer-attribute.js
@@ -3,7 +3,7 @@
 import Signal            from '../../../fn/modules/signal.js';
 import names  from './property-names.js';
 import Renderer, { stats } from './renderer.js';
-import { printError } from '../scope/print.js';
+import { printError } from '../print.js';
 import toText from './to-text.js';
 
 

diff --git a/modules/renderer/renderer-checked.js b/modules/renderer/renderer-checked.js
@@ -4,7 +4,7 @@ import isDefined         from '../../../fn/modules/is-defined.js';
 import Signal            from '../../../fn/modules/signal.js';
 import trigger           from '../../../dom/modules/trigger.js';
 import config            from '../config.js';
-import bindChecked       from '../scope/bind-checked.js';
+import bindChecked       from '../../scope/bind-checked.js';
 import AttributeRenderer from './renderer-attribute.js';
 import { toAttributeBoolean } from './renderer-boolean.js';
 import { getValue }      from './renderer-value.js';

diff --git a/modules/renderer/renderer-text.js b/modules/renderer/renderer-text.js
@@ -9,10 +9,10 @@ that DOM after the text node.
 import Signal           from '../../../fn/modules/signal.js';
 import Data             from '../../../fn/modules/data.js';
 import { isCommentNode, isElementNode, isFragmentNode, isTextNode } from '../../../dom/modules/node.js';
-import include          from '../scope/include.js';
+import include          from '../include.js';
 import deleteRange      from '../dom/delete-range.js';
-import DOMRenderer      from '../template.js';
-import print, { printError } from '../scope/print.js';
+import Literal          from '../template.js';
+import print, { printError } from '../print.js';
 import toText           from './to-text.js';
 import Renderer, { stats } from './renderer.js';
 
@@ -55,7 +55,7 @@ function objectToContents(state, object, i) {
 
     // If object is not a node or renderer, append to string. Array.isArray()
     // does return true for a proxy of an array.
-    if (!(object instanceof DOMRenderer) && !(object instanceof Node) && !Array.isArray(object)) {
+    if (!(object instanceof Literal) && !(object instanceof Node) && !Array.isArray(object)) {
         state.string += toText(object);
         return i;
     }
@@ -92,7 +92,7 @@ function objectToContents(state, object, i) {
     }
 
     // Object is a freshly rendered Literal Template
-    if (object instanceof DOMRenderer) {
+    if (object instanceof Literal) {
         contents[++i].before(toContent(object));
         if (window.DEBUG) ++stats.add;
         contents.splice(i, 0, object);

diff --git a/modules/renderer/renderer-value.js b/modules/renderer/renderer-value.js
@@ -5,7 +5,7 @@ import overload          from '../../../fn/modules/overload.js';
 import Signal            from '../../../fn/modules/signal.js';
 import trigger           from '../../../dom/modules/trigger.js';
 import config            from '../config.js';
-import bindValue         from '../scope/bind-value.js';
+import bindValue         from '../../scope/bind-value.js';
 import AttributeRenderer, { toAttributeString } from './renderer-attribute.js';
 import { stats }         from './renderer.js';
 import toText            from './to-text.js';

diff --git a/modules/scope.js b/modules/scope.js
@@ -1,7 +1,7 @@
 
 // Import base set of scope functions
 
-import * as scope1 from './scope/scope-fns.js';
-import * as scope2 from './scope/scope-dom.js';
+import * as scope1 from '../scope/scope-fns.js';
+import * as scope2 from '../scope/scope-dom.js';
 
 export default Object.assign({}, scope1, scope2);
diff --git a/modules/template.js b/modules/template.js
@@ -83,7 +83,7 @@ function removeRange(first, last, fragment) {
     fragment.appendChild(dom);
 }
 
-export default class LiteralDOM {
+export default class Literal {
     static compile(fragment, options, src) {
         if (window.DEBUG) {
             groupCollapsed('compile', src, 'yellow');
@@ -105,11 +105,11 @@ export default class LiteralDOM {
 
     static fromFragment(fragment, identifier, element, consts = {}, data, options) {
         const compiled = cache[identifier] || (
-            cache[identifier] = LiteralDOM.compile(fragment, options, identifier)
+            cache[identifier] = Literal.compile(fragment, options, identifier)
         );
 
         // fragment, targets, element, consts, data, options
-        return new LiteralDOM(fragment.cloneNode(true), compiled, element, consts, data, options);
+        return new Literal(fragment.cloneNode(true), compiled, element, consts, data, options);
     }
 
     static fromTemplate(template, element, consts = {}, data) {
@@ -120,7 +120,7 @@ export default class LiteralDOM {
             nostrict: template.hasAttribute && template.hasAttribute('nostrict')
         };
 
-        return LiteralDOM.fromFragment(fragment, '#' + id, element, consts, data, options);
+        return Literal.fromFragment(fragment, '#' + id, element, consts, data, options);
     }
 
     #first;
@@ -279,7 +279,7 @@ export default class LiteralDOM {
     }
 }
 
-assign(LiteralDOM.prototype, {
+assign(Literal.prototype, {
     /**
     .stop()
     Stops renderer.

diff --git a/scope.js b/scope.js
@@ -2,7 +2,7 @@
 // Extend scope with library of pure and DOM functions
 
 import Literal       from './module.js';
-import * as scopeFn  from './modules/scope/scope-fns-ext.js';
-import * as scopeDom from './modules/scope/scope-dom-ext.js';
+import * as scopeFn  from './scope/scope-fns-ext.js';
+import * as scopeDom from './scope/scope-dom-ext.js';
 
 Object.assign(Literal.scope, scopeFn, scopeDom);
diff --git a/modules/scope/add.js → scope/add.js b/modules/scope/add.js → scope/add.js
diff --git a/modules/scope/bind-checked.js → scope/bind-checked.js b/modules/scope/bind-checked.js → scope/bind-checked.js
@@ -1,7 +1,7 @@
 
-import id        from '../../../fn/modules/id.js';
-import isDefined from '../../../fn/modules/is-defined.js';
-import set       from '../../../fn/modules/set.js';
+import id        from '../../fn/modules/id.js';
+import isDefined from '../../fn/modules/is-defined.js';
+import set       from '../../fn/modules/set.js';
 //import events    from '../../../dom/modules/events.js';
 //import { observe } from '../data.js';
 

diff --git a/modules/scope/bind-value.js → scope/bind-value.js b/modules/scope/bind-value.js → scope/bind-value.js
@@ -1,8 +1,8 @@
 
-import id     from '../../../fn/modules/id.js';
-import set    from '../../../fn/modules/set-path.js';
+import id     from '../../fn/modules/id.js';
+import set    from '../../fn/modules/set-path.js';
 //import events from '../../../dom/modules/events.js';
-import { getValue, setValue } from '../renderer/renderer-value.js';
+import { getValue, setValue } from '../modules/renderer/renderer-value.js';
 //import { observe } from '../data.js';
 
 let warned;

diff --git a/modules/scope/copy.js → scope/copy.js b/modules/scope/copy.js → scope/copy.js
diff --git a/modules/scope/include-html.js → scope/include-html.js b/modules/scope/include-html.js → scope/include-html.js
diff --git a/modules/scope/messages.js → scope/messages.js b/modules/scope/messages.js → scope/messages.js
diff --git a/modules/scope/paramify.js → scope/paramify.js b/modules/scope/paramify.js → scope/paramify.js
diff --git a/modules/scope/pluralise.js → scope/pluralise.js b/modules/scope/pluralise.js → scope/pluralise.js
diff --git a/modules/scope/scope-dom-ext.js → scope/scope-dom-ext.js b/modules/scope/scope-dom-ext.js → scope/scope-dom-ext.js
diff --git a/modules/scope/scope-dom.js → scope/scope-dom.js b/modules/scope/scope-dom.js → scope/scope-dom.js
diff --git a/modules/scope/scope-fns-ext.js → scope/scope-fns-ext.js b/modules/scope/scope-fns-ext.js → scope/scope-fns-ext.js
diff --git a/modules/scope/scope-fns.js → scope/scope-fns.js b/modules/scope/scope-fns.js → scope/scope-fns.js
diff --git a/modules/scope/stash.js → scope/stash.js b/modules/scope/stash.js → scope/stash.js
diff --git a/modules/scope/style.js → scope/style.js b/modules/scope/style.js → scope/style.js
diff --git a/templates/index.html b/templates/index.html
@@ -49,7 +49,7 @@ <h1 class="text-01">Literal <span class="text-06">0.8.3</span></h1>
     </header>
 
     <section class="x1 4x @2-x2 x-stretch" id="template-scope">
-        
+
 
 <h2 class="text-02" id="template-scope">Template scope</h2>
 <p>Literal templates are compiled in a <strong>scope</strong> that contains a number of
@@ -83,7 +83,7 @@ <h2 class="text-02" id="template-scope">Template scope</h2>
     <div class="x1 4x @1-3x @1-y3 @2-x2 x-stretch y-start">
         <h3>Objects</h3>
 
-        
+
 
 <details-toggle class="selector-details-toggle" id="selector-data">
     <h4 class="selector-text text-05" slot="summary">
@@ -172,7 +172,7 @@ <h4 class="selector-text text-05" slot="summary">
 
         <h3>Streams</h3>
 
-        
+
 
 <details-toggle class="function-details-toggle" id="function-clock-1">
     <h4 class="function-text text-05" slot="summary">
@@ -362,7 +362,7 @@ <h4 class="constructor-text text-05" slot="summary">
 
         <h3>Functions</h3>
 
-        
+
 
 <details-toggle class="function-details-toggle" id="function-assign-2">
     <h4 class="function-text text-05" slot="summary">
@@ -450,7 +450,7 @@ <h4 class="function-text text-05" slot="summary">
         <code class=" language-js">denormalise(<span class="param">min</span>, <span class="param">max</span>, <span class="param">value</span>)</code>
     </h4>
 
-    
+
 </details-toggle>
 
 
@@ -639,7 +639,7 @@ <h4 class="function-text text-05" slot="summary">
         <code class=" language-js">normalise(<span class="param">min</span>, <span class="param">max</span>, <span class="param">value</span>)</code>
     </h4>
 
-    
+
 </details-toggle>
 
 
@@ -698,7 +698,7 @@ <h4 class="function-text text-05" slot="summary">
 Messages should be styled with the print stylesheet:
 
 ```css
-@import "http://stephen.band/literal/modules/scope/print.css";
+@import "http://stephen.band/literal/modules/print.css";
 ```-->
 
 
@@ -838,7 +838,7 @@ <h4 class="function-text text-05" slot="summary">
 
 
 
-        
+
 
 <details-toggle class="function-details-toggle" id="function-px">
     <h4 class="function-text text-05" slot="summary">
@@ -925,7 +925,7 @@ <h3 id="extending-the-template-scope">Extending the template scope</h3>
     </section>
 
     <section class="x1 4x @2-x2 x-stretch" id="template-expressions">
-        
+
 
 <h2 class="text-02" id="template-expressions">Template expressions</h2>
 <p>Expressions may evaluate to a <strong>string</strong> or other <strong>primitive</strong>, a <strong>DOM node</strong>
@@ -1066,7 +1066,7 @@ <h2 class="text-02" id="template-expressions">Template expressions</h2>
 
     </section>
 
-    
+
 <nav>
     <details-toggle class="nav-details-toggle">
         <button slot="summary" class="nav-thumb thumb">
@@ -1237,7 +1237,7 @@ <h2 class="text-02" id="template-expressions">Template expressions</h2>
     </details-toggle>
 </nav>
 
-    
+
 <hr class="x1 4x @2-x2 x-stretch" style="margin-top: 4.2em;" />
 
 <div class="x1 4x @2-x2 x-stretch y-start">
@@ -1254,7 +1254,7 @@ <h2 class="text-02" id="template-expressions">Template expressions</h2>
     </p>
 </div>
 
-    
+
 <footer class="x1 4x @1-6x @2-7x @3-9x 4x-grid @1-6x-grid @2-7x-grid @3-9x-grid grid grid footer">
     <div class="x1 4x @1-2x @2-x2 x-stretch y-start">
         <h3>Elements</h3>
@@ -1284,4 +1284,4 @@ <h3>Tools</h3>
         import '../literal-html/module.js';
     </script>
 </body>
-</html>
+</html>
diff --git a/templates/index.html.literal b/templates/index.html.literal
@@ -67,9 +67,9 @@
             '../../dom/modules/trigger.js',
             '../modules/scope.js',
             '../modules/scope-dom.js',
-            '../modules/scope/include.js',
-            '../modules/scope/paramify.js',
-            '../modules/scope/print.js'
+            '../modules/include.js',
+            '../scope/paramify.js',
+            '../modules/print.js'
         ))
         .filter((doc) => (doc.type === 'function' || doc.type === 'constructor'))
         .filter((entry) => !['Stream.of', 'Stream.from', 'Stream.combine', 'Stream.merge', 'clock', 'events', 'observe'].includes(entry.name))
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		@import './modules/scope/print.css';
		@import './modules/print.css';