tungsten 0.4.11 → 0.4.13

package/dist/indexInner.js

@@ -1,5 +1,5 @@
 // core
-export * from "./TungstenAppOld.js";
+export * from './TungstenAppOld.js';
 export { TungstenSimpleComponent, TungstenSimpleComponent as SimpleComponent,
 // static component
 TungstenStatefulComponent, TungstenStatefulComponent as StatefulComponent,
@@ -7,11 +7,11 @@ TungstenStatefulComponent, TungstenStatefulComponent as StatefulComponent,
 //TungstenBaseStoreComponent as TungstenBaseStoreComponent, TungstenBaseStoreComponent as BaseStoreComponent,
 TungstenBaseSimpleStoreComponent, TungstenBaseSimpleStoreComponent as BaseSimpleStoreComponent, TungstenBaseStatefulStoreComponent, TungstenBaseStatefulStoreComponent as BaseStatefulStoreComponent } from "./Components.js";
 // other
-export * from "./alive.js";
-export * from "./appOutput.js";
-export * from "./AssignedStyle.js"; // assigned style symbol and assigned style type
-export * from "./clone.js";
-export * from "./components/Await.js";
+export * from './alive.js';
+export * from './appOutput.js';
+export * from './AssignedStyle.js'; // assigned style symbol and assigned style type
+export * from './clone.js';
+export * from './components/Await.js';
 export * from "./components/bindable/BindableCheckbox.js";
 export * from "./components/bindable/BindableInput.js";
 export * from "./components/bindable/BindableInputTyped.js";
@@ -19,58 +19,58 @@ export * from "./components/bindable/BindableRadio.js";
 export * from "./components/bindable/BindableSelect.js";
 export * from "./components/bindable/BindableTextarea.js";
 export * from "./components/GoToComponent.js";
-export * from "./components/Lazy.js";
+export * from './components/Lazy.js';
 export * from "./components/Link.js";
 export * from "./components/PopMessages.js";
 export * from "./components/RawHtml.js";
 export * from "./components/RouteRedirectComponent.js";
-export { parseHtml } from "./rawHtml/parseHtml.js";
-export { safeHtmlAllowList } from "./rawHtml/safeHtmlAllowList.js";
-export { sanitizeHtml } from "./rawHtml/sanitizeHtml.js";
-export { filterContentNode } from "./rawHtml/filterContentNode.js";
-export { contentNodeToHtml } from "./render/contentNodeToHtml.js";
+export { parseHtml } from './rawHtml/parseHtml.js';
+export { safeHtmlAllowList } from './rawHtml/safeHtmlAllowList.js';
+export { sanitizeHtml } from './rawHtml/sanitizeHtml.js';
+export { filterContentNode } from './rawHtml/filterContentNode.js';
+export { contentNodeToHtml } from './render/contentNodeToHtml.js';
 export * from "./components/WebRedirectComponent.js";
 export * from "./nbsp.js";
-export { pop, dismissPop } from "./pop.js";
-export * from "./browserStorage.js";
-export { createElement } from "./createElement.js";
-export * from "./createRef.js";
+export { pop, dismissPop } from './pop.js';
+export * from './browserStorage.js';
+export { createElement } from './createElement.js';
+export * from './createRef.js';
 //export * from './env/funcs.js'
 //export * from './env/index.js'
-export { foreach } from "./foreach.js";
-export * from "./helpers/index.js";
-export * from "./hooks/index.js";
+export { foreach } from './foreach.js';
+export * from './helpers/index.js';
+export * from './hooks/index.js';
 export * from "./hydrate/hydrate.js";
-export * from "./jsxRuntime.js";
+export * from './jsxRuntime.js';
 //export { tungstenPrivateEnv, tungstenPublicEnv } from './env/env.js'
 //export * from './env/parseEnv.js'
-export * from "./makeServerRpc.js";
-export { isBrowser } from "./isBrowser.js";
-export { isClient } from "./isClient.js";
-export { isServer } from "./isServer.js";
-export { isDev } from "./isDev.js";
-export { isProd } from "./isProd.js";
-export { logAndReturn } from "./logAndReturn.js";
+export * from './makeServerRpc.js';
+export { isBrowser } from './isBrowser.js';
+export { isClient } from './isClient.js';
+export { isServer } from './isServer.js';
+export { isDev } from './isDev.js';
+export { isProd } from './isProd.js';
+export { logAndReturn } from './logAndReturn.js';
 //export * from './RenderRoutes.js' // maybe we won't use render routes, instead Router and Route
-export * from "./requests/index.js";
+export * from './requests/index.js';
 //export * from './zones/react.jsx'
-export { registerGlobalData } from "./routing/registerGlobalData.js";
-export * from "./routing/MatchedRoute.js";
-export * from "./routing/RedirectCode.js";
+export { registerGlobalData } from './routing/registerGlobalData.js';
+export * from './routing/MatchedRoute.js';
+export * from './routing/RedirectCode.js';
 export * from "./routing/Route.js";
 export * from "./routing/Router.js";
-export * from "./routing/RouteContentFunction.js";
-export * from "./routing/RoutingRedirect.js";
-export * from "./routing/WebRedirect.js";
-export * from "./when.js";
-export * from "./serverRpc.js";
-export * from "./settings.js";
-export * from "./Store/getStore.js";
-export * from "./Store/registerStore.js";
+export * from './routing/RouteContentFunction.js';
+export * from './routing/RoutingRedirect.js';
+export * from './routing/WebRedirect.js';
+export * from './when.js';
+export * from './serverRpc.js';
+export * from './settings.js';
+export * from './Store/getStore.js';
+export * from './Store/registerStore.js';
 export * from "./components/Stylesheet.js";
-export { TungstenError } from "./TungstenError.js";
-export * from "./__deproxy.js";
-export { $original } from "./componentProxyHandlers.js";
-export * from "./ContentNode.js"; // types and type guards
-export { StringIsPath, RouteKeyIsPath } from "./routing/RouteTypes.js";
-export { makeTungstenErrorInfo } from "./routing/TungstenErrorInfo.js";
+export { TungstenError } from './TungstenError.js';
+export * from './__deproxy.js';
+export { $original } from './componentProxyHandlers.js';
+export * from './ContentNode.js'; // types and type guards
+export { StringIsPath, RouteKeyIsPath } from './routing/RouteTypes.js';
+export { makeTungstenErrorInfo } from './routing/TungstenErrorInfo.js';

package/dist/innerHtmlFromProps.js

@@ -1,4 +1,4 @@
-import { throwError } from "./throwError.js";
+import { throwError } from './throwError.js';
 /**
  * Reads React's `dangerouslySetInnerHTML` prop, returning the raw markup, or
  * `null` when the element does not use it.

package/dist/isBrowser.js

@@ -1 +1 @@
-export { isClient as isBrowser } from "./isClient.js";
+export { isClient as isBrowser } from './isClient.js';

package/dist/isDev.js

@@ -1,4 +1,4 @@
-import { TungstenError } from "./TungstenError.js";
+import { TungstenError } from './TungstenError.js';
 let isDev = false;
 // Neither global alone identifies the environment:
 //  - `process` exists in the browser in dev, because cjsHelpers.js installs a shim so that

package/dist/isProd.js

@@ -1,2 +1,2 @@
-import { isDev } from "./isDev.js";
+import { isDev } from './isDev.js';
 export const isProd = !isDev;

package/dist/isServer.js

@@ -1,2 +1,2 @@
-import { isBrowser } from "./isBrowser.js";
+import { isBrowser } from './isBrowser.js';
 export const isServer = !isBrowser;

package/dist/jsx-runtime.js

@@ -1 +1 @@
-export { jsx, jsxs, Fragment } from "./jsxRuntime.js";
+export { jsx, jsxs, Fragment } from './jsxRuntime.js';

package/dist/jsxRuntime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jsxRuntime.d.ts","sourceRoot":"","sources":["../src/jsxRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAC7D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,KAAK,6BAA6B,EAAoD,MAAM,kBAAkB,CAAA;AACvH,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAM9C,cAAc,yBAAyB,CAAA;AAGvC,eAAO,MAAM,QAAQ,EAAG,KAAe,CAAA;AAGvC,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,gBAAgB,GAAG,OAAO,QAAQ,CAAA;AAkBrE,wBAAgB,GAAG,CACf,IAAI,EAAE,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,EAChE,KAAK,EAAE,6BAA6B,EACpC,GAAG,EAAE,OAAO,GACb,WAAW,CAyEb;AAID,eAAO,MAAM,IAAI,GAAY,GAAG,MAAM,UAAU,CAAC,OAAO,GAAG,CAAC,gBAG3D,CAAA"}
+{"version":3,"file":"jsxRuntime.d.ts","sourceRoot":"","sources":["../src/jsxRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAC7D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,KAAK,6BAA6B,EAAoD,MAAM,kBAAkB,CAAA;AACvH,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAM9C,cAAc,yBAAyB,CAAA;AAGvC,eAAO,MAAM,QAAQ,EAAG,KAAe,CAAA;AAGvC,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,gBAAgB,GAAG,OAAO,QAAQ,CAAA;AAkBrE,wBAAgB,GAAG,CACf,IAAI,EAAE,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,EAChE,KAAK,EAAE,6BAA6B,EACpC,GAAG,EAAE,OAAO,GACb,WAAW,CAiFb;AAID,eAAO,MAAM,IAAI,GAAY,GAAG,MAAM,UAAU,CAAC,OAAO,GAAG,CAAC,gBAG3D,CAAA"}

package/dist/jsxRuntime.js

@@ -1,9 +1,9 @@
 import { TungstenBaseComponent } from "./Components.js";
-import { TungstenError } from "./TungstenError.js";
-import { $key, $props, $type } from "./contentNodeSymbols.js";
-import { packageNameCapitalized } from "./settings.js";
-import { throwError } from "./throwError.js";
-export * from "./contentNodeSymbols.js";
+import { TungstenError } from './TungstenError.js';
+import { $key, $props, $type } from './contentNodeSymbols.js';
+import { packageNameCapitalized } from './settings.js';
+import { throwError } from './throwError.js';
+export * from './contentNodeSymbols.js';
 //import { inspect } from 'util'
 export const Fragment = 0xeacb; // code taken from react for fragments
 // (?outdated?) this doesn't seem to handle string/number/undefined correctly
@@ -77,8 +77,13 @@ export function jsx(type, props, key) {
       [$key]: key
     };
   }
-  if (typeof type === undefined || type === null) {
-    return type;
+  if (type === null) {
+    return null;
+  }
+  // an import that resolved to nothing - a removed or misspelled export, or one caught
+  // mid-edit by HMR, which relies on this throw to fall back to a full reload
+  if (type === undefined) {
+    throw new TungstenError(`${packageNameCapitalized} JSX Runtime error: element type is undefined` + ` - does the import it came from still export it?`);
   }
   if (typeof type === 'number') {
     return String(type);

package/dist/jsxRuntimeSignals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jsxRuntimeSignals.d.ts","sourceRoot":"","sources":["../src/jsxRuntimeSignals.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAC7D,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAA;AACrE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAI3C,cAAc,yBAAyB,CAAA;AAEvC,eAAO,MAAM,QAAQ,EAAG,KAAe,CAAA;AAEvC,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,gBAAgB,GAAG,OAAO,QAAQ,CAAA;AAGrE,eAAO,MAAM,UAAU,eAAiB,CAAA;AAcxC,wBAAgB,GAAG,CACf,IAAI,EAAE,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,EAChE,KAAK,EAAE,6BAA6B,EACpC,GAAG,EAAE,OAAO;;;;;;;;qBA+Cf;AAID,eAAO,MAAM,IAAI,YAAM,CAAA"}
+{"version":3,"file":"jsxRuntimeSignals.d.ts","sourceRoot":"","sources":["../src/jsxRuntimeSignals.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAC7D,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAA;AACrE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAI3C,cAAc,yBAAyB,CAAA;AAEvC,eAAO,MAAM,QAAQ,EAAG,KAAe,CAAA;AAEvC,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,gBAAgB,GAAG,OAAO,QAAQ,CAAA;AAGrE,eAAO,MAAM,UAAU,eAAiB,CAAA;AAcxC,wBAAgB,GAAG,CACf,IAAI,EAAE,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,EAChE,KAAK,EAAE,6BAA6B,EACpC,GAAG,EAAE,OAAO;;;;;;;;qBA+Df;AAID,eAAO,MAAM,IAAI,YAAM,CAAA"}

package/dist/jsxRuntimeSignals.js

@@ -1,7 +1,7 @@
-import { TungstenError } from "./TungstenError.js";
-import { packageNameCapitalized } from "./settings.js";
-import { throwError } from "./throwError.js";
-export * from "./contentNodeSymbols.js";
+import { TungstenError } from './TungstenError.js';
+import { packageNameCapitalized } from './settings.js';
+import { throwError } from './throwError.js';
+export * from './contentNodeSymbols.js';
 export const Fragment = 0xeacb; // code taken from react for fragments
 //// TODO use this symbol for type
 export const TypeSymbol = Symbol('type');
@@ -22,7 +22,9 @@ export function jsx(type, props, key) {
     if (Array.isArray(props.class) || typeof props.class === 'string') {
       const classString = Array.isArray(props.class) ? classNameArrayToString(props.class) : props.class;
       if (props.className !== undefined) {
-        if (typeof props.className !== 'string') throwError('jsxRuntime', `expected className prop to be string, instead got ${typeof props.className}`);
+        if (typeof props.className !== 'string') {
+          throwError('jsxRuntime', `expected className prop to be string, instead got ${typeof props.className}`);
+        }
         props.className = props.className + ' ' + classString;
       } else {
         props.className = classString;
@@ -52,13 +54,18 @@ export function jsx(type, props, key) {
       key
     };
   }
-  if (typeof type === undefined || type === null) {
-    return type;
+  if (type === null) {
+    return null;
+  }
+  // an import that resolved to nothing - a removed or misspelled export, or one caught
+  // mid-edit by HMR, which relies on this throw to fall back to a full reload
+  if (type === undefined) {
+    throw new TungstenError(`${packageNameCapitalized} JSX Runtime error: element type is undefined` + ` - does the import it came from still export it?`);
   }
   if (typeof type === 'number') {
     return String(type);
   }
-  throw new TungstenError(`${packageNameCapitalized} JSX Runtime error: did not recognize element, expected a string, function, class (type function), or fragment. Received type ${typeof type}: ${type}`);
+  throw new TungstenError(`${packageNameCapitalized} JSX Runtime error: did not recognize element` + `, expected a string, function, class (type function), or fragment.` + ` Received type ${typeof type}: ${type}`);
 }
 // jsx func for static elements
 // not sure exactly what this is, just use the same func for now

package/dist/makeFinalConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"makeFinalConfig.d.ts","sourceRoot":"","sources":["../src/makeFinalConfig.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACR,eAAe,EAAE,uBAAuB,EAAE,wBAAwB,EACrE,MAAM,sBAAsB,CAAA;AAG7B,wBAAgB,eAAe,CAC3B,UAAU,EAAE,eAAe,EAC3B,SAAS,GAAE,wBAAwB,GAAG,IAAW,GAClD,uBAAuB,CAiBzB"}
+{"version":3,"file":"makeFinalConfig.d.ts","sourceRoot":"","sources":["../src/makeFinalConfig.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACR,eAAe,EAAE,uBAAuB,EAAE,wBAAwB,EACrE,MAAM,sBAAsB,CAAA;AAG7B,wBAAgB,eAAe,CAC3B,UAAU,EAAE,eAAe,EAC3B,SAAS,GAAE,wBAAwB,GAAG,IAAW,GAClD,uBAAuB,CAiBzB"}

package/dist/makeFinalConfig.js

@@ -1,16 +1,16 @@
-import { defaultConfig } from "./defaultConfig.js";
+import { defaultConfig } from './defaultConfig.js';
 export function makeFinalConfig(userConfig, overrides = null) {
   const finalConfig = structuredClone(defaultConfig);
   for (const key in userConfig) {
     //if (Object.prototype.hasOwnProperty.call(userConfig, key)) { // github co-pilot suggestion, unsure if needed
-    finalConfig[key] = userConfig[key]; // eslint-disable-line no-type-assertion/no-type-assertion
+    finalConfig[key] = userConfig[key]; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
     //}
   }
   // an override left undefined keeps the user config / default value
   for (const key in overrides) {
     const value = overrides[key];
     if (value === undefined) continue;
-    finalConfig[key] = value; // eslint-disable-line no-type-assertion/no-type-assertion
+    finalConfig[key] = value; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
   }
   return finalConfig;
 }

package/dist/makeInstanceConfigFromFrameworkConfig.js

@@ -1,4 +1,4 @@
-import { isProd } from "./isProd.js";
+import { isProd } from './isProd.js';
 export function makeInstanceConfigFromFrameworkConfig(frameworkConfig, dev = false) {
   const c = {
     prod: isProd,

package/dist/makeServerRpc.js

@@ -1,6 +1,6 @@
-import { TungstenError } from "./TungstenError.js";
-import { isServer } from "./isServer.js";
-import { post } from "./requests/index.js";
+import { TungstenError } from './TungstenError.js';
+import { isServer } from './isServer.js';
+import { post } from './requests/index.js';
 // maybe come back to this later
 const config = {
   httpLocation: 'http://localhost:3000'

package/dist/markOptionSelected.js

@@ -1,4 +1,4 @@
-import { $props, $type } from "./contentNodeSymbols.js";
+import { $props, $type } from './contentNodeSymbols.js';
 // An option with no value attribute is identified by its label text, so gather it the way the
 // browser does: script content and raw HTML are not label text, anything else contributes.
 function collectOptionText(node) {
@@ -10,7 +10,7 @@ function collectOptionText(node) {
   }
   if (typeof node === 'string' || typeof node === 'number') return String(node);
   if (typeof node !== 'object') return '';
-  const element = node; // eslint-disable-line no-type-assertion/no-type-assertion -- content and rendering nodes are both { [$type], [$props] }
+  const element = node; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- content and rendering nodes are both { [$type], [$props] }
   if (element[$type] === 'script' || typeof element[$props]?.__html === 'string') return '';
   return collectOptionText(element[$props]?.children);
 }

package/dist/mergeConfigs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mergeConfigs.d.ts","sourceRoot":"","sources":["../src/mergeConfigs.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAI3D,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,CAU3H"}
+{"version":3,"file":"mergeConfigs.d.ts","sourceRoot":"","sources":["../src/mergeConfigs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAc3D,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,CAU3H"}

package/dist/mergeConfigs.js

@@ -1,5 +1,14 @@
-import cloneDeep from 'lodash.clonedeep';
-// can we use structured close?
+// plain data is copied, anything else (functions, class instances) kept by reference - config
+// carries babel plugins, which structuredClone would reject
+function cloneDeep(value) {
+  if (Array.isArray(value)) return value.map(cloneDeep); // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- array in, array out
+  if (typeof value === 'object' && value !== null && Object.getPrototypeOf(value) === Object.prototype) {
+    const copy = {};
+    for (const [key, entry] of Object.entries(value)) copy[key] = cloneDeep(entry);
+    return copy; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- same shape as the input
+  }
+  return value;
+}
 export function mergeConfigs(config1, config2) {
   const newConfig = cloneDeep(config1);
   for (const key in config2) {

package/dist/mutatingFunctions.js

@@ -2,14 +2,14 @@ export const arrayMutatingFunctions = ['push', 'pop', 'shift', 'unshift', 'sort'
 export const mapMutatingFunctions = ['set', 'delete', 'clear'];
 export const setMutatingFunctions = ['add', 'delete', 'clear'];
 export function KeyIsArrayMutatingFunction(key) {
-  // eslint-disable-next-line no-type-assertion/no-type-assertion -- weird TS issue, won't let us search in a const array
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- weird TS issue, won't let us search in a const array
   return arrayMutatingFunctions.includes(key);
 }
 export function KeyIsMapMutatingFunction(key) {
-  // eslint-disable-next-line no-type-assertion/no-type-assertion -- weird TS issue, won't let us search in a const array
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- weird TS issue, won't let us search in a const array
   return mapMutatingFunctions.includes(key);
 }
 export function KeyIsSetMutatingFunction(key) {
-  // eslint-disable-next-line no-type-assertion/no-type-assertion -- weird TS issue, won't let us search in a const array
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- weird TS issue, won't let us search in a const array
   return setMutatingFunctions.includes(key);
 }

package/dist/nbsp.js

@@ -1,4 +1,4 @@
-import { Fragment as _Fragment, jsx as _jsx } from "tungsten/jsxRuntime.js";
+import { Fragment as _Fragment, jsx as _jsx } from "tungsten/jsx-runtime";
 //export function Space() { return ' ' }
 export const nbsp = _jsx(_Fragment, {
   children: "\xA0"

package/dist/output.js

@@ -1,4 +1,4 @@
-import { isClient } from "./isClient.js";
+import { isClient } from './isClient.js';
 /* eslint-disable no-console */
 export function out(...inputs) {
   console.log(...inputs);

package/dist/pop.js

@@ -1,5 +1,5 @@
-import { isServer } from "./isServer.js";
-import { log, warn } from "./appOutput.js";
+import { isServer } from './isServer.js';
+import { log, warn } from './appOutput.js';
 // Set once by PopMessages.clientInit, from this.__instance - one Instance per app, shared
 // across the whole client lifetime, so no per-component proxy/subscription is needed here.
 let instance = null;

package/dist/postcssPlugins/TransformCssNames.js

@@ -9,12 +9,12 @@ extract classes -> localise
 .navItem    ->  NavItem_navItemf
 .span       ->  NavItem_span
 */
-import { parseSelectorsRich } from "./parseSelectorsRich.js";
-import { scopeAnimationValue } from "./scopeAnimationValue.js";
-import { unwrapIgnoreMarker } from "./unwrapIgnoreMarker.js";
-import { componentBumpClass } from "../componentClassName.js";
-import { throwError, warnMessage } from "../throwError.js";
-import { warn } from "../output.js";
+import { parseSelectorsRich } from './parseSelectorsRich.js';
+import { scopeAnimationValue } from './scopeAnimationValue.js';
+import { unwrapIgnoreMarker } from './unwrapIgnoreMarker.js';
+import { componentBumpClass } from '../componentClassName.js';
+import { throwError, warnMessage } from '../throwError.js';
+import { warn } from '../output.js';
 function debug(...texts) {
   //console.log(...texts)
 }
@@ -178,11 +178,11 @@ export const TransformCssNames = opts => {
               const pseudoClassRegex = /:([a-zA-Z0-9-_]+)(?:\((.*)\))?/;
               const results = pseudoClassRegex.exec(content);
               if (results === null) throwError('TransformCssNames -> walkRules', 'pseudo-class selector did not match pseudo-class regex');
-              const label = results[1]; // eslint-disable-line no-type-assertion/no-type-assertion -- typings are incorrect
+              const label = results[1]; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- typings are incorrect
               // if it is :i(xxx) or :ignore(xxx), pass through the internal part
               // otherwise pass all through unaffected
               if (label === 'i' || label === 'ignore') {
-                const inner = results[2]; // eslint-disable-line no-type-assertion/no-type-assertion -- typings are incorrect
+                const inner = results[2]; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- typings are incorrect
                 if (inner !== undefined && inner !== '') {
                   newSelectors.push(inner);
                 }

package/dist/postcssPlugins/parseSelectors.js

@@ -1,4 +1,4 @@
-import { throwError } from "../throwError.js";
+import { throwError } from '../throwError.js';
 // | 'attribute-name-search' | 'attribute-name' | 'attribute-equals-search' | 'attribute-equals'
 // | 'attribute-value-search' | 'attribute-value' | 'attribute-end-search'
 export function parseSelectors(selectorGroup) {

package/dist/postcssPlugins/parseSelectorsRich.js

@@ -1,4 +1,4 @@
-import { throwError } from "../throwError.js";
+import { throwError } from '../throwError.js';
 // | 'attribute-name-search' | 'attribute-name' | 'attribute-equals-search' | 'attribute-equals'
 // | 'attribute-value-search' | 'attribute-value' | 'attribute-end-search'
 export function parseSelectorsRich(selectorGroup) {

package/dist/postcssPlugins/scopeAnimationValue.js

@@ -1,5 +1,5 @@
-import { splitCssValue } from "./splitCssValue.js";
-import { unwrapIgnoreMarker } from "./unwrapIgnoreMarker.js";
+import { splitCssValue } from './splitCssValue.js';
+import { unwrapIgnoreMarker } from './unwrapIgnoreMarker.js';
 // every keyword the animation shorthand accepts. A word that is none of these, and does not
 // read as a time, a number or a function, is the animation name
 const animationKeywords = new Set(['none', 'forwards', 'backwards', 'both',

package/dist/propsAreEqual.js

@@ -1,6 +1,6 @@
-import { objectTypesToProxy } from "./objectTypesToProxy.js";
-import { changedAt } from "./stateTracking.js";
-import { $key, $props, $type } from "./contentNodeSymbols.js";
+import { objectTypesToProxy } from './objectTypesToProxy.js';
+import { changedAt } from './stateTracking.js';
+import { $key, $props, $type } from './contentNodeSymbols.js';
 /**
  * Structural comparison of component props, used to skip updating a child whose
  * props have not changed.

package/dist/rawHtml/filterContentNode.js

@@ -1,7 +1,7 @@
-import { ContentNodeIsComponent } from "../ContentNode.js";
-import { $props, $type } from "../contentNodeSymbols.js";
-import { StringIsHtmlEvent } from "../htmlEvents.js";
-import { blockedUrl, makeAllowCheck, removalFor, urlAttributes } from "./parseHtml.js";
+import { ContentNodeIsComponent } from '../ContentNode.js';
+import { $props, $type } from '../contentNodeSymbols.js';
+import { StringIsHtmlEvent } from '../htmlEvents.js';
+import { blockedUrl, makeAllowCheck, removalFor, urlAttributes } from './parseHtml.js';
 // The NodeProps equivalent of parseHtml's class->className, style->css
 // rename: the allow list is written in terms of the HTML attribute name, but
 // a content tree already carries Tungsten's prop names for these two.

package/dist/rawHtml/parseHtml.js

@@ -1,7 +1,7 @@
-import { $props, $type } from "../contentNodeSymbols.js";
-import { htmlVoidTags } from "../render/htmlVoidTags.js";
-import { tokenizeHtml } from "./tokenizeHtml.js";
-import { htmlRawTextTags, htmlTableStructureTags, impliedEndTag } from "./htmlParsingTags.js";
+import { $props, $type } from '../contentNodeSymbols.js';
+import { htmlVoidTags } from '../render/htmlVoidTags.js';
+import { tokenizeHtml } from './tokenizeHtml.js';
+import { htmlRawTextTags, htmlTableStructureTags, impliedEndTag } from './htmlParsingTags.js';
 const allowEverything = {
   tag: () => true,
   attribute: () => true
@@ -134,7 +134,7 @@ export function parseHtml(html, options = {}) {
   const current = () => stack[stack.length - 1];
   const close = downTo => {
     while (stack.length > downTo) {
-      const element = stack.pop(); // eslint-disable-line no-type-assertion/no-type-assertion -- guarded by the loop
+      const element = stack.pop(); // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- guarded by the loop
       if (element.removal === 'drop') continue;
       if (element.removal === 'unwrap') current().children.push(...element.children);else current().children.push(toContentNode(element));
     }

package/dist/rawHtml/sanitizeHtml.js

@@ -1,6 +1,6 @@
-import { contentNodeToHtml } from "../render/contentNodeToHtml.js";
-import { parseHtml } from "./parseHtml.js";
-import { safeHtmlAllowList } from "./safeHtmlAllowList.js";
+import { contentNodeToHtml } from '../render/contentNodeToHtml.js';
+import { parseHtml } from './parseHtml.js';
+import { safeHtmlAllowList } from './safeHtmlAllowList.js';
 /**
  * Cleans untrusted HTML and returns it as a string, synchronously.
  *

package/dist/rawHtml/tokenizeHtml.js

@@ -1,5 +1,5 @@
-import { decodeHtmlEntities } from "./decodeHtmlEntities.js";
-import { htmlRawTextTags } from "./htmlParsingTags.js";
+import { decodeHtmlEntities } from './decodeHtmlEntities.js';
+import { htmlRawTextTags } from './htmlParsingTags.js';
 // REGEX: < then optional / then a letter -- the only thing that starts a tag.
 // Anything else after a < is literal text, which is how browsers treat it too.
 const tagStart = /<\/?[a-zA-Z]/;

package/dist/render/addImportMap.js

@@ -1,7 +1,7 @@
 /* eslint-disable indent */
 //import { packageName, frameworkDistFolder } from '../settings.js'
-import { isDev } from "../isDev.js";
-import { $props, $type } from "../contentNodeSymbols.js";
+import { isDev } from '../isDev.js';
+import { $props, $type } from '../contentNodeSymbols.js';
 //import { clientModulesAliases } from '../build/clientModuleAliases.js'
 //const nodeModulesLength = `node_modules/`.length
 export function addImportMap(head, importAliases, clientImportAliases) {

package/dist/render/classComponentNodeToRenderingTree.js

@@ -1,7 +1,7 @@
-import { contentTreeToRenderingTree } from "./contentTreeToRenderingTree.js";
-import { debug } from "./debug.js";
-import { makeRenderingNodeClassComponentFromContentNodeClassComponent } from "../RenderingNode.js";
-import { instantiateClassComponent } from "./instantiateClassComponent.js";
+import { contentTreeToRenderingTree } from './contentTreeToRenderingTree.js';
+import { debug } from './debug.js';
+import { makeRenderingNodeClassComponentFromContentNodeClassComponent } from '../RenderingNode.js';
+import { instantiateClassComponent } from './instantiateClassComponent.js';
 export async function classComponentNodeToRenderingTree(node, parentComponent, instance, noEscape) {
   const component = await instantiateClassComponent(node, parentComponent, instance);
   //const component = instantiateComponent(node, parentComponent, instance)

package/dist/render/componentNodeToRenderingTree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"componentNodeToRenderingTree.d.ts","sourceRoot":"","sources":["../../src/render/componentNodeToRenderingTree.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AACvD,OAAO,EACH,KAAK,sBAAsB,EAG9B,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAqD,KAAK,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AAGhH,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAKjD,wBAAsB,4BAA4B,CAC9C,aAAa,EAAE,oBAAoB,EAAE,eAAe,EAAE,YAAY,GAAG,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,GACjH,OAAO,CAAC,sBAAsB,CAAC,CA6CjC"}
+{"version":3,"file":"componentNodeToRenderingTree.d.ts","sourceRoot":"","sources":["../../src/render/componentNodeToRenderingTree.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AACvD,OAAO,EACH,KAAK,sBAAsB,EAG9B,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAqD,KAAK,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AAGhH,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAKjD,wBAAsB,4BAA4B,CAC9C,aAAa,EAAE,oBAAoB,EAAE,eAAe,EAAE,YAAY,GAAG,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,GACjH,OAAO,CAAC,sBAAsB,CAAC,CAmCjC"}

package/dist/render/componentNodeToRenderingTree.js

@@ -1,33 +1,22 @@
-import { makeRenderingNodeClassComponentFromContentNodeClassComponent, makeRenderingNodeFunctionComponentFromContentNodeFunctionComponent } from "../RenderingNode.js";
-import { ContentNodeComponentIsClassComponent } from "../ContentNode.js";
-import { classComponentNodeToRenderingTree } from "./classComponentNodeToRenderingTree.js";
-import { functionComponentNodeToRenderingTree } from "./functionComponentNodeToRenderingTree.js";
-import { TungstenError } from "../TungstenError.js";
-import { $type } from "../contentNodeSymbols.js";
-import { contentTreeToRenderingTree } from "./contentTreeToRenderingTree.js";
+import { makeRenderingNodeClassComponentFromContentNodeClassComponent, makeRenderingNodeFunctionComponentFromContentNodeFunctionComponent } from '../RenderingNode.js';
+import { ContentNodeComponentIsClassComponent } from '../ContentNode.js';
+import { classComponentNodeToRenderingTree } from './classComponentNodeToRenderingTree.js';
+import { functionComponentNodeToRenderingTree } from './functionComponentNodeToRenderingTree.js';
+import { TungstenError } from '../TungstenError.js';
+import { $type } from '../contentNodeSymbols.js';
+import { contentTreeToRenderingTree } from './contentTreeToRenderingTree.js';
 export async function componentNodeToRenderingTree(componentNode, parentComponent, instance, noEscape) {
   //console.log('type', componentNode[$type])
   const render = componentNode[$type].render;
   //console.log('render', render)
   if (render) {
-    let location;
-    let placeholder = null;
-    if (typeof render === 'string') {
-      location = render;
+    // ComponentRenderInfo only knows the client location; the object form adds a placeholder
+    const placeholder = typeof render === 'object' && 'placeholder' in render ? render.placeholder : null;
+    const placeholderTree = await contentTreeToRenderingTree(placeholder, parentComponent, instance, noEscape);
+    if (ContentNodeComponentIsClassComponent(componentNode)) {
+      return makeRenderingNodeClassComponentFromContentNodeClassComponent(componentNode, null, placeholderTree, true);
     } else {
-      location = render.location;
-      if (typeof render === 'object' && 'placeholder') {
-        // not sure what this is
-        placeholder = render.placeholder;
-      }
-    }
-    if (location === 'client') {
-      const placeholderTree = await contentTreeToRenderingTree(placeholder, parentComponent, instance, noEscape);
-      if (ContentNodeComponentIsClassComponent(componentNode)) {
-        return makeRenderingNodeClassComponentFromContentNodeClassComponent(componentNode, null, placeholderTree, true);
-      } else {
-        return makeRenderingNodeFunctionComponentFromContentNodeFunctionComponent(componentNode, null, placeholderTree, true);
-      }
+      return makeRenderingNodeFunctionComponentFromContentNodeFunctionComponent(componentNode, null, placeholderTree, true);
     }
   }
   //console.log('componentRenderToTree component', component)