getPropNames passing

Author: justjake

c/interface.c

@@ -591,19 +591,73 @@ void QTS_DefineProp(JSContext *ctx, JSValueConst *this_val, JSValueConst *prop_n
   JS_FreeAtom(ctx, prop_atom);
 }
 
-MaybeAsync(JSValue *) QTS_GetOwnPropertyNames(JSContext *ctx, JSValue **out_ptrs, uint32_t *out_len, JSValueConst *obj, int flags) {
+#define JS_ATOM_TAG_INT (1U << 31)
+static inline BOOL __JS_AtomIsTaggedInt(JSAtom v) {
+  return (v & JS_ATOM_TAG_INT) != 0;
+}
+
+static inline uint32_t __JS_AtomToUInt32(JSAtom atom) {
+  return atom & ~JS_ATOM_TAG_INT;
+}
+
+/* include numbers. when only this is set, we filter out strings */
+#define QTS_GPN_NUMBER_MASK (1 << 6)
+/* Treat numbers as strings */
+#define QTS_STANDARD_COMPLIANT_NUMBER (1 << 7)
+
+MaybeAsync(JSValue *) QTS_GetOwnPropertyNames(JSContext *ctx, JSValue ***out_ptrs, uint32_t *out_len, JSValueConst *obj, int flags) {
   JSPropertyEnum *tab = NULL;
+  uint32_t total_props = 0;
+  uint32_t out_props = 0;
+
+  BOOL qts_standard_compliant_number = (flags & QTS_STANDARD_COMPLIANT_NUMBER) != 0;
+  BOOL qts_include_string = (flags & JS_GPN_STRING_MASK) != 0;
+  BOOL qts_include_number = qts_standard_compliant_number ? 0 : (flags & QTS_GPN_NUMBER_MASK) != 0;
+  if (qts_include_number) {
+    // if we want numbers, we must include strings in call down
+    flags = flags | JS_GPN_STRING_MASK;
+  }
+
   int status = 0;
-  status = JS_GetOwnPropertyNames(ctx, &tab, out_len, *obj, flags);
+  status = JS_GetOwnPropertyNames(ctx, &tab, &total_props, *obj, flags);
   if (status < 0) {
+    if (tab != NULL) {
+      js_free(ctx, tab);
+    }
     return jsvalue_to_heap(JS_GetException(ctx));
   }
   *out_ptrs = malloc(sizeof(JSValue) * *out_len);
-  for (int i = 0; i < *out_len; i++) {
-    out_ptrs[i] = jsvalue_to_heap(JS_AtomToValue(ctx, tab[i].atom));
-    JS_FreeAtom(ctx, tab[i].atom);
+  for (int i = 0; i < total_props; i++) {
+    JSAtom atom = tab[i].atom;
+
+    if (__JS_AtomIsTaggedInt(atom)) {
+      if (qts_include_number) {
+        uint32_t v = __JS_AtomToUInt32(atom);
+        (*out_ptrs)[out_props++] = jsvalue_to_heap(JS_NewUint32(ctx, v));
+      } else if (qts_include_string && qts_standard_compliant_number) {
+        (*out_ptrs)[out_props++] = jsvalue_to_heap(JS_AtomToValue(ctx, tab[i].atom));
+      }
+      JS_FreeAtom(ctx, atom);
+      continue;
+    }
+
+    JSValue atom_value = JS_AtomToValue(ctx, atom);
+    JS_FreeAtom(ctx, atom);
+
+    if (JS_IsString(atom_value)) {
+      if (qts_include_string) {
+        (*out_ptrs)[out_props++] = jsvalue_to_heap(atom_value);
+      } else {
+        JS_FreeValue(ctx, atom_value);
+      }
+    } else {  // Symbol
+      // We must have set the includeSymbol or includePrivate flags
+      // if it's present
+      (*out_ptrs)[out_props++] = jsvalue_to_heap(atom_value);
+    }
   }
   js_free(ctx, tab);
+  *out_len = out_props;
   return NULL;
 }
 
@@ -1152,4 +1206,4 @@ JSValue *QTS_bjson_decode(JSContext *ctx, JSValueConst *data) {
 
   JSValue value = JS_ReadObject(ctx, buffer, length, 0);
   return jsvalue_to_heap(value);
-}
+}

doc/@jitl/quickjs-ffi-types/exports.md

@@ -23,6 +23,7 @@
   - [JSValueConstPointerPointer](exports.md#jsvalueconstpointerpointer)
   - [JSValuePointer](exports.md#jsvaluepointer)
   - [JSValuePointerPointer](exports.md#jsvaluepointerpointer)
+  - [JSValuePointerPointerPointer](exports.md#jsvaluepointerpointerpointer)
   - [JSVoidPointer](exports.md#jsvoidpointer)
   - [OwnedHeapCharPointer](exports.md#ownedheapcharpointer)
   - [QTS\_C\_To\_HostCallbackFuncPointer](exports.md#qts-c-to-hostcallbackfuncpointer)
@@ -63,7 +64,7 @@ for the Emscripten stack.
 
 #### Source
 
-[packages/quickjs-ffi-types/src/ffi-types.ts:77](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L77)
+[packages/quickjs-ffi-types/src/ffi-types.ts:82](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L82)
 
 ***
 
@@ -96,7 +97,7 @@ for the Emscripten stack.
 
 #### Source
 
-[packages/quickjs-ffi-types/src/ffi-types.ts:89](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L89)
+[packages/quickjs-ffi-types/src/ffi-types.ts:94](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L94)
 
 ***
 
@@ -144,7 +145,7 @@ State of a promise.
 
 #### Source
 
-[packages/quickjs-ffi-types/src/ffi-types.ts:126](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L126)
+[packages/quickjs-ffi-types/src/ffi-types.ts:131](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L131)
 
 ***
 
@@ -181,7 +182,7 @@ Used internally for Javascript-to-C function calls.
 
 #### Source
 
-[packages/quickjs-ffi-types/src/ffi-types.ts:51](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L51)
+[packages/quickjs-ffi-types/src/ffi-types.ts:56](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L56)
 
 ***
 
@@ -210,6 +211,18 @@ Used internally for Javascript-to-C function calls.
 
 ***
 
+### JSValuePointerPointerPointer
+
+> **JSValuePointerPointerPointer**: `Pointer`\<`"*JSValue[]"`\>
+
+Used internally for Javascript-to-C function calls.
+
+#### Source
+
+[packages/quickjs-ffi-types/src/ffi-types.ts:51](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L51)
+
+***
+
 ### JSVoidPointer
 
 > **JSVoidPointer**: `Pointer`\<`any`\>
@@ -218,7 +231,7 @@ Opaque pointer that was allocated by js_malloc.
 
 #### Source
 
-[packages/quickjs-ffi-types/src/ffi-types.ts:94](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L94)
+[packages/quickjs-ffi-types/src/ffi-types.ts:99](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L99)
 
 ***
 
@@ -231,7 +244,7 @@ for the Emscripten stack.
 
 #### Source
 
-[packages/quickjs-ffi-types/src/ffi-types.ts:83](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L83)
+[packages/quickjs-ffi-types/src/ffi-types.ts:88](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L88)
 
 ***
 
@@ -243,7 +256,7 @@ Used internally for C-to-Javascript function calls.
 
 #### Source
 
-[packages/quickjs-ffi-types/src/ffi-types.ts:61](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L61)
+[packages/quickjs-ffi-types/src/ffi-types.ts:66](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L66)
 
 ***
 
@@ -255,7 +268,7 @@ Used internally for C-to-Javascript interrupt handlers.
 
 #### Source
 
-[packages/quickjs-ffi-types/src/ffi-types.ts:66](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L66)
+[packages/quickjs-ffi-types/src/ffi-types.ts:71](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L71)
 
 ***
 
@@ -267,7 +280,7 @@ Used internally for C-to-Javascript module loading.
 
 #### Source
 
-[packages/quickjs-ffi-types/src/ffi-types.ts:71](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L71)
+[packages/quickjs-ffi-types/src/ffi-types.ts:76](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L76)
 
 ***
 
@@ -287,7 +300,7 @@ Used internally for C-to-Javascript module loading.
 
 #### Source
 
-[packages/quickjs-ffi-types/src/ffi-types.ts:96](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L96)
+[packages/quickjs-ffi-types/src/ffi-types.ts:101](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L101)
 
 ## Variables
 
@@ -355,7 +368,7 @@ module code
 
 #### Source
 
-[packages/quickjs-ffi-types/src/ffi-types.ts:101](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L101)
+[packages/quickjs-ffi-types/src/ffi-types.ts:106](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L106)
 
 ***
 
@@ -387,9 +400,17 @@ Bitfield options for QTS_GetOwnPropertyNames
 
 > **JS\_GPN\_SYMBOL\_MASK**: `number`
 
+##### QTS\_GPN\_NUMBER\_MASK
+
+> **QTS\_GPN\_NUMBER\_MASK**: `number`
+
+##### QTS\_STANDARD\_COMPLIANT\_NUMBER
+
+> **QTS\_STANDARD\_COMPLIANT\_NUMBER**: `number`
+
 #### Source
 
-[packages/quickjs-ffi-types/src/ffi-types.ts:116](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L116)
+[packages/quickjs-ffi-types/src/ffi-types.ts:121](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L121)
 
 ***
 
@@ -467,7 +488,7 @@ Bitfield options for QTS_NewContext intrinsics
 
 #### Source
 
-[packages/quickjs-ffi-types/src/ffi-types.ts:106](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L106)
+[packages/quickjs-ffi-types/src/ffi-types.ts:111](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L111)
 
 ***
 
@@ -491,7 +512,7 @@ Bitfield options for QTS_NewContext intrinsics
 
 #### Source
 
-[packages/quickjs-ffi-types/src/ffi-types.ts:121](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L121)
+[packages/quickjs-ffi-types/src/ffi-types.ts:126](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L126)
 
 ***
 
@@ -515,7 +536,7 @@ Bitfield options for QTS_NewContext intrinsics
 
 #### Source
 
-[packages/quickjs-ffi-types/src/ffi-types.ts:126](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L126)
+[packages/quickjs-ffi-types/src/ffi-types.ts:131](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L131)
 
 ## Functions
 
@@ -548,7 +569,7 @@ Bitfield options for QTS_NewContext intrinsics
 
 #### Source
 
-[packages/quickjs-ffi-types/src/ffi-types.ts:131](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L131)
+[packages/quickjs-ffi-types/src/ffi-types.ts:136](https://github.com/justjake/quickjs-emscripten/blob/main/packages/quickjs-ffi-types/src/ffi-types.ts#L136)
 
 ***