@malloydata/render 0.0.61-dev230724154311 → 0.0.61-dev230724171210

package/dist/html/number.js

@@ -21,15 +21,12 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NumberRendererFactory = exports.HTMLNumberRenderer = void 0;
 const malloy_1 = require("@malloydata/malloy");
 const text_1 = require("./text");
 const renderer_factory_1 = require("../renderer_factory");
-const numfmt_1 = __importDefault(require("numfmt"));
+const ssf_1 = require("ssf");
 class HTMLNumberRenderer extends text_1.HTMLTextRenderer {
     constructor(document, options) {
         super(document);
@@ -41,7 +38,7 @@ class HTMLNumberRenderer extends text_1.HTMLTextRenderer {
         }
         if (this.options.value_format) {
             try {
-                return numfmt_1.default.format(this.options.value_format, data.number.value);
+                return (0, ssf_1.format)(this.options.value_format, data.number.value);
             }
             catch {
                 // TODO: explore surfacing invalid format error, ignoring it for now.

package/dist/html/table.js

@@ -119,6 +119,17 @@ class HTMLTableRenderer extends container_1.ContainerRenderer {
                         if ((aValue === null || aValue === void 0 ? void 0 : aValue.isScalar()) &&
                             (bValue === null || bValue === void 0 ? void 0 : bValue.isScalar()) &&
                             typeof aValue === typeof bValue) {
+                            if (aValue.isNull()) {
+                                if (bValue.isNull()) {
+                                    return 0;
+                                }
+                                else {
+                                    return 1;
+                                }
+                            }
+                            else if (bValue.isNull()) {
+                                return -1;
+                            }
                             // eslint-disable-next-line @typescript-eslint/no-explicit-any
                             const compValue = aValue.compareTo(bValue);
                             if (compValue !== 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/render",
-  "version": "0.0.61-dev230724154311",
+  "version": "0.0.61-dev230724171210",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,11 +18,11 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.61-dev230724154311",
+    "@malloydata/malloy": "^0.0.61-dev230724171210",
     "@types/luxon": "^2.4.0",
     "lodash": "^4.17.20",
     "luxon": "^2.4.0",
-    "numfmt": "^2.5.1",
+    "ssf": "^0.11.2",
     "us-atlas": "^3.0.0",
     "vega": "^5.21.0",
     "vega-lite": "^5.2.0"