ripple 0.2.86 → 0.2.88

package/package.json

@@ -3,7 +3,7 @@
   "description": "Ripple is an elegant TypeScript UI framework",
   "license": "MIT",
   "author": "Dominic Gannaway",
-  "version": "0.2.86",
+  "version": "0.2.88",
   "type": "module",
   "module": "src/runtime/index-client.js",
   "main": "src/runtime/index-client.js",
@@ -58,6 +58,8 @@
   "imports": {
     "#client": "./src/runtime/internal/client/types.d.ts",
     "#client/constants": "./src/internal/client/constants.js",
+    "#server": "./src/runtime/internal/server/types.d.ts",
+    "#compiler": "./src/compiler/types/index.d.ts",
     "#public": "./types/index.d.ts"
   },
   "dependencies": {

package/src/compiler/phases/1-parse/index.js

@@ -793,7 +793,36 @@ function RipplePlugin(config) {
 						this.next();
 					}
 				} else {
-					if (open.name.name === 'style') {
+					if (open.name.name === 'script') {
+						let content = '';
+
+						// TODO implement this where we get a string for content of the content of the script tag
+						// This is a temporary workaround to get the content of the script tag
+						const start = open.end;
+						const input = this.input.slice(start);
+						const end = input.indexOf('</script>');
+						content = input.slice(0, end);
+
+						const newLines = content.match(regex_newline_characters)?.length;
+						if (newLines) {
+							this.curLine = open.loc.end.line + newLines;
+							this.lineStart = start + content.lastIndexOf('\n') + 1;
+						}
+						this.pos = start + content.length + 1;
+
+						this.type = tok.jsxTagStart;
+						this.next();
+						if (this.value === '/') {
+							this.next();
+							this.jsx_parseElementName();
+							this.exprAllowed = true;
+							this.#path.pop();
+							this.next();
+						}
+
+						element.content = content;
+						this.finishNode(element, 'Element');
+					} else if (open.name.name === 'style') {
 						// jsx_parseOpeningElementAt treats ID selectors (ie. #myid) or type selectors (ie. div) as identifier and read it
 						// So backtrack to the end of the <style> tag to make sure everything is included
 						const start = open.end;

package/src/compiler/phases/2-analyze/index.js

@@ -488,7 +488,9 @@ const visitors = {
 					if (attr.name.type === 'Identifier') {
 						attribute_names.add(attr.name);
 					}
-					visit(attr.value, state);
+          if (attr.value !== null) {
+					  visit(attr.value, state);
+          }
 				} else if (attr.type === 'SpreadAttribute') {
 					visit(attr.argument, state);
 				} else if (attr.type === 'RefAttribute') {

package/src/compiler/phases/3-transform/client/index.js

@@ -137,12 +137,6 @@ function visit_title_element(node, context) {
 	}
 }
 
-function visit_style_element(node, context) {
-	context.state.template.push(
-		b.literal(`<style>${sanitize_template_string(node.css)}</style>`),
-	);
-}
-
 const visitors = {
 	_: function set_scope(node, { next, state }) {
 		const scope = state.scopes.get(node);
@@ -487,9 +481,19 @@ const visitors = {
 	Element(node, context) {
 		const { state, visit } = context;
 
-		if (context.state.inside_head && node.id.type === 'Identifier' && node.id.name === 'style') {
-			state.template.push(`<style>${sanitize_template_string(node.css)}</style>`);
-			return;
+		if (context.state.inside_head) {
+			if (node.id.type === 'Identifier' && node.id.name === 'style') {
+				state.template.push(`<style>${sanitize_template_string(node.css)}</style>`);
+				return;
+			}
+			if (node.id.type === 'Identifier' && node.id.name === 'script') {
+				const id = state.flush_node();
+				state.template.push('<!>');
+				context.state.init.push(
+					b.stmt(b.call('_$_.script', id, b.literal(sanitize_template_string(node.content)))),
+				);
+				return;
+			}
 		}
 
 		const is_dom_element = is_element_dom_element(node);
@@ -766,7 +770,8 @@ const visitors = {
 				if (attr.type === 'Attribute') {
 					if (attr.name.type === 'Identifier') {
 						const metadata = { tracking: false, await: false };
-						let property = visit(attr.value, { ...state, metadata });
+						let property =
+							attr.value === null ? b.literal(true) : visit(attr.value, { ...state, metadata });
 
 						if (metadata.tracking || attr.name.tracked) {
 							if (attr.name.name === 'children') {
@@ -1139,6 +1144,14 @@ const visitors = {
 		return context.next();
 	},
 
+	ExportNamedDeclaration(node, context) {
+		if (!context.state.to_ts && node.exportKind === 'type') {
+			return b.empty;
+		}
+
+		return context.next();
+	},
+
 	TryStatement(node, context) {
 		if (!is_inside_component(context)) {
 			context.next();

package/src/compiler/scope.js

@@ -1,3 +1,5 @@
+/** @import * as ESTree from 'estree' */
+
 import is_reference from 'is-reference';
 import { extract_identifiers, object, unwrap_pattern } from '../utils/ast.js';
 import { walk } from 'zimmerframe';

package/src/compiler/types/index.d.ts

@@ -0,0 +1,5 @@
+
+
+export interface CompileResult {
+ // TODO
+}

package/src/runtime/array.js

@@ -69,6 +69,7 @@ TrackedArray.fromAsync = async function (arrayLike, mapFn, thisArg) {
  * @returns {TrackedArray<T>}
  */
 function proxy({ elements, block, from_static = false, use_array = false }) {
+  /** @type {T[]} */
   var arr;
   var first;
 
@@ -77,9 +78,9 @@ function proxy({ elements, block, from_static = false, use_array = false }) {
     (first = get_first_if_length(/** @type {Array<T>} */ (elements))) !== undefined
   ) {
     arr = new Array();
-    arr[0] = first;
+    arr[0] = /** @type {T} */ (/** @type {unknown} */ (first));
   } else if (use_array) {
-    arr = elements;
+    arr = /** @type {T[]} */ (elements);
   } else {
     arr = new Array(...elements);
   }
@@ -94,7 +95,7 @@ function proxy({ elements, block, from_static = false, use_array = false }) {
       var exists = prop in target;
 
       if (t === undefined && (!exists || get_descriptor(target, prop)?.writable)) {
-        t = tracked(exists ? target[prop] : UNINITIALIZED, block);
+        t = tracked(exists ? /** @type {any} */ (target)[prop] : UNINITIALIZED, block);
         tracked_elements.set(prop, t);
       }
 
@@ -106,7 +107,7 @@ function proxy({ elements, block, from_static = false, use_array = false }) {
       var result = Reflect.get(target, prop, receiver);
 
       if (typeof result === 'function') {
-        if (methods_returning_arrays.has(prop)) {
+        if (methods_returning_arrays.has(/** @type {string} */ (prop))) {
           /** @type {(this: any, ...args: any[]) => any} */
           return function (...args) {
             var output = Reflect.apply(result, receiver, args);
@@ -211,7 +212,7 @@ function proxy({ elements, block, from_static = false, use_array = false }) {
 
       if (t !== undefined || !exists || get_descriptor(target, prop)?.writable) {
         if (t === undefined) {
-          t = tracked(exists ? target[prop] : UNINITIALIZED, block);
+          t = tracked(exists ? /** @type {any} */ (target)[prop] : UNINITIALIZED, block);
 
           tracked_elements.set(prop, t);
         }
@@ -288,6 +289,12 @@ const methods_returning_arrays = new Set([
   'with',
 ]);
 
+/**
+ * @template T
+ * @param {Iterable<T>} elements
+ * @param {Block} block
+ * @returns {TrackedArray<T>}
+ */
 export function tracked_array(elements, block) {
   return proxy({ elements, block, from_static: true });
 }

package/src/runtime/index-client.js

@@ -47,7 +47,6 @@ export {
   track,
   trackSplit,
   untrack,
-  deferred,
 } from './internal/client/runtime.js';
 
 export { TrackedArray } from './array.js';

package/src/runtime/index-server.js

@@ -1,5 +1,8 @@
-import { DERIVED, TRACKED, UNINITIALIZED } from './internal/client/constants';
-import { is_tracked_object } from './internal/client/utils';
+/** @import { Component, Derived, Tracked } from '#server' */
+
+import { DERIVED, TRACKED, UNINITIALIZED } from './internal/client/constants.js';
+import { is_tracked_object } from './internal/client/utils.js';
+import { active_component } from './internal/server/index.js';
 
 export { create_context as createContext } from './internal/server/context.js';
 
@@ -9,7 +12,16 @@ export function effect() {
 
 export const TrackedArray = Array;
 
-export function track(v, o) {
+var empty_get_set = { get: undefined, set: undefined };
+
+/**
+ *
+ * @param {any} v
+ * @param {Function} [get]
+ * @param {Function} [set]
+ * @returns {Tracked | Derived}
+ */
+export function track(v, get, set) {
 	var is_tracked = is_tracked_object(v);
 
 	if (is_tracked) {
@@ -18,6 +30,8 @@ export function track(v, o) {
 
 	if (typeof v === 'function') {
 		return {
+			a: get || set ? { get, set } : empty_get_set,
+			co: active_component,
 			f: TRACKED | DERIVED,
 			fn: v,
 			v: UNINITIALIZED,
@@ -25,6 +39,7 @@ export function track(v, o) {
 	}
 
 	return {
+		a: get || set ? { get, set } : empty_get_set,
 		f: TRACKED,
 		v,
 	};