seroval - npm Package Compare versions

Comparing version 0.4.0-alpha.5 to 0.4.0-alpha.6

dist/types/tree/types.d.ts

@@ -34,3 +34,3 @@ import { PrimitiveValue } from '../types';
 ];
-export type SerovalDictionaryNode = [key: string[], value: SerovalNode[], size: number];
+export type SerovalDictionaryNode = Record<string, SerovalNode>;
 export type SerovalSetNode = [type: SerovalNodeType.Set, value: SerovalNode[], id: number];
@@ -37,0 +37,0 @@ export type SerovalMapNode = [

package.json

 {
   "name": "seroval",
   "type": "module",
-  "version": "0.4.0-alpha.5",
+  "version": "0.4.0-alpha.6",
   "files": [
@@ -67,3 +67,3 @@ "dist",
   },
-  "gitHead": "b6e4a61b67d1ba6e6e209dd5ba81cd94fb33d021"
+  "gitHead": "91199038f92d170421d2cfe02b928fb24202d9a8"
 }

src/tree/async.ts

@@ -33,30 +33,20 @@ /* eslint-disable no-await-in-loop */
 
-async function serializePropertiesAsync(
+async function generateDictionary(
   ctx: ParserContext,
-  properties: Record<string, unknown>,
+  properties: Record<string, AsyncServerValue>,
 ): Promise<SerovalDictionaryNode> {
   const keys = Object.keys(properties);
-  const size = keys.length;
-  const keyNodes = new Array<string>(size);
-  const valueNodes = new Array<SerovalNode>(size);
-  const deferredKeys = new Array<string>(size);
-  const deferredValues = new Array<AsyncServerValue>(size);
-  let deferredSize = 0;
-  let nodesSize = 0;
+  const nodes: SerovalDictionaryNode = {};
+  const deferred: Record<string, AsyncServerValue> = {};
   for (const key of keys) {
     if (isIterable(properties[key])) {
-      deferredKeys[deferredSize] = key;
-      deferredValues[deferredSize] = properties[key] as AsyncServerValue;
-      deferredSize++;
+      deferred[key] = properties[key];
     } else {
-      keyNodes[nodesSize] = key;
-      valueNodes[nodesSize] = await generateTreeAsync(ctx, properties[key] as AsyncServerValue);
-      nodesSize++;
+      nodes[key] = await generateTreeAsync(ctx, properties[key]);
     }
   }
-  for (let i = 0; i < deferredSize; i++) {
-    keyNodes[nodesSize + i] = deferredKeys[i];
-    valueNodes[nodesSize + i] = await generateTreeAsync(ctx, deferredValues[i]);
+  for (const key of Object.keys(deferred)) {
+    nodes[key] = await generateTreeAsync(ctx, deferred[key]);
   }
-  return [keyNodes, valueNodes, size];
+  return nodes;
 }
@@ -161,3 +151,3 @@
   const optionsNode = options
-    ? await serializePropertiesAsync(ctx, options)
+    ? await generateDictionary(ctx, options)
     : undefined;
@@ -179,3 +169,3 @@ const errorsNode = await generateTreeAsync(ctx, current.errors as AsyncServerValue);
   const optionsNode = options
-    ? await serializePropertiesAsync(ctx, options)
+    ? await generateDictionary(ctx, options)
     : undefined;
@@ -198,3 +188,5 @@ return [
     // Parse options first before the items
-    options ? await serializePropertiesAsync(ctx, options) : undefined,
+    options
+      ? await generateDictionary(ctx, options as Record<string, AsyncServerValue>)
+      : undefined,
     await generateNodeList(ctx, Array.from(current)),
@@ -251,3 +243,3 @@ ], id];
       empty ? SerovalNodeType.NullConstructor : SerovalNodeType.Object,
-      await serializePropertiesAsync(ctx, current as Record<string, unknown>),
+      await generateDictionary(ctx, current as Record<string, AsyncServerValue>),
       id,
@@ -254,0 +246,0 @@ ];

src/tree/serialize.ts

@@ -172,12 +172,11 @@ /* eslint-disable @typescript-eslint/no-use-before-define */
   targetRef: number,
-  [keys, values, size]: SerovalDictionaryNode,
+  record: SerovalDictionaryNode,
 ) {
   ctx.stack.push(targetRef);
   const mainAssignments: Assignment[] = [];
-  for (let i = 0; i < size; i++) {
+  for (const key of Object.keys(record)) {
     const parentStack = ctx.stack;
     ctx.stack = [];
-    const refParam = serializeTree(ctx, values[i]);
+    const refParam = serializeTree(ctx, record[key]);
     ctx.stack = parentStack;
-    const key = keys[i];
     const check = Number(key);
@@ -202,15 +201,11 @@ const parentAssignment = ctx.assignments;
 
-function serializeObject(
+function serializeDictionary(
   ctx: SerializationContext,
   sourceID: number,
-  [keys, values, size]: SerovalDictionaryNode,
+  record: SerovalDictionaryNode,
 ) {
-  if (size === 0) {
-    return '{}';
-  }
   let result = '';
   ctx.stack.push(sourceID);
-  for (let i = 0; i < size; i++) {
-    const key = keys[i];
-    const val = values[i];
+  for (const key of Object.keys(record)) {
+    const val = record[key];
     const check = Number(key);
@@ -410,3 +405,3 @@ // Test if key is a valid number or JS identifier
 ) {
-  const fields = serializeObject(ctx, id, value);
+  const fields = serializeDictionary(ctx, id, value);
   if (fields !== '{}') {
@@ -562,3 +557,3 @@ return `Object.assign(${serialized},${fields})`;
     case SerovalNodeType.Object:
-      return assignRef(ctx, id, serializeObject(ctx, id, value));
+      return assignRef(ctx, id, serializeDictionary(ctx, id, value));
     default:
@@ -565,0 +560,0 @@ throw new Error('Unsupported type');

src/tree/sync.ts

@@ -27,30 +27,20 @@ /* eslint-disable @typescript-eslint/no-use-before-define */
 
-function serializePropertiesSync(
+function generateDictionary(
   ctx: ParserContext,
-  properties: Record<string, unknown>,
+  properties: Record<string, ServerValue>,
 ): SerovalDictionaryNode {
   const keys = Object.keys(properties);
-  const size = keys.length;
-  const keyNodes = new Array<string>(size);
-  const valueNodes = new Array<SerovalNode>(size);
-  const deferredKeys = new Array<string>(size);
-  const deferredValues = new Array<ServerValue>(size);
-  let deferredSize = 0;
-  let nodesSize = 0;
+  const nodes: SerovalDictionaryNode = {};
+  const deferred: Record<string, ServerValue> = {};
   for (const key of keys) {
     if (isIterable(properties[key])) {
-      deferredKeys[deferredSize] = key;
-      deferredValues[deferredSize] = properties[key] as ServerValue;
-      deferredSize++;
+      deferred[key] = properties[key];
     } else {
-      keyNodes[nodesSize] = key;
-      valueNodes[nodesSize] = generateTreeSync(ctx, properties[key] as ServerValue);
-      nodesSize++;
+      nodes[key] = generateTreeSync(ctx, properties[key]);
     }
   }
-  for (let i = 0; i < deferredSize; i++) {
-    keyNodes[nodesSize + i] = deferredKeys[i];
-    valueNodes[nodesSize + i] = generateTreeSync(ctx, deferredValues[i]);
+  for (const key of Object.keys(deferred)) {
+    nodes[key] = generateTreeSync(ctx, deferred[key]);
   }
-  return [keyNodes, valueNodes, size];
+  return nodes;
 }
@@ -155,3 +145,3 @@
   const optionsNode = options
-    ? serializePropertiesSync(ctx, options)
+    ? generateDictionary(ctx, options)
     : undefined;
@@ -169,3 +159,3 @@ const errorsNode = generateTreeSync(ctx, current.errors as ServerValue);
   const optionsNode = options
-    ? serializePropertiesSync(ctx, options)
+    ? generateDictionary(ctx, options)
     : undefined;
@@ -188,3 +178,5 @@ return [
     // Parse options first before the items
-    options ? serializePropertiesSync(ctx, options) : undefined,
+    options
+      ? generateDictionary(ctx, options as Record<string, ServerValue>)
+      : undefined,
     generateNodeList(ctx, Array.from(current)),
@@ -233,3 +225,3 @@ ], id];
       empty ? SerovalNodeType.NullConstructor : SerovalNodeType.Object,
-      serializePropertiesSync(ctx, current as Record<string, unknown>),
+      generateDictionary(ctx, current as Record<string, ServerValue>),
       id,
@@ -236,0 +228,0 @@ ];

src/tree/types.ts

@@ -42,3 +42,3 @@ import { PrimitiveValue } from '../types';
 
-export type SerovalDictionaryNode = [key: string[], value: SerovalNode[], size: number];
+export type SerovalDictionaryNode = Record<string, SerovalNode>;
 export type SerovalSetNode = [type: SerovalNodeType.Set, value: SerovalNode[], id: number];
@@ -45,0 +45,0 @@ export type SerovalMapNode = [

No alert changes

Worsened metrics

Total package byte prevSize

365674

decreased by-1.8%

Lines of code

4876

decreased by-1.49%

No dependency changes