Slight improvements to ID generation and other cleanup

components/ComponentDef.js

@@ -95,7 +95,7 @@ ComponentDef.prototype = {
         var id = this.id;
 
         return id ?
-            id + '-w' + (this.$__nextIdIndex++) :
+            id + '-c' + (this.$__nextIdIndex++) :
             nextComponentId(this.$__out);
     },
 

components/renderer.js

@@ -7,7 +7,7 @@ var ComponentsContext = require('./ComponentsContext');
 var registry = require('./registry');
 var extend = require('raptor-util/extend');
 
-var WIDGETS_BEGIN_ASYNC_ADDED_KEY = '$wa';
+var COMPONENT_BEGIN_ASYNC_ADDED_KEY = '$wa';
 
 function resolveComponentKey(out, key, scope) {
     if (key.charAt(0) == '#') {
@@ -83,8 +83,8 @@ function createRendererFunc(templateRenderFunc, componentProps, renderingLogic)
         var outGlobal = out.global;
 
         if (!out.isSync()) {
-            if (!outGlobal[WIDGETS_BEGIN_ASYNC_ADDED_KEY]) {
-                outGlobal[WIDGETS_BEGIN_ASYNC_ADDED_KEY] = true;
+            if (!outGlobal[COMPONENT_BEGIN_ASYNC_ADDED_KEY]) {
+                outGlobal[COMPONENT_BEGIN_ASYNC_ADDED_KEY] = true;
                 out.on('beginAsync', handleBeginAsync);
             }
         }

components/util-browser.js

@@ -92,7 +92,7 @@ function nextComponentId() {
     // marko runtimes. This allows multiple instances of marko to be
     // loaded in the same window and they should all place nice
     // together
-    return 'c' + ((markoGlobal.uid)++);
+    return 'b' + ((markoGlobal.uid)++);
 }
 
 function getElementById(doc, id) {

components/util.js

@@ -2,7 +2,7 @@ var KEY = Symbol();
 var isArray = Array.isArray;
 
 function UniqueId(out) {
-    this.prefix = out.global.componentIdPrefix || 's'; // "s" is for server (we use "c" for the client/browser)
+    this.prefix = out.global.componentIdPrefix || 's'; // "s" is for server (we use "b" for the browser)
     this.nextId = 0;
 }
 

test/autotests/components-server/getRenderedWidgets/components/app-simple/index.js

@@ -1,26 +0,0 @@
-module.exports = require('marko/components/legacy').defineComponent({
-	template: require.resolve('./template.marko'),
-
-	getComponentConfig: function() {
-		return {
-			type: 'component config'
-		};
-	},
-
-	getInitialState: function() {
-		return {
-			type: 'component state'
-		};
-	},
-
-	getTemplateData: function(state, input) {
-		return {
-			name: input.name,
-            messageCount: input.messageCount
-		};
-	},
-
-	init: function(componentConfig) {
-		this.componentConfig = componentConfig;
-	}
-});

test/autotests/components-server/getRenderedWidgets/components/app-simple/index.marko

@@ -1,4 +1,8 @@
-<div w-bind>
+class {
+
+}
+
+<div>
 	Hello ${data.name}! You have ${data.messageCount} new messages.
 	<div key="foo">foo</div>
 </div>

test/autotests/components-server/getRenderedWidgets/index.marko

@@ -1,4 +1,8 @@
-<div w-bind>
+class {
+
+}
+
+<div>
 	<app-simple name="Frank" count=20/>
 	<app-simple name="John" count=30/>
 </div>

test/autotests/components-server/getRenderedWidgets/marko.json

@@ -1,3 +0,0 @@
-{
-    "tags-dir": "./components"
-}

test/autotests/components-server/getRenderedWidgets/test.js

@@ -2,18 +2,20 @@ var expect = require('chai').expect;
 var markoComponents = require('marko/components');
 
 module.exports = function(helpers, done) {
-    var template = require('./template.marko');
+    var template = require('./index.marko');
 
     template.renderToString({}, function(err, html, out) {
 		var renderedComponents = markoComponents.getRenderedComponents(out);
         expect(renderedComponents).to.be.an('object');
 
+        console.log('HTML', html);
+
         expect(Object.keys(renderedComponents).length).to.equal(2);
         var componentDefs = renderedComponents.w;
         expect(componentDefs.length).to.equal(3);
 
-        expect(componentDefs[0][0]).to.equal('s0-w0');
-        expect(componentDefs[1][0]).to.equal('s0-w1');
+        expect(componentDefs[0][0]).to.equal('s0-c0');
+        expect(componentDefs[1][0]).to.equal('s0-c1');
         expect(componentDefs[2][0]).to.equal('s0');
         done();
 	});

test/autotests/components-server/getRenderedWidgets/widget.js

@@ -1,5 +0,0 @@
-function Component() {
-
-}
-
-module.exports = Component;